@fecp/designer 5.4.108 → 5.4.109
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/es/designer/package.json.mjs +1 -1
- package/es/designer/src/packages/dialog/useDialogDialog.mjs +1 -1
- package/es/designer/src/packages/dialogGlobal/useDialogGlobalDialog.mjs +1 -1
- package/es/designer/src/packages/form/property/widgets.vue.mjs +2 -2
- package/es/node_modules/vxe-table/es/grid/src/grid.mjs +1 -1
- package/es/node_modules/vxe-table/es/table/module/custom/hook.mjs +1 -1
- package/es/node_modules/vxe-table/es/table/module/custom/panel.mjs +1 -1
- package/es/node_modules/vxe-table/es/table/module/edit/hook.mjs +1 -1
- package/es/node_modules/vxe-table/es/table/module/export/export-panel.mjs +1 -1
- package/es/node_modules/vxe-table/es/table/module/export/hook.mjs +1 -1
- package/es/node_modules/vxe-table/es/table/module/export/import-panel.mjs +1 -1
- package/es/node_modules/vxe-table/es/table/module/filter/hook.mjs +1 -1
- package/es/node_modules/vxe-table/es/table/module/filter/panel.mjs +1 -1
- package/es/node_modules/vxe-table/es/table/module/keyboard/hook.mjs +1 -1
- package/es/node_modules/vxe-table/es/table/module/menu/hook.mjs +1 -1
- package/es/node_modules/vxe-table/es/table/module/menu/panel.mjs +1 -1
- package/es/node_modules/vxe-table/es/table/module/validator/hook.mjs +1 -1
- package/es/node_modules/vxe-table/es/table/render/index.mjs +1 -1
- package/es/node_modules/vxe-table/es/table/src/body.mjs +1 -1
- package/es/node_modules/vxe-table/es/table/src/cell.mjs +1 -1
- package/es/node_modules/vxe-table/es/table/src/columnInfo.mjs +1 -1
- package/es/node_modules/vxe-table/es/table/src/footer.mjs +1 -1
- package/es/node_modules/vxe-table/es/table/src/header.mjs +1 -1
- package/es/node_modules/vxe-table/es/table/src/table.mjs +1 -1
- package/es/node_modules/vxe-table/es/table/src/use/cell-view.mjs +1 -1
- package/es/node_modules/vxe-table/es/table/src/util.mjs +1 -1
- package/es/node_modules/vxe-table/es/toolbar/src/toolbar.mjs +1 -1
- package/es/node_modules/vxe-table/es/ui/src/anime.mjs +1 -1
- package/es/node_modules/vxe-table/es/ui/src/dom.mjs +1 -1
- package/es/node_modules/vxe-table/es/ui/src/utils.mjs +1 -1
- package/es/node_modules/vxe-table/es/ui/src/vn.mjs +1 -1
- package/es/packages/mobile/src/components/dataDisplay/table/Table.vue.mjs +2 -1
- package/es/packages/mobile/src/components/form/field/Field.vue.mjs +0 -1
- package/es/packages/mobile/src/utils/optionUtil.mjs +2 -3
- package/es/packages/vue/src/components/forms/subForm/SubForm.vue.mjs +2 -2
- package/es/packages/vue/src/components/table/CustomButtons.vue.mjs +2 -1
- package/es/packages/vue/src/components/table/DynamicQuery.vue.mjs +2 -1
- package/es/packages/vue/src/components/table/Table.vue.mjs +2 -1
- package/es/packages/vue/src/components/table/TableColumn.vue.mjs +2 -1
- package/lib/designer/package.json.js +1 -1
- package/lib/designer/src/packages/dialog/useDialogDialog.js +1 -1
- package/lib/designer/src/packages/dialogGlobal/useDialogGlobalDialog.js +1 -1
- package/lib/designer/src/packages/form/property/widgets.vue.js +2 -2
- package/lib/node_modules/vxe-table/es/grid/src/grid.js +41 -41
- package/lib/node_modules/vxe-table/es/table/module/custom/hook.js +9 -9
- package/lib/node_modules/vxe-table/es/table/module/custom/panel.js +23 -23
- package/lib/node_modules/vxe-table/es/table/module/edit/hook.js +28 -28
- package/lib/node_modules/vxe-table/es/table/module/export/export-panel.js +6 -6
- package/lib/node_modules/vxe-table/es/table/module/export/hook.js +50 -50
- package/lib/node_modules/vxe-table/es/table/module/export/import-panel.js +2 -2
- package/lib/node_modules/vxe-table/es/table/module/filter/hook.js +2 -2
- package/lib/node_modules/vxe-table/es/table/module/filter/panel.js +3 -3
- package/lib/node_modules/vxe-table/es/table/module/keyboard/hook.js +6 -6
- package/lib/node_modules/vxe-table/es/table/module/menu/hook.js +7 -7
- package/lib/node_modules/vxe-table/es/table/module/menu/panel.js +9 -9
- package/lib/node_modules/vxe-table/es/table/module/validator/hook.js +26 -26
- package/lib/node_modules/vxe-table/es/table/render/index.js +65 -65
- package/lib/node_modules/vxe-table/es/table/src/body.js +10 -10
- package/lib/node_modules/vxe-table/es/table/src/cell.js +15 -15
- package/lib/node_modules/vxe-table/es/table/src/columnInfo.js +12 -12
- package/lib/node_modules/vxe-table/es/table/src/footer.js +7 -7
- package/lib/node_modules/vxe-table/es/table/src/header.js +12 -12
- package/lib/node_modules/vxe-table/es/table/src/table.js +342 -342
- package/lib/node_modules/vxe-table/es/table/src/use/cell-view.js +3 -3
- package/lib/node_modules/vxe-table/es/table/src/util.js +24 -24
- package/lib/node_modules/vxe-table/es/toolbar/src/toolbar.js +23 -23
- package/lib/node_modules/vxe-table/es/ui/src/anime.js +7 -7
- package/lib/node_modules/vxe-table/es/ui/src/dom.js +5 -5
- package/lib/node_modules/vxe-table/es/ui/src/utils.js +4 -4
- package/lib/node_modules/vxe-table/es/ui/src/vn.js +2 -2
- package/lib/packages/mobile/src/components/dataDisplay/table/Table.vue.js +3 -2
- package/lib/packages/mobile/src/components/form/field/Field.vue.js +0 -1
- package/lib/packages/mobile/src/utils/optionUtil.js +2 -3
- package/lib/packages/vue/src/components/forms/subForm/SubForm.vue.js +2 -2
- package/lib/packages/vue/src/components/table/CustomButtons.vue.js +5 -4
- package/lib/packages/vue/src/components/table/DynamicQuery.vue.js +27 -26
- package/lib/packages/vue/src/components/table/Table.vue.js +5 -4
- package/lib/packages/vue/src/components/table/TableColumn.vue.js +17 -16
- package/package.json +1 -1
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
|
|
3
|
-
const
|
|
3
|
+
const XEUtils = require("xe-utils");
|
|
4
4
|
require("../../ui/index.js");
|
|
5
5
|
const util = require("./util.js");
|
|
6
6
|
const utils = require("../../ui/src/utils.js");
|
|
@@ -15,9 +15,9 @@ class ColumnInfo {
|
|
|
15
15
|
const $xeGantt = $xeTable.xeGantt;
|
|
16
16
|
const $xeGGWrapper = $xeGrid || $xeGantt;
|
|
17
17
|
const { field, editRender, filterRender, headerFormatter } = _vm;
|
|
18
|
-
const colId = _vm.colId ||
|
|
18
|
+
const colId = _vm.colId || XEUtils.uniqueId("col_");
|
|
19
19
|
const formatter = _vm.formatter;
|
|
20
|
-
const visible =
|
|
20
|
+
const visible = XEUtils.isBoolean(_vm.visible) ? _vm.visible : true;
|
|
21
21
|
const flCompConf = utils.isEnableConf(filterRender) ? renderer.get(filterRender.name) : null;
|
|
22
22
|
const ctFilterOptions = flCompConf ? flCompConf.createTableFilterOptions : null;
|
|
23
23
|
const filters = util.toFilters(_vm.filters, colId);
|
|
@@ -28,10 +28,10 @@ class ColumnInfo {
|
|
|
28
28
|
if (_vm.type && types.indexOf(_vm.type) === -1) {
|
|
29
29
|
log.warnLog("vxe.error.errProp", [`type=${_vm.type}`, types.join(", ")]);
|
|
30
30
|
}
|
|
31
|
-
if (
|
|
31
|
+
if (XEUtils.isBoolean(_vm.cellRender) || _vm.cellRender && !XEUtils.isObject(_vm.cellRender)) {
|
|
32
32
|
log.warnLog("vxe.error.errProp", [`column.cell-render=${_vm.cellRender}`, "column.cell-render={}"]);
|
|
33
33
|
}
|
|
34
|
-
if (
|
|
34
|
+
if (XEUtils.isBoolean(_vm.editRender) || _vm.editRender && !XEUtils.isObject(_vm.editRender)) {
|
|
35
35
|
log.warnLog("vxe.error.errProp", [`column.edit-render=${_vm.editRender}`, "column.edit-render={}"]);
|
|
36
36
|
}
|
|
37
37
|
if (_vm.type === "expand") {
|
|
@@ -43,14 +43,14 @@ class ColumnInfo {
|
|
|
43
43
|
}
|
|
44
44
|
}
|
|
45
45
|
if (formatter) {
|
|
46
|
-
if (
|
|
47
|
-
const gFormatOpts = formats.get(formatter) ||
|
|
48
|
-
if (!gFormatOpts || !
|
|
46
|
+
if (XEUtils.isString(formatter)) {
|
|
47
|
+
const gFormatOpts = formats.get(formatter) || XEUtils[formatter];
|
|
48
|
+
if (!gFormatOpts || !XEUtils.isFunction(gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod)) {
|
|
49
49
|
log.errLog("vxe.error.notFormats", [formatter]);
|
|
50
50
|
}
|
|
51
|
-
} else if (
|
|
52
|
-
const gFormatOpts = formats.get(formatter[0]) ||
|
|
53
|
-
if (!gFormatOpts || !
|
|
51
|
+
} else if (XEUtils.isArray(formatter)) {
|
|
52
|
+
const gFormatOpts = formats.get(formatter[0]) || XEUtils[formatter[0]];
|
|
53
|
+
if (!gFormatOpts || !XEUtils.isFunction(gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod)) {
|
|
54
54
|
log.errLog("vxe.error.notFormats", [formatter[0]]);
|
|
55
55
|
}
|
|
56
56
|
}
|
|
@@ -97,7 +97,7 @@ class ColumnInfo {
|
|
|
97
97
|
sortBy: _vm.sortBy,
|
|
98
98
|
sortType: _vm.sortType,
|
|
99
99
|
filters,
|
|
100
|
-
filterMultiple:
|
|
100
|
+
filterMultiple: XEUtils.isBoolean(_vm.filterMultiple) ? _vm.filterMultiple : true,
|
|
101
101
|
filterMethod: _vm.filterMethod,
|
|
102
102
|
filterResetMethod: _vm.filterResetMethod,
|
|
103
103
|
filterRecoverMethod: _vm.filterRecoverMethod,
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
|
|
3
3
|
const vue = require("vue");
|
|
4
4
|
const comp = require("../../ui/src/comp.js");
|
|
5
|
-
const
|
|
5
|
+
const XEUtils = require("xe-utils");
|
|
6
6
|
require("../../ui/index.js");
|
|
7
7
|
const dom = require("../../ui/src/dom.js");
|
|
8
8
|
const util = require("./util.js");
|
|
@@ -64,14 +64,14 @@ const TableFooterComponent = comp.defineVxeComponent({
|
|
|
64
64
|
const compConf = renderOpts ? renderer.get(renderOpts.name) : null;
|
|
65
65
|
const showAllTip = footerTooltipOpts.showAll;
|
|
66
66
|
const fixedHiddenColumn = overflowX && (fixedType ? column.fixed !== fixedType : !!column.fixed);
|
|
67
|
-
const isPadding =
|
|
68
|
-
const footOverflow =
|
|
67
|
+
const isPadding = XEUtils.isBoolean(footerCellOpts.padding) ? footerCellOpts.padding : cellOpts.padding;
|
|
68
|
+
const footOverflow = XEUtils.eqNull(showFooterOverflow) ? allColumnFooterOverflow : showFooterOverflow;
|
|
69
69
|
const footAlign = footerAlign || (compConf ? compConf.tableFooterCellAlign : "") || allFooterAlign || align || (compConf ? compConf.tableCellAlign : "") || allAlign;
|
|
70
70
|
const showEllipsis = footOverflow === "ellipsis";
|
|
71
71
|
const showTitle = footOverflow === "title";
|
|
72
72
|
const showTooltip = footOverflow === true || footOverflow === "tooltip";
|
|
73
73
|
const hasEllipsis = showTitle || showTooltip || showEllipsis;
|
|
74
|
-
const showResizable =
|
|
74
|
+
const showResizable = XEUtils.isBoolean(column.resizable) ? column.resizable : columnOpts.resizable || allResizable;
|
|
75
75
|
const attrs = { colid };
|
|
76
76
|
const tfOns = {};
|
|
77
77
|
const columnIndex = colRest.index;
|
|
@@ -170,7 +170,7 @@ const TableFooterComponent = comp.defineVxeComponent({
|
|
|
170
170
|
"is--padding": isPadding,
|
|
171
171
|
"col--ellipsis": hasEllipsis,
|
|
172
172
|
"col--current": currentColumn === column
|
|
173
|
-
}, dom.getPropClass(footerClassName, cellParams), dom.getPropClass(footerCellClassName, cellParams)] }, attrs), { style: footerCellStyle ?
|
|
173
|
+
}, dom.getPropClass(footerClassName, cellParams), dom.getPropClass(footerCellClassName, cellParams)] }, attrs), { style: footerCellStyle ? XEUtils.isFunction(footerCellStyle) ? footerCellStyle(cellParams) : footerCellStyle : null }), tfOns), { key: columnKey || scrollXLoad || scrollYLoad || columnOpts.useKey || columnOpts.drag ? column.id : $columnIndex }), [
|
|
174
174
|
vue.h("div", {
|
|
175
175
|
class: ["vxe-cell", {
|
|
176
176
|
"c--title": showTitle,
|
|
@@ -207,9 +207,9 @@ const TableFooterComponent = comp.defineVxeComponent({
|
|
|
207
207
|
key: $rowIndex,
|
|
208
208
|
class: [
|
|
209
209
|
"vxe-footer--row",
|
|
210
|
-
footerRowClassName ?
|
|
210
|
+
footerRowClassName ? XEUtils.isFunction(footerRowClassName) ? footerRowClassName(rowParams) : footerRowClassName : ""
|
|
211
211
|
],
|
|
212
|
-
style: footerRowStyle ?
|
|
212
|
+
style: footerRowStyle ? XEUtils.isFunction(footerRowStyle) ? footerRowStyle(rowParams) : footerRowStyle : null
|
|
213
213
|
}, renderRows(isOptimizeMode, renderColumnList, footerTableData, row, $rowIndex, _rowIndex));
|
|
214
214
|
});
|
|
215
215
|
};
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
|
|
3
3
|
const vue = require("vue");
|
|
4
4
|
const comp = require("../../ui/src/comp.js");
|
|
5
|
-
const
|
|
5
|
+
const XEUtils = require("xe-utils");
|
|
6
6
|
require("../../ui/index.js");
|
|
7
7
|
const utils = require("../../ui/src/utils.js");
|
|
8
8
|
const util = require("./util.js");
|
|
@@ -73,8 +73,8 @@ const TableHeaderComponent = comp.defineVxeComponent({
|
|
|
73
73
|
const compConf = renderOpts ? renderer.get(renderOpts.name) : null;
|
|
74
74
|
const isColGroup = column.children && column.children.length;
|
|
75
75
|
const fixedHiddenColumn = overflowX && !isColGroup && (fixedType ? column.fixed !== fixedType : !!column.fixed);
|
|
76
|
-
const isPadding =
|
|
77
|
-
const headOverflow =
|
|
76
|
+
const isPadding = XEUtils.isBoolean(headerCellOpts.padding) ? headerCellOpts.padding : cellOpts.padding;
|
|
77
|
+
const headOverflow = XEUtils.eqNull(showHeaderOverflow) ? allColumnHeaderOverflow : showHeaderOverflow;
|
|
78
78
|
const headAlign = headerAlign || (compConf ? compConf.tableHeaderCellAlign : "") || allHeaderAlign || align || (compConf ? compConf.tableCellAlign : "") || allAlign;
|
|
79
79
|
const showEllipsis = headOverflow === "ellipsis";
|
|
80
80
|
const showTitle = headOverflow === "title";
|
|
@@ -150,7 +150,7 @@ const TableHeaderComponent = comp.defineVxeComponent({
|
|
|
150
150
|
}
|
|
151
151
|
}
|
|
152
152
|
const isLastColumn = $columnIndex === cols.length - 1;
|
|
153
|
-
const showResizable =
|
|
153
|
+
const showResizable = XEUtils.isBoolean(column.resizable) ? column.resizable : columnOpts.resizable || allResizable;
|
|
154
154
|
const isAutoCellWidth = !column.resizeWidth && (column.minWidth === "auto" || column.width === "auto");
|
|
155
155
|
let isVNPreEmptyStatus = false;
|
|
156
156
|
if (isOptimizeMode && overflowX && !isGroup && !isMergeCell) {
|
|
@@ -169,7 +169,7 @@ const TableHeaderComponent = comp.defineVxeComponent({
|
|
|
169
169
|
if (showCustomHeader) ;
|
|
170
170
|
else if (isColGroup && !isLastRow) {
|
|
171
171
|
let childWidth = 0;
|
|
172
|
-
|
|
172
|
+
XEUtils.eachTree(column.children, (childRow) => {
|
|
173
173
|
if (childRow.visible && (!childRow.children || !childRow.children.length)) {
|
|
174
174
|
childWidth += childRow.renderWidth;
|
|
175
175
|
}
|
|
@@ -196,9 +196,9 @@ const TableHeaderComponent = comp.defineVxeComponent({
|
|
|
196
196
|
"is--drag-disabled": columnOpts.drag && isDisabledDrag,
|
|
197
197
|
"col--current": currentColumn === column
|
|
198
198
|
},
|
|
199
|
-
headerClassName ?
|
|
200
|
-
headerCellClassName ?
|
|
201
|
-
], style: headerCellStyle ?
|
|
199
|
+
headerClassName ? XEUtils.isFunction(headerClassName) ? headerClassName(cellParams) : headerClassName : "",
|
|
200
|
+
headerCellClassName ? XEUtils.isFunction(headerCellClassName) ? headerCellClassName(cellParams) : headerCellClassName : ""
|
|
201
|
+
], style: headerCellStyle ? XEUtils.isFunction(headerCellStyle) ? headerCellStyle(cellParams) : headerCellStyle : null }, thAttrs), thOns), { key: showCustomHeader ? `${colid}${$columnIndex}` : columnKey || scrollXLoad || scrollYLoad || columnOpts.useKey || columnOpts.drag || isColGroup ? colid : $columnIndex }), [
|
|
202
202
|
vue.h("div", {
|
|
203
203
|
class: ["vxe-cell", {
|
|
204
204
|
"c--title": showTitle,
|
|
@@ -244,8 +244,8 @@ const TableHeaderComponent = comp.defineVxeComponent({
|
|
|
244
244
|
const flCompConf = utils.isEnableConf(filterRender) ? renderer.get(filterRender.name) : null;
|
|
245
245
|
const rtFloatingFilter = flCompConf ? flCompConf.renderTableFloatingFilter : null;
|
|
246
246
|
const fixedHiddenColumn = overflowX && (fixedType ? column.fixed !== fixedType : !!column.fixed);
|
|
247
|
-
const isPadding =
|
|
248
|
-
const headOverflow =
|
|
247
|
+
const isPadding = XEUtils.isBoolean(headerCellOpts.padding) ? headerCellOpts.padding : cellOpts.padding;
|
|
248
|
+
const headOverflow = XEUtils.eqNull(showHeaderOverflow) ? allColumnHeaderOverflow : showHeaderOverflow;
|
|
249
249
|
const headAlign = headerAlign || (compConf ? compConf.tableHeaderCellAlign : "") || allHeaderAlign || align || (compConf ? compConf.tableCellAlign : "") || allAlign;
|
|
250
250
|
const showEllipsis = headOverflow === "ellipsis";
|
|
251
251
|
const showTitle = headOverflow === "title";
|
|
@@ -327,9 +327,9 @@ const TableHeaderComponent = comp.defineVxeComponent({
|
|
|
327
327
|
key: $rowIndex,
|
|
328
328
|
class: [
|
|
329
329
|
"vxe-header--row",
|
|
330
|
-
headerRowClassName ?
|
|
330
|
+
headerRowClassName ? XEUtils.isFunction(headerRowClassName) ? headerRowClassName(params) : headerRowClassName : ""
|
|
331
331
|
],
|
|
332
|
-
style: headerRowStyle ?
|
|
332
|
+
style: headerRowStyle ? XEUtils.isFunction(headerRowStyle) ? headerRowStyle(params) : headerRowStyle : null
|
|
333
333
|
}, renderRows(isGroup, isOptimizeMode, headerGroups, $rowIndex, cols));
|
|
334
334
|
});
|
|
335
335
|
if (floatingFilterOpts.enabled) {
|