vxe-table 3.8.23 → 3.8.24

package/lib/index.umd.js

@@ -10735,6 +10735,7 @@ __webpack_require__.d(__webpack_exports__, {
   "default": function() { return /* binding */ entry_lib; },
   formats: function() { return /* reexport */ formats; },
   getComponent: function() { return /* reexport */ getComponent; },
+  getConfig: function() { return /* reexport */ getConfig; },
   getTheme: function() { return /* reexport */ getTheme; },
   globalConfs: function() { return /* reexport */ globalConfs; },
   globalStore: function() { return /* reexport */ globalStore; },
@@ -10837,6 +10838,7 @@ __webpack_require__.d(all_namespaceObject, {
   config: function() { return config; },
   formats: function() { return formats; },
   getComponent: function() { return getComponent; },
+  getConfig: function() { return getConfig; },
   getTheme: function() { return getTheme; },
   globalConfs: function() { return globalConfs; },
   globalStore: function() { return globalStore; },
@@ -11522,7 +11524,7 @@ var es_array_concat = __webpack_require__(8706);
 
 
 function getLog(message, params) {
-  return "[vxe-table v".concat("3.8.23", "] ").concat(conf.i18n(message, params));
+  return "[vxe-table v".concat("3.8.24", "] ").concat(conf.i18n(message, params));
 }
 function outLog(type) {
   return function (message, params) {
@@ -13142,6 +13144,9 @@ var setConfig = function setConfig(options) {
   }
   return VxeUI;
 };
+function getConfig(key, defaultValue) {
+  return arguments.length ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(conf, key, defaultValue) : conf;
+}
 var VXETableConfig = /*#__PURE__*/function () {
   function VXETableConfig() {
     _classCallCheck(this, VXETableConfig);
@@ -13226,7 +13231,7 @@ function component(comp) {
     components[comp.name] = comp;
   }
 }
-var version = "3.8.23";
+var version = "3.8.24";
 var tableVersion = version;
 var VxeUI = {
   v: v,
@@ -13235,6 +13240,7 @@ var VxeUI = {
   reg: reg,
   use: use,
   setConfig: setConfig,
+  getConfig: getConfig,
   setIcon: setIcon,
   globalStore: globalStore,
   interceptor: interceptor,
@@ -14147,6 +14153,7 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
   var params = {
     $table: $xetable,
     $grid: $xetable.$xegrid,
+    isEdit: false,
     seq: seq,
     rowid: rowid,
     row: row,
@@ -16659,26 +16666,28 @@ var Cell = {
       formatter = column.formatter;
     var compConf = v_x_e_table.renderer.get(editRender.name);
     var rtEdit = compConf ? compConf.renderTableEdit || compConf.renderEdit : null;
+    var cellParams = Object.assign({
+      $type: '',
+      isEdit: isEdit
+    }, params);
     if (isEdit) {
       if (slots && slots.edit) {
-        return $table.callSlot(slots.edit, params, h);
+        return $table.callSlot(slots.edit, cellParams, h);
       }
       if (rtEdit) {
-        return getSlotVNs(rtEdit.call($table, h, editRender, Object.assign({
-          $type: 'edit'
-        }, params)));
+        return getSlotVNs(rtEdit.call($table, h, editRender, cellParams));
       }
       return [];
     }
     if (slots && slots.default) {
-      return $table.callSlot(slots.default, params, h);
+      return $table.callSlot(slots.default, cellParams, h);
     }
     if (formatter) {
       return [h('span', {
         class: 'vxe-cell--label'
-      }, [getDefaultCellLabel(params)])];
+      }, [getDefaultCellLabel(cellParams)])];
     }
-    return Cell.renderDefaultCell.call(_vm, h, params);
+    return Cell.renderDefaultCell.call(_vm, h, cellParams);
   }
 };
 /* harmony default export */ var cell = (Cell);
@@ -18835,9 +18844,9 @@ var Methods = {
   /**
    * 刷新列配置
    */
-  refreshColumn: function refreshColumn(resiveOrder) {
+  refreshColumn: function refreshColumn(initOrder) {
     var _this22 = this;
-    if (resiveOrder) {
+    if (initOrder) {
       var columnList = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().orderBy(this.collectColumn, 'renderSortNumber');
       this.collectColumn = columnList;
       var tableFullColumn = methods_getColumnList(columnList);
@@ -19841,7 +19850,7 @@ var Methods = {
             if (selected.row && selected.column) {
               evnt.stopPropagation();
               evnt.preventDefault();
-              _this31.handleActived(selected.args, evnt);
+              _this31.handleEdit(selected.args, evnt);
             }
           }
         } else if (isContextMenu) {
@@ -19960,7 +19969,7 @@ var Methods = {
                   backMethod(_params3);
                 } else {
                   setCellValue(selected.row, selected.column, null);
-                  _this31.handleActived(selected.args, evnt);
+                  _this31.handleEdit(selected.args, evnt);
                 }
                 _this31.emitEvent('cell-backspace-value', _params3, evnt);
               }
@@ -20011,7 +20020,7 @@ var Methods = {
                 editMethod(_params5);
               } else {
                 setCellValue(selected.row, selected.column, null);
-                _this31.handleActived(selected.args, evnt);
+                _this31.handleEdit(selected.args, evnt);
               }
               var afterEditMethod = editOpts.afterEditMethod;
               if (afterEditMethod) {
@@ -21353,7 +21362,7 @@ var Methods = {
     this.checkValidate('blur').catch(function (e) {
       return e;
     }).then(function () {
-      _this39.handleActived(params, evnt).then(function () {
+      _this39.handleEdit(params, evnt).then(function () {
         return _this39.checkValidate('change');
       }).catch(function (e) {
         return e;
@@ -21468,14 +21477,14 @@ var Methods = {
           this.checkValidate('blur').catch(function (e) {
             return e;
           }).then(function () {
-            _this40.handleActived(params, evnt).then(function () {
+            _this40.handleEdit(params, evnt).then(function () {
               return _this40.checkValidate('change');
             }).catch(function (e) {
               return e;
             });
           });
         } else if (editOpts.mode === 'cell') {
-          this.handleActived(params, evnt).then(function () {
+          this.handleEdit(params, evnt).then(function () {
             return _this40.checkValidate('change');
           }).catch(function (e) {
             return e;
@@ -26027,7 +26036,7 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
     /**
      * 处理激活编辑
      */
-    handleActived: function handleActived(params, evnt) {
+    handleEdit: function handleEdit(params, evnt) {
       var _this7 = this;
       var editStore = this.editStore,
         editOpts = this.editOpts,
@@ -26132,6 +26141,12 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
       }
       return this.$nextTick();
     },
+    /**
+     * @deprecated
+     */
+    handleActived: function handleActived(params, evnt) {
+      return this.handleEdit(params, evnt);
+    },
     _getColumnModel: function _getColumnModel(row, column) {
       var model = column.model,
         editRender = column.editRender;
@@ -26312,7 +26327,7 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
         return this.scrollToRow(row, true).then(function () {
           var cell = _this9.getCellElement(row, column);
           if (cell) {
-            _this9.handleActived({
+            _this9.handleEdit({
               row: row,
               rowIndex: _this9.getRowIndex(row),
               column: column,
@@ -34084,7 +34099,7 @@ function getCheckboxRangeRows(_vm, params, targetTrElem, moveRange) {
         if (editConfig) {
           if (editOpts.trigger === 'click' || editOpts.trigger === 'dblclick') {
             if (editOpts.mode === 'row') {
-              this.handleActived(params, evnt);
+              this.handleEdit(params, evnt);
             } else {
               this.scrollToRow(params.row, params.column).then(function () {
                 return _this.handleSelected(params, evnt);
@@ -34513,7 +34528,7 @@ function validErrorRuleValue(rule, val) {
           _this.emitEvent('valid-error', params);
           resolve();
         } else {
-          _this.handleActived(params, {
+          _this.handleEdit(params, {
             type: 'valid-error',
             trigger: 'call'
           }).then(function () {
@@ -35006,7 +35021,7 @@ var Validator = VxeTableValidatorModule;
       // 判断面板不能大于表格高度
       var tableHeight = 0;
       if ($el) {
-        tableHeight = $el.clientHeight - 30;
+        tableHeight = $el.clientHeight - 28;
       }
       customStore.maxHeight = Math.max(4, tableHeight);
     },
@@ -36128,7 +36143,10 @@ var renderPopupPanel = function renderPopupPanel(h, _vm) {
         allowFixed = customOpts.allowFixed,
         allowResizable = customOpts.allowResizable;
       external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(customColumnList, function (column, index, items, path, parent) {
-        if (!parent) {
+        if (parent) {
+          // 更新子列信息
+          column.fixed = parent.fixed;
+        } else {
           if (allowSort) {
             var sortIndex = index + 1;
             column.renderSortNumber = sortIndex;
@@ -36279,22 +36297,30 @@ var renderPopupPanel = function renderPopupPanel(h, _vm) {
         customOpts = $xetable.customOpts;
       if (customOpts.immediate) {
         if (column.renderFixed === colFixed) {
-          column.fixed = '';
-          column.renderFixed = '';
+          external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree([column], function (col) {
+            col.fixed = '';
+            col.renderFixed = '';
+          });
         } else {
           if (!isMaxFixedColumn || column.renderFixed) {
-            column.fixed = colFixed;
-            column.renderFixed = colFixed;
+            external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree([column], function (col) {
+              col.fixed = colFixed;
+              col.renderFixed = colFixed;
+            });
           }
         }
         $xetable.handleCustom();
         $xetable.saveCustomStore('update:fixed');
       } else {
         if (column.renderFixed === colFixed) {
-          column.renderFixed = '';
+          external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree([column], function (col) {
+            col.renderFixed = '';
+          });
         } else {
           if (!isMaxFixedColumn || column.renderFixed) {
-            column.renderFixed = colFixed;
+            external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree([column], function (col) {
+              col.renderFixed = colFixed;
+            });
           }
         }
       }
@@ -39562,7 +39588,7 @@ var autoTxtElem;
     maxlength: [String, Number],
     rows: {
       type: [String, Number],
-      default: 2
+      default: null
     },
     cols: {
       type: [String, Number],
@@ -39670,7 +39696,7 @@ var autoTxtElem;
       attrs.placeholder = getFuncText(placeholder);
     }
     return h('div', {
-      class: ['vxe-textarea', className, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "size--".concat(vSize), vSize), 'is--autosize', autosize), 'is--disabled', disabled), 'def--rows', !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(rows)), 'def--cols', !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(cols))],
+      class: ['vxe-textarea', className, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "size--".concat(vSize), vSize), 'is--autosize', autosize), 'is--disabled', disabled), 'is--rows', !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(rows)), 'is--cols', !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(cols))],
       attrs: {
         spellcheck: false
       }
@@ -40100,11 +40126,12 @@ function renderContent(h, _vm) {
   var $scopedSlots = _vm.$scopedSlots,
     useHTML = _vm.useHTML,
     tipContent = _vm.tipContent;
-  if ($scopedSlots.content) {
+  var contentSlot = $scopedSlots.content;
+  if (contentSlot) {
     return h('div', {
       key: 1,
       class: 'vxe-table--tooltip-content'
-    }, $scopedSlots.content.call(this, {}));
+    }, contentSlot.call(this, {}));
   }
   if (useHTML) {
     return h('div', {
@@ -40189,7 +40216,11 @@ function renderContent(h, _vm) {
     },
     value: function value(_value) {
       if (!this.isUpdate) {
-        this[_value ? 'open' : 'close']();
+        if (_value) {
+          this.handleVisible(this.target, this.content);
+        } else {
+          this.close();
+        }
       }
       this.isUpdate = false;
     }
@@ -40234,7 +40265,7 @@ function renderContent(h, _vm) {
         }
       }
       if (value) {
-        this.open();
+        this.handleVisible(target, content);
       }
     }
   },
@@ -40286,7 +40317,7 @@ function renderContent(h, _vm) {
   },
   methods: {
     open: function open(target, content) {
-      return this.toVisible(target || this.target, content);
+      return this.handleVisible(target || this.target, content);
     },
     close: function close() {
       this.tipTarget = null;
@@ -40314,6 +40345,13 @@ function renderContent(h, _vm) {
       }
     },
     toVisible: function toVisible(target, content) {
+      return this.handleVisible(target, content);
+    },
+    handleVisible: function handleVisible(target, content) {
+      var contentSlot = this.$scopedSlots.default;
+      if (!contentSlot && (content === '' || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(content))) {
+        return this.$nextTick();
+      }
       if (target) {
         var trigger = this.trigger,
           enterDelay = this.enterDelay;
@@ -40350,10 +40388,14 @@ function renderContent(h, _vm) {
       this.tipActive = !!actived;
     },
     clickEvent: function clickEvent() {
-      this[this.visible ? 'close' : 'open']();
+      if (this.visible) {
+        this.close();
+      } else {
+        this.handleVisible(this.target, this.content);
+      }
     },
     targetMouseenterEvent: function targetMouseenterEvent() {
-      this.open();
+      this.handleVisible(this.target, this.content);
     },
     targetMouseleaveEvent: function targetMouseleaveEvent() {
       var _this3 = this;