vxe-table 4.6.3 → 4.6.5

package/lib/index.umd.js

@@ -2414,6 +2414,9 @@ const GlobalConfig = {
     // size: null,
     // transfer: false
   },
+  buttonGroup: {
+    // size: null
+  },
   radio: {
     // size: null,
     strict: true
@@ -2467,7 +2470,7 @@ const GlobalConfig = {
 ;// CONCATENATED MODULE: ./packages/tools/log.ts
 
 function getLog(message, params) {
-  return `[vxe-table v${"4.6.3"}] ${conf.i18n(message, params)}`;
+  return `[vxe-table v${"4.6.5"}] ${conf.i18n(message, params)}`;
 }
 function outLog(type) {
   return function (message, params) {
@@ -4932,7 +4935,7 @@ const setup = config;
 const globalStore = {};
 const VXETable = {
   v,
-  version: "4.6.3",
+  version: "4.6.5",
   config: config,
   globalStore,
   interceptor: interceptor,
@@ -7388,7 +7391,7 @@ function useSize(props) {
       }
       return false;
     });
-    const computeBtnType = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
+    const computeBtnMode = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
       const {
         type,
         mode
@@ -7557,6 +7560,10 @@ function useSize(props) {
       }
       mouseenterEvent(evnt);
     };
+    const mouseleaveTargetEvent = evnt => {
+      closePanel();
+      mouseleaveEvent(evnt);
+    };
     const mouseenterEvent = evnt => {
       emit('mouseenter', {
         $event: evnt
@@ -7676,7 +7683,7 @@ function useSize(props) {
         showPanel
       } = reactData;
       const isFormBtn = computeIsFormBtn.value;
-      const btnType = computeBtnType.value;
+      const btnMode = computeBtnMode.value;
       const vSize = computeSize.value;
       if (slots.dropdowns) {
         return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
@@ -7689,7 +7696,7 @@ function useSize(props) {
           }]
         }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('button', {
           ref: refButton,
-          class: ['vxe-button', `type--${btnType}`, {
+          class: ['vxe-button', `type--${btnMode}`, {
             [`size--${vSize}`]: vSize,
             [`theme--${status}`]: status,
             'is--round': round,
@@ -7702,7 +7709,7 @@ function useSize(props) {
           type: isFormBtn ? type : 'button',
           disabled: disabled || loading,
           onMouseenter: mouseenterTargetEvent,
-          onMouseleave: mouseleaveEvent,
+          onMouseleave: mouseleaveTargetEvent,
           onClick: clickEvent
         }, renderContent().concat([(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('i', {
           class: `vxe-button--dropdown-arrow ${conf.icon.BUTTON_DROPDOWN}`
@@ -7730,7 +7737,7 @@ function useSize(props) {
       }
       return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('button', {
         ref: refButton,
-        class: ['vxe-button', `type--${btnType}`, className ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(className) ? className({
+        class: ['vxe-button', `type--${btnMode}`, className ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(className) ? className({
           $button: $xebutton
         }) : className : '', {
           [`size--${vSize}`]: vSize,
@@ -16838,9 +16845,11 @@ const customHook = {
     };
     const openCustom = () => {
       const {
+        initStore,
         customStore
       } = reactData;
       customStore.visible = true;
+      initStore.custom = true;
       checkCustomStatus();
       calcMaxHeight();
       return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)().then(() => calcMaxHeight());
@@ -18509,7 +18518,7 @@ dynamicApp.component('VxeTableColgroup', src_group);
   params: Object
 });
 ;// CONCATENATED MODULE: ./packages/table/src/emits.ts
-/* harmony default export */ var emits = (['update:data', 'keydown-start', 'keydown', 'keydown-end', 'paste', 'copy', 'cut', 'current-change', 'radio-change', 'checkbox-change', 'checkbox-all', 'checkbox-range-start', 'checkbox-range-change', 'checkbox-range-end', 'checkbox-range-select', 'cell-click', 'cell-dblclick', 'cell-menu', 'cell-mouseenter', 'cell-mouseleave', 'cell-selected', 'header-cell-click', 'header-cell-dblclick', 'header-cell-menu', 'footer-cell-click', 'footer-cell-dblclick', 'footer-cell-menu', 'clear-merge', 'sort-change', 'clear-sort', 'filter-change', 'filter-visible', 'clear-filter', 'resizable-change', 'toggle-row-expand', 'toggle-tree-expand', 'menu-click', 'edit-closed', 'edit-actived', 'edit-activated', 'edit-disabled', 'valid-error', 'scroll', 'custom', 'change-fnr', 'open-fnr', 'show-fnr', 'hide-fnr', 'fnr-change', 'fnr-find', 'fnr-find-all', 'fnr-replace', 'fnr-replace-all', 'cell-area-copy', 'cell-area-cut', 'cell-area-paste', 'cell-area-merge', 'clear-cell-area-merge', 'header-cell-area-selection', 'cell-area-selection-start', 'cell-area-selection-drag', 'cell-area-selection-end', 'cell-area-extension-start', 'cell-area-extension-drag', 'cell-area-extension-end', 'cell-area-selection-all-start', 'cell-area-selection-all-end', 'cell-area-arrows-start', 'cell-area-arrows-end', 'active-cell-change-start', 'active-cell-change-end']);
+/* harmony default export */ var emits = (['update:data', 'keydown-start', 'keydown', 'keydown-end', 'paste', 'copy', 'cut', 'current-change', 'radio-change', 'checkbox-change', 'checkbox-all', 'checkbox-range-start', 'checkbox-range-change', 'checkbox-range-end', 'checkbox-range-select', 'cell-click', 'cell-dblclick', 'cell-menu', 'cell-mouseenter', 'cell-mouseleave', 'cell-selected', 'header-cell-click', 'header-cell-dblclick', 'header-cell-menu', 'footer-cell-click', 'footer-cell-dblclick', 'footer-cell-menu', 'clear-merge', 'sort-change', 'clear-sort', 'filter-change', 'filter-visible', 'clear-filter', 'resizable-change', 'toggle-row-expand', 'toggle-tree-expand', 'menu-click', 'edit-closed', 'edit-actived', 'edit-activated', 'edit-disabled', 'valid-error', 'scroll', 'custom', 'change-fnr', 'open-fnr', 'show-fnr', 'hide-fnr', 'fnr-change', 'fnr-find', 'fnr-find-all', 'fnr-replace', 'fnr-replace-all', 'cell-area-copy', 'cell-area-cut', 'cell-area-paste', 'cell-area-merge', 'clear-cell-area-merge', 'header-cell-area-selection', 'cell-area-selection-invalid', 'cell-area-selection-start', 'cell-area-selection-drag', 'cell-area-selection-end', 'cell-area-extension-start', 'cell-area-extension-drag', 'cell-area-extension-end', 'cell-area-selection-all-start', 'cell-area-selection-all-end', 'cell-area-arrows-start', 'cell-area-arrows-end', 'active-cell-change-start', 'active-cell-change-end']);
 ;// CONCATENATED MODULE: ./packages/grid/src/grid.ts
 
 
@@ -20379,16 +20388,16 @@ dynamicApp.component(grid.name, grid);
       const customOpts = computeCustomOpts.value;
       if (true) {
         if (customOpts.isFooter) {
-          warnLog('vxe.error.delProp', ['custom.isFooter', 'custom-config.showFooter']);
+          warnLog('vxe.error.delProp', ['toolbar.custom.isFooter', 'table.custom-config.showFooter']);
         }
         if (customOpts.showFooter) {
-          warnLog('vxe.error.delProp', ['custom.showFooter', 'custom-config.showFooter']);
+          warnLog('vxe.error.delProp', ['toolbar.custom.showFooter', 'table.custom-config.showFooter']);
         }
         if (customOpts.immediate) {
-          warnLog('vxe.error.delProp', ['custom.immediate', 'custom-config.immediate']);
+          warnLog('vxe.error.delProp', ['toolbar.custom.immediate', 'table.custom-config.immediate']);
         }
         if (customOpts.trigger) {
-          warnLog('vxe.error.delProp', ['custom.trigger', 'custom-config.trigger']);
+          warnLog('vxe.error.delProp', ['toolbar.custom.trigger', 'table.custom-config.trigger']);
         }
       }
     });
@@ -21592,7 +21601,12 @@ dynamicApp.component(src_button.name, src_button);
       const defaultSlot = slots.default;
       return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         class: 'vxe-button-group'
-      }, defaultSlot ? defaultSlot({}) : options ? options.map(item => (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(src_button, item)) : []);
+      }, defaultSlot ? defaultSlot({}) : options ? options.map((item, index) => {
+        return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(src_button, {
+          key: index,
+          ...item
+        });
+      }) : []);
     };
     $xebuttongroup.renderVN = renderVN;
     (0,external_commonjs_vue_commonjs2_vue_root_Vue_.provide)('$xebuttongroup', $xebuttongroup);
@@ -26704,7 +26718,8 @@ const orderStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_ORDER';
       initStore: {
         filter: false,
         import: false,
-        export: false
+        export: false,
+        custom: false
       },
       // 自定义列相关的信息
       customStore: {
@@ -34481,10 +34496,10 @@ const orderStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_ORDER';
       /**
        * 自定义列
        */
-      (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)((0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)('vxe-table-custom-panel'), {
+      initStore.custom ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)((0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)('vxe-table-custom-panel'), {
         ref: refTableCustom,
         customStore
-      }),
+      }) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)(),
       /**
        * 筛选
        */
@@ -34603,92 +34618,6 @@ dynamicApp.component(table.name, table);
       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: '全选/取消',
@@ -34749,6 +34678,9 @@ dynamicApp.component(table.name, table);
       confirm: '确认',
       cancel: '取消'
     },
+    filter: {
+      search: '搜索'
+    },
     custom: {
       cstmTitle: '列设置',
       cstmRestore: '恢复默认',
@@ -34893,6 +34825,203 @@ dynamicApp.component(table.name, table);
           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
+     */
+    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: {
+        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: '无匹配项'
+      }
     }
   }
 });