rapid-spreadjs 1.0.152 → 1.0.153
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.cjs.js +6 -3
- package/dist/index.cjs.js.map +1 -1
- package/dist/index.cjs.min.js +1 -1
- package/dist/index.cjs.min.js.map +1 -1
- package/dist/index.esm.js +6 -3
- package/dist/index.esm.js.map +1 -1
- package/dist/index.esm.min.js +1 -1
- package/dist/index.esm.min.js.map +1 -1
- package/dist/utils/sheet.d.ts +2 -1
- package/package.json +1 -1
package/dist/index.cjs.js
CHANGED
|
@@ -574,8 +574,9 @@ const SheetUtils = {
|
|
|
574
574
|
col: 0
|
|
575
575
|
}]
|
|
576
576
|
* @param isAutoSize 是否自适应单元格大小（默认为：true）
|
|
577
|
+
* @param isRange 是否为范围选择（默认为：false，如果设置为true，则显示的格式为2026-05-06至2026-05-08【如果选择的范围内只有1天，则显示的格式为2026-05-06】）
|
|
577
578
|
*/
|
|
578
|
-
setSheetCellDate: (GC, sheet, cells, isAutoSize = true) => {
|
|
579
|
+
setSheetCellDate: (GC, sheet, cells, isAutoSize = true, isRange = false) => {
|
|
579
580
|
cells.forEach((item, index) => {
|
|
580
581
|
// 先获取单元格样式，否则设置控件后样式会丢失
|
|
581
582
|
let cellStyle = sheet.getStyle(item.row, item.col);
|
|
@@ -596,11 +597,13 @@ const SheetUtils = {
|
|
|
596
597
|
type: GC.Spread.Sheets.DropDownType.dateTimePicker,
|
|
597
598
|
option: {
|
|
598
599
|
showTime: false,
|
|
599
|
-
showDateRange:
|
|
600
|
+
showDateRange: isRange,
|
|
600
601
|
},
|
|
601
602
|
},
|
|
602
603
|
];
|
|
603
|
-
cellStyle.formatter =
|
|
604
|
+
cellStyle.formatter = !isRange
|
|
605
|
+
? item.dateFormat
|
|
606
|
+
: '=IF(ISBLANK(@), "", IF(TEXT(@.start, "yyyy-mm-dd")=TEXT(@.end, "yyyy-mm-dd"), TEXT(@.start, "yyyy-mm-dd"), TEXT(@.start, "yyyy-mm-dd")&"至"&TEXT(@.end, "yyyy-mm-dd")))';
|
|
604
607
|
// 是否缩小以适应
|
|
605
608
|
cellStyle.shrinkToFit = isAutoSize;
|
|
606
609
|
// 设置单元格样式
|