vxe-table 3.8.7-beta.2 → 3.8.7-beta.3

package/lib/index.umd.js

@@ -11013,6 +11013,7 @@ var iconPrefix = 'vxe-icon-';
     validConfig: {
       showMessage: true,
       autoClear: true,
+      autoPos: true,
       message: 'inline',
       msgMode: 'single'
     },
@@ -11322,6 +11323,7 @@ var iconPrefix = 'vxe-icon-';
     animat: true,
     showClose: true,
     draggable: true,
+    showConfirmButton: null,
     // storage: false,
     storageKey: 'VXE_MODAL_POSITION'
   },
@@ -11349,7 +11351,7 @@ var es_array_concat = __webpack_require__(8706);
 
 
 function getLog(message, params) {
-  return "[vxe-table v".concat("3.8.7-beta.2", "] ").concat(conf.i18n(message, params));
+  return "[vxe-table v".concat("3.8.7-beta.3", "] ").concat(conf.i18n(message, params));
 }
 function outLog(type) {
   return function (message, params) {
@@ -12988,7 +12990,6 @@ function setConfig(options) {
   }
   return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().merge(conf, options);
 }
-var config = setConfig;
 ;// CONCATENATED MODULE: ./packages/v-x-e-table/index.js
 
 
@@ -13085,11 +13086,28 @@ function _t(key, args) {
   return key ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toValueString(conf.translate ? conf.translate(key, args) : key) : '';
 }
 var v = 'v3';
-var setup = setConfig;
+
+/**
+ * 已废弃，请使用 setConfig
+ * @deprecated
+ */
+var setup = function setup(options) {
+  if (false) {}
+  return setConfig(options);
+};
+
+/**
+ * 已废弃，请使用 setConfig
+ * @deprecated
+ */
+var config = function config(options) {
+  if (false) {}
+  return setConfig(options);
+};
 var globalStore = {};
 var VXETable = {
   v: v,
-  version: "3.8.7-beta.2",
+  version: "3.8.7-beta.3",
   reg: reg,
   use: use,
   setConfig: setConfig,
@@ -13103,7 +13121,7 @@ var VXETable = {
   t: t,
   _t: _t,
   // 已废弃
-  config: setConfig,
+  config: config,
   setup: setup,
   globalConfs: globalConfs
 };
@@ -14461,9 +14479,9 @@ function syncBodyScroll(_vm, fixedType, scrollTop, elem1, elem2) {
       }, h);
     } else {
       var compConf = emptyOpts.name ? v_x_e_table.renderer.get(emptyOpts.name) : null;
-      var renderEmpty = compConf ? compConf.renderEmpty : null;
-      if (renderEmpty) {
-        emptyContent = getSlotVNs(renderEmpty.call(this, h, emptyOpts, {
+      var renderTableEmptyView = compConf ? compConf.renderTableEmptyView || compConf.renderEmpty : null;
+      if (renderTableEmptyView) {
+        emptyContent = getSlotVNs(renderTableEmptyView.call(this, h, emptyOpts, {
           $table: $xetable
         }));
       } else {
@@ -22982,9 +23000,9 @@ function renderEmptyContenet(h, _vm) {
     emptyContent = $scopedSlots.empty.call(_vm, params, h);
   } else {
     var compConf = emptyOpts.name ? v_x_e_table.renderer.get(emptyOpts.name) : null;
-    var renderEmpty = compConf ? compConf.renderEmpty : null;
-    if (renderEmpty) {
-      emptyContent = getSlotVNs(renderEmpty.call(_vm, h, emptyOpts, params));
+    var renderTableEmptyView = compConf ? compConf.renderTableEmptyView || compConf.renderEmpty : null;
+    if (renderTableEmptyView) {
+      emptyContent = getSlotVNs(renderTableEmptyView.call(_vm, h, emptyOpts, params));
     } else {
       emptyContent = getFuncText(_vm.emptyText) || conf.i18n('vxe.table.emptyText');
     }
@@ -26200,12 +26218,22 @@ var msgQueue = [];
     // 请使用 content
     message: [String, Function],
     content: [String, Function],
+    showCancelButton: {
+      type: Boolean,
+      default: null
+    },
     cancelButtonText: {
       type: String,
       default: function _default() {
         return conf.modal.cancelButtonText;
       }
     },
+    showConfirmButton: {
+      type: Boolean,
+      default: function _default() {
+        return conf.modal.showConfirmButton;
+      }
+    },
     confirmButtonText: {
       type: String,
       default: function _default() {
@@ -26453,7 +26481,9 @@ var msgQueue = [];
       mask = this.mask,
       isMsg = this.isMsg,
       showTitleOverflow = this.showTitleOverflow,
-      destroyOnClose = this.destroyOnClose;
+      destroyOnClose = this.destroyOnClose,
+      showCancelButton = this.showCancelButton,
+      showConfirmButton = this.showConfirmButton;
     var content = this.content || this.message;
     var defaultSlot = $scopedSlots.default || slots.default;
     var footerSlot = $scopedSlots.footer || slots.footer;
@@ -26539,12 +26569,14 @@ var msgQueue = [];
       class: 'vxe-modal--footer'
     }, footerSlot ? !inited || destroyOnClose && !visible ? [] : getSlotVNs(footerSlot.call(this, {
       $modal: this
-    }, h)) : [type === 'confirm' ? h('vxe-button', {
+    }, h)) : [external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(showCancelButton) ? showCancelButton : type === 'confirm' ? h('vxe-button', {
+      key: 1,
       ref: 'cancelBtn',
       on: {
         click: this.cancelEvent
       }
-    }, this.cancelButtonText || conf.i18n('vxe.button.cancel')) : null, h('vxe-button', {
+    }, this.cancelButtonText || conf.i18n('vxe.button.cancel')) : null, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(showConfirmButton) ? showConfirmButton : type === 'confirm' || type === 'alert' ? h('vxe-button', {
+      key: 2,
       ref: 'confirmBtn',
       props: {
         status: 'primary'
@@ -26552,7 +26584,7 @@ var msgQueue = [];
       on: {
         click: this.confirmEvent
       }
-    }, this.confirmButtonText || conf.i18n('vxe.button.confirm'))]) : null, !isMsg && resize ? h('span', {
+    }, this.confirmButtonText || conf.i18n('vxe.button.confirm')) : null]) : null, !isMsg && resize ? h('span', {
       class: 'vxe-modal--resize'
     }, ['wl', 'wr', 'swst', 'sest', 'st', 'swlb', 'selb', 'sb'].map(function (type) {
       return h('span', {
@@ -26985,6 +27017,10 @@ var msgQueue = [];
           modalBoxElem.style.left = "".concat(left, "px");
           modalBoxElem.style.top = "".concat(top, "px");
           modalBoxElem.className = modalBoxElem.className.replace(/\s?is--drag/, '') + ' is--drag';
+          _this11.$emit('move', {
+            type: 'move',
+            $event: evnt
+          });
         };
         document.onmouseup = function () {
           document.onmousemove = domMousemove;
@@ -27148,10 +27184,10 @@ var msgQueue = [];
         if (remember && storage) {
           _this12.savePosStorage();
         }
-        if ($listeners.zoom) {
-          _this12.$emit('zoom', params);
-        } else if (events.zoom) {
-          events.zoom.call(_this12, params);
+        if ($listeners.resize) {
+          _this12.$emit('resize', params);
+        } else if (events.resize) {
+          events.resize.call(_this12, params);
         }
       };
       document.onmouseup = function () {
@@ -33948,6 +33984,9 @@ var Keyboard = VxeTableKeyboardModule;
 
 
 
+
+
+
 
 
 
@@ -34081,20 +34120,20 @@ function validErrorRuleValue(rule, val) {
         treeConfig = this.treeConfig,
         treeOpts = this.treeOpts;
       var childrenField = treeOpts.children || treeOpts.childrenField;
-      var vaildDatas;
+      var validDatas;
       if (rows === true) {
-        vaildDatas = afterFullData;
+        validDatas = afterFullData;
       } else if (rows) {
         if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(rows)) {
           cb = rows;
         } else {
-          vaildDatas = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(rows) ? rows : [rows];
+          validDatas = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(rows) ? rows : [rows];
         }
       }
-      if (!vaildDatas) {
-        vaildDatas = this.getInsertRecords().concat(this.getUpdateRecords());
+      if (!validDatas) {
+        validDatas = this.getInsertRecords().concat(this.getUpdateRecords());
       }
-      var rowValids = [];
+      var rowValidErrs = [];
       this.lastCallTime = Date.now();
       this.validRuleErr = false; // 如果为快速校验，当存在某列校验不通过时将终止执行
       this.clearValidate();
@@ -34136,17 +34175,17 @@ function validErrorRuleValue(rule, val) {
                 }));
               }
             });
-            rowValids.push(Promise.all(colVailds));
+            rowValidErrs.push(Promise.all(colVailds));
           }
         };
         if (treeConfig) {
-          external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(vaildDatas, handleVaild, {
+          external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(validDatas, handleVaild, {
             children: childrenField
           });
         } else {
-          vaildDatas.forEach(handleVaild);
+          validDatas.forEach(handleVaild);
         }
-        return Promise.all(rowValids).then(function () {
+        return Promise.all(rowValidErrs).then(function () {
           var ruleProps = Object.keys(validRest);
           _this2.validErrorMaps = _this2.handleErrMsgMode(validErrMaps);
           return _this2.$nextTick().then(function () {
@@ -34191,9 +34230,9 @@ function validErrorRuleValue(rule, val) {
               var column = firstErrParams.column;
               var rowIndex = afterFullData.indexOf(row);
               var columnIndex = visibleColumn.indexOf(column);
-              var locatRow = rowIndex > 0 ? afterFullData[rowIndex - 1] : row;
-              var locatColumn = columnIndex > 0 ? visibleColumn[rowIndex - 1] : column;
-              _this2.scrollToRow(locatRow, locatColumn).then(posAndFinish);
+              var targetRow = rowIndex > 0 ? afterFullData[rowIndex - 1] : row;
+              var targetColumn = columnIndex > 0 ? visibleColumn[columnIndex - 1] : column;
+              _this2.scrollToRow(targetRow, targetColumn).then(posAndFinish);
             }
           });
         });
@@ -34348,9 +34387,9 @@ function validErrorRuleValue(rule, val) {
         validErrMaps = Object.assign({}, validErrorMaps);
         rowList.forEach(function (row) {
           colList.forEach(function (column) {
-            var vaildKey = "".concat(getRowid(_this4, row), ":").concat(column.id);
-            if (validErrMaps[vaildKey]) {
-              delete validErrMaps[vaildKey];
+            var validKey = "".concat(getRowid(_this4, row), ":").concat(column.id);
+            if (validErrMaps[validKey]) {
+              delete validErrMaps[validKey];
             }
           });
         });
@@ -39458,6 +39497,7 @@ var Tooltip = VxeTooltip;
 
 
 
+
 var ItemConfig = /*#__PURE__*/function () {
   function ItemConfig($xeform, item) {
     _classCallCheck(this, ItemConfig);
@@ -39486,6 +39526,7 @@ var ItemConfig = /*#__PURE__*/function () {
       titleClassName: item.titleClassName,
       titleStyle: item.titleStyle,
       itemRender: item.itemRender,
+      rules: item.rules,
       // 渲染属性
       showError: false,
       errRule: null,
@@ -39653,6 +39694,7 @@ function renderTitle(h, _vm, item) {
 
 
 
+
 /**
  * 配置式项
  */
@@ -39747,7 +39789,7 @@ var VxeFormConfigItem = {
         });
       });
       return childVNs.length ? h('div', {
-        class: ['vxe-form--gather vxe-row', item.id, span ? "vxe-col--".concat(span, " is--span") : '', className ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(className) ? className(params) : className : '']
+        class: ['vxe-form--gather vxe-form--item-row', item.id, span ? "vxe-form--item-col_".concat(span, " is--span") : '', className ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(className) ? className(params) : className : '']
       }, childVNs) : _e();
     }
     if (rules) {
@@ -39775,7 +39817,7 @@ var VxeFormConfigItem = {
       mouseleave: $xeform.handleTitleTipLeaveEvent
     } : {};
     return h('div', {
-      class: ['vxe-form--item', item.id, span ? "vxe-col--".concat(span, " is--span") : null, className ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(className) ? className(params) : className : '', itemClassName ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(itemClassName) ? itemClassName(params) : itemClassName : '', {
+      class: ['vxe-form--item', item.id, span ? "vxe-form--item-col_".concat(span, " is--span") : null, className ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(className) ? className(params) : className : '', itemClassName ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(itemClassName) ? itemClassName(params) : itemClassName : '', {
         'is--title': title,
         'is--colon': titleColon,
         'is--vertical': itemVertical,
@@ -39846,6 +39888,9 @@ var VxeFormConfigItem = {
 
 
 
+
+
+
 
 
 
@@ -40067,7 +40112,7 @@ function getResetValue(value, resetValue) {
         reset: this.resetEvent
       }
     }, [h('div', {
-      class: 'vxe-form--wrapper vxe-row'
+      class: 'vxe-form--wrapper vxe-form--item-row'
     }, customLayout ? defaultSlot ? this.callSlot(defaultSlot, {}, h) : [] : formItems.map(function (item, index) {
       return h(form_config_item, {
         key: index,
@@ -40570,6 +40615,7 @@ var Form = VxeForm;
 
 
 
+
 var form_item_props = {
   title: String,
   field: String,
@@ -40621,7 +40667,8 @@ var form_item_props = {
   visibleMethod: Function,
   folding: Boolean,
   collapseNode: Boolean,
-  itemRender: Object
+  itemRender: Object,
+  rules: Array
 };
 var form_item_watch = {};
 Object.keys(form_item_props).forEach(function (name) {
@@ -40814,12 +40861,21 @@ var FormItem = VxeFormItem;
       $xeformiteminfo: this
     };
   },
-  created: function created() {
-    var _this = this;
-    if (false) {}
-  },
   render: function render(h) {
-    return h('div', this.$slots.default);
+    var $xeform = this.$xeform,
+      className = this.className,
+      field = this.field,
+      itemConfig = this.itemConfig;
+    var span = this.span || ($xeform ? $xeform.props.span : null);
+    return $xeform && $xeform.customLayout ? h('div', {
+      class: ['vxe-form--gather vxe-form--item-row', itemConfig.id, span ? "vxe-form--item-col_".concat(span, " is--span") : '', className ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(className) ? className({
+        $form: $xeform,
+        data: $xeform ? $xeform.props.data : {},
+        item: itemConfig,
+        field: field,
+        property: field
+      }) : className : '']
+    }, this.$slots.default) : h('div');
   }
 });
 ;// CONCATENATED MODULE: ./packages/form-gather/index.js
@@ -40955,7 +41011,9 @@ var Option = VxeOption;
       default: false
     },
     openIcon: String,
-    closeIcon: String
+    closeIcon: String,
+    openActiveIcon: String,
+    closeActiveIcon: String
   },
   inject: {
     $xeform: {
@@ -42031,6 +42089,13 @@ var Pulldown = VxePulldown;
         }
       }
     },
+    formDesign: {
+      widget: {
+        input: '输入框',
+        textarea: '文本域',
+        select: '下拉框'
+      }
+    },
     /**
      * 扩展插件
      */