vxe-table 3.8.3 → 3.8.4-beta.0

package/lib/index.umd.js

@@ -11346,7 +11346,7 @@ var es_array_concat = __webpack_require__(8706);
 
 
 function getLog(message, params) {
-  return "[vxe-table v".concat("3.8.3-beta.1", "] ").concat(conf.i18n(message, params));
+  return "[vxe-table v".concat("3.8.4-beta.0", "] ").concat(conf.i18n(message, params));
 }
 function outLog(type) {
   return function (message, params) {
@@ -13067,7 +13067,7 @@ var setup = config;
 var globalStore = {};
 var VXETable = {
   v: v,
-  version: "3.8.3-beta.1",
+  version: "3.8.4-beta.0",
   reg: reg,
   use: use,
   setup: setup,
@@ -18339,6 +18339,16 @@ var Methods = {
     return this.handleCustom();
   },
   handleCustom: function handleCustom() {
+    var mouseConfig = this.mouseConfig;
+    if (mouseConfig) {
+      if (this.clearSelected) {
+        this.clearSelected();
+      }
+      if (this.clearCellAreas) {
+        this.clearCellAreas();
+        this.clearCopyCellArea();
+      }
+    }
     this.saveCustomVisible();
     this.analyColumnWidth();
     return this.refreshColumn(true);
@@ -19350,7 +19360,9 @@ var Methods = {
       }
     } else if (mouseConfig) {
       if (!getEventTargetNode(evnt, $el).flag && !($xegrid && getEventTargetNode(evnt, $xegrid.$el).flag) && !(ctxWrapper && getEventTargetNode(evnt, ctxWrapper.$el).flag) && !($toolbar && getEventTargetNode(evnt, $toolbar.$el).flag)) {
-        this.clearSelected();
+        if (this.clearSelected) {
+          this.clearSelected();
+        }
         if (!getEventTargetNode(evnt, document.body, 'vxe-table--ignore-areas-clear').flag) {
           this.preventEvent(evnt, 'event.clearAreas', {}, function () {
             _this27.clearCellAreas();
@@ -35301,6 +35313,8 @@ var Colgroup = VxeColgroup;
 
 
 
+
+
 
 
 
@@ -35867,7 +35881,8 @@ Object.keys(packages_table.methods).forEach(function (name) {
         pagerConfig = this.pagerConfig,
         editRules = this.editRules,
         formData = this.formData,
-        isMsg = this.isMsg;
+        isMsg = this.isMsg,
+        validConfig = this.validConfig;
       var beforeQuery = proxyOpts.beforeQuery,
         afterQuery = proxyOpts.afterQuery,
         beforeDelete = proxyOpts.beforeDelete,
@@ -36140,7 +36155,7 @@ Object.keys(packages_table.methods).forEach(function (name) {
               var restPromise = Promise.resolve();
               if (editRules) {
                 // 只校验新增和修改的数据
-                restPromise = this.validate(_body.insertRecords.concat(updateRecords));
+                restPromise = this[validConfig && validConfig.msgMode === 'full' ? 'fullValidate' : 'validate'](_body.insertRecords.concat(updateRecords));
               }
               return restPromise.then(function (errMap) {
                 if (errMap) {
@@ -38309,9 +38324,46 @@ var Textarea = VxeTextarea;
       return false;
     },
     btnMode: function btnMode() {
-      var mode = this.mode,
+      var $xebuttonggroup = this.$xebuttonggroup,
+        mode = this.mode,
         type = this.type;
-      return mode === 'text' || type === 'text' ? 'text' : 'button';
+      if (mode === 'text' || type === 'text' || $xebuttonggroup && $xebuttonggroup.mode === 'text') {
+        return 'text';
+      }
+      return 'button';
+    },
+    btnStatus: function btnStatus() {
+      var $xebuttonggroup = this.$xebuttonggroup,
+        status = this.status;
+      if (status) {
+        return status;
+      }
+      if ($xebuttonggroup) {
+        return $xebuttonggroup.status;
+      }
+      return '';
+    },
+    btnRound: function btnRound() {
+      var $xebuttonggroup = this.$xebuttonggroup,
+        round = this.round;
+      if (round) {
+        return round;
+      }
+      if ($xebuttonggroup) {
+        return $xebuttonggroup.round;
+      }
+      return false;
+    },
+    btnCircle: function btnCircle() {
+      var $xebuttonggroup = this.$xebuttonggroup,
+        circle = this.circle;
+      if (circle) {
+        return circle;
+      }
+      if ($xebuttonggroup) {
+        return $xebuttonggroup.circle;
+      }
+      return false;
     }
   },
   created: function created() {
@@ -38341,8 +38393,10 @@ var Textarea = VxeTextarea;
       type = this.type,
       destroyOnClose = this.destroyOnClose,
       isFormBtn = this.isFormBtn,
-      status = this.status,
       btnMode = this.btnMode,
+      btnStatus = this.btnStatus,
+      btnRound = this.btnRound,
+      btnCircle = this.btnCircle,
       vSize = this.vSize,
       name = this.name,
       disabled = this.disabled,
@@ -38357,7 +38411,7 @@ var Textarea = VxeTextarea;
       }) : className : '', _defineProperty(_defineProperty({}, "size--".concat(vSize), vSize), 'is--active', showPanel)]
     }, [h('button', {
       ref: 'xBtn',
-      class: ['vxe-button', "type--".concat(btnMode), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "size--".concat(vSize), vSize), "theme--".concat(status), status), 'is--round', this.round), 'is--circle', this.circle), 'is--disabled', disabled || loading), 'is--loading', loading)],
+      class: ['vxe-button', "type--".concat(btnMode), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "size--".concat(vSize), vSize), "theme--".concat(btnStatus), btnStatus), 'is--round', btnRound), 'is--circle', btnCircle), 'is--disabled', disabled || loading), 'is--loading', loading)],
       attrs: {
         name: name,
         title: title,
@@ -38392,7 +38446,7 @@ var Textarea = VxeTextarea;
       ref: 'xBtn',
       class: ['vxe-button', "type--".concat(btnMode), className ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(className) ? className({
         $button: this
-      }) : className : '', _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "size--".concat(vSize), vSize), "theme--".concat(status), status), 'is--round', this.round), 'is--circle', this.circle), 'is--disabled', disabled || loading), 'is--loading', loading)],
+      }) : className : '', _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "size--".concat(vSize), vSize), "theme--".concat(btnStatus), btnStatus), 'is--round', btnRound), 'is--circle', btnCircle), 'is--disabled', disabled || loading), 'is--loading', loading)],
       attrs: {
         name: name,
         title: title,
@@ -38670,10 +38724,16 @@ var Button = VxeButton;
 
 
 
+
 /* harmony default export */ var button_src_group = ({
   name: 'VxeButtonGroup',
   props: {
     options: Array,
+    mode: String,
+    status: String,
+    round: Boolean,
+    circle: Boolean,
+    className: [String, Function],
     disabled: Boolean,
     size: {
       type: String,
@@ -38694,10 +38754,13 @@ var Button = VxeButton;
   },
   render: function render(h) {
     var $scopedSlots = this.$scopedSlots,
+      className = this.className,
       options = this.options;
     var defaultSlot = $scopedSlots.default;
     return h('div', {
-      class: 'vxe-button-group'
+      class: ['vxe-button-group', className ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(className) ? className({
+        $buttonGroup: this
+      }) : className : '']
     }, defaultSlot ? defaultSlot.cell(this, {}) : options ? options.map(function (item) {
       return h('vxe-button', {
         props: item
@@ -41850,11 +41913,11 @@ var Pulldown = VxePulldown;
       },
       filterComplexInput: {
         menus: {
-          fixedColumn: '锁定列',
-          fixedGroup: '锁定组',
-          cancelFixed: '取消锁定',
-          fixedLeft: '锁定左侧',
-          fixedRight: '锁定右侧'
+          fixedColumn: '冻结列',
+          fixedGroup: '冻结分组',
+          cancelFixed: '取消冻结',
+          fixedLeft: '冻结左侧',
+          fixedRight: '冻结右侧'
         },
         cases: {
           equal: '等于',
@@ -41871,11 +41934,11 @@ var Pulldown = VxePulldown;
           clearSort: '清除排序',
           sortAsc: '升序',
           sortDesc: '降序',
-          fixedColumn: '锁定列',
-          fixedGroup: '锁定组',
-          cancelFixed: '取消锁定',
-          fixedLeft: '锁定左侧',
-          fixedRight: '锁定右侧',
+          fixedColumn: '冻结列',
+          fixedGroup: '冻结分组',
+          cancelFixed: '取消冻结',
+          fixedLeft: '冻结左侧',
+          fixedRight: '冻结右侧',
           clearFilter: '清除筛选',
           textOption: '文本筛选',
           numberOption: '数值筛选'
@@ -41913,6 +41976,47 @@ var Pulldown = VxePulldown;
      * 以下废弃
      * @deprecated
      */
+    pro: {
+      area: {
+        mergeErr: '无法对合并单元格进行该操作',
+        multiErr: '无法对多重选择区域进行该操作',
+        extendErr: '如果延伸的区域包含被合并的单元格，所有合并的单元格需大小相同',
+        pasteMultiErr: '无法粘贴，需要相同大小的复制的区域和粘贴的区域才能执行此操作'
+      },
+      fnr: {
+        title: '查找和替换',
+        findLabel: '查找',
+        replaceLabel: '替换',
+        findTitle: '查找内容：',
+        replaceTitle: '替换为：',
+        tabs: {
+          find: '查找',
+          replace: '替换'
+        },
+        filter: {
+          re: '正则表达式',
+          whole: '全词匹配',
+          sensitive: '区分大小写'
+        },
+        btns: {
+          findNext: '查找下一个',
+          findAll: '查找全部',
+          replace: '替换',
+          replaceAll: '替换全部',
+          cancel: '取消'
+        },
+        header: {
+          seq: '#',
+          cell: '单元格',
+          value: '值'
+        },
+        empty: '(空值)',
+        reError: '无效的正则表达式',
+        recordCount: '已找到 {0} 个单元格',
+        notCell: '找不到匹配的单元格',
+        replaceSuccess: '成功替换 {0} 个单元格'
+      }
+    },
     renderer: {
       search: '搜索',
       cases: {
@@ -41957,47 +42061,6 @@ var Pulldown = VxePulldown;
         empty: '(空白)',
         notData: '无匹配项'
       }
-    },
-    pro: {
-      area: {
-        mergeErr: '无法对合并单元格进行该操作',
-        multiErr: '无法对多重选择区域进行该操作',
-        extendErr: '如果延伸的区域包含被合并的单元格，所有合并的单元格需大小相同',
-        pasteMultiErr: '无法粘贴，需要相同大小的复制的区域和粘贴的区域才能执行此操作'
-      },
-      fnr: {
-        title: '查找和替换',
-        findLabel: '查找',
-        replaceLabel: '替换',
-        findTitle: '查找内容：',
-        replaceTitle: '替换为：',
-        tabs: {
-          find: '查找',
-          replace: '替换'
-        },
-        filter: {
-          re: '正则表达式',
-          whole: '全词匹配',
-          sensitive: '区分大小写'
-        },
-        btns: {
-          findNext: '查找下一个',
-          findAll: '查找全部',
-          replace: '替换',
-          replaceAll: '替换全部',
-          cancel: '取消'
-        },
-        header: {
-          seq: '#',
-          cell: '单元格',
-          value: '值'
-        },
-        empty: '(空值)',
-        reError: '无效的正则表达式',
-        recordCount: '已找到 {0} 个单元格',
-        notCell: '找不到匹配的单元格',
-        replaceSuccess: '成功替换 {0} 个单元格'
-      }
     }
   }
 });