vxe-table 4.7.63 → 4.7.65

package/lib/index.umd.js

@@ -1951,9 +1951,9 @@ function eqEmptyValue(cellValue) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "4.7.63";
+const version = "4.7.65";
 core_.VxeUI.version = version;
-core_.VxeUI.tableVersion = "4.7.63";
+core_.VxeUI.tableVersion = "4.7.65";
 core_.VxeUI.setConfig({
   emptyCell: '　',
   table: {
@@ -2217,6 +2217,7 @@ const use = core_.VxeUI.use;
 const setup = options => {
   return core_.VxeUI.setConfig(options);
 };
+core_.VxeUI.setup = setup;
 /**
  * 已废弃
  * @deprecated
@@ -2224,6 +2225,7 @@ const setup = options => {
 const config = options => {
   return core_.VxeUI.setConfig(options);
 };
+core_.VxeUI.config = config;
 /**
  * 已废弃
  * @deprecated
@@ -2231,6 +2233,7 @@ const config = options => {
 const t = (key, args) => {
   return core_.VxeUI.getI18n(key, args);
 };
+core_.VxeUI.t = t;
 /**
  * 已废弃
  * @deprecated
@@ -2238,13 +2241,12 @@ const t = (key, args) => {
 const _t = (content, args) => {
   return getFuncText(content, args);
 };
+core_.VxeUI._t = _t;
 /**
  * 已废弃，兼容老版本
  * @deprecated
  */
 const VXETable = core_.VxeUI;
-VXETable.setup = config;
-VXETable.config = config;
 /**
  * 已废弃，兼容老版本
  * @deprecated
@@ -2332,7 +2334,7 @@ var es_array_push = __webpack_require__(4114);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.7.63"}`;
+const log_version = `table v${"4.7.65"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -8345,6 +8347,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         resizeList: [],
         pxList: [],
         pxMinList: [],
+        autoMinList: [],
         scaleList: [],
         scaleMinList: [],
         autoList: [],
@@ -8712,7 +8715,10 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       const {
         visibleColumn
       } = internalData;
-      return visibleColumn.filter(column => column.width === 'auto');
+      const {
+        tableColumn
+      } = reactData;
+      return tableColumn.length || visibleColumn.length ? visibleColumn.filter(column => column.width === 'auto' || column.minWidth === 'auto') : [];
     });
     const computeFixedColumnSize = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
       const {
@@ -9350,11 +9356,11 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
               const cellStyle = getComputedStyle(firstCellEl);
               paddingSize = Math.floor(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(cellStyle.paddingLeft) + external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(cellStyle.paddingRight)) + 2;
             }
-            let colWidth = column.renderAutoWidth - paddingSize + 2;
+            let colWidth = column.renderAutoWidth - paddingSize;
             external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().arrayEach(cellElList, cellEl => {
               const labelEl = cellEl.firstChild;
               if (labelEl) {
-                colWidth = Math.max(colWidth, labelEl.offsetWidth);
+                colWidth = Math.max(colWidth, Math.ceil(labelEl.offsetWidth) + 4);
               }
             });
             column.renderAutoWidth = colWidth + paddingSize;
@@ -9394,6 +9400,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       const {
         resizeList,
         pxMinList,
+        autoMinList,
         pxList,
         scaleList,
         scaleMinList,
@@ -9406,6 +9413,12 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         tableWidth += minWidth;
         column.renderWidth = minWidth;
       });
+      // 最小自适应
+      autoMinList.forEach(column => {
+        const scaleWidth = Math.max(60, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toInteger(column.renderAutoWidth));
+        tableWidth += scaleWidth;
+        column.renderWidth = scaleWidth;
+      });
       // 最小百分比
       scaleMinList.forEach(column => {
         const scaleWidth = Math.floor(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toInteger(column.minWidth) * meanWidth);
@@ -9437,10 +9450,10 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         column.renderWidth = width;
       });
       remainWidth -= tableWidth;
-      meanWidth = remainWidth > 0 ? Math.floor(remainWidth / (scaleMinList.length + pxMinList.length + remainList.length)) : 0;
+      meanWidth = remainWidth > 0 ? Math.floor(remainWidth / (scaleMinList.length + pxMinList.length + autoMinList.length + remainList.length)) : 0;
       if (fit) {
         if (remainWidth > 0) {
-          scaleMinList.concat(pxMinList).forEach(column => {
+          scaleMinList.concat(pxMinList).concat(autoMinList).forEach(column => {
             tableWidth += meanWidth;
             column.renderWidth += meanWidth;
           });
@@ -9459,7 +9472,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
          * 偏移量算法
          * 如果所有列足够放的情况下，从最后动态列开始分配
          */
-        const dynamicList = scaleList.concat(scaleMinList).concat(pxMinList).concat(remainList);
+        const dynamicList = scaleList.concat(scaleMinList).concat(pxMinList).concat(autoMinList).concat(remainList);
         let dynamicSize = dynamicList.length - 1;
         if (dynamicSize > 0) {
           let odiffer = bodyWidth - tableWidth;
@@ -14510,6 +14523,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         const resizeList = [];
         const pxList = [];
         const pxMinList = [];
+        const autoMinList = [];
         const scaleList = [];
         const scaleMinList = [];
         const autoList = [];
@@ -14532,6 +14546,8 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
               scaleList.push(column);
             } else if (isPx(column.minWidth)) {
               pxMinList.push(column);
+            } else if (column.minWidth === 'auto') {
+              autoMinList.push(column);
             } else if (isScale(column.minWidth)) {
               scaleMinList.push(column);
             } else {
@@ -14543,6 +14559,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           resizeList,
           pxList,
           pxMinList,
+          autoMinList,
           scaleList,
           scaleMinList,
           autoList,
@@ -24233,10 +24250,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
-/**
- * 已废弃
- * @deprecated
- */
 /* harmony default export */ var zh_CN = ({
   vxe: {
     base: {
@@ -24258,7 +24271,7 @@ const Grid = VxeGrid;
       useErr: '安装 "{0}" 模块时发生错误，可能顺序不正确，依赖的模块需要在 Table 之前安装',
       barUnableLink: '工具栏无法关联表格',
       expandContent: '展开行的插槽应该是 "content"，请检查是否正确',
-      reqComp: '缺少 "{0}" 组件，请检查是否正确安装',
+      reqComp: '缺少 "{0}" 组件，请检查是否正确安装。 https://vxeui.com/#/start/useGlobal',
       reqModule: '缺少 "{0}" 模块',
       reqProp: '缺少必要的 "{0}" 参数，这可能会导致出现错误',
       emptyProp: '参数 "{0}" 不允许为空',
@@ -24288,6 +24301,7 @@ const Grid = VxeGrid;
       emptyText: '暂无数据',
       allTitle: '全选/取消',
       seqTitle: '序号',
+      actionTitle: '操作',
       confirmFilter: '筛选',
       resetFilter: '重置',
       allFilter: '全部',
@@ -24583,7 +24597,8 @@ const Grid = VxeGrid;
           textarea: '文本域',
           select: '下拉选择',
           row: '一行多列',
-          title: '文本',
+          title: '标题',
+          text: '文本',
           subtable: '子表',
           VxeSwitch: '是/否',
           VxeInput: '输入框',
@@ -24657,7 +24672,15 @@ const Grid = VxeGrid;
     },
     listDesign: {
       fieldSettingTab: '字段设置',
-      listSettingTab: '列表设置'
+      listSettingTab: '列表设置',
+      activeBtn: {
+        ActionButtonUpdate: '编辑',
+        ActionButtonDelete: '删除'
+      }
+    },
+    text: {
+      copySuccess: '已复制到剪贴板',
+      copyError: '当前环境不支持该操作'
     },
     /**
      * 扩展插件