vxe-table 3.20.14 → 3.20.15

package/es/table/src/cell.js

@@ -370,7 +370,7 @@ export const Cell = {
         const tableInternalData = $table;
         const { isRowGroupStatus } = tableReactData;
         const { editConfig } = tableProps;
-        const { field, slots, editRender, cellRender, rowGroupNode, aggFunc, formatter } = column;
+        const { field, slots, editRender, cellRender, rowGroupNode, aggFunc } = column;
         const isEnableEdit = editConfig && isEnableConf(editConfig);
         const editRenderOpts = isEnableEdit && isEnableConf(editRender) ? editRender : null;
         const cellRenderOpts = isEnableConf(cellRender) ? cellRender : null;
@@ -445,8 +445,9 @@ export const Cell = {
                 return renderCellBaseVNs(h, params, $table.callSlot(defaultSlot, params, h));
             }
             const renderOpts = editRenderOpts || cellRenderOpts;
-            // formatter > (renderTableCell | renderTableDefault)
-            if (renderOpts && !formatter) {
+            // 如果是编辑表格：renderTableCell > formatter
+            // 如果是查看表格：renderTableDefault > formatter
+            if (renderOpts) {
                 const compConf = renderer.get(renderOpts.name);
                 if (compConf) {
                     const renderFn = editRenderOpts ? (compConf.renderTableCell || compConf.renderCell) : (compConf.renderTableDefault || compConf.renderDefault);

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "3.20.14";
+export const version = "3.20.15";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({

package/es/ui/src/log.js

@@ -1,5 +1,5 @@
 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const version = `table v${"3.20.14"}`;
+const version = `table v${"3.20.15"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/index.umd.js

@@ -3311,7 +3311,7 @@ function getClass(property, params) {
 /* unused harmony import specifier */ var VxeUI;
 
 
-const version = "3.20.14";
+const version = "3.20.15";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -4067,7 +4067,7 @@ var es_iterator_reduce = __webpack_require__(8237);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.20.14"}`;
+const log_version = `table v${"3.20.15"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// ./packages/table/src/columnInfo.ts
@@ -5821,8 +5821,7 @@ const Cell = {
       editRender,
       cellRender,
       rowGroupNode,
-      aggFunc,
-      formatter
+      aggFunc
     } = column;
     const isEnableEdit = editConfig && isEnableConf(editConfig);
     const editRenderOpts = isEnableEdit && isEnableConf(editRender) ? editRender : null;
@@ -5920,8 +5919,9 @@ const Cell = {
         return renderCellBaseVNs(h, params, $table.callSlot(defaultSlot, params, h));
       }
       const renderOpts = editRenderOpts || cellRenderOpts;
-      // formatter > (renderTableCell | renderTableDefault)
-      if (renderOpts && !formatter) {
+      // 如果是编辑表格：renderTableCell > formatter
+      // 如果是查看表格：renderTableDefault > formatter
+      if (renderOpts) {
         const compConf = cell_renderer.get(renderOpts.name);
         if (compConf) {
           const renderFn = editRenderOpts ? compConf.renderTableCell || compConf.renderCell : compConf.renderTableDefault || compConf.renderDefault;
@@ -26617,7 +26617,7 @@ const Toolbar = VxeToolbar;
       useErr: '安装 "{0}" 模块时发生错误，可能顺序不正确，依赖的模块需要在 Table 之前安装',
       barUnableLink: '工具栏无法关联表格',
       expandContent: '展开行的插槽应该是 "content"，请检查是否正确',
-      reqComp: '缺少 "{0}" 组件，请检查是否正确安装。 https://vxeui.com/#/start/useGlobal',
+      reqComp: '缺少 "{0}" 组件，请检查是否正确安装。 https://vxeui.com/#/start/useUI/useGlobal',
       reqModule: '缺少 "{0}" 模块',
       reqProp: '缺少必要的 "{0}" 参数，这可能会导致出现错误',
       emptyProp: '参数 "{0}" 不允许为空',
@@ -26648,7 +26648,7 @@ const Toolbar = VxeToolbar;
       treeNotImp: '树表格不支持导入',
       treeCrossDrag: '只能拖拽第一层级',
       treeDragChild: '父级不能拖拽到自己的子级中',
-      reqPlugin: '扩展插件未安装 "{1}" https://vxeui.com/other{0}/#/{1}/install',
+      reqPlugin: '扩展插件未安装 "{1}" https://vxeui.com/other{0}/#/{1}/start/npmInstall',
       errMaxRow: '超过支持的最大数据量 {0} 行，这可能会导致出现错误',
       useNew: '不建议使用 {0}，请使用 {1}',
       errorVersion: '版本不匹配，当前版本 {0}，最低支持版本为 {1}'
@@ -26696,7 +26696,8 @@ const Toolbar = VxeToolbar;
     select: {
       clear: '清除',
       allChecked: '全选',
-      total: '{0} / {1}',
+      total: '已选 {0} 项',
+      close: '关闭',
       search: '搜索',
       loadingText: '加载中...',
       emptyText: '暂无数据',
@@ -26713,7 +26714,8 @@ const Toolbar = VxeToolbar;
       allChecked: '全选',
       allExpand: '全部展开',
       clearExpand: '全部收起',
-      total: '已选 {0}',
+      total: '已选 {0} 项',
+      close: '关闭',
       search: '搜索',
       emptyText: '暂无数据'
     },
@@ -26756,7 +26758,7 @@ const Toolbar = VxeToolbar;
       cstmDragTarget: '移动：{0}',
       setting: {
         colSort: '排序',
-        sortHelpTip: '点击并拖动图标可以调整顺序',
+        sortHelpTip: '点击图标开始拖动',
         colTitle: '列标题',
         colResizable: '列宽（像素）',
         colVisible: '是否显示',
@@ -26764,7 +26766,15 @@ const Toolbar = VxeToolbar;
         colFixedMax: '冻结列（最多 {0} 列）',
         fixedLeft: '左侧',
         fixedUnset: '不设置',
-        fixedRight: '右侧'
+        fixedRight: '右侧',
+        moveUp: '上移',
+        moveDn: '下移',
+        putTop: '置顶',
+        putBottom: '置尾',
+        moveUpTitle: '点击向上移动',
+        moveDnTitle: '点击向下移动',
+        putTopTitle: '点击置顶',
+        putBottomTitle: '点击置尾'
       }
     },
     import: {
@@ -26822,6 +26832,10 @@ const Toolbar = VxeToolbar;
       expMergeTitle: '如果存在，则支持带有合并结构的单元格',
       expOptAllExpand: '展开树',
       expAllExpandTitle: '如果存在，则支持将带有层级结构的数据全部展开',
+      expOptTreeAllExpand: '展开树',
+      expTreeAllExpandTitle: '如果存在，则自动展开所有树层级',
+      expOptRowGroupAllExpand: '展开分组',
+      expRowGroupAllExpandTitle: '如果存在，则自动展开所有分组层级',
       expOptUseStyle: '样式',
       expUseStyleTitle: '如果存在，则支持带样式的单元格',
       expOptOriginal: '源数据',
@@ -27140,6 +27154,10 @@ const Toolbar = VxeToolbar;
     contextMenu: {
       loadingText: '加载中...'
     },
+    switch: {
+      onText: '打开',
+      offText: '关闭'
+    },
     gantt: {
       tFullFormat: {
         year: '{yyyy}年',
@@ -27230,7 +27248,7 @@ const Toolbar = VxeToolbar;
           groupPlaceholder: '拖至此处进行分组',
           valuesPlaceholder: '拖至此处进行聚合',
           dragExistCol: '该列已存在',
-          sortHelpTip: '点击并拖动图标可以调整顺序'
+          sortHelpTip: '点击图标开始拖动'
         },
         aggFuncs: {
           sum: '求和',