vxe-table 4.7.67 → 4.7.69

package/lib/index.umd.js

@@ -1951,9 +1951,9 @@ function eqEmptyValue(cellValue) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "4.7.67";
+const version = "4.7.69";
 core_.VxeUI.version = version;
-core_.VxeUI.tableVersion = "4.7.67";
+core_.VxeUI.tableVersion = "4.7.69";
 core_.VxeUI.setConfig({
   emptyCell: '　',
   table: {
@@ -2334,7 +2334,7 @@ var es_array_push = __webpack_require__(4114);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.7.67"}`;
+const log_version = `table v${"4.7.69"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -4729,6 +4729,7 @@ const lineOffsetSizes = {
       const {
         height: rowHeight
       } = rowOpts;
+      const colid = column.id;
       const renderOpts = editRender || cellRender;
       const compConf = renderOpts ? body_renderer.get(renderOpts.name) : null;
       const compCellClassName = compConf ? compConf.tableCellClassName || compConf.cellClassName : null;
@@ -4746,10 +4747,10 @@ const lineOffsetSizes = {
       let isDirty;
       const tdOns = {};
       const cellAlign = align || allAlign;
-      const errorValidItem = validErrorMaps[`${rowid}:${column.id}`];
+      const errorValidItem = validErrorMaps[`${rowid}:${colid}`];
       const showValidTip = editRules && validOpts.showMessage && (validOpts.message === 'default' ? height || tableData.length > 1 : validOpts.message === 'inline');
       const attrs = {
-        colid: column.id
+        colid
       };
       const params = {
         $table: $xeTable,
@@ -4908,7 +4909,7 @@ const lineOffsetSizes = {
         }
       }
       return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('td', {
-        class: ['vxe-body--column', column.id, {
+        class: ['vxe-body--column', colid, {
           [`col--${cellAlign}`]: cellAlign,
           [`col--${type}`]: type,
           'col--last': $columnIndex === columns.length - 1,
@@ -4921,7 +4922,7 @@ const lineOffsetSizes = {
           'col--valid-error': !!errorValidItem,
           'col--current': currentColumn === column
         }, getPropClass(compCellClassName, params), getPropClass(className, params), getPropClass(allCellClassName, params)],
-        key: columnKey || columnOpts.useKey ? column.id : $columnIndex,
+        key: columnKey || columnOpts.useKey ? colid : $columnIndex,
         ...attrs,
         style: Object.assign({
           height: hasEllipsis && (scrollYRHeight || rowHeight) ? `${scrollYRHeight || rowHeight}px` : ''
@@ -5842,6 +5843,7 @@ const header_renderType = 'header';
             align,
             headerClassName
           } = column;
+          const colid = column.id;
           const isColGroup = column.children && column.children.length;
           const fixedHiddenColumn = fixedType ? column.fixed !== fixedType && !isColGroup : !!column.fixed && overflowX;
           const headOverflow = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(showHeaderOverflow) ? allColumnHeaderOverflow : showHeaderOverflow;
@@ -5879,7 +5881,7 @@ const header_renderType = 'header';
             thOns.onMousedown = evnt => $xeTable.triggerHeaderCellMousedownEvent(evnt, params);
           }
           return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('th', {
-            class: ['vxe-header--column', column.id, {
+            class: ['vxe-header--column', colid, {
               [`col--${headAlign}`]: headAlign,
               [`col--${type}`]: type,
               'col--last': $columnIndex === cols.length - 1,
@@ -5892,12 +5894,12 @@ const header_renderType = 'header';
               'is--filter-active': hasFilter,
               'col--current': currentColumn === column
             }, headerClassName ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(headerClassName) ? headerClassName(params) : headerClassName : '', headerCellClassName ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(headerCellClassName) ? headerCellClassName(params) : headerCellClassName : ''],
-            colid: column.id,
+            colid,
             colspan: column.colSpan > 1 ? column.colSpan : null,
             rowspan: column.rowSpan > 1 ? column.rowSpan : null,
             style: headerCellStyle ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(headerCellStyle) ? headerCellStyle(params) : headerCellStyle : null,
             ...thOns,
-            key: columnKey || columnOpts.useKey || isColGroup ? column.id : $columnIndex
+            key: columnKey || columnOpts.useKey || isColGroup ? colid : $columnIndex
           }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
             class: ['vxe-cell', {
               'c--title': showTitle,
@@ -8529,6 +8531,10 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       fullDataRowIdData: {},
       fullColumnIdData: {},
       fullColumnFieldData: {},
+      // 列选取状态
+      columnStatusMaps: {},
+      // 行选取状态
+      rowStatusMaps: {},
       inited: false,
       tooltipTimeout: null,
       initStatus: false,
@@ -13932,7 +13938,6 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           const operCtxMenu = isMenu && ctxMenuStore.visible && (isEnter || isSpacebar || operArrow);
           const isEditStatus = isEnableConf(editConfig) && actived.column && actived.row;
           const beforeEditMethod = editOpts.beforeEditMethod || editOpts.activeMethod;
-          let params;
           if (operCtxMenu) {
             // 如果配置了右键菜单; 支持方向键操作、回车
             evnt.preventDefault();
@@ -13988,7 +13993,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
             if (hasCtrlKey) {
               // 如果是激活编辑状态，则取消编辑
               if (actived.row) {
-                params = actived.args;
+                const params = actived.args;
                 $xeTable.clearEdit(evnt);
                 // 如果配置了选中功能，则为选中状态
                 if (mouseOpts.selected) {
@@ -14018,7 +14023,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
                 if (childrens && childrens.length) {
                   evnt.preventDefault();
                   const targetRow = childrens[0];
-                  params = {
+                  const params = {
                     $table: $xeTable,
                     row: targetRow,
                     rowIndex: tableMethods.getRowIndex(targetRow),
@@ -14051,23 +14056,24 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
               const {
                 delMethod
               } = keyboardOpts;
-              const delPaqrams = {
+              const params = {
                 row: selected.row,
                 rowIndex: tableMethods.getRowIndex(selected.row),
                 column: selected.column,
                 columnIndex: tableMethods.getColumnIndex(selected.column),
-                $table: $xeTable
+                $table: $xeTable,
+                $grid: $xeGrid
               };
               // 是否被禁用
               if (!beforeEditMethod || beforeEditMethod(params)) {
                 if (delMethod) {
-                  delMethod(delPaqrams);
+                  delMethod(params);
                 } else {
                   setCellValue(selected.row, selected.column, null);
                 }
                 // 如果按下 del 键，更新表尾数据
                 tableMethods.updateFooter();
-                $xeTable.dispatchEvent('cell-delete-value', delPaqrams, evnt);
+                $xeTable.dispatchEvent('cell-delete-value', params, evnt);
               }
             }
           } else if (hasBackspaceKey && keyboardConfig && keyboardOpts.isBack && isEnableConf(editConfig) && (selected.row || selected.column)) {
@@ -14077,28 +14083,23 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
               } = keyboardOpts;
               // 如果是删除键
               if (keyboardOpts.isDel && isEnableConf(editConfig) && (selected.row || selected.column)) {
-                const delPaqrams = {
+                const params = {
                   row: selected.row,
                   rowIndex: tableMethods.getRowIndex(selected.row),
                   column: selected.column,
                   columnIndex: tableMethods.getColumnIndex(selected.column),
-                  $table: $xeTable
+                  $table: $xeTable,
+                  $grid: $xeGrid
                 };
                 // 是否被禁用
                 if (!beforeEditMethod || beforeEditMethod(params)) {
                   if (backMethod) {
-                    backMethod({
-                      row: selected.row,
-                      rowIndex: tableMethods.getRowIndex(selected.row),
-                      column: selected.column,
-                      columnIndex: tableMethods.getColumnIndex(selected.column),
-                      $table: $xeTable
-                    });
+                    backMethod(params);
                   } else {
                     setCellValue(selected.row, selected.column, null);
                     $xeTable.handleActived(selected.args, evnt);
                   }
-                  $xeTable.dispatchEvent('cell-backspace-value', delPaqrams, evnt);
+                  $xeTable.dispatchEvent('cell-backspace-value', params, evnt);
                 }
               }
             }
@@ -14111,11 +14112,12 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
             });
             if (parentRow) {
               evnt.preventDefault();
-              params = {
-                $table: $xeTable,
+              const params = {
                 row: parentRow,
                 rowIndex: tableMethods.getRowIndex(parentRow),
-                $rowIndex: tableMethods.getVMRowIndex(parentRow)
+                $rowIndex: tableMethods.getVMRowIndex(parentRow),
+                $table: $xeTable,
+                $grid: $xeGrid
               };
               tableMethods.setTreeExpand(parentRow, false).then(() => tableMethods.scrollToRow(parentRow)).then(() => tablePrivateMethods.triggerCurrentRowEvent(evnt, params));
             }
@@ -14130,20 +14132,21 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
             // 如果是按下非功能键之外允许直接编辑
             if (selected.column && selected.row && isEnableConf(selected.column.editRender)) {
               const beforeEditMethod = editOpts.beforeEditMethod || editOpts.activeMethod;
+              const params = {
+                row: selected.row,
+                rowIndex: tableMethods.getRowIndex(selected.row),
+                column: selected.column,
+                columnIndex: tableMethods.getColumnIndex(selected.column),
+                $table: $xeTable,
+                $grid: $xeGrid
+              };
               if (!beforeEditMethod || beforeEditMethod({
                 ...selected.args,
                 $table: $xeTable,
                 $grid: $xeGrid
               })) {
                 if (editMethod) {
-                  editMethod({
-                    row: selected.row,
-                    rowIndex: tableMethods.getRowIndex(selected.row),
-                    column: selected.column,
-                    columnIndex: tableMethods.getColumnIndex(selected.column),
-                    $table: $xeTable,
-                    $grid: $xeGrid
-                  });
+                  editMethod(params);
                 } else {
                   setCellValue(selected.row, selected.column, null);
                   $xeTable.handleActived(selected.args, evnt);
@@ -14151,14 +14154,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
                 const afterEditMethod = editOpts.afterEditMethod;
                 if (afterEditMethod) {
                   (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)(() => {
-                    afterEditMethod({
-                      row: selected.row,
-                      rowIndex: tableMethods.getRowIndex(selected.row),
-                      column: selected.column,
-                      columnIndex: tableMethods.getColumnIndex(selected.column),
-                      $table: $xeTable,
-                      $grid: $xeGrid
-                    });
+                    afterEditMethod(params);
                   });
                 }
               }
@@ -24330,6 +24326,7 @@ const Grid = VxeGrid;
       text: '加载中...'
     },
     error: {
+      downErr: '下载失败',
       groupFixed: '如果使用分组表头，冻结列必须按组设置',
       groupMouseRange: '分组表头与 "{0}" 不能同时使用，这可能会出现错误',
       groupTag: '分组列头应该使用 "{0}" 而不是 "{1}"，这可能会出现错误',
@@ -24355,6 +24352,7 @@ const Grid = VxeGrid;
       notProp: '不支持的参数 "{0}"',
       checkProp: '当数据量过大时可能会导致复选框卡顿，建议设置参数 "{0}" 提升渲染速度',
       coverProp: '"{0}" 的参数 "{1}" 重复定义，这可能会出现错误',
+      uniField: '字段名 "{0}" 重复定义，这可能会出现错误',
       delFunc: '方法 "{0}" 已废弃，请使用 "{1}"',
       delProp: '参数 "{0}" 已废弃，请使用 "{1}"',
       delEvent: '事件 "{0}" 已废弃，请使用 "{1}"',
@@ -24404,6 +24402,7 @@ const Grid = VxeGrid;
     },
     pager: {
       goto: '前往',
+      gotoTitle: '页数',
       pagesize: '{0}条/页',
       total: '共 {0} 条记录',
       pageClassifier: '页',
@@ -24635,6 +24634,10 @@ const Grid = VxeGrid;
       defFormTitle: '未命名的表单',
       widgetPropTab: '控件属性',
       widgetFormTab: '表单属性',
+      error: {
+        wdFormUni: '该类型的控件在表单中只允许添加一个',
+        wdSubUni: '该类型的控件在子表中只允许添加一个'
+      },
       styleSetting: {
         btn: '样式设置',
         title: '表单的样式设置',
@@ -24660,6 +24663,8 @@ const Grid = VxeGrid;
           base: '基础控件',
           layout: '布局控件',
           system: '系统控件',
+          module: '模块控件',
+          chart: '图表控件',
           advanced: '高级控件'
         },
         copyTitle: '副本_{0}',
@@ -24743,10 +24748,18 @@ const Grid = VxeGrid;
     },
     listDesign: {
       fieldSettingTab: '字段设置',
-      listSettingTab: '列表设置',
+      listSettingTab: '参数设置',
+      searchTitle: '查询条件',
+      listTitle: '列表字段',
+      searchField: '查询字段',
+      listField: '列表字段',
       activeBtn: {
         ActionButtonUpdate: '编辑',
         ActionButtonDelete: '删除'
+      },
+      search: {
+        addBtn: '编辑',
+        emptyText: '未配置查询条件'
       }
     },
     text: {
@@ -24967,14 +24980,12 @@ function install(app, options) {
   components.forEach(component => component.install(app));
 }
 // 保留兼容老版本
+if (!core_.VxeUI.hasLanguage('zh-CN')) {
+  const defaultLanguage = 'zh-CN';
+  core_.VxeUI.setI18n(defaultLanguage, zh_CN);
+  core_.VxeUI.setLanguage(defaultLanguage);
+}
 core_.VxeUI.setTheme('light');
-setTimeout(() => {
-  if (!core_.VxeUI.hasLanguage('zh-CN')) {
-    const defaultLanguage = 'zh-CN';
-    core_.VxeUI.setI18n(defaultLanguage, zh_CN);
-    core_.VxeUI.setLanguage(defaultLanguage);
-  }
-});
 
 // Components