vxe-table 3.5.9-beta.1 → 3.5.9-beta.4

package/lib/index.umd.js

@@ -8457,6 +8457,8 @@ var iconPrefix = 'vxe-icon--';
   // 版本号，对于某些带数据缓存的功能有用到，上升版本号可以用于重置数据
   // resizeInterval: 500,
   emptyCell: '　',
+  loadingText: null,
+  // 自定义loading提示内容，如果为null则不显示文本
   table: {
     fit: true,
     showHeader: true,
@@ -8574,6 +8576,8 @@ var iconPrefix = 'vxe-icon--';
     types: {}
   },
   icon: {
+    // loading
+    // LOADING: iconPrefix + 'refresh roll vxe-loading--default-icon',
     // table
     TABLE_SORT_ASC: iconPrefix + 'caret-top',
     TABLE_SORT_DESC: iconPrefix + 'caret-bottom',
@@ -8804,7 +8808,7 @@ var es_array_concat = __webpack_require__("99af");
 
 
 function getLog(message, params) {
-  return "[vxe-table v".concat("3.5.9-beta.0", "] ").concat(conf.i18n(message, params));
+  return "[vxe-table v".concat("3.5.9-beta.3", "] ").concat(conf.i18n(message, params));
 }
 
 function outLog(type) {
@@ -10073,7 +10077,7 @@ function _t(key, args) {
 var v = 'v3';
 var VXETable = {
   v: v,
-  version: "3.5.9-beta.0",
+  version: "3.5.9-beta.3",
   reg: reg,
   use: use,
   setup: setup,
@@ -16660,7 +16664,9 @@ var Methods = {
           // 如果是按下非功能键之外允许直接编辑
 
           if (selected.column && selected.row && isEnableConf(selected.column.editRender)) {
-            if (!editOpts.activeMethod || editOpts.activeMethod(_objectSpread2(_objectSpread2({}, selected.args), {}, {
+            var beforeEditMethod = editOpts.beforeEditMethod || editOpts.activeMethod;
+
+            if (!beforeEditMethod || beforeEditMethod(_objectSpread2(_objectSpread2({}, selected.args), {}, {
               $table: _this28
             }))) {
               if (editMethod) {
@@ -19755,6 +19761,42 @@ funcs.forEach(function (name) {
   };
 });
 /* harmony default export */ var methods = (Methods);
+// CONCATENATED MODULE: ./packages/loading/src/loading.js
+
+/* harmony default export */ var src_loading = ({
+  name: 'VxeLoading',
+  props: {
+    loading: Boolean
+  },
+  render: function render(h) {
+    var icon = conf.icon.LOADING;
+    var loadingText = conf.loadingText;
+    var text = loadingText === null ? loadingText : conf.i18n('vxe.loading.text');
+    return h('div', {
+      class: ['vxe-loading', {
+        'is--visible': this.loading
+      }]
+    }, [h('div', {
+      class: 'vxe-loading--chunk'
+    }, [icon ? h('i', {
+      class: icon
+    }) : h('div', {
+      class: 'vxe-loading--spinner'
+    }), text ? h('div', {
+      class: 'vxe-loading--text'
+    }, "".concat(text)) : null])]);
+  }
+});
+// CONCATENATED MODULE: ./packages/loading/index.js
+
+
+
+var Loading = Object.assign(src_loading, {
+  install: function install(Vue) {
+    Vue.component(src_loading.name, src_loading);
+  }
+});
+/* harmony default export */ var packages_loading = (src_loading);
 // CONCATENATED MODULE: ./packages/table/src/table.js
 
 
@@ -19779,6 +19821,7 @@ funcs.forEach(function (name) {
 
 
 
+
 
 
 /**
@@ -20923,13 +20966,12 @@ function handleUupdateResize(_vm) {
     /**
      * 加载中
      */
-    h('div', {
-      class: ['vxe-table--loading vxe-loading', {
-        'is--visible': loading
-      }]
-    }, [h('div', {
-      class: 'vxe-loading--spinner'
-    })]),
+    h(packages_loading, {
+      class: 'vxe-table--loading',
+      props: {
+        loading: loading
+      }
+    }),
     /**
      * 筛选
      */
@@ -22641,20 +22683,20 @@ function insertTreeRow(_vm, newRecords, isAppend) {
           tableColumn = this.tableColumn,
           editConfig = this.editConfig,
           mouseConfig = this.mouseConfig;
-      var mode = editOpts.mode,
-          activeMethod = editOpts.activeMethod;
+      var mode = editOpts.mode;
       var actived = editStore.actived;
       var row = params.row,
           column = params.column;
       var editRender = column.editRender;
       var cell = params.cell = params.cell || this.getCell(row, column);
+      var beforeEditMethod = editOpts.beforeEditMethod || editOpts.activeMethod;
 
       if (isEnableConf(editConfig) && isEnableConf(editRender) && cell) {
         if (actived.row !== row || (mode === 'cell' ? actived.column !== column : false)) {
           // 判断是否禁用编辑
           var type = 'edit-disabled';
 
-          if (!activeMethod || activeMethod(_objectSpread2(_objectSpread2({}, params), {}, {
+          if (!beforeEditMethod || beforeEditMethod(_objectSpread2(_objectSpread2({}, params), {}, {
             $table: this
           }))) {
             if (mouseConfig) {
@@ -23157,6 +23199,7 @@ function _slicedToArray(arr, i) {
 
 
 
+
 var allActivedModals = [];
 var msgQueue = [];
 /* harmony default export */ var modal = ({
@@ -23357,7 +23400,7 @@ var msgQueue = [];
       modalTop: 0,
       modalZindex: 0,
       zoomLocat: null,
-      firstOpen: false
+      firstOpen: true
     };
   },
   computed: {
@@ -23522,13 +23565,16 @@ var msgQueue = [];
       class: 'vxe-modal--content'
     }, defaultSlot ? !inited || destroyOnClose && !visible ? [] : defaultSlot.call(this, {
       $modal: this
-    }, h) : getFuncText(content)), !isMsg ? h('div', {
-      class: ['vxe-loading', {
-        'is--visible': loading
-      }]
-    }, [h('div', {
-      class: 'vxe-loading--spinner'
-    })]) : null]), showFooter ? h('div', {
+    }, h) : getFuncText(content)),
+    /**
+     * 加载中
+     */
+    !isMsg ? h(packages_loading, {
+      class: 'vxe-modal--loading',
+      props: {
+        loading: loading
+      }
+    }) : null]), showFooter ? h('div', {
       class: 'vxe-modal--footer'
     }, footerSlot ? !inited || destroyOnClose && !visible ? [] : footerSlot.call(this, {
       $modal: this
@@ -23709,7 +23755,7 @@ var msgQueue = [];
             var firstOpen = _this2.firstOpen,
                 fullscreen = _this2.fullscreen;
 
-            if (!remember || !firstOpen) {
+            if (!remember || firstOpen) {
               _this2.updatePosition().then(function () {
                 setTimeout(function () {
                   return _this2.updatePosition();
@@ -23717,8 +23763,8 @@ var msgQueue = [];
               });
             }
 
-            if (!firstOpen) {
-              _this2.firstOpen = true;
+            if (firstOpen) {
+              _this2.firstOpen = false;
 
               if (_this2.hasPosStorage()) {
                 _this2.restorePosStorage();
@@ -23727,6 +23773,12 @@ var msgQueue = [];
                   return _this2.maximize();
                 });
               }
+            } else {
+              if (fullscreen) {
+                _this2.$nextTick(function () {
+                  return _this2.maximize();
+                });
+              }
             }
           });
         }
@@ -32632,7 +32684,7 @@ Object.keys(packages_table.methods).forEach(function (name) {
       tZindex: 0,
       tablePage: {
         total: 0,
-        pageSize: 10,
+        pageSize: conf.pager.pageSize || 10,
         currentPage: 1
       }
     };
@@ -32706,7 +32758,7 @@ Object.keys(packages_table.methods).forEach(function (name) {
 
       if (editConfig) {
         tableProps.editConfig = Object.assign({}, editConfig, {
-          activeMethod: this.handleActiveMethod
+          beforeEditMethod: this.handleBeforeEditMethod
         });
       }
 
@@ -32893,12 +32945,17 @@ Object.keys(packages_table.methods).forEach(function (name) {
       clss.push(rowClassName ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isFunction(rowClassName) ? rowClassName(params) : rowClassName : '');
       return clss;
     },
-    handleActiveMethod: function handleActiveMethod(params) {
+    handleBeforeEditMethod: function handleBeforeEditMethod(params) {
       var editConfig = this.editConfig;
-      var activeMethod = editConfig ? editConfig.activeMethod : null;
-      return this.pendingRecords.indexOf(params.row) === -1 && (!activeMethod || activeMethod(_objectSpread2(_objectSpread2({}, params), {}, {
-        $grid: this
-      })));
+      var beforeEditMethod = editConfig ? editConfig.beforeEditMethod || editConfig.activeMethod : null;
+
+      if (this.pendingRecords.indexOf(params.row) === -1) {
+        return !beforeEditMethod || beforeEditMethod(_objectSpread2(_objectSpread2({}, params), {}, {
+          $grid: this
+        }));
+      }
+
+      return false;
     },
     initToolbar: function initToolbar() {
       var _this3 = this;
@@ -36892,6 +36949,7 @@ var VxeFormConfigItem = {
 
 
 
+
 
 
 var form_Rule = /*#__PURE__*/function () {
@@ -37125,13 +37183,16 @@ function getResetValue(value, resetValue) {
     })), h('div', {
       class: 'vxe-form-slots',
       ref: 'hideItem'
-    }, customLayout ? [] : defaultSlot ? defaultSlot.call(this, h, {}) : []), h('div', {
-      class: ['vxe-loading', {
-        'is--visible': loading
-      }]
-    }, [h('div', {
-      class: 'vxe-loading--spinner'
-    })]),
+    }, customLayout ? [] : defaultSlot ? defaultSlot.call(this, h, {}) : []),
+    /**
+     * 加载中
+     */
+    h(packages_loading, {
+      class: 'vxe-form--loading',
+      props: {
+        loading: loading
+      }
+    }),
     /**
      * 工具提示
      */
@@ -38123,6 +38184,7 @@ var Switch = Object.assign(src_switch, {
 
 
 
+
 /* harmony default export */ var src_list = ({
   name: 'VxeList',
   mixins: [size],
@@ -38260,13 +38322,16 @@ var Switch = Object.assign(src_switch, {
     }, $scopedSlots.default ? $scopedSlots.default.call(this, {
       items: items,
       $list: this
-    }, h) : [])]), h('div', {
-      class: ['vxe-list--loading vxe-loading', {
-        'is--visible': loading
-      }]
-    }, [h('div', {
-      class: 'vxe-loading--spinner'
-    })])]);
+    }, h) : [])]),
+    /**
+     * 加载中
+     */
+    h(packages_loading, {
+      class: 'vxe-list--loading',
+      props: {
+        loading: loading
+      }
+    })]);
   },
   methods: {
     getParentElem: function getParentElem() {
@@ -38829,6 +38894,9 @@ var Pulldown = Object.assign(pulldown, {
 // CONCATENATED MODULE: ./packages/locale/lang/zh-CN.js
 /* harmony default export */ var zh_CN = ({
   vxe: {
+    loading: {
+      text: '加载中'
+    },
     error: {
       groupFixed: '如果使用分组表头，固定列必须按组设置',
       groupMouseRange: '分组表头与 "{0}" 不能同时使用，这可能会出现错误',