vxe-table 4.7.60 → 4.7.62

package/lib/table/src/table.js

@@ -369,6 +369,21 @@ var _default = exports.default = (0, _vue.defineComponent)({
     const refEmptyPlaceholder = (0, _vue.ref)();
     const $xeGrid = (0, _vue.inject)('$xeGrid', null);
     let $xeToolbar;
+    const computeTableId = (0, _vue.computed)(() => {
+      const {
+        id
+      } = props;
+      if (id) {
+        if (_xeUtils.default.isFunction(id)) {
+          return `${id({
+            $table: $xeTable,
+            $grid: $xeGrid
+          }) || ''}`;
+        }
+        return `${id}`;
+      }
+      return '';
+    });
     const computeValidOpts = (0, _vue.computed)(() => {
       return Object.assign({}, getConfig().table.validConfig, props.validConfig);
     });
@@ -609,6 +624,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
     };
     const computeMaps = {
       computeSize,
+      computeTableId,
       computeValidOpts,
       computeSXOpts,
       computeSYOpts,
@@ -969,9 +985,9 @@ var _default = exports.default = (0, _vue.defineComponent)({
      */
     const restoreCustomStorage = () => {
       const {
-        id,
         customConfig
       } = props;
+      const tableId = computeTableId.value;
       const customOpts = computeCustomOpts.value;
       const {
         storage,
@@ -984,14 +1000,14 @@ var _default = exports.default = (0, _vue.defineComponent)({
       const isCustomFixed = isAllCustom || storageOpts.fixed;
       const isCustomSort = isAllCustom || storageOpts.sort;
       if (customConfig && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort)) {
-        if (!id) {
+        if (!tableId) {
           (0, _log.errLog)('vxe.error.reqProp', ['id']);
           return;
         }
-        const storeData = getCustomStorageMap(id);
+        const storeData = getCustomStorageMap(tableId);
         if (restoreStore) {
           return Promise.resolve(restoreStore({
-            id,
+            id: tableId,
             type: 'restore',
             storeData
           })).then(storeData => {
@@ -5545,9 +5561,9 @@ var _default = exports.default = (0, _vue.defineComponent)({
             $xeTable.clearSelected();
           }
           if (areaOpts.autoClear) {
-            if ($xeTable.clearCellAreas) {
+            if ($xeTable.getCellAreas) {
               const cellAreas = $xeTable.getCellAreas();
-              if (cellAreas.length && !(0, _dom.getEventTargetNode)(evnt, document.body, 'vxe-table--ignore-areas-clear').flag) {
+              if (cellAreas && cellAreas.length && !(0, _dom.getEventTargetNode)(evnt, document.body, 'vxe-table--ignore-areas-clear').flag) {
                 tablePrivateMethods.preventEvent(evnt, 'event.clearAreas', {}, () => {
                   $xeTable.clearCellAreas();
                   $xeTable.clearCopyCellArea();
@@ -6340,9 +6356,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
         });
       },
       saveCustomStore(type) {
-        const {
-          id
-        } = props;
+        const tableId = computeTableId.value;
         const customOpts = computeCustomOpts.value;
         const {
           updateStore,
@@ -6355,7 +6369,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
         const isCustomFixed = isAllCustom || storageOpts.fixed;
         const isCustomSort = isAllCustom || storageOpts.sort;
         if (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort) {
-          if (!id) {
+          if (!tableId) {
             (0, _log.errLog)('vxe.error.reqProp', ['id']);
             return (0, _vue.nextTick)();
           }
@@ -6367,12 +6381,12 @@ var _default = exports.default = (0, _vue.defineComponent)({
           } : tableMethods.getCustomStoreData();
           if (updateStore) {
             return updateStore({
-              id,
+              id: tableId,
               type,
               storeData
             });
           } else {
-            setCustomStorageMap(id, type === 'reset' ? null : storeData);
+            setCustomStorageMap(tableId, type === 'reset' ? null : storeData);
           }
         }
         return (0, _vue.nextTick)();
@@ -8165,29 +8179,33 @@ var _default = exports.default = (0, _vue.defineComponent)({
       isMenu ? (0, _vue.h)(_panel3.default, {
         ref: refTableMenu
       }) : (0, _vue.createCommentVNode)(),
+      /**
+       * 提示相关
+       */
+      VxeUITooltipComponent ? (0, _vue.h)('div', {}, [
       /**
        * 通用提示
        */
-      VxeUITooltipComponent ? (0, _vue.h)(VxeUITooltipComponent, {
+      (0, _vue.h)(VxeUITooltipComponent, {
         ref: refCommTooltip,
         isArrow: false,
         enterable: false
-      }) : (0, _vue.createCommentVNode)(),
+      }),
       /**
-       * 工具提示
-       */
-      VxeUITooltipComponent ? (0, _vue.h)(VxeUITooltipComponent, Object.assign({
+        * 工具提示
+        */
+      (0, _vue.h)(VxeUITooltipComponent, Object.assign({
         ref: refTooltip
-      }, tipConfig, tooltipStore.currOpts)) : (0, _vue.createCommentVNode)(),
+      }, tipConfig, tooltipStore.currOpts)),
       /**
-       * 校验提示
-       */
-      VxeUITooltipComponent && props.editRules && validOpts.showMessage && (validOpts.message === 'default' ? !height : validOpts.message === 'tooltip') ? (0, _vue.h)(VxeUITooltipComponent, Object.assign({
+        * 校验提示
+        */
+      props.editRules && validOpts.showMessage && (validOpts.message === 'default' ? !height : validOpts.message === 'tooltip') ? (0, _vue.h)(VxeUITooltipComponent, Object.assign({
         ref: refValidTooltip,
         class: [{
           'old-cell-valid': editRules && getConfig().cellVaildMode === 'obsolete'
         }, 'vxe-table--valid-error']
-      }, validOpts.message === 'tooltip' || tableData.length === 1 ? validTipOpts : {})) : (0, _vue.createCommentVNode)()]);
+      }, validOpts.message === 'tooltip' || tableData.length === 1 ? validTipOpts : {})) : (0, _vue.createCommentVNode)()]) : (0, _vue.createCommentVNode)()]);
     };
     $xeTable.renderVN = renderVN;
     if (process.env.NODE_ENV === 'development') {