vxe-table 3.11.21 → 3.11.23

package/es/table/module/custom/panel.js

@@ -21,11 +21,15 @@ function updateDropHint(_vm, evnt) {
 }
 const renderSimplePanel = (h, _vm) => {
     const VxeUIButtonComponent = VxeUI.getComponent('VxeButton');
+    const props = _vm;
     const $xeTable = _vm.$xeTable;
-    const { _e, customStore, dragColumn } = _vm;
-    const { customColumnList, customOpts, isMaxFixedColumn } = $xeTable;
+    const reactData = $xeTable;
+    const { customStore } = props;
+    const { isCustomStatus, customColumnList } = reactData;
+    const customOpts = $xeTable.computeCustomOpts;
     const { maxHeight } = customStore;
     const { checkMethod, visibleMethod, allowVisible, allowSort, allowFixed, trigger, placement } = customOpts;
+    const isMaxFixedColumn = $xeTable.computeIsMaxFixedColumn;
     const slots = customOpts.slots || {};
     const headerSlot = slots.header;
     const topSlot = slots.top;
@@ -34,19 +38,21 @@ const renderSimplePanel = (h, _vm) => {
     const footerSlot = slots.footer;
     const colVNs = [];
     const customWrapperOns = {};
+    const isAllChecked = customStore.isAll;
+    const isAllIndeterminate = customStore.isIndeterminate;
+    const dragColumn = _vm.dragColumn;
     // hover 触发
     if (trigger === 'hover') {
         customWrapperOns.mouseenter = _vm.handleWrapperMouseenterEvent;
         customWrapperOns.mouseleave = _vm.handleWrapperMouseleaveEvent;
     }
-    const isAllChecked = customStore.isAll;
-    const isAllIndeterminate = customStore.isIndeterminate;
     const params = {
         $table: $xeTable,
         $grid: $xeTable.xegrid,
         columns: customColumnList,
         isAllChecked,
-        isAllIndeterminate
+        isAllIndeterminate,
+        isCustomStatus
     };
     XEUtils.eachTree(customColumnList, (column, index, items, path, parent) => {
         const isVisible = visibleMethod ? visibleMethod({ column }) : true;
@@ -94,7 +100,7 @@ const renderSimplePanel = (h, _vm) => {
                             class: ['vxe-checkbox--icon', isIndeterminate ? getIcon().TABLE_CHECKBOX_INDETERMINATE : (isChecked ? getIcon().TABLE_CHECKBOX_CHECKED : getIcon().TABLE_CHECKBOX_UNCHECKED)]
                         })
                     ])
-                    : _e(),
+                    : renderEmptyElement($xeTable),
                 allowSort && column.level === 1
                     ? h('div', {
                         class: 'vxe-table-custom--sort-option'
@@ -118,7 +124,7 @@ const renderSimplePanel = (h, _vm) => {
                             })
                         ])
                     ])
-                    : _e(),
+                    : renderEmptyElement($xeTable),
                 column.type === 'html'
                     ? h('div', {
                         key: '1',
@@ -167,7 +173,7 @@ const renderSimplePanel = (h, _vm) => {
                             }
                         })
                     ])
-                    : _e()
+                    : renderEmptyElement($xeTable)
             ]));
         }
     });
@@ -263,7 +269,8 @@ const renderSimplePanel = (h, _vm) => {
                             h(VxeUIButtonComponent, {
                                 props: {
                                     mode: 'text',
-                                    content: customOpts.resetButtonText || getI18n('vxe.table.customRestore')
+                                    content: customOpts.resetButtonText || getI18n('vxe.table.customRestore'),
+                                    disabled: !isCustomStatus
                                 },
                                 on: {
                                     click: _vm.resetCustomEvent
@@ -289,7 +296,7 @@ const renderSimplePanel = (h, _vm) => {
                                     }
                                 }),
                             customOpts.immediate
-                                ? _e()
+                                ? renderEmptyElement($xeTable)
                                 : h(VxeUIButtonComponent, {
                                     props: {
                                         mode: 'text',
@@ -313,15 +320,22 @@ const renderPopupPanel = (h, _vm) => {
     const VxeUINumberInputComponent = VxeUI.getComponent('VxeInput');
     const VxeUITooltipComponent = VxeUI.getComponent('VxeTooltip');
     const $xeTableCustomPanel = _vm;
+    const props = _vm;
     const $xeTable = _vm.$xeTable;
-    const { _e, customStore } = _vm;
-    const { resizable: allResizable, customOpts, customColumnList, columnOpts, isMaxFixedColumn } = $xeTable;
+    const tableProps = $xeTable;
+    const reactData = $xeTable;
+    const { customStore } = props;
+    const { resizable: allResizable } = tableProps;
+    const { isCustomStatus, customColumnList } = reactData;
+    const customOpts = $xeTable.computeCustomOpts;
     const { mode, modalOptions, drawerOptions, allowVisible, allowSort, allowFixed, allowResizable, checkMethod, visibleMethod } = customOpts;
+    const columnOpts = $xeTable.computeColumnOpts;
     const { maxFixedSize } = columnOpts;
     const resizableOpts = $xeTable.computeResizableOpts;
     const { minWidth: reMinWidth, maxWidth: reMaxWidth } = resizableOpts;
     const modalOpts = Object.assign({}, modalOptions);
     const drawerOpts = Object.assign({}, drawerOptions);
+    const isMaxFixedColumn = $xeTable.computeIsMaxFixedColumn;
     const slots = customOpts.slots || {};
     const headerSlot = slots.header;
     const topSlot = slots.top;
@@ -331,12 +345,14 @@ const renderPopupPanel = (h, _vm) => {
     const trVNs = [];
     const isAllChecked = customStore.isAll;
     const isAllIndeterminate = customStore.isIndeterminate;
+    const dragColumn = _vm.dragColumn;
     const params = {
         $table: $xeTable,
         $grid: $xeTable.xegrid,
         columns: customColumnList,
         isAllChecked,
-        isAllIndeterminate
+        isAllIndeterminate,
+        isCustomStatus
     };
     XEUtils.eachTree(customColumnList, (column, index, items, path, parent) => {
         const isVisible = visibleMethod ? visibleMethod({ column }) : true;
@@ -405,7 +421,7 @@ const renderPopupPanel = (h, _vm) => {
                             })
                         ])
                     ])
-                    : _e(),
+                    : renderEmptyElement($xeTable),
                 allowSort
                     ? h('td', {
                         class: 'vxe-table-custom-popup--column-item col--sort'
@@ -431,7 +447,7 @@ const renderPopupPanel = (h, _vm) => {
                             ])
                             : h('span', '-')
                     ])
-                    : _e(),
+                    : renderEmptyElement($xeTable),
                 h('td', {
                     class: 'vxe-table-custom-popup--column-item col--name'
                 }, [
@@ -475,7 +491,7 @@ const renderPopupPanel = (h, _vm) => {
                                 })
                                 : renderEmptyElement($xeTableCustomPanel))
                     ])
-                    : _e(),
+                    : renderEmptyElement($xeTable),
                 allowFixed
                     ? h('td', {
                         class: 'vxe-table-custom-popup--column-item col--fixed'
@@ -501,7 +517,7 @@ const renderPopupPanel = (h, _vm) => {
                                 }
                             })
                     ])
-                    : _e()
+                    : renderEmptyElement($xeTable)
             ]));
         }
     });
@@ -528,12 +544,12 @@ const renderPopupPanel = (h, _vm) => {
                                 ? h('col', {
                                     class: 'vxe-table-custom-popup--table-col-seq'
                                 })
-                                : _e(),
+                                : renderEmptyElement($xeTable),
                             allowSort
                                 ? h('col', {
                                     class: 'vxe-table-custom-popup--table-col-sort'
                                 })
-                                : _e(),
+                                : renderEmptyElement($xeTable),
                             h('col', {
                                 class: 'vxe-table-custom-popup--table-col-title'
                             }),
@@ -541,12 +557,12 @@ const renderPopupPanel = (h, _vm) => {
                                 ? h('col', {
                                     class: 'vxe-table-custom-popup--table-col-width'
                                 })
-                                : _e(),
+                                : renderEmptyElement($xeTable),
                             allowFixed
                                 ? h('col', {
                                     class: 'vxe-table-custom-popup--table-col-fixed'
                                 })
-                                : _e()
+                                : renderEmptyElement($xeTable)
                         ]),
                         h('thead', {}, [
                             h('tr', {}, [
@@ -572,7 +588,7 @@ const renderPopupPanel = (h, _vm) => {
                                             }, getI18n('vxe.toolbar.customAll'))
                                         ])
                                     ])
-                                    : _e(),
+                                    : renderEmptyElement($xeTable),
                                 allowSort
                                     ? h('th', {}, [
                                         h('span', {
@@ -595,14 +611,14 @@ const renderPopupPanel = (h, _vm) => {
                                             })
                                             : renderEmptyElement($xeTableCustomPanel)
                                     ])
-                                    : _e(),
+                                    : renderEmptyElement($xeTable),
                                 h('th', {}, getI18n('vxe.custom.setting.colTitle')),
                                 allowResizable
                                     ? h('th', {}, getI18n('vxe.custom.setting.colResizable'))
-                                    : _e(),
+                                    : renderEmptyElement($xeTable),
                                 allowFixed
                                     ? h('th', {}, getI18n(`vxe.custom.setting.${maxFixedSize ? 'colFixedMax' : 'colFixed'}`, [maxFixedSize]))
-                                    : _e()
+                                    : renderEmptyElement($xeTable)
                             ])
                         ]),
                         h('transition-group', {
@@ -622,7 +638,7 @@ const renderPopupPanel = (h, _vm) => {
                 h('div', {
                     ref: 'dragHintElemRef',
                     class: 'vxe-table-custom-popup--drag-hint'
-                }, getI18n('vxe.custom.cstmDragTarget', [_vm.dragColumn ? _vm.dragColumn.getTitle() : '']))
+                }, getI18n('vxe.custom.cstmDragTarget', [dragColumn ? dragColumn.getTitle() : '']))
             ]);
         },
         footer: () => {
@@ -634,7 +650,8 @@ const renderPopupPanel = (h, _vm) => {
             }, [
                 h(VxeUIButtonComponent, {
                     props: {
-                        content: customOpts.resetButtonText || getI18n('vxe.custom.cstmRestore')
+                        content: customOpts.resetButtonText || getI18n('vxe.custom.cstmRestore'),
+                        disabled: !isCustomStatus
                     },
                     on: {
                         click: _vm.resetCustomEvent

package/es/table/render/index.js

@@ -562,20 +562,40 @@ renderer.mixin({
         tableAutoFocus: 'input',
         renderTableEdit: defaultEditRender,
         renderTableCell(h, renderOpts, params) {
-            var _a;
             const { props = {} } = renderOpts;
             const { row, column } = params;
-            const digits = props.digits || ((_a = getConfig().numberInput) === null || _a === void 0 ? void 0 : _a.digits) || 2;
+            const { type } = props;
             let cellValue = XEUtils.get(row, column.field);
             if (cellValue) {
-                switch (props.type) {
-                    case 'float':
-                        cellValue = XEUtils.toFixed(XEUtils.floor(cellValue, digits), digits);
-                        break;
+                if (type === 'float') {
+                    const digits = props.digits || getConfig().numberInput.digits || 1;
+                    cellValue = XEUtils.toFixed(XEUtils.floor(cellValue, digits), digits);
+                }
+                else if (type === 'amount') {
+                    const digits = props.digits || getConfig().numberInput.digits || 2;
+                    cellValue = XEUtils.commafy(XEUtils.toNumber(cellValue), { digits });
                 }
             }
             return getCellLabelVNs(h, renderOpts, params, cellValue);
         },
+        renderTableFooter(h, renderOpts, params) {
+            const { props = {} } = renderOpts;
+            const { row, column, _columnIndex } = params;
+            const { type } = props;
+            // 兼容老模式
+            const cellValue = XEUtils.isArray(row) ? row[_columnIndex] : XEUtils.get(row, column.field);
+            if (XEUtils.isNumber(cellValue)) {
+                if (type === 'float') {
+                    const digits = props.digits || getConfig().numberInput.digits || 1;
+                    return XEUtils.toFixed(XEUtils.floor(cellValue, digits), digits);
+                }
+                else if (type === 'amount') {
+                    const digits = props.digits || getConfig().numberInput.digits || 2;
+                    return XEUtils.commafy(XEUtils.toNumber(cellValue), { digits });
+                }
+            }
+            return getFuncText(cellValue, 1);
+        },
         renderTableDefault: defaultEditRender,
         renderTableFilter: defaultFilterRender,
         tableFilterDefaultMethod: handleInputFilterMethod

package/es/table/src/body.js

@@ -330,12 +330,12 @@ function renderRows(h, _vm, $xeTable, fixedType, tableData, tableColumn) {
         if (editConfig) {
             isNewRow = $xeTable.isInsertByRow(row);
         }
-        if (treeConfig && !scrollYLoad && !treeOpts.transform) {
+        if (treeConfig && !scrollYLoad && !transform) {
             rowChildren = row[childrenField];
             isExpandTree = rowChildren && rowChildren.length && !!treeExpandedMaps[rowid];
         }
         // 拖拽行事件
-        if (rowOpts.drag && !rowLevel) {
+        if (rowOpts.drag && (!treeConfig || transform)) {
             trOn.dragstart = (evnt) => {
                 $xeTable.handleRowDragDragstartEvent(evnt);
             };

package/es/table/src/cell.js

@@ -75,11 +75,16 @@ function renderCellBaseVNs(h, params, content) {
     const { treeConfig, dragConfig } = tableProps;
     const rowOpts = $table.computeRowOpts;
     const rowDragOpts = $table.computeRowDragOpts;
-    const { showIcon, visibleMethod } = rowDragOpts;
+    const { showIcon, isCrossDrag, visibleMethod } = rowDragOpts;
     const rVisibleMethod = visibleMethod || (dragConfig ? dragConfig.rowVisibleMethod : null);
     const vns = XEUtils.isArray(content) ? content : [content];
     if (dragSort && rowOpts.drag && ((showIcon || (dragConfig ? dragConfig.showRowIcon : false)) && (!rVisibleMethod || rVisibleMethod(params)))) {
-        if (!treeConfig || !level) {
+        if (treeConfig) {
+            if (isCrossDrag || !level) {
+                vns.unshift(renderCellDragIcon(h, params));
+            }
+        }
+        else {
             vns.unshift(renderCellDragIcon(h, params));
         }
     }

package/es/table/src/header.js

@@ -42,7 +42,7 @@ const renderRows = (h, _vm, cols, $rowIndex) => {
             thOns.mousedown = (evnt) => $xetable.triggerHeaderCellMousedownEvent(evnt, params);
         }
         // 拖拽行事件
-        if (columnOpts.drag && !column.parentId) {
+        if (columnOpts.drag) {
             thOns.dragstart = $xetable.handleHeaderCellDragDragstartEvent;
             thOns.dragend = $xetable.handleHeaderCellDragDragendEvent;
             thOns.dragover = $xetable.handleHeaderCellDragDragoverEvent;