vxe-table 3.8.0-beta.8 → 3.8.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.0-beta.7", "] ").concat(conf.i18n(message, params));
+  return "[vxe-table v".concat("3.8.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.0-beta.7",
+  version: "3.8.0",
   reg: reg,
   use: use,
   setup: setup,
@@ -23218,7 +23218,8 @@ function handleUupdateResize(_vm) {
       initStore: {
         filter: false,
         import: false,
-        export: false
+        export: false,
+        custom: false
       },
       // 刷新列标识，当列筛选被改变时，触发表格刷新数据
       upDataFlag: 0,
@@ -23944,12 +23945,12 @@ function handleUupdateResize(_vm) {
     /**
      * 自定义列
      */
-    h('vxe-table-custom-panel', {
+    initStore.custom ? h('vxe-table-custom-panel', {
       ref: 'customWrapper',
       props: {
         customStore: customStore
       }
-    }),
+    }) : _e(),
     /**
      * 筛选
      */
@@ -34321,8 +34322,10 @@ var Validator = VxeTableValidatorModule;
   methods: {
     _openCustom: function _openCustom() {
       var _this = this;
-      var customStore = this.customStore;
+      var initStore = this.initStore,
+        customStore = this.customStore;
       customStore.visible = true;
+      initStore.custom = true;
       this.checkCustomStatus();
       this.calcMaxHeight();
       return this.$nextTick().then(function () {
@@ -38037,6 +38040,7 @@ var Textarea = VxeTextarea;
 
 
 
+
 // import { warnLog } from '../../tools/log'
 
 /* harmony default export */ var button_src_button = ({
@@ -38088,10 +38092,16 @@ var Textarea = VxeTextarea;
   },
   computed: {
     isFormBtn: function isFormBtn() {
-      return ['submit', 'reset', 'button'].indexOf(this.type) > -1;
+      var type = this.type;
+      if (type) {
+        return ['submit', 'reset', 'button'].indexOf(type) > -1;
+      }
+      return false;
     },
-    btnType: function btnType() {
-      return this.type === 'text' || this.mode === 'text' ? 'text' : 'button';
+    btnMode: function btnMode() {
+      var mode = this.mode,
+        type = this.type;
+      return mode === 'text' || type === 'text' ? 'text' : 'button';
     }
   },
   created: function created() {
@@ -38122,7 +38132,7 @@ var Textarea = VxeTextarea;
       destroyOnClose = this.destroyOnClose,
       isFormBtn = this.isFormBtn,
       status = this.status,
-      btnType = this.btnType,
+      btnMode = this.btnMode,
       vSize = this.vSize,
       name = this.name,
       disabled = this.disabled,
@@ -38137,7 +38147,7 @@ var Textarea = VxeTextarea;
       }) : className : '', _defineProperty(_defineProperty({}, "size--".concat(vSize), vSize), 'is--active', showPanel)]
     }, [h('button', {
       ref: 'xBtn',
-      class: ['vxe-button', "type--".concat(btnType), _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(status), status), 'is--round', this.round), 'is--circle', this.circle), 'is--disabled', disabled || loading), 'is--loading', loading)],
       attrs: {
         name: name,
         title: title,
@@ -38170,7 +38180,7 @@ var Textarea = VxeTextarea;
       }
     }, destroyOnClose && !showPanel ? [] : downsSlot.call(this, {}, h))] : null)]) : h('button', {
       ref: 'xBtn',
-      class: ['vxe-button', "type--".concat(btnType), className ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(className) ? className({
+      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)],
       attrs: {
@@ -41359,92 +41369,6 @@ var Pulldown = VxePulldown;
       impFields: '导入失败，请检查字段名和数据格式是否正确',
       treeNotImp: '树表格不支持导入'
     },
-    renderer: {
-      search: '搜索',
-      cases: {
-        equal: '等于',
-        unequal: '不等于',
-        gt: '大于',
-        ge: '大于或等于',
-        lt: '小于',
-        le: '小于或等于',
-        begin: '开头是',
-        notbegin: '开头不是',
-        endin: '结尾是',
-        notendin: '结尾不是',
-        include: '包含',
-        exclude: '不包含',
-        between: '介于',
-        custom: '自定义筛选',
-        insensitive: '不区分大小写',
-        isSensitive: '区分大小写'
-      },
-      combination: {
-        menus: {
-          clearSort: '清除排序',
-          sortAsc: '升序',
-          sortDesc: '降序',
-          fixedColumn: '锁定列',
-          fixedGroup: '锁定组',
-          cancelFixed: '取消锁定',
-          fixedLeft: '锁定左侧',
-          fixedRight: '锁定右侧',
-          clearFilter: '清除筛选',
-          textOption: '文本筛选',
-          numberOption: '数值筛选'
-        },
-        popup: {
-          title: '自定义筛选的方式',
-          currColumnTitle: '当前列：',
-          and: '与',
-          or: '或',
-          describeHtml: '可用 ? 代表单个字符<br/>用 * 代表任意多个字符'
-        },
-        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} 个单元格'
-      }
-    },
     table: {
       emptyText: '暂无数据',
       allTitle: '全选/取消',
@@ -41505,6 +41429,9 @@ var Pulldown = VxePulldown;
       confirm: '确认',
       cancel: '取消'
     },
+    filter: {
+      search: '搜索'
+    },
     custom: {
       cstmTitle: '列设置',
       cstmRestore: '恢复默认',
@@ -41649,6 +41576,203 @@ var Pulldown = VxePulldown;
           q4: '第四季度'
         }
       }
+    },
+    /**
+     * 扩展插件
+     */
+    plugins: {
+      extendCellArea: {
+        area: {
+          mergeErr: '无法对合并单元格进行该操作',
+          multiErr: '无法对多重选择区域进行该操作',
+          extendErr: '如果延伸的区域包含被合并的单元格，所有合并的单元格需大小相同',
+          pasteMultiErr: '无法粘贴，需要相同大小的复制的区域和粘贴的区域才能执行此操作',
+          cpInvalidErr: '该操作无法进行，您选择的区域中存在被禁止的列（{0}）'
+        },
+        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} 个单元格'
+        }
+      },
+      filterComplexInput: {
+        menus: {
+          fixedColumn: '锁定列',
+          fixedGroup: '锁定组',
+          cancelFixed: '取消锁定',
+          fixedLeft: '锁定左侧',
+          fixedRight: '锁定右侧'
+        },
+        cases: {
+          equal: '等于',
+          gt: '大于',
+          lt: '小于',
+          begin: '开头是',
+          endin: '结尾是',
+          include: '包含',
+          isSensitive: '区分大小写'
+        }
+      },
+      filterCombination: {
+        menus: {
+          clearSort: '清除排序',
+          sortAsc: '升序',
+          sortDesc: '降序',
+          fixedColumn: '锁定列',
+          fixedGroup: '锁定组',
+          cancelFixed: '取消锁定',
+          fixedLeft: '锁定左侧',
+          fixedRight: '锁定右侧',
+          clearFilter: '清除筛选',
+          textOption: '文本筛选',
+          numberOption: '数值筛选'
+        },
+        popup: {
+          title: '自定义筛选的方式',
+          currColumnTitle: '当前列：',
+          and: '与',
+          or: '或',
+          describeHtml: '可用 ? 代表单个字符<br/>用 * 代表任意多个字符'
+        },
+        cases: {
+          equal: '等于',
+          unequal: '不等于',
+          gt: '大于',
+          ge: '大于或等于',
+          lt: '小于',
+          le: '小于或等于',
+          begin: '开头是',
+          notbegin: '开头不是',
+          endin: '结尾是',
+          notendin: '结尾不是',
+          include: '包含',
+          exclude: '不包含',
+          between: '介于',
+          custom: '自定义筛选',
+          insensitive: '不区分大小写',
+          isSensitive: '区分大小写'
+        },
+        empty: '(空白)',
+        notData: '无匹配项'
+      }
+    },
+    /**
+     * 以下废弃
+     * @deprecated
+     */
+    renderer: {
+      search: '搜索',
+      cases: {
+        equal: '等于',
+        unequal: '不等于',
+        gt: '大于',
+        ge: '大于或等于',
+        lt: '小于',
+        le: '小于或等于',
+        begin: '开头是',
+        notbegin: '开头不是',
+        endin: '结尾是',
+        notendin: '结尾不是',
+        include: '包含',
+        exclude: '不包含',
+        between: '介于',
+        custom: '自定义筛选',
+        insensitive: '不区分大小写',
+        isSensitive: '区分大小写'
+      },
+      combination: {
+        menus: {
+          clearSort: '清除排序',
+          sortAsc: '升序',
+          sortDesc: '降序',
+          fixedColumn: '锁定列',
+          fixedGroup: '锁定组',
+          cancelFixed: '取消锁定',
+          fixedLeft: '锁定左侧',
+          fixedRight: '锁定右侧',
+          clearFilter: '清除筛选',
+          textOption: '文本筛选',
+          numberOption: '数值筛选'
+        },
+        popup: {
+          title: '自定义筛选的方式',
+          currColumnTitle: '当前列：',
+          and: '与',
+          or: '或',
+          describeHtml: '可用 ? 代表单个字符<br/>用 * 代表任意多个字符'
+        },
+        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} 个单元格'
+      }
     }
   }
 });