vxe-table 3.17.0 → 3.17.1

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

@@ -18,6 +18,12 @@ function emitCustomEvent($xeTable, type, evnt) {
 }
 export default {
     methods: {
+        _getCustomVisible() {
+            const $xeTable = this;
+            const reactData = $xeTable;
+            const { customStore } = reactData;
+            return customStore.visible;
+        },
         _openCustom() {
             const $xeTable = this;
             const reactData = $xeTable;
@@ -54,6 +60,7 @@ export default {
         _saveCustom() {
             const $xeTable = this;
             const reactData = $xeTable;
+            const internalData = $xeTable;
             const { customColumnList, aggHandleFields, rowGroupList } = reactData;
             const customOpts = $xeTable.computeCustomOpts;
             const { allowVisible, allowSort, allowFixed, allowResizable, allowGroup, allowValues } = customOpts;
@@ -102,6 +109,9 @@ export default {
                     $xeTable.handleUpdateAggData();
                 }
             }
+            if (allowSort) {
+                internalData.collectColumn = customColumnList;
+            }
             return $xeTable.saveCustomStore('confirm');
         },
         _cancelCustom() {

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

@@ -1085,7 +1085,7 @@ export default {
                     }
                 }
             }
-            if (!targetFixed !== null) {
+            if (targetFixed !== null) {
                 $xeTable.dispatchEvent('custom-fixed-change', { column, fixed: targetFixed }, evnt);
             }
         },

package/es/table/src/methods.js

@@ -251,8 +251,8 @@ function cacheColumnMap($xeTable) {
     const reactData = $xeTable;
     const internalData = $xeTable;
     const { tableFullColumn, collectColumn } = internalData;
-    const fullColumnIdData = internalData.fullColumnIdData = {};
-    const fullColumnFieldData = internalData.fullColumnFieldData = {};
+    const fullColIdData = internalData.fullColumnIdData = {};
+    const fullColFieldData = internalData.fullColumnFieldData = {};
     const mouseOpts = $xeTable.computeMouseOpts;
     const expandOpts = $xeTable.computeExpandOpts;
     const columnOpts = $xeTable.computeColumnOpts;
@@ -274,10 +274,10 @@ function cacheColumnMap($xeTable) {
         const { id: colid, field, fixed, type, treeNode, rowGroupNode } = column;
         const rest = { $index: -1, _index: -1, column, colid, index, items, parent: parentColumn || null, width: 0, oLeft: 0 };
         if (field) {
-            if (fullColumnFieldData[field]) {
+            if (fullColFieldData[field]) {
                 errLog('vxe.error.colRepet', ['field', field]);
             }
-            fullColumnFieldData[field] = rest;
+            fullColFieldData[field] = rest;
         }
         else {
             if ((storage && !type) || (columnOpts.drag && (isCrossDrag || isSelfToChildDrag))) {
@@ -333,10 +333,10 @@ function cacheColumnMap($xeTable) {
         if (isAllOverflow && column.showOverflow === false) {
             isAllOverflow = false;
         }
-        if (fullColumnIdData[colid]) {
+        if (fullColIdData[colid]) {
             errLog('vxe.error.colRepet', ['colId', colid]);
         }
-        fullColumnIdData[colid] = rest;
+        fullColIdData[colid] = rest;
     };
     if (isGroup) {
         XEUtils.eachTree(collectColumn, (column, index, items, path, parentColumn, nodes) => {
@@ -352,10 +352,10 @@ function cacheColumnMap($xeTable) {
     }
     if (htmlColumn) {
         if (!columnOpts.useKey) {
-            errLog('vxe.error.reqProp', ['column-config.useKey & column.type=html']);
+            errLog('vxe.error.notSupportProp', ['column.type=html', 'column-config.useKey=false', 'column-config.useKey=true']);
         }
         if (!rowOpts.useKey) {
-            errLog('vxe.error.reqProp', ['row-config.useKey & column.type=html']);
+            errLog('vxe.error.notSupportProp', ['column.type=html', 'row-config.useKey=false', 'row-config.useKey=true']);
         }
     }
     reactData.isGroup = isGroup;
@@ -3273,15 +3273,28 @@ function parseColumns($xeTable, isReset) {
 function initColumnHierarchy($xeTable) {
     const internalData = $xeTable;
     const { collectColumn } = internalData;
+    const fullColIdData = {};
+    const fullColFieldData = {};
     let sortIndex = 1;
     XEUtils.eachTree(collectColumn, (column, index, items, path, parentColumn) => {
+        const { id: colid, field } = column;
         const parentId = parentColumn ? parentColumn.id : null;
+        const rest = { $index: -1, _index: -1, column, colid, index, items, parent: parentColumn || null, width: 0, oLeft: 0 };
         column.parentId = parentId;
         column.defaultParentId = parentId;
         column.sortNumber = sortIndex;
         column.renderSortNumber = sortIndex;
         sortIndex++;
+        if (field) {
+            if (fullColFieldData[field]) {
+                errLog('vxe.error.colRepet', ['field', field]);
+            }
+            fullColFieldData[field] = rest;
+        }
+        fullColIdData[colid] = rest;
     });
+    internalData.fullColumnIdData = fullColIdData;
+    internalData.fullColumnFieldData = fullColFieldData;
 }
 function handleInitColumn($xeTable, collectColumn) {
     const $xeToolbar = $xeTable.$refs.$xeToolbar;
@@ -10797,7 +10810,7 @@ const Methods = {
     }
 };
 // Module methods
-const funcs = 'setFilter,openFilter,clearFilter,saveFilterPanel,saveFilterPanelByEvent,resetFilterPanel,resetFilterPanelByEvent,getCheckedFilters,updateFilterOptionStatus,closeMenu,setActiveCellArea,getActiveCellArea,getCellAreas,clearCellAreas,copyCellArea,cutCellArea,pasteCellArea,getCopyCellArea,getCopyCellAreas,clearCopyCellArea,setCellAreas,openFNR,openFind,openReplace,closeFNR,getSelectedCell,clearSelected,insert,insertAt,insertNextAt,insertChild,insertChildAt,insertChildNextAt,remove,removeCheckboxRow,removeRadioRow,removeCurrentRow,getRecordset,getInsertRecords,getRemoveRecords,getUpdateRecords,clearEdit,clearActived,getEditRecord,getEditCell,getActiveRecord,isEditByRow,isActiveByRow,setEditRow,setActiveRow,setEditCell,setActiveCell,setSelectCell,clearValidate,fullValidate,validate,fullValidateField,validateField,openExport,closeExport,openPrint,closePrint,getPrintHtml,exportData,openImport,closeImport,importData,saveFile,readFile,importByFile,print,openCustom,closeCustom,toggleCustom,saveCustom,cancelCustom,resetCustom,toggleCustomAllCheckbox,setCustomAllCheckbox'.split(',');
+const funcs = 'setFilter,openFilter,clearFilter,saveFilterPanel,saveFilterPanelByEvent,resetFilterPanel,resetFilterPanelByEvent,getCheckedFilters,updateFilterOptionStatus,closeMenu,setActiveCellArea,getActiveCellArea,getCellAreas,clearCellAreas,copyCellArea,cutCellArea,pasteCellArea,getCopyCellArea,getCopyCellAreas,clearCopyCellArea,setCellAreas,openFNR,openFind,openReplace,closeFNR,getSelectedCell,clearSelected,insert,insertAt,insertNextAt,insertChild,insertChildAt,insertChildNextAt,remove,removeCheckboxRow,removeRadioRow,removeCurrentRow,getRecordset,getInsertRecords,getRemoveRecords,getUpdateRecords,clearEdit,clearActived,getEditRecord,getEditCell,getActiveRecord,isEditByRow,isActiveByRow,setEditRow,setActiveRow,setEditCell,setActiveCell,setSelectCell,clearValidate,fullValidate,validate,fullValidateField,validateField,openExport,closeExport,openPrint,closePrint,getPrintHtml,exportData,openImport,closeImport,importData,saveFile,readFile,importByFile,print,getCustomVisible,openCustom,closeCustom,toggleCustom,saveCustom,cancelCustom,resetCustom,toggleCustomAllCheckbox,setCustomAllCheckbox'.split(',');
 funcs.forEach(name => {
     Methods[name] = function (...args) {
         if (!this[`_${name}`]) {

package/es/table/src/table.js

@@ -758,12 +758,20 @@ export default {
         computeVirtualXOpts() {
             const $xeTable = this;
             const props = $xeTable;
-            return Object.assign({}, getConfig().table.virtualXConfig || getConfig().table.scrollX, props.virtualXConfig || props.scrollX);
+            const { virtualXConfig } = props;
+            if (virtualXConfig) {
+                return Object.assign({}, getConfig().table.virtualXConfig, virtualXConfig);
+            }
+            return Object.assign({}, getConfig().table.virtualXConfig, getConfig().table.scrollX, props.scrollX);
         },
         computeVirtualYOpts() {
             const $xeTable = this;
             const props = $xeTable;
-            return Object.assign({}, getConfig().table.virtualYConfig || getConfig().table.scrollY, props.virtualYConfig || props.scrollY);
+            const { virtualYConfig } = props;
+            if (virtualYConfig) {
+                return Object.assign({}, getConfig().table.virtualYConfig, virtualYConfig);
+            }
+            return Object.assign({}, getConfig().table.virtualYConfig, getConfig().table.scrollY, props.scrollY);
         },
         computeScrollbarOpts() {
             const $xeTable = this;

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "3.17.0";
+export const version = "3.17.1";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({
@@ -221,6 +221,7 @@ VxeUI.setConfig({
         },
         virtualYConfig: {
             // enabled: false,
+            // mode: 'wheel',
             gt: 100,
             preSize: 1,
             oSize: 0

package/es/ui/src/log.js

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

package/lib/index.umd.js

@@ -2002,7 +2002,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.17.0";
+const version = "3.17.1";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2223,6 +2223,7 @@ core_.VxeUI.setConfig({
     },
     virtualYConfig: {
       // enabled: false,
+      // mode: 'wheel',
       gt: 100,
       preSize: 1,
       oSize: 0
@@ -2668,7 +2669,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.17.0"}`;
+const log_version = `table v${"3.17.1"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -5569,8 +5570,8 @@ function cacheColumnMap($xeTable) {
     tableFullColumn,
     collectColumn
   } = internalData;
-  const fullColumnIdData = internalData.fullColumnIdData = {};
-  const fullColumnFieldData = internalData.fullColumnFieldData = {};
+  const fullColIdData = internalData.fullColumnIdData = {};
+  const fullColFieldData = internalData.fullColumnFieldData = {};
   const mouseOpts = $xeTable.computeMouseOpts;
   const expandOpts = $xeTable.computeExpandOpts;
   const columnOpts = $xeTable.computeColumnOpts;
@@ -5614,10 +5615,10 @@ function cacheColumnMap($xeTable) {
       oLeft: 0
     };
     if (field) {
-      if (fullColumnFieldData[field]) {
+      if (fullColFieldData[field]) {
         errLog('vxe.error.colRepet', ['field', field]);
       }
-      fullColumnFieldData[field] = rest;
+      fullColFieldData[field] = rest;
     } else {
       if (storage && !type || columnOpts.drag && (isCrossDrag || isSelfToChildDrag)) {
         errLog('vxe.error.reqProp', [`${column.getTitle() || type || ''} -> column.field=?`]);
@@ -5671,10 +5672,10 @@ function cacheColumnMap($xeTable) {
     if (isAllOverflow && column.showOverflow === false) {
       isAllOverflow = false;
     }
-    if (fullColumnIdData[colid]) {
+    if (fullColIdData[colid]) {
       errLog('vxe.error.colRepet', ['colId', colid]);
     }
-    fullColumnIdData[colid] = rest;
+    fullColIdData[colid] = rest;
   };
   if (isGroup) {
     external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(collectColumn, (column, index, items, path, parentColumn, nodes) => {
@@ -5689,10 +5690,10 @@ function cacheColumnMap($xeTable) {
   }
   if (htmlColumn) {
     if (!columnOpts.useKey) {
-      errLog('vxe.error.reqProp', ['column-config.useKey & column.type=html']);
+      errLog('vxe.error.notSupportProp', ['column.type=html', 'column-config.useKey=false', 'column-config.useKey=true']);
     }
     if (!rowOpts.useKey) {
-      errLog('vxe.error.reqProp', ['row-config.useKey & column.type=html']);
+      errLog('vxe.error.notSupportProp', ['column.type=html', 'row-config.useKey=false', 'row-config.useKey=true']);
     }
   }
   reactData.isGroup = isGroup;
@@ -9134,15 +9135,41 @@ function initColumnHierarchy($xeTable) {
   const {
     collectColumn
   } = internalData;
+  const fullColIdData = {};
+  const fullColFieldData = {};
   let sortIndex = 1;
   external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(collectColumn, (column, index, items, path, parentColumn) => {
+    const {
+      id: colid,
+      field
+    } = column;
     const parentId = parentColumn ? parentColumn.id : null;
+    const rest = {
+      $index: -1,
+      _index: -1,
+      column,
+      colid,
+      index,
+      items,
+      parent: parentColumn || null,
+      width: 0,
+      oLeft: 0
+    };
     column.parentId = parentId;
     column.defaultParentId = parentId;
     column.sortNumber = sortIndex;
     column.renderSortNumber = sortIndex;
     sortIndex++;
+    if (field) {
+      if (fullColFieldData[field]) {
+        errLog('vxe.error.colRepet', ['field', field]);
+      }
+      fullColFieldData[field] = rest;
+    }
+    fullColIdData[colid] = rest;
   });
+  internalData.fullColumnIdData = fullColIdData;
+  internalData.fullColumnFieldData = fullColFieldData;
 }
 function handleInitColumn($xeTable, collectColumn) {
   const $xeToolbar = $xeTable.$refs.$xeToolbar;
@@ -17861,7 +17888,7 @@ const Methods = {
   }
 };
 // Module methods
-const funcs = 'setFilter,openFilter,clearFilter,saveFilterPanel,saveFilterPanelByEvent,resetFilterPanel,resetFilterPanelByEvent,getCheckedFilters,updateFilterOptionStatus,closeMenu,setActiveCellArea,getActiveCellArea,getCellAreas,clearCellAreas,copyCellArea,cutCellArea,pasteCellArea,getCopyCellArea,getCopyCellAreas,clearCopyCellArea,setCellAreas,openFNR,openFind,openReplace,closeFNR,getSelectedCell,clearSelected,insert,insertAt,insertNextAt,insertChild,insertChildAt,insertChildNextAt,remove,removeCheckboxRow,removeRadioRow,removeCurrentRow,getRecordset,getInsertRecords,getRemoveRecords,getUpdateRecords,clearEdit,clearActived,getEditRecord,getEditCell,getActiveRecord,isEditByRow,isActiveByRow,setEditRow,setActiveRow,setEditCell,setActiveCell,setSelectCell,clearValidate,fullValidate,validate,fullValidateField,validateField,openExport,closeExport,openPrint,closePrint,getPrintHtml,exportData,openImport,closeImport,importData,saveFile,readFile,importByFile,print,openCustom,closeCustom,toggleCustom,saveCustom,cancelCustom,resetCustom,toggleCustomAllCheckbox,setCustomAllCheckbox'.split(',');
+const funcs = 'setFilter,openFilter,clearFilter,saveFilterPanel,saveFilterPanelByEvent,resetFilterPanel,resetFilterPanelByEvent,getCheckedFilters,updateFilterOptionStatus,closeMenu,setActiveCellArea,getActiveCellArea,getCellAreas,clearCellAreas,copyCellArea,cutCellArea,pasteCellArea,getCopyCellArea,getCopyCellAreas,clearCopyCellArea,setCellAreas,openFNR,openFind,openReplace,closeFNR,getSelectedCell,clearSelected,insert,insertAt,insertNextAt,insertChild,insertChildAt,insertChildNextAt,remove,removeCheckboxRow,removeRadioRow,removeCurrentRow,getRecordset,getInsertRecords,getRemoveRecords,getUpdateRecords,clearEdit,clearActived,getEditRecord,getEditCell,getActiveRecord,isEditByRow,isActiveByRow,setEditRow,setActiveRow,setEditCell,setActiveCell,setSelectCell,clearValidate,fullValidate,validate,fullValidateField,validateField,openExport,closeExport,openPrint,closePrint,getPrintHtml,exportData,openImport,closeImport,importData,saveFile,readFile,importByFile,print,getCustomVisible,openCustom,closeCustom,toggleCustom,saveCustom,cancelCustom,resetCustom,toggleCustomAllCheckbox,setCustomAllCheckbox'.split(',');
 funcs.forEach(name => {
   Methods[name] = function (...args) {
     if (!this[`_${name}`]) {
@@ -21042,7 +21069,7 @@ const renderPopupPanel = (h, $xeTableCustomPanel) => {
           }
         }
       }
-      if (!targetFixed !== null) {
+      if (targetFixed !== null) {
         $xeTable.dispatchEvent('custom-fixed-change', {
           column,
           fixed: targetFixed
@@ -27720,6 +27747,14 @@ function emitCustomEvent($xeTable, type, evnt) {
 }
 /* harmony default export */ var custom_mixin = ({
   methods: {
+    _getCustomVisible() {
+      const $xeTable = this;
+      const reactData = $xeTable;
+      const {
+        customStore
+      } = reactData;
+      return customStore.visible;
+    },
     _openCustom() {
       const $xeTable = this;
       const reactData = $xeTable;
@@ -27763,6 +27798,7 @@ function emitCustomEvent($xeTable, type, evnt) {
     _saveCustom() {
       const $xeTable = this;
       const reactData = $xeTable;
+      const internalData = $xeTable;
       const {
         customColumnList,
         aggHandleFields,
@@ -27819,6 +27855,9 @@ function emitCustomEvent($xeTable, type, evnt) {
           $xeTable.handleUpdateAggData();
         }
       }
+      if (allowSort) {
+        internalData.collectColumn = customColumnList;
+      }
       return $xeTable.saveCustomStore('confirm');
     },
     _cancelCustom() {
@@ -28866,12 +28905,24 @@ function renderBody(h, $xeTable) {
     computeVirtualXOpts() {
       const $xeTable = this;
       const props = $xeTable;
-      return Object.assign({}, table_getConfig().table.virtualXConfig || table_getConfig().table.scrollX, props.virtualXConfig || props.scrollX);
+      const {
+        virtualXConfig
+      } = props;
+      if (virtualXConfig) {
+        return Object.assign({}, table_getConfig().table.virtualXConfig, virtualXConfig);
+      }
+      return Object.assign({}, table_getConfig().table.virtualXConfig, table_getConfig().table.scrollX, props.scrollX);
     },
     computeVirtualYOpts() {
       const $xeTable = this;
       const props = $xeTable;
-      return Object.assign({}, table_getConfig().table.virtualYConfig || table_getConfig().table.scrollY, props.virtualYConfig || props.scrollY);
+      const {
+        virtualYConfig
+      } = props;
+      if (virtualYConfig) {
+        return Object.assign({}, table_getConfig().table.virtualYConfig, virtualYConfig);
+      }
+      return Object.assign({}, table_getConfig().table.virtualYConfig, table_getConfig().table.scrollY, props.scrollY);
     },
     computeScrollbarOpts() {
       const $xeTable = this;