@visactor/vtable-calendar 1.17.4-alpha.3 → 1.17.4-alpha.5
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/vtable-calendar.js +132 -34
- package/dist/vtable-calendar.min.js +1 -1
- package/package.json +2 -2
package/dist/vtable-calendar.js
CHANGED
|
@@ -34052,7 +34052,7 @@
|
|
|
34052
34052
|
function _generateCustomElementsGroup(table, define, col, row, cellWidth, cellHeight, padding, range, customResult) {
|
|
34053
34053
|
let customElementsGroup,
|
|
34054
34054
|
renderDefault = !0;
|
|
34055
|
-
if (customResult) customElementsGroup = customResult.elementsGroup, renderDefault = customResult.renderDefault;else {
|
|
34055
|
+
if (customResult) customElementsGroup = customResult.elementsGroup, renderDefault = customResult.renderDefault;else if (null == range ? void 0 : range.isCustom) ;else {
|
|
34056
34056
|
let customRender, customLayout;
|
|
34057
34057
|
if ("body" !== table.getCellLocation(col, row) ? (customRender = null == define ? void 0 : define.headerCustomRender, customLayout = null == define ? void 0 : define.headerCustomLayout) : (customRender = (null == define ? void 0 : define.customRender) || table.customRender, customLayout = null == define ? void 0 : define.customLayout), customLayout || customRender) {
|
|
34058
34058
|
const customResult = dealWithCustom(customLayout, customRender, col, row, cellWidth, cellHeight, !1, table.isAutoRowHeight(row), padding, range, table);
|
|
@@ -42354,7 +42354,14 @@
|
|
|
42354
42354
|
if (recordIndex >= 0) {
|
|
42355
42355
|
const dataIndex = state.table.dataSource.getIndexKey(recordIndex).toString();
|
|
42356
42356
|
if (isValid$3(null === (_b = state.checkedState.get(dataIndex)) || void 0 === _b ? void 0 : _b[field])) return state.checkedState.get(dataIndex)[field];
|
|
42357
|
-
state.checkedState.has(dataIndex)
|
|
42357
|
+
if (state.checkedState.has(dataIndex)) state.checkedState.get(dataIndex)[field] = checked;else if (dataIndex.includes(",")) {
|
|
42358
|
+
const parentDataIndex = dataIndex.split(",").slice(0, -1).join(",");
|
|
42359
|
+
state.checkedState.has(parentDataIndex) && !0 === state.checkedState.get(parentDataIndex)[field] ? state.checkedState.set(dataIndex, {
|
|
42360
|
+
[field]: !0
|
|
42361
|
+
}) : state.checkedState.set(dataIndex, {
|
|
42362
|
+
[field]: checked
|
|
42363
|
+
});
|
|
42364
|
+
} else state.checkedState.set(dataIndex, {
|
|
42358
42365
|
[field]: checked
|
|
42359
42366
|
});
|
|
42360
42367
|
}
|
|
@@ -42435,7 +42442,7 @@
|
|
|
42435
42442
|
} = state;
|
|
42436
42443
|
let source, target;
|
|
42437
42444
|
if (table.internalProps.transpose ? (sourceIndex = table.getRecordShowIndexByCell(sourceIndex, 0), targetIndex = table.getRecordShowIndexByCell(targetIndex, 0)) : (source = table.isPivotTable() ? void 0 : table.getRecordIndexByCell(0, sourceIndex), target = table.isPivotTable() ? void 0 : table.getRecordIndexByCell(0, targetIndex)), isNumber$4(source) && isNumber$4(target)) {
|
|
42438
|
-
if (sourceIndex > targetIndex) {
|
|
42445
|
+
if ((sourceIndex = source) > (targetIndex = target)) {
|
|
42439
42446
|
const sourceRecord = checkedState.get(sourceIndex.toString());
|
|
42440
42447
|
for (let i = sourceIndex; i > targetIndex; i--) checkedState.set(i.toString(), checkedState.get((i - 1).toString()));
|
|
42441
42448
|
checkedState.set(targetIndex.toString(), sourceRecord);
|
|
@@ -44678,20 +44685,22 @@
|
|
|
44678
44685
|
|
|
44679
44686
|
function bindGroupTitleCheckboxChange(table) {
|
|
44680
44687
|
table.on("checkbox_state_change", args => {
|
|
44681
|
-
var _a;
|
|
44682
|
-
if (!0 !== (null === (_a = table.internalProps.rowSeriesNumber) || void 0 === _a ? void 0 : _a.enableTreeCheckbox)) return;
|
|
44688
|
+
var _a, _b;
|
|
44683
44689
|
const {
|
|
44684
|
-
|
|
44685
|
-
|
|
44686
|
-
|
|
44687
|
-
|
|
44688
|
-
|
|
44690
|
+
col: col,
|
|
44691
|
+
row: row,
|
|
44692
|
+
checked: checked,
|
|
44693
|
+
field: field
|
|
44694
|
+
} = args;
|
|
44695
|
+
if ("_vtable_rowSeries_number" !== field || !0 !== (null === (_a = table.internalProps.rowSeriesNumber) || void 0 === _a ? void 0 : _a.enableTreeCheckbox)) return;
|
|
44696
|
+
if (table.isHeader(col, row)) return;
|
|
44697
|
+
const record = table.getCellOriginRecord(col, row),
|
|
44689
44698
|
indexedData = table.dataSource.currentPagerIndexedData,
|
|
44690
44699
|
titleShowIndex = table.getRecordShowIndexByCell(col, row);
|
|
44691
44700
|
let titleIndex = indexedData[titleShowIndex];
|
|
44692
|
-
if (isNumber$4(titleIndex) && (titleIndex = [titleIndex]), record.vtableMerge) {
|
|
44693
|
-
if (checked)
|
|
44694
|
-
|
|
44701
|
+
if (isNumber$4(titleIndex) && (titleIndex = [titleIndex]), record.vtableMerge || (null === (_b = record.children) || void 0 === _b ? void 0 : _b.length)) {
|
|
44702
|
+
if (checked) getHierarchyState(table, col, row) === HierarchyState.collapse ? updateChildrenCheckboxState(!0, titleIndex, table) : setAllChildrenCheckboxState(!0, titleShowIndex, titleIndex, indexedData, table), updateGroupTitleCheckboxState(titleShowIndex, titleIndex, indexedData, table);else {
|
|
44703
|
+
getHierarchyState(table, col, row) === HierarchyState.collapse ? updateChildrenCheckboxState(!1, titleIndex, table) : setAllChildrenCheckboxState(!1, titleShowIndex, titleIndex, indexedData, table), updateGroupTitleCheckboxState(titleShowIndex, titleIndex, indexedData, table);
|
|
44695
44704
|
const oldHeaderCheckedState = table.stateManager.headerCheckedState._vtable_rowSeries_number,
|
|
44696
44705
|
newHeaderCheckedState = table.stateManager.updateHeaderCheckedState("_vtable_rowSeries_number", col, row);
|
|
44697
44706
|
oldHeaderCheckedState !== newHeaderCheckedState && table.scenegraph.updateHeaderCheckboxCellState(col, row, newHeaderCheckedState);
|
|
@@ -44727,8 +44736,23 @@
|
|
|
44727
44736
|
key = currentIndex.toString(),
|
|
44728
44737
|
currentIndexLength = isArray$7(currentIndex) ? currentIndex.length : 1;
|
|
44729
44738
|
let start = !1;
|
|
44730
|
-
const result = []
|
|
44731
|
-
|
|
44739
|
+
const result = [],
|
|
44740
|
+
keys = Array.from(checkedState.keys()).sort((a, b) => {
|
|
44741
|
+
var _a, _b;
|
|
44742
|
+
const aArr = a.split(","),
|
|
44743
|
+
bArr = b.split(","),
|
|
44744
|
+
maxLength = Math.max(aArr.length, bArr.length);
|
|
44745
|
+
for (let i = 0; i < maxLength; i++) {
|
|
44746
|
+
const a = null !== (_a = Number(aArr[i])) && void 0 !== _a ? _a : 0,
|
|
44747
|
+
b = null !== (_b = Number(bArr[i])) && void 0 !== _b ? _b : 0;
|
|
44748
|
+
if (a !== b) return a - b;
|
|
44749
|
+
}
|
|
44750
|
+
return 0;
|
|
44751
|
+
}),
|
|
44752
|
+
stateArr = keys.map(key => checkedState.get(key));
|
|
44753
|
+
if (stateArr.forEach((state, i) => {
|
|
44754
|
+
const index = keys[i],
|
|
44755
|
+
value = state;
|
|
44732
44756
|
if (start) {
|
|
44733
44757
|
index.split(",").length === currentIndexLength ? start = !1 : result.push(value._vtable_rowSeries_number);
|
|
44734
44758
|
}
|
|
@@ -44738,20 +44762,60 @@
|
|
|
44738
44762
|
allUnChecked = result.every(item => !item);
|
|
44739
44763
|
allChecked ? (table.stateManager.setCheckedState(col, row, "_vtable_rowSeries_number", !0), setCellCheckboxStateByAttribute(col, row, !0, table)) : allUnChecked ? (table.stateManager.setCheckedState(col, row, "_vtable_rowSeries_number", !1), setCellCheckboxStateByAttribute(col, row, !1, table)) : (table.stateManager.setCheckedState(col, row, "_vtable_rowSeries_number", "indeterminate"), setCellCheckboxStateByAttribute(col, row, "indeterminate", table));
|
|
44740
44764
|
}
|
|
44741
|
-
function updateChildrenCheckboxState(
|
|
44765
|
+
function updateChildrenCheckboxState(parentState, currentIndex, table) {
|
|
44742
44766
|
const {
|
|
44743
44767
|
checkedState: checkedState
|
|
44744
44768
|
} = table.stateManager,
|
|
44745
44769
|
key = currentIndex.toString(),
|
|
44746
44770
|
currentIndexLength = isArray$7(currentIndex) ? currentIndex.length : 1;
|
|
44747
44771
|
let start = !1;
|
|
44748
|
-
checkedState.
|
|
44772
|
+
const keys = Array.from(checkedState.keys()).sort((a, b) => {
|
|
44773
|
+
var _a, _b;
|
|
44774
|
+
const aArr = a.split(","),
|
|
44775
|
+
bArr = b.split(","),
|
|
44776
|
+
maxLength = Math.max(aArr.length, bArr.length);
|
|
44777
|
+
for (let i = 0; i < maxLength; i++) {
|
|
44778
|
+
const a = null !== (_a = Number(aArr[i])) && void 0 !== _a ? _a : 0,
|
|
44779
|
+
b = null !== (_b = Number(bArr[i])) && void 0 !== _b ? _b : 0;
|
|
44780
|
+
if (a !== b) return a - b;
|
|
44781
|
+
}
|
|
44782
|
+
return 0;
|
|
44783
|
+
}),
|
|
44784
|
+
stateArr = keys.map(key => checkedState.get(key));
|
|
44785
|
+
stateArr.forEach((state, i) => {
|
|
44786
|
+
const index = keys[i],
|
|
44787
|
+
value = state;
|
|
44749
44788
|
if (start) {
|
|
44750
|
-
index.split(",").length === currentIndexLength ? start = !1 : value._vtable_rowSeries_number =
|
|
44789
|
+
index.split(",").length === currentIndexLength ? start = !1 : value._vtable_rowSeries_number = parentState;
|
|
44751
44790
|
}
|
|
44752
44791
|
index === key && (start = !0);
|
|
44753
44792
|
});
|
|
44754
44793
|
}
|
|
44794
|
+
function bindHeaderCheckboxChange(table) {
|
|
44795
|
+
table.on("checkbox_state_change", args => {
|
|
44796
|
+
const {
|
|
44797
|
+
col: col,
|
|
44798
|
+
row: row,
|
|
44799
|
+
checked: checked,
|
|
44800
|
+
field: field
|
|
44801
|
+
} = args;
|
|
44802
|
+
if (table.isHeader(col, row)) {
|
|
44803
|
+
table.stateManager.setHeaderCheckedState(field, checked);
|
|
44804
|
+
"checkbox" === table.getCellType(col, row) && table.scenegraph.updateCheckboxCellState(col, row, checked);
|
|
44805
|
+
} else {
|
|
44806
|
+
table.stateManager.setCheckedState(col, row, field, checked);
|
|
44807
|
+
if ("checkbox" === table.getCellType(col, row)) {
|
|
44808
|
+
const oldHeaderCheckedState = table.stateManager.headerCheckedState[field],
|
|
44809
|
+
newHeaderCheckedState = table.stateManager.updateHeaderCheckedState(field, col, row);
|
|
44810
|
+
oldHeaderCheckedState !== newHeaderCheckedState && table.scenegraph.updateHeaderCheckboxCellState(col, row, newHeaderCheckedState);
|
|
44811
|
+
}
|
|
44812
|
+
}
|
|
44813
|
+
});
|
|
44814
|
+
}
|
|
44815
|
+
function getHierarchyState(table, col, row) {
|
|
44816
|
+
const index = table.getRecordShowIndexByCell(col, row);
|
|
44817
|
+
return table.dataSource.getHierarchyState(index);
|
|
44818
|
+
}
|
|
44755
44819
|
|
|
44756
44820
|
function bindButtonClickEvent(table) {
|
|
44757
44821
|
table.on(TABLE_EVENT_TYPE.CLICK_CELL, e => {
|
|
@@ -44861,7 +44925,7 @@
|
|
|
44861
44925
|
}, 0);
|
|
44862
44926
|
}
|
|
44863
44927
|
bindSelfEvent() {
|
|
44864
|
-
this.table.isReleased || (bindIconClickEvent(this.table), bindDropdownMenuClickEvent(this.table), this.updateEventBinder(), bindMediaClick(this.table), bindDBClickAutoColumnWidthEvent(this.table), this.table.isPivotTable() && checkHaveDrill(this.table) && bindDrillEvent(this.table), bindSparklineHoverEvent(this.table), bindAxisClickEvent(this.table), bindAxisHoverEvent(this.table), bindGroupTitleCheckboxChange(this.table), bindButtonClickEvent(this.table), rightButtonClickEvent(this.table));
|
|
44928
|
+
this.table.isReleased || (bindIconClickEvent(this.table), bindDropdownMenuClickEvent(this.table), this.updateEventBinder(), bindMediaClick(this.table), bindDBClickAutoColumnWidthEvent(this.table), this.table.isPivotTable() && checkHaveDrill(this.table) && bindDrillEvent(this.table), bindSparklineHoverEvent(this.table), bindAxisClickEvent(this.table), bindAxisHoverEvent(this.table), bindGroupTitleCheckboxChange(this.table), bindHeaderCheckboxChange(this.table), bindButtonClickEvent(this.table), rightButtonClickEvent(this.table));
|
|
44865
44929
|
}
|
|
44866
44930
|
dealTableHover(eventArgsSet) {
|
|
44867
44931
|
if (!eventArgsSet) return void this.table.stateManager.updateHoverPos(-1, -1);
|
|
@@ -45055,8 +45119,8 @@
|
|
|
45055
45119
|
constructor() {
|
|
45056
45120
|
let style = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
|
|
45057
45121
|
let bodyStyle = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
|
|
45058
|
-
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
|
|
45059
|
-
super(style, bodyStyle), this._showBar = null === (_a = style.showBar) || void 0 === _a || _a, this._barColor = null !== (_b = style.barColor) && void 0 !== _b ? _b : DEFAULT_BAR_COLOR, this._barPositiveColor = null !== (_c = style.barPositiveColor) && void 0 !== _c ? _c : "#4dbd74", this._barNegativeColor = null !== (_d = style.barNegativeColor) && void 0 !== _d ? _d : "#f86c6b", this._barAxisColor = null !== (_e = style.barAxisColor) && void 0 !== _e ? _e : "black", this._barBgColor = style.barBgColor, this._barHeight = null !== (_f = style.barHeight) && void 0 !== _f ? _f : 3, this._barHeight = null !== (_g = style.barHeight) && void 0 !== _g ? _g : 3, this._barBottom = null !== (_h = style.barBottom) && void 0 !== _h ? _h : 0, this._barPadding = null !== (_j = style.barPadding) && void 0 !== _j ? _j : [0, 0, 0, 0], this._showBarMark = null !== (_k = style.showBarMark) && void 0 !== _k && _k, this._barMarkPositiveColor = null !== (_l = style.barMarkPositiveColor) && void 0 !== _l ? _l : "#4dbd74", this._barMarkNegativeColor = null !== (_m = style.barMarkNegativeColor) && void 0 !== _m ? _m : "#f86c6b", this._barMarkWidth = null !== (_o = style.barMarkWidth) && void 0 !== _o ? _o : 2, this._barMarkPosition = null !== (_p = style.barMarkPosition) && void 0 !== _p ? _p : "right", this._barRightToLeft = null !== (_q = style.barRightToLeft) && void 0 !== _q && _q;
|
|
45122
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
|
|
45123
|
+
super(style, bodyStyle), this._showBar = null === (_a = style.showBar) || void 0 === _a || _a, this._barColor = null !== (_b = style.barColor) && void 0 !== _b ? _b : DEFAULT_BAR_COLOR, this._barPositiveColor = null !== (_c = style.barPositiveColor) && void 0 !== _c ? _c : "#4dbd74", this._barNegativeColor = null !== (_d = style.barNegativeColor) && void 0 !== _d ? _d : "#f86c6b", this._barAxisColor = null !== (_e = style.barAxisColor) && void 0 !== _e ? _e : "black", this._barBgColor = style.barBgColor, this._barHeight = null !== (_f = style.barHeight) && void 0 !== _f ? _f : 3, this._barHeight = null !== (_g = style.barHeight) && void 0 !== _g ? _g : 3, this._barBottom = null !== (_h = style.barBottom) && void 0 !== _h ? _h : 0, this._barPadding = null !== (_j = style.barPadding) && void 0 !== _j ? _j : [0, 0, 0, 0], this._showBarMark = null !== (_k = style.showBarMark) && void 0 !== _k && _k, this._barMarkPositiveColor = null !== (_l = style.barMarkPositiveColor) && void 0 !== _l ? _l : "#4dbd74", this._barMarkNegativeColor = null !== (_m = style.barMarkNegativeColor) && void 0 !== _m ? _m : "#f86c6b", this._barMarkWidth = null !== (_o = style.barMarkWidth) && void 0 !== _o ? _o : 2, this._barMarkPosition = null !== (_p = style.barMarkPosition) && void 0 !== _p ? _p : "right", this._barRightToLeft = null !== (_q = style.barRightToLeft) && void 0 !== _q && _q, this._barMarkInBar = null === (_r = style.barMarkInBar) || void 0 === _r || _r;
|
|
45060
45124
|
}
|
|
45061
45125
|
get showBar() {
|
|
45062
45126
|
return this._showBar;
|
|
@@ -45148,6 +45212,12 @@
|
|
|
45148
45212
|
set barRightToLeft(value) {
|
|
45149
45213
|
this._barRightToLeft = value;
|
|
45150
45214
|
}
|
|
45215
|
+
get barMarkInBar() {
|
|
45216
|
+
return this._barMarkInBar;
|
|
45217
|
+
}
|
|
45218
|
+
set barMarkInBar(value) {
|
|
45219
|
+
this._barMarkInBar = value;
|
|
45220
|
+
}
|
|
45151
45221
|
clone() {
|
|
45152
45222
|
return new ProgressBarStyle(this, null);
|
|
45153
45223
|
}
|
|
@@ -47612,7 +47682,7 @@
|
|
|
47612
47682
|
constructor(container) {
|
|
47613
47683
|
let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
|
|
47614
47684
|
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
|
|
47615
|
-
if (super(), this.showFrozenIcon = !0, this.version = "1.17.4-alpha.
|
|
47685
|
+
if (super(), this.showFrozenIcon = !0, this.version = "1.17.4-alpha.5", this.id = `VTable${Date.now()}`, this.isReleased = !1, this._chartEventMap = {}, this.throttleInvalidate = throttle2(this.render.bind(this), 200), !container && "node" !== options.mode && !options.canvas) throw new Error("vtable's container is undefined");
|
|
47616
47686
|
!1 === (null === (_a = options.customConfig) || void 0 === _a ? void 0 : _a.imageAnonymous) && (vglobal.isImageAnonymous = !1);
|
|
47617
47687
|
const {
|
|
47618
47688
|
frozenColCount = 0,
|
|
@@ -47997,6 +48067,7 @@
|
|
|
47997
48067
|
shadowWidths = toBoxArray(null !== (_q = null === (_p = this.internalProps.theme.frameStyle) || void 0 === _p ? void 0 : _p.shadowBlur) && void 0 !== _q ? _q : [0]);
|
|
47998
48068
|
(null === (_r = this.theme.frameStyle) || void 0 === _r ? void 0 : _r.innerBorder) ? (this.tableX = 0, this.tableY = 0, this.tableNoFrameWidth = width - (null !== (_s = shadowWidths[1]) && void 0 !== _s ? _s : 0), this.tableNoFrameHeight = height - (null !== (_t = shadowWidths[2]) && void 0 !== _t ? _t : 0)) : (this.tableX = (null !== (_u = lineWidths[3]) && void 0 !== _u ? _u : 0) + (null !== (_v = shadowWidths[3]) && void 0 !== _v ? _v : 0), this.tableY = (null !== (_w = lineWidths[0]) && void 0 !== _w ? _w : 0) + (null !== (_x = shadowWidths[0]) && void 0 !== _x ? _x : 0), this.tableNoFrameWidth = width - ((null !== (_y = lineWidths[1]) && void 0 !== _y ? _y : 0) + (null !== (_z = shadowWidths[1]) && void 0 !== _z ? _z : 0)) - ((null !== (_0 = lineWidths[3]) && void 0 !== _0 ? _0 : 0) + (null !== (_1 = shadowWidths[3]) && void 0 !== _1 ? _1 : 0)), this.tableNoFrameHeight = height - ((null !== (_2 = lineWidths[0]) && void 0 !== _2 ? _2 : 0) + (null !== (_3 = shadowWidths[0]) && void 0 !== _3 ? _3 : 0)) - ((null !== (_4 = lineWidths[2]) && void 0 !== _4 ? _4 : 0) + (null !== (_5 = shadowWidths[2]) && void 0 !== _5 ? _5 : 0)));
|
|
47999
48069
|
}
|
|
48070
|
+
this._clearColRangeWidthsMap(), this._clearRowRangeHeightsMap();
|
|
48000
48071
|
}
|
|
48001
48072
|
updateViewBox(newViewBox) {
|
|
48002
48073
|
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
|
|
@@ -48750,7 +48821,8 @@
|
|
|
48750
48821
|
end: {
|
|
48751
48822
|
col: Math.min(customMerge.range.end.col, this.colCount - 1),
|
|
48752
48823
|
row: Math.min(customMerge.range.end.row, this.rowCount - 1)
|
|
48753
|
-
}
|
|
48824
|
+
},
|
|
48825
|
+
isCustom: !0
|
|
48754
48826
|
};
|
|
48755
48827
|
}
|
|
48756
48828
|
}
|
|
@@ -48776,7 +48848,17 @@
|
|
|
48776
48848
|
}, styleClass, this.options.autoWrapText, this.theme);
|
|
48777
48849
|
customMerge.style = fullStyle;
|
|
48778
48850
|
}
|
|
48779
|
-
return customMerge
|
|
48851
|
+
return customMerge.range = {
|
|
48852
|
+
start: {
|
|
48853
|
+
col: Math.max(customMerge.range.start.col, 0),
|
|
48854
|
+
row: Math.max(customMerge.range.start.row, 0)
|
|
48855
|
+
},
|
|
48856
|
+
end: {
|
|
48857
|
+
col: Math.min(customMerge.range.end.col, this.colCount - 1),
|
|
48858
|
+
row: Math.min(customMerge.range.end.row, this.rowCount - 1)
|
|
48859
|
+
},
|
|
48860
|
+
isCustom: !0
|
|
48861
|
+
}, customMerge;
|
|
48780
48862
|
}
|
|
48781
48863
|
}
|
|
48782
48864
|
}
|
|
@@ -51725,6 +51807,8 @@
|
|
|
51725
51807
|
const editor = this.table.getEditor(col, row);
|
|
51726
51808
|
if (editor) {
|
|
51727
51809
|
if (null === (_b = null === (_a = this.table.internalProps.layoutMap) || void 0 === _a ? void 0 : _a.isAggregation) || void 0 === _b ? void 0 : _b.call(_a, col, row)) return;
|
|
51810
|
+
const record = this.table.getCellRawRecord(col, row);
|
|
51811
|
+
if (null == record ? void 0 : record.vtableMerge) return;
|
|
51728
51812
|
this.editingEditor || (this.editCell = {
|
|
51729
51813
|
col: col,
|
|
51730
51814
|
row: row
|
|
@@ -52722,8 +52806,19 @@
|
|
|
52722
52806
|
}
|
|
52723
52807
|
getCheckboxState(field) {
|
|
52724
52808
|
if (this.stateManager.checkedState.size < this.rowCount - this.columnHeaderLevelCount && this.stateManager.initLeftRecordsCheckState(this.records), isValid$3(field)) {
|
|
52725
|
-
let stateArr = Array.from(this.stateManager.checkedState.keys()).sort((a, b) =>
|
|
52726
|
-
|
|
52809
|
+
let stateArr = Array.from(this.stateManager.checkedState.keys()).sort((a, b) => {
|
|
52810
|
+
var _a, _b;
|
|
52811
|
+
const aArr = a.split(","),
|
|
52812
|
+
bArr = b.split(","),
|
|
52813
|
+
maxLength = Math.max(aArr.length, bArr.length);
|
|
52814
|
+
for (let i = 0; i < maxLength; i++) {
|
|
52815
|
+
const a = null !== (_a = Number(aArr[i])) && void 0 !== _a ? _a : 0,
|
|
52816
|
+
b = null !== (_b = Number(bArr[i])) && void 0 !== _b ? _b : 0;
|
|
52817
|
+
if (a !== b) return a - b;
|
|
52818
|
+
}
|
|
52819
|
+
return 0;
|
|
52820
|
+
}).map(key => this.stateManager.checkedState.get(key));
|
|
52821
|
+
return this.options.groupBy && (stateArr = getGroupCheckboxState(this)), Array.from(stateArr, state => state && state[field]);
|
|
52727
52822
|
}
|
|
52728
52823
|
return new Array(...this.stateManager.checkedState.values());
|
|
52729
52824
|
}
|
|
@@ -56921,7 +57016,8 @@
|
|
|
56921
57016
|
barMarkPositiveColor: barMarkPositiveColor,
|
|
56922
57017
|
barMarkNegativeColor: barMarkNegativeColor,
|
|
56923
57018
|
barMarkWidth: barMarkWidth,
|
|
56924
|
-
barMarkPosition: barMarkPosition
|
|
57019
|
+
barMarkPosition: barMarkPosition,
|
|
57020
|
+
barMarkInBar: barMarkInBar
|
|
56925
57021
|
} = style;
|
|
56926
57022
|
let {
|
|
56927
57023
|
barHeight: barHeight,
|
|
@@ -56936,11 +57032,11 @@
|
|
|
56936
57032
|
return Number(v);
|
|
56937
57033
|
});
|
|
56938
57034
|
const borderWidth = getQuadProps(getProp("borderLineWidth", style, col, row, table)),
|
|
56939
|
-
barPaddingTop = Math.max(barPadding[0], Math.ceil(borderWidth[0] / 2))
|
|
56940
|
-
|
|
56941
|
-
|
|
56942
|
-
|
|
56943
|
-
contentWidth -= barPaddingRight + barPaddingLeft, contentHeight -= barPaddingBottom + barPaddingTop, row === table.rowCount - 1 && [0, "0"].includes(barBottom) && (contentHeight -= 1);
|
|
57035
|
+
barPaddingTop = Math.max(barPadding[0], Math.ceil(borderWidth[0] / 2));
|
|
57036
|
+
let barPaddingRight = Math.max(barPadding[1], Math.floor(borderWidth[1] / 2));
|
|
57037
|
+
const barPaddingBottom = Math.max(barPadding[2], Math.floor(borderWidth[2] / 2));
|
|
57038
|
+
let barPaddingLeft = Math.max(barPadding[3], Math.ceil(borderWidth[3] / 2));
|
|
57039
|
+
showBarMark && barMarkWidth > 0 && "right" === barMarkPosition && !1 === barMarkInBar && (barPaddingRight += barMarkWidth, barPaddingLeft += barMarkWidth), contentWidth -= barPaddingRight + barPaddingLeft, contentHeight -= barPaddingBottom + barPaddingTop, row === table.rowCount - 1 && [0, "0"].includes(barBottom) && (contentHeight -= 1);
|
|
56944
57040
|
const top = barPaddingTop,
|
|
56945
57041
|
left = barPaddingLeft,
|
|
56946
57042
|
right = contentWidth;
|
|
@@ -57127,7 +57223,7 @@
|
|
|
57127
57223
|
dataValue: dataValue,
|
|
57128
57224
|
percentile: positiveRate
|
|
57129
57225
|
}) || "#20a8d8", "right" === barMarkPosition) {
|
|
57130
|
-
const markLeft = barRightToLeft ? barRectPosi.left + barMarkWidth / 2 : barRectPosi.left + barRectPosi.width - barMarkWidth / 2;
|
|
57226
|
+
const markLeft = barRightToLeft ? barRectPosi.left + barMarkWidth / 2 : barRectPosi.left + barRectPosi.width + (barMarkInBar ? -barMarkWidth / 2 : barMarkWidth / 2);
|
|
57131
57227
|
points.push({
|
|
57132
57228
|
x: markLeft,
|
|
57133
57229
|
y: barRectPosi.top
|
|
@@ -57448,7 +57544,9 @@
|
|
|
57448
57544
|
cornerRadius: buttonBorderRadius
|
|
57449
57545
|
},
|
|
57450
57546
|
state: {
|
|
57451
|
-
text: {
|
|
57547
|
+
text: {
|
|
57548
|
+
hover: {}
|
|
57549
|
+
},
|
|
57452
57550
|
panel: {
|
|
57453
57551
|
hover: {
|
|
57454
57552
|
fill: buttonHoverColor,
|