vxe-table 3.19.33 → 3.19.35

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

@@ -201,12 +201,12 @@ const renderSimplePanel = (h, _vm) => {
                         }, [
                             h('span', {
                                 class: ['vxe-table-custom--sort-btn', {
-                                        'is--disabled': isDisabled || isHidden
+                                        'is--disabled': isHidden
                                     }],
                                 attrs: {
                                     title: getI18n('vxe.custom.setting.sortHelpTip')
                                 },
-                                on: isDisabled || isHidden
+                                on: isHidden
                                     ? {}
                                     : {
                                         mousedown: _vm.sortMousedownEvent,
@@ -244,7 +244,7 @@ const renderSimplePanel = (h, _vm) => {
                                 mode: 'text',
                                 icon: column.renderFixed === 'left' ? getIcon().TOOLBAR_TOOLS_FIXED_LEFT_ACTIVE : getIcon().TOOLBAR_TOOLS_FIXED_LEFT,
                                 status: column.renderFixed === 'left' ? 'primary' : '',
-                                disabled: isDisabled || isHidden || (isMaxFixedColumn && !column.renderFixed),
+                                disabled: isHidden || (isMaxFixedColumn && !column.renderFixed),
                                 title: getI18n(column.renderFixed === 'left' ? 'vxe.toolbar.cancelFixed' : 'vxe.toolbar.fixedLeft')
                             },
                             on: {
@@ -258,7 +258,7 @@ const renderSimplePanel = (h, _vm) => {
                                 mode: 'text',
                                 icon: column.renderFixed === 'right' ? getIcon().TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVE : getIcon().TOOLBAR_TOOLS_FIXED_RIGHT,
                                 status: column.renderFixed === 'right' ? 'primary' : '',
-                                disabled: isDisabled || isHidden || (isMaxFixedColumn && !column.renderFixed),
+                                disabled: isHidden || (isMaxFixedColumn && !column.renderFixed),
                                 title: getI18n(column.renderFixed === 'right' ? 'vxe.toolbar.cancelFixed' : 'vxe.toolbar.fixedRight')
                             },
                             on: {
@@ -545,12 +545,12 @@ const renderPopupPanel = (h, $xeTableCustomPanel) => {
                             ? ((isCrossDrag ? immediate : false) || column.level === 1
                                 ? h('div', {
                                     class: ['vxe-table-custom-popup--column-sort-btn', {
-                                            'is--disabled': isDisabled || isHidden
+                                            'is--disabled': isHidden
                                         }],
                                     attrs: {
                                         title: getI18n('vxe.custom.setting.sortHelpTip')
                                     },
-                                    on: (isDisabled || isHidden
+                                    on: (isHidden
                                         ? {}
                                         : {
                                             mousedown: _vm.sortMousedownEvent,
@@ -594,7 +594,7 @@ const renderPopupPanel = (h, $xeTableCustomPanel) => {
                                     props: {
                                         type: 'integer',
                                         immediate: false,
-                                        disabled: isDisabled || isHidden,
+                                        disabled: isHidden,
                                         value: column.renderResizeWidth,
                                         min: customMinWidth || undefined,
                                         max: customMaxWidth || undefined
@@ -622,11 +622,11 @@ const renderPopupPanel = (h, $xeTableCustomPanel) => {
                                     value: column.renderFixed || '',
                                     type: 'button',
                                     size: 'mini',
-                                    disabled: isDisabled || isHidden,
+                                    disabled: isHidden,
                                     options: [
-                                        { label: getI18n('vxe.custom.setting.fixedLeft'), value: 'left', disabled: isDisabled || isHidden || isMaxFixedColumn },
-                                        { label: getI18n('vxe.custom.setting.fixedUnset'), value: '', disabled: isDisabled || isHidden },
-                                        { label: getI18n('vxe.custom.setting.fixedRight'), value: 'right', disabled: isDisabled || isHidden || isMaxFixedColumn }
+                                        { label: getI18n('vxe.custom.setting.fixedLeft'), value: 'left', disabled: isHidden || isMaxFixedColumn },
+                                        { label: getI18n('vxe.custom.setting.fixedUnset'), value: '', disabled: isHidden },
+                                        { label: getI18n('vxe.custom.setting.fixedRight'), value: 'right', disabled: isHidden || isMaxFixedColumn }
                                     ]
                                 },
                                 on: {

package/es/table/module/edit/mixin.js

@@ -88,7 +88,7 @@ function insertTreeRow($xeTable, newRecords, isAppend) {
 }
 // function insertGroupRow ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, newRecords: any[], isAppend: boolean) {
 // }
-function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
+function handleInsertRowAt($xeTable, records, targetRowOrRowid, isInsertNextRow) {
     const props = $xeTable;
     const reactData = $xeTable;
     const internalData = $xeTable;
@@ -101,6 +101,13 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
     if (!XEUtils.isArray(records)) {
         records = [records];
     }
+    let targetRow = targetRowOrRowid;
+    if (XEUtils.isString(targetRowOrRowid) || XEUtils.isNumber(targetRowOrRowid)) {
+        const rowRest = fullAllDataRowIdData[targetRowOrRowid];
+        if (rowRest) {
+            targetRow = rowRest.row;
+        }
+    }
     const newRecords = $xeTable.defineField(records.map(record => Object.assign(treeConfig && transform ? { [mapChildrenField]: [], [childrenField]: [] } : {}, record)));
     let treeRecords = [];
     if (treeConfig && transform) {
@@ -312,16 +319,25 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
         };
     });
 }
-function handleInsertChildRowAt($xeTable, records, parentRow, targetRow, isInsertNextRow) {
+function handleInsertChildRowAt($xeTable, records, parentRowOrParentId, targetRowOrRowid, isInsertNextRow) {
     const props = $xeTable;
+    const internalData = $xeTable;
     const { treeConfig } = props;
+    const { fullAllDataRowIdData } = internalData;
     const treeOpts = $xeTable.computeTreeOpts;
     const { transform, rowField, parentField } = treeOpts;
     if (treeConfig && transform) {
         if (!XEUtils.isArray(records)) {
             records = [records];
         }
-        return handleInsertRowAt($xeTable, records.map((item) => Object.assign({}, item, { [parentField]: parentRow[rowField] })), targetRow, isInsertNextRow);
+        let parentRow = parentRowOrParentId;
+        if (XEUtils.isString(parentRowOrParentId) || XEUtils.isNumber(parentRowOrParentId)) {
+            const rowRest = fullAllDataRowIdData[parentRowOrParentId];
+            if (rowRest) {
+                parentRow = rowRest.row;
+            }
+        }
+        return handleInsertRowAt($xeTable, records.map((item) => Object.assign({}, item, { [parentField]: parentRow[rowField] })), targetRowOrRowid, isInsertNextRow);
     }
     else {
         errLog('vxe.error.errProp', ['tree-config.transform=false', 'tree-config.transform=true']);
@@ -509,24 +525,22 @@ export default {
          * 如果 row 为空则从插入到顶部
          * 如果 row 为 -1 则从插入到底部
          * 如果 row 为有效行则插入到该行的位置
-         * @param {Object/Array} records 新的数据
-         * @param {Row} targetRow 指定行
          * @returns
          */
-        _insertAt(records, targetRow) {
-            return handleInsertRowAt(this, records, targetRow);
+        _insertAt(records, targetRowOrRowid) {
+            return handleInsertRowAt(this, records, targetRowOrRowid);
         },
-        _insertNextAt(records, targetRow) {
-            return handleInsertRowAt(this, records, targetRow, true);
+        _insertNextAt(records, targetRowOrRowid) {
+            return handleInsertRowAt(this, records, targetRowOrRowid, true);
         },
-        _insertChild(records, parentRow) {
-            return handleInsertChildRowAt(this, records, parentRow, null);
+        _insertChild(records, parentRowOrParentId) {
+            return handleInsertChildRowAt(this, records, parentRowOrParentId, null);
         },
-        _insertChildAt(records, parentRow, targetRow) {
-            return handleInsertChildRowAt(this, records, parentRow, targetRow);
+        _insertChildAt(records, parentRowOrParentId, targetRowOrRowid) {
+            return handleInsertChildRowAt(this, records, parentRowOrParentId, targetRowOrRowid);
         },
-        _insertChildNextAt(records, parentRow, targetRow) {
-            return handleInsertChildRowAt(this, records, parentRow, targetRow, true);
+        _insertChildNextAt(records, parentRowOrParentId, targetRowOrRowid) {
+            return handleInsertChildRowAt(this, records, parentRowOrParentId, targetRowOrRowid, true);
         },
         /**
          * 删除指定行数据

package/es/table/src/methods.js

@@ -5594,19 +5594,6 @@ const tableMethods = {
         const { treeConfig } = props;
         const { tableFullData, tableFullTreeData } = internalData;
         if (treeConfig) {
-            const treeOpts = $xeTable.computeTreeOpts;
-            const { transform, mapChildrenField, rowField, parentField } = treeOpts;
-            const childrenField = treeOpts.children || treeOpts.childrenField;
-            if (transform) {
-                return XEUtils.toArrayTree(XEUtils.toTreeArray(tableFullTreeData, {
-                    children: mapChildrenField
-                }), {
-                    key: rowField,
-                    parentKey: parentField,
-                    children: childrenField,
-                    mapChildren: mapChildrenField
-                });
-            }
             return tableFullTreeData.slice(0);
         }
         return tableFullData.slice(0);

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "3.19.33";
+export const version = "3.19.35";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({

package/es/ui/src/log.js

@@ -1,5 +1,5 @@
 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const version = `table v${"3.19.33"}`;
+const version = `table v${"3.19.35"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/index.umd.js

@@ -2005,7 +2005,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.19.33";
+const version = "3.19.35";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2715,7 +2715,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.19.33"}`;
+const log_version = `table v${"3.19.35"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -6311,7 +6311,7 @@ if(!rowRest){return false;}const row=rowRest.row;const oRow=sourceDataRowIdData[
      * 如果存在排序，继续处理
      */getTableData(){const $xeTable=this;const props=$xeTable;const reactData=$xeTable;const internalData=$xeTable;const{tableData,footerTableData}=reactData;const{tableFullData,afterFullData,tableFullTreeData}=internalData;return{fullData:props.treeConfig?tableFullTreeData.slice(0):tableFullData.slice(0),visibleData:afterFullData.slice(0),tableData:tableData.slice(0),footerData:footerTableData.slice(0)};},/**
      * 获取表格的全量数据，如果是 tree-config 则返回带层级的树结构
-     */getFullData(){const $xeTable=this;const props=$xeTable;const internalData=$xeTable;const{treeConfig}=props;const{tableFullData,tableFullTreeData}=internalData;if(treeConfig){const treeOpts=$xeTable.computeTreeOpts;const{transform,mapChildrenField,rowField,parentField}=treeOpts;const childrenField=treeOpts.children||treeOpts.childrenField;if(transform){return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toArrayTree(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toTreeArray(tableFullTreeData,{children:mapChildrenField}),{key:rowField,parentKey:parentField,children:childrenField,mapChildren:mapChildrenField});}return tableFullTreeData.slice(0);}return tableFullData.slice(0);},/**
+     */getFullData(){const $xeTable=this;const props=$xeTable;const internalData=$xeTable;const{treeConfig}=props;const{tableFullData,tableFullTreeData}=internalData;if(treeConfig){return tableFullTreeData.slice(0);}return tableFullData.slice(0);},/**
      * 处理数据加载默认行为
      * 默认执行一次，除非被重置
      */handleLoadDefaults(){const $xeTable=this;handleLoadDefaults($xeTable);},/**
@@ -9028,12 +9028,12 @@ const renderSimplePanel = (h, _vm) => {
         class: 'vxe-table-custom--sort-option'
       }, [h('span', {
         class: ['vxe-table-custom--sort-btn', {
-          'is--disabled': isDisabled || isHidden
+          'is--disabled': isHidden
         }],
         attrs: {
           title: panel_getI18n('vxe.custom.setting.sortHelpTip')
         },
-        on: isDisabled || isHidden ? {} : {
+        on: isHidden ? {} : {
           mousedown: _vm.sortMousedownEvent,
           mouseup: _vm.sortMouseupEvent
         }
@@ -9058,7 +9058,7 @@ const renderSimplePanel = (h, _vm) => {
           mode: 'text',
           icon: column.renderFixed === 'left' ? panel_getIcon().TOOLBAR_TOOLS_FIXED_LEFT_ACTIVE : panel_getIcon().TOOLBAR_TOOLS_FIXED_LEFT,
           status: column.renderFixed === 'left' ? 'primary' : '',
-          disabled: isDisabled || isHidden || isMaxFixedColumn && !column.renderFixed,
+          disabled: isHidden || isMaxFixedColumn && !column.renderFixed,
           title: panel_getI18n(column.renderFixed === 'left' ? 'vxe.toolbar.cancelFixed' : 'vxe.toolbar.fixedLeft')
         },
         on: {
@@ -9073,7 +9073,7 @@ const renderSimplePanel = (h, _vm) => {
           mode: 'text',
           icon: column.renderFixed === 'right' ? panel_getIcon().TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVE : panel_getIcon().TOOLBAR_TOOLS_FIXED_RIGHT,
           status: column.renderFixed === 'right' ? 'primary' : '',
-          disabled: isDisabled || isHidden || isMaxFixedColumn && !column.renderFixed,
+          disabled: isHidden || isMaxFixedColumn && !column.renderFixed,
           title: panel_getI18n(column.renderFixed === 'right' ? 'vxe.toolbar.cancelFixed' : 'vxe.toolbar.fixedRight')
         },
         on: {
@@ -9329,12 +9329,12 @@ const renderPopupPanel = (h, $xeTableCustomPanel) => {
         class: 'vxe-table-custom-popup--name'
       }, [allowSort ? (isCrossDrag ? immediate : false) || column.level === 1 ? h('div', {
         class: ['vxe-table-custom-popup--column-sort-btn', {
-          'is--disabled': isDisabled || isHidden
+          'is--disabled': isHidden
         }],
         attrs: {
           title: panel_getI18n('vxe.custom.setting.sortHelpTip')
         },
-        on: isDisabled || isHidden ? {} : {
+        on: isHidden ? {} : {
           mousedown: _vm.sortMousedownEvent,
           mouseup: _vm.sortMouseupEvent
         }
@@ -9360,7 +9360,7 @@ const renderPopupPanel = (h, $xeTableCustomPanel) => {
         props: {
           type: 'integer',
           immediate: false,
-          disabled: isDisabled || isHidden,
+          disabled: isHidden,
           value: column.renderResizeWidth,
           min: customMinWidth || undefined,
           max: customMaxWidth || undefined
@@ -9380,19 +9380,19 @@ const renderPopupPanel = (h, $xeTableCustomPanel) => {
           value: column.renderFixed || '',
           type: 'button',
           size: 'mini',
-          disabled: isDisabled || isHidden,
+          disabled: isHidden,
           options: [{
             label: panel_getI18n('vxe.custom.setting.fixedLeft'),
             value: 'left',
-            disabled: isDisabled || isHidden || isMaxFixedColumn
+            disabled: isHidden || isMaxFixedColumn
           }, {
             label: panel_getI18n('vxe.custom.setting.fixedUnset'),
             value: '',
-            disabled: isDisabled || isHidden
+            disabled: isHidden
           }, {
             label: panel_getI18n('vxe.custom.setting.fixedRight'),
             value: 'right',
-            disabled: isDisabled || isHidden || isMaxFixedColumn
+            disabled: isHidden || isMaxFixedColumn
           }]
         },
         on: {
@@ -12450,7 +12450,7 @@ function insertTreeRow($xeTable, newRecords, isAppend) {
 }
 // function insertGroupRow ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, newRecords: any[], isAppend: boolean) {
 // }
-function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
+function handleInsertRowAt($xeTable, records, targetRowOrRowid, isInsertNextRow) {
   const props = $xeTable;
   const reactData = $xeTable;
   const internalData = $xeTable;
@@ -12481,6 +12481,13 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
   if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(records)) {
     records = [records];
   }
+  let targetRow = targetRowOrRowid;
+  if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(targetRowOrRowid) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(targetRowOrRowid)) {
+    const rowRest = fullAllDataRowIdData[targetRowOrRowid];
+    if (rowRest) {
+      targetRow = rowRest.row;
+    }
+  }
   const newRecords = $xeTable.defineField(records.map(record => Object.assign(treeConfig && transform ? {
     [mapChildrenField]: [],
     [childrenField]: []
@@ -12747,11 +12754,15 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
     };
   });
 }
-function handleInsertChildRowAt($xeTable, records, parentRow, targetRow, isInsertNextRow) {
+function handleInsertChildRowAt($xeTable, records, parentRowOrParentId, targetRowOrRowid, isInsertNextRow) {
   const props = $xeTable;
+  const internalData = $xeTable;
   const {
     treeConfig
   } = props;
+  const {
+    fullAllDataRowIdData
+  } = internalData;
   const treeOpts = $xeTable.computeTreeOpts;
   const {
     transform,
@@ -12762,9 +12773,16 @@ function handleInsertChildRowAt($xeTable, records, parentRow, targetRow, isInser
     if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(records)) {
       records = [records];
     }
+    let parentRow = parentRowOrParentId;
+    if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(parentRowOrParentId) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(parentRowOrParentId)) {
+      const rowRest = fullAllDataRowIdData[parentRowOrParentId];
+      if (rowRest) {
+        parentRow = rowRest.row;
+      }
+    }
     return handleInsertRowAt($xeTable, records.map(item => Object.assign({}, item, {
       [parentField]: parentRow[rowField]
-    })), targetRow, isInsertNextRow);
+    })), targetRowOrRowid, isInsertNextRow);
   } else {
     errLog('vxe.error.errProp', ['tree-config.transform=false', 'tree-config.transform=true']);
   }
@@ -12990,24 +13008,22 @@ function handleEditCell($xeTable, row, fieldOrColumn, isPos) {
      * 如果 row 为空则从插入到顶部
      * 如果 row 为 -1 则从插入到底部
      * 如果 row 为有效行则插入到该行的位置
-     * @param {Object/Array} records 新的数据
-     * @param {Row} targetRow 指定行
      * @returns
      */
-    _insertAt(records, targetRow) {
-      return handleInsertRowAt(this, records, targetRow);
+    _insertAt(records, targetRowOrRowid) {
+      return handleInsertRowAt(this, records, targetRowOrRowid);
     },
-    _insertNextAt(records, targetRow) {
-      return handleInsertRowAt(this, records, targetRow, true);
+    _insertNextAt(records, targetRowOrRowid) {
+      return handleInsertRowAt(this, records, targetRowOrRowid, true);
     },
-    _insertChild(records, parentRow) {
-      return handleInsertChildRowAt(this, records, parentRow, null);
+    _insertChild(records, parentRowOrParentId) {
+      return handleInsertChildRowAt(this, records, parentRowOrParentId, null);
     },
-    _insertChildAt(records, parentRow, targetRow) {
-      return handleInsertChildRowAt(this, records, parentRow, targetRow);
+    _insertChildAt(records, parentRowOrParentId, targetRowOrRowid) {
+      return handleInsertChildRowAt(this, records, parentRowOrParentId, targetRowOrRowid);
     },
-    _insertChildNextAt(records, parentRow, targetRow) {
-      return handleInsertChildRowAt(this, records, parentRow, targetRow, true);
+    _insertChildNextAt(records, parentRowOrParentId, targetRowOrRowid) {
+      return handleInsertChildRowAt(this, records, parentRowOrParentId, targetRowOrRowid, true);
     },
     /**
      * 删除指定行数据