vxe-table 3.8.17 → 3.8.18

package/lib/index.umd.js

@@ -11513,7 +11513,7 @@ var es_array_concat = __webpack_require__(8706);
 
 
 function getLog(message, params) {
-  return "[vxe-table v".concat("3.8.17", "] ").concat(conf.i18n(message, params));
+  return "[vxe-table v".concat("3.8.18", "] ").concat(conf.i18n(message, params));
 }
 function outLog(type) {
   return function (message, params) {
@@ -13217,7 +13217,7 @@ function component(comp) {
     components[comp.name] = comp;
   }
 }
-var version = "3.8.17";
+var version = "3.8.18";
 var tableVersion = version;
 var VxeUI = {
   v: v,
@@ -18622,7 +18622,6 @@ var Methods = {
     return this.refreshColumn(true);
   },
   handleCustomRestore: function handleCustomRestore(storeData) {
-    var tableFullColumn = this.tableFullColumn;
     var collectColumn = this.collectColumn;
     var resizableData = storeData.resizableData,
       sortData = storeData.sortData,
@@ -18631,7 +18630,7 @@ var Methods = {
     var hasCustomSort = false;
     // 处理还原
     if (resizableData || sortData || visibleData || fixedData) {
-      tableFullColumn.forEach(function (column) {
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(collectColumn, function (column, index, items, path, parent) {
         var colKey = column.getKey();
         // 支持一级
         if (!parent) {
@@ -18663,7 +18662,7 @@ var Methods = {
    */
   restoreCustomStorage: function restoreCustomStorage() {
     var _this21 = this;
-    var id = this.id,
+    var tableId = this.tableId,
       customConfig = this.customConfig,
       customOpts = this.customOpts;
     var storage = customOpts.storage,
@@ -18675,14 +18674,14 @@ var Methods = {
     var isCustomFixed = isAllCustom || storageOpts.fixed;
     var isCustomSort = isAllCustom || storageOpts.sort;
     if (customConfig && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort)) {
-      if (!id) {
+      if (!tableId) {
         errLog('vxe.error.reqProp', ['id']);
         return;
       }
-      var storeData = getCustomStorageMap(id);
+      var storeData = getCustomStorageMap(tableId);
       if (restoreStore) {
         return Promise.resolve(restoreStore({
-          id: id,
+          id: tableId,
           type: 'restore',
           storeData: storeData
         })).then(function (storeData) {
@@ -18779,7 +18778,7 @@ var Methods = {
     return storeData;
   },
   saveCustomStore: function saveCustomStore(type) {
-    var id = this.id,
+    var tableId = this.tableId,
       customOpts = this.customOpts;
     var updateStore = customOpts.updateStore,
       storage = customOpts.storage;
@@ -18790,7 +18789,7 @@ var Methods = {
     var isCustomFixed = isAllCustom || storageOpts.fixed;
     var isCustomSort = isAllCustom || storageOpts.sort;
     if (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort) {
-      if (!id) {
+      if (!tableId) {
         errLog('vxe.error.reqProp', ['id']);
         return this.$nextTick();
       }
@@ -18802,12 +18801,12 @@ var Methods = {
       } : this.getCustomStoreData();
       if (updateStore) {
         return updateStore({
-          id: id,
+          id: tableId,
           type: type,
           storeData: storeData
         });
       } else {
-        setCustomStorageMap(id, type === 'reset' ? null : storeData);
+        setCustomStorageMap(tableId, type === 'reset' ? null : storeData);
       }
     }
     return this.$nextTick();
@@ -23207,7 +23206,7 @@ function handleUupdateResize(_vm) {
   mixins: [size],
   props: {
     /** 基本属性 */
-    id: String,
+    id: [String, Function],
     // 数据
     data: Array,
     // 表格的高度
@@ -23723,6 +23722,18 @@ function handleUupdateResize(_vm) {
     };
   },
   computed: {
+    tableId: function tableId() {
+      var id = this.id;
+      if (id) {
+        if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(id)) {
+          return "".concat(id({
+            $table: this
+          }) || '');
+        }
+        return "".concat(id);
+      }
+      return '';
+    },
     validOpts: function validOpts() {
       return Object.assign({
         message: 'default'
@@ -24362,7 +24373,7 @@ function handleUupdateResize(_vm) {
         ctxMenuStore: ctxMenuStore,
         ctxMenuOpts: ctxMenuOpts
       }
-    }) : _e(),
+    }) : _e(), h('div', {}, [
     /**
      * 通用提示
      */
@@ -24389,7 +24400,7 @@ function handleUupdateResize(_vm) {
         'old-cell-valid': editRules && conf.cellVaildMode === 'obsolete'
       }, 'vxe-table--valid-error'],
       props: validOpts.message === 'tooltip' || tableData.length === 1 ? validTipOpts : null
-    }) : _e()]);
+    }) : _e()])]);
   },
   methods: methods
 });