vxe-table 4.7.41 → 4.7.43

package/lib/index.umd.js

@@ -1951,9 +1951,9 @@ function eqEmptyValue(cellValue) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "4.7.41";
+const version = "4.7.43";
 core_.VxeUI.version = version;
-core_.VxeUI.tableVersion = "4.7.41";
+core_.VxeUI.tableVersion = "4.7.43";
 core_.VxeUI.setConfig({
   emptyCell: '　',
   table: {
@@ -2013,9 +2013,16 @@ core_.VxeUI.setConfig({
       allowFixed: true,
       allowSort: true,
       showFooter: true,
-      placement: 'top-right'
+      placement: 'top-right',
       //  storage: false,
-      //  checkMethod () {}
+      //  checkMethod () {},
+      modalOptions: {
+        showMaximize: true,
+        mask: true,
+        lockView: true,
+        resize: true,
+        escClosable: true
+      }
     },
     sortConfig: {
       // remote: false,
@@ -2324,7 +2331,7 @@ var es_array_push = __webpack_require__(4114);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.7.41"}`;
+const log_version = `table v${"4.7.43"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -6511,6 +6518,7 @@ const {
   },
   setup(props) {
     const VxeUIModalComponent = core_.VxeUI.getComponent('VxeModal');
+    const VxeUIDrawerComponent = core_.VxeUI.getComponent('VxeDrawer');
     const VxeUIButtonComponent = core_.VxeUI.getComponent('VxeButton');
     const VxeUIInputComponent = core_.VxeUI.getComponent('VxeInput');
     const VxeUITooltipComponent = core_.VxeUI.getComponent('VxeTooltip');
@@ -6980,6 +6988,7 @@ const {
       const customOpts = computeCustomOpts.value;
       const {
         modalOptions,
+        drawerOptions,
         allowVisible,
         allowSort,
         allowFixed,
@@ -6988,7 +6997,14 @@ const {
         visibleMethod
       } = customOpts;
       const columnOpts = computeColumnOpts.value;
+      const {
+        maxFixedSize
+      } = columnOpts;
+      const {
+        mode
+      } = customOpts;
       const modalOpts = Object.assign({}, modalOptions);
+      const drawerOpts = Object.assign({}, drawerOptions);
       const isMaxFixedColumn = computeIsMaxFixedColumn.value;
       const trVNs = [];
       external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(customColumnList, (column, index, items, path, parent) => {
@@ -7080,25 +7096,7 @@ const {
       });
       const isAllChecked = customStore.isAll;
       const isAllIndeterminate = customStore.isIndeterminate;
-      return VxeUIModalComponent ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(VxeUIModalComponent, {
-        key: 'popup',
-        className: ['vxe-table-custom-popup-wrapper', 'vxe-table--ignore-clear', modalOpts.className || ''].join(' '),
-        modelValue: customStore.visible,
-        title: modalOpts.title || panel_getI18n('vxe.custom.cstmTitle'),
-        width: modalOpts.width || '50vw',
-        minWidth: modalOpts.minWidth || 700,
-        height: modalOpts.height || '50vh',
-        minHeight: modalOpts.minHeight || 400,
-        mask: true,
-        lockView: true,
-        showFooter: true,
-        resize: true,
-        escClosable: true,
-        destroyOnClose: true,
-        'onUpdate:modelValue'(value) {
-          customStore.visible = value;
-        }
-      }, {
+      const scopedSlots = {
         default: () => {
           return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
             ref: bodyElemRef,
@@ -7147,7 +7145,7 @@ const {
                 class: 'vxe-table-custom-popup--table-sort-help-icon vxe-icon-question-circle-fill'
               });
             }
-          }) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)()]) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('th', {}, panel_getI18n('vxe.custom.setting.colTitle')), allowResizable ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('th', {}, panel_getI18n('vxe.custom.setting.colResizable')) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)(), allowFixed ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('th', {}, panel_getI18n('vxe.custom.setting.colFixed', [columnOpts.maxFixedSize || 0])) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)()])]), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(external_commonjs_vue_commonjs2_vue_root_Vue_.TransitionGroup, {
+          }) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)()]) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('th', {}, panel_getI18n('vxe.custom.setting.colTitle')), allowResizable ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('th', {}, panel_getI18n('vxe.custom.setting.colResizable')) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)(), allowFixed ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('th', {}, panel_getI18n(`vxe.custom.setting.${maxFixedSize ? 'colFixedMax' : 'colFixed'}`, [maxFixedSize])) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)()])]), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(external_commonjs_vue_commonjs2_vue_root_Vue_.TransitionGroup, {
             class: 'vxe-table-custom--body',
             tag: 'tbody',
             name: 'vxe-table-custom--list'
@@ -7173,11 +7171,49 @@ const {
             onClick: confirmCustomEvent
           }) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)()]);
         }
-      }) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)();
+      };
+      if (mode === 'drawer') {
+        return VxeUIDrawerComponent ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(VxeUIDrawerComponent, {
+          key: 'drawer',
+          className: ['vxe-table-custom-drawer-wrapper', 'vxe-table--ignore-clear', drawerOpts.className || ''].join(' '),
+          modelValue: customStore.visible,
+          title: drawerOpts.title || panel_getI18n('vxe.custom.cstmTitle'),
+          width: drawerOpts.width || Math.min(880, document.documentElement.clientWidth),
+          position: drawerOpts.position,
+          escClosable: !!drawerOpts.escClosable,
+          destroyOnClose: true,
+          showFooter: true,
+          'onUpdate:modelValue'(value) {
+            customStore.visible = value;
+          }
+        }, scopedSlots) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)();
+      }
+      return VxeUIModalComponent ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(VxeUIModalComponent, {
+        key: 'modal',
+        className: ['vxe-table-custom-modal-wrapper', 'vxe-table--ignore-clear', modalOpts.className || ''].join(' '),
+        modelValue: customStore.visible,
+        title: modalOpts.title || panel_getI18n('vxe.custom.cstmTitle'),
+        width: modalOpts.width || Math.min(880, document.documentElement.clientWidth),
+        minWidth: modalOpts.minWidth || 700,
+        height: modalOpts.height || Math.min(680, document.documentElement.clientHeight),
+        minHeight: modalOpts.minHeight || 400,
+        showZoom: modalOpts.showZoom,
+        showMaximize: modalOpts.showMaximize,
+        showMinimize: modalOpts.showMinimize,
+        mask: modalOpts.mask,
+        lockView: modalOpts.lockView,
+        resize: modalOpts.resize,
+        escClosable: !!modalOpts.escClosable,
+        destroyOnClose: true,
+        showFooter: true,
+        'onUpdate:modelValue'(value) {
+          customStore.visible = value;
+        }
+      }, scopedSlots) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)();
     };
     const renderVN = () => {
       const customOpts = computeCustomOpts.value;
-      if (customOpts.mode === 'popup') {
+      if (['modal', 'drawer', 'popup'].includes(`${customOpts.mode}`)) {
         return renderPopupPanel();
       }
       return renderSimplePanel();
@@ -8644,7 +8680,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       let fixedSize = 0;
       // 只判断第一层
       collectColumn.forEach(column => {
-        if (column.fixed) {
+        if (column.renderFixed) {
           fixedSize++;
         }
       });
@@ -9043,9 +9079,6 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       return num;
     };
     const handleCustomRestore = storeData => {
-      const {
-        tableFullColumn
-      } = internalData;
       let {
         collectColumn
       } = internalData;
@@ -9058,21 +9091,24 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       let hasCustomSort = false;
       // 处理还原
       if (resizableData || sortData || visibleData || fixedData) {
-        tableFullColumn.forEach(column => {
+        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(collectColumn, (column, index, items, path, parent) => {
           const colKey = column.getKey();
+          // 支持一级
+          if (!parent) {
+            if (fixedData && fixedData[colKey]) {
+              column.fixed = fixedData[colKey];
+            }
+            if (sortData && external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(sortData[colKey])) {
+              hasCustomSort = true;
+              column.renderSortNumber = sortData[colKey];
+            }
+          }
           if (resizableData && external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(resizableData[colKey])) {
             column.resizeWidth = resizableData[colKey];
           }
           if (visibleData && external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(visibleData[colKey])) {
             column.visible = visibleData[colKey];
           }
-          if (fixedData && fixedData[colKey]) {
-            column.fixed = fixedData[colKey];
-          }
-          if (sortData && external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(sortData[colKey])) {
-            hasCustomSort = true;
-            column.renderSortNumber = sortData[colKey];
-          }
         });
         // 如果自定义了顺序
         if (hasCustomSort) {
@@ -11953,16 +11989,13 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         const targetColumn = getRootColumn($xeTable, column);
         const isMaxFixedColumn = computeIsMaxFixedColumn.value;
         const columnOpts = computeColumnOpts.value;
-        const {
-          maxFixedSize
-        } = columnOpts;
         if (targetColumn && targetColumn.fixed !== fixed) {
           // 是否超过最大固定列数量
           if (!targetColumn.fixed && isMaxFixedColumn) {
             if (core_.VxeUI.modal) {
               core_.VxeUI.modal.message({
                 status: 'error',
-                content: table_getI18n('vxe.table.maxFixedCol', [maxFixedSize])
+                content: table_getI18n('vxe.table.maxFixedCol', [columnOpts.maxFixedSize])
               });
             }
             return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
@@ -13448,7 +13481,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         let hasFixedt = 0;
         let hasVisible = 0;
         external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(collectColumn, (column, index, items, path, parent) => {
-          // 排序只支持一级
+          // 只支持一级
           if (!parent) {
             collectColumn.forEach(column => {
               const colKey = column.getKey();
@@ -13457,6 +13490,13 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
                 sortData[colKey] = column.renderSortNumber;
               }
             });
+            if (column.fixed && column.fixed !== column.defaultFixed) {
+              const colKey = column.getKey();
+              if (colKey) {
+                hasFixedt = 1;
+                fixedData[colKey] = column.fixed;
+              }
+            }
           }
           if (column.resizeWidth) {
             const colKey = column.getKey();
@@ -13465,13 +13505,6 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
               resizableData[colKey] = column.renderWidth;
             }
           }
-          if (column.fixed && column.fixed !== column.defaultFixed) {
-            const colKey = column.getKey();
-            if (colKey) {
-              hasFixedt = 1;
-              fixedData[colKey] = column.fixed;
-            }
-          }
           if (!checkMethod || checkMethod({
             column
           })) {
@@ -21237,7 +21270,7 @@ function nativeEditRender(renderOpts, params) {
     ...getNativeEditOns(renderOpts, params)
   })];
 }
-function defaultCellRender(renderOpts, params) {
+function buttonCellRender(renderOpts, params) {
   return [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(getDefaultComponent(renderOpts), {
     ...getCellEditProps(renderOpts, params, null),
     ...getComponentOns(renderOpts, params)
@@ -21254,6 +21287,21 @@ function defaultEditRender(renderOpts, params) {
     ...getEditOns(renderOpts, params)
   })];
 }
+function radioAndCheckboxEditRender(renderOpts, params) {
+  const {
+    options
+  } = renderOpts;
+  const {
+    row,
+    column
+  } = params;
+  const cellValue = getCellValue(row, column);
+  return [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(getDefaultComponent(renderOpts), {
+    options,
+    ...getCellEditProps(renderOpts, params, cellValue),
+    ...getEditOns(renderOpts, params)
+  })];
+}
 /**
  * 已废弃
  * @deprecated
@@ -21611,7 +21659,7 @@ render_renderer.mixin({
     autofocus: '.vxe-textarea--inner'
   },
   VxeButton: {
-    renderDefault: defaultCellRender
+    renderDefault: buttonCellRender
   },
   VxeButtonGroup: {
     renderDefault(renderOpts, params) {
@@ -21659,6 +21707,12 @@ render_renderer.mixin({
     defaultFilterMethod: handleFilterMethod,
     exportMethod: handleExportSelectMethod
   },
+  VxeRadioGroup: {
+    renderDefault: radioAndCheckboxEditRender
+  },
+  VxeCheckboxGroup: {
+    renderDefault: radioAndCheckboxEditRender
+  },
   VxeSwitch: {
     autofocus: '.vxe-switch--button',
     renderEdit: defaultEditRender,
@@ -21881,7 +21935,9 @@ const {
           return computeCustomOpts.value;
         }
       }
-      return {};
+      return {
+        trigger: ''
+      };
     });
     const computeTrigger = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
       const tableCustomOpts = computeTableCustomOpts.value;
@@ -23814,10 +23870,6 @@ core_.VxeUI.component(grid);
 const Grid = VxeGrid;
 /* harmony default export */ var packages_grid = ((/* unused pure expression or super */ null && (VxeGrid)));
 ;// CONCATENATED MODULE: ./packages/locale/lang/zh-CN.ts
-/**
- * v4保留兼容，已废弃，即将删除文件
- * @deprecated
- */
 /* harmony default export */ var zh_CN = ({
   vxe: {
     base: {
@@ -23942,7 +23994,8 @@ const Grid = VxeGrid;
         colTitle: '标题',
         colResizable: '列宽（像素）',
         colVisible: '是否显示',
-        colFixed: '冻结列（最多 {0} 列）',
+        colFixed: '冻结列',
+        colFixedMax: '冻结列（最多 {0} 列）',
         fixedLeft: '左侧',
         fixedUnset: '不设置',
         fixedRight: '右侧'