vxe-table 4.7.79 → 4.7.81

package/lib/index.umd.js

@@ -1998,9 +1998,9 @@ function eqEmptyValue(cellValue) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "4.7.79";
+const version = "4.7.81";
 core_.VxeUI.version = version;
-core_.VxeUI.tableVersion = "4.7.79";
+core_.VxeUI.tableVersion = "4.7.81";
 core_.VxeUI.setConfig({
   emptyCell: '　',
   table: {
@@ -2382,7 +2382,7 @@ var es_array_push = __webpack_require__(4114);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.7.79"}`;
+const log_version = `table v${"4.7.81"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -8806,7 +8806,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
     const computeRowOpts = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
       return Object.assign({}, table_getConfig().table.rowConfig, props.rowConfig);
     });
-    const computeResizeleOpts = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
+    const computeResizeOpts = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
       return Object.assign({}, table_getConfig().table.resizeConfig, props.resizeConfig);
     });
     const computeResizableOpts = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
@@ -9034,7 +9034,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       computeSYOpts,
       computeColumnOpts,
       computeRowOpts,
-      computeResizeleOpts,
+      computeResizeOpts,
       computeResizableOpts,
       computeSeqOpts,
       computeRadioOpts,
@@ -9575,10 +9575,20 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
               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;
-            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, Math.ceil(labelEl.offsetWidth) + 4);
+            external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().arrayEach(cellElList, itemEl => {
+              const cellEl = itemEl;
+              const thElem = cellEl.parentNode;
+              let titleWidth = 0;
+              if (`${thElem.tagName}`.toLowerCase() === 'th') {
+                external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().arrayEach(cellEl.children, btnEl => {
+                  titleWidth += btnEl.offsetWidth + 1;
+                });
+              } else {
+                const labelEl = cellEl.firstChild;
+                titleWidth = labelEl.offsetWidth;
+              }
+              if (titleWidth) {
+                colWidth = Math.max(colWidth, Math.ceil(titleWidth) + 4);
               }
             });
             column.renderAutoWidth = colWidth + paddingSize;
@@ -16420,7 +16430,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           updateStyle();
         });
         if (props.autoResize) {
-          const resizeOpts = computeResizeleOpts.value;
+          const resizeOpts = computeResizeOpts.value;
           const {
             refreshDelay
           } = resizeOpts;
@@ -21568,7 +21578,7 @@ function getFormatDate(value, props, defaultFormat) {
   return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toDateString(parseDate(value, props), dateConfig.labelFormat || defaultFormat);
 }
 function getLabelFormatDate(value, props) {
-  return getFormatDate(value, props, render_getI18n(`vxe.input.date.labelFormat.${props.type}`));
+  return getFormatDate(value, props, render_getI18n(`vxe.input.date.labelFormat.${props.type || 'date'}`));
 }
 /**
  * 已废弃
@@ -22263,15 +22273,7 @@ render_renderer.mixin({
       } = params;
       let cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, column.field);
       if (cellValue) {
-        switch (props.type) {
-          case 'date':
-          case 'week':
-          case 'month':
-          case 'quarter':
-          case 'year':
-            cellValue = getLabelFormatDate(cellValue, props);
-            break;
-        }
+        cellValue = getLabelFormatDate(cellValue, props);
       }
       return getCellLabelVNs(renderOpts, params, cellValue);
     },
@@ -22864,6 +22866,8 @@ const {
             round: child.round,
             status: child.status,
             content: child.name,
+            routerLink: item.routerLink,
+            permissionCode: item.permissionCode,
             onClick: ({
               $event
             }) => isBtn ? btnEvent($event, child) : tolEvent($event, child)
@@ -22914,6 +22918,7 @@ const {
                   round: item.round,
                   status: item.status,
                   content: item.name,
+                  routerLink: item.routerLink,
                   permissionCode: item.permissionCode,
                   destroyOnClose: item.destroyOnClose,
                   placement: item.placement,
@@ -22976,6 +22981,8 @@ const {
                   round: item.round,
                   status: item.status,
                   content: item.name,
+                  routerLink: item.routerLink,
+                  permissionCode: item.permissionCode,
                   destroyOnClose: item.destroyOnClose,
                   placement: item.placement,
                   transfer: item.transfer,
@@ -24065,11 +24072,14 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
                   }
                 }
                 if (isInited) {
-                  const {
-                    computeSortOpts
-                  } = $xeTable.getComputeMaps();
-                  const sortOpts = computeSortOpts.value;
-                  let defaultSort = sortOpts.defaultSort;
+                  let defaultSort = null;
+                  if ($xeTable) {
+                    const {
+                      computeSortOpts
+                    } = $xeTable.getComputeMaps();
+                    const sortOpts = computeSortOpts.value;
+                    defaultSort = sortOpts.defaultSort;
+                  }
                   // 如果使用默认排序
                   if (defaultSort) {
                     if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(defaultSort)) {
@@ -24083,14 +24093,18 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
                       };
                     });
                   }
-                  filterList = $xeTable.getCheckedFilters();
-                } else {
-                  if (isReload) {
-                    $xeTable.clearAll();
-                  } else {
-                    sortList = $xeTable.getSortColumns();
+                  if ($xeTable) {
                     filterList = $xeTable.getCheckedFilters();
                   }
+                } else {
+                  if ($xeTable) {
+                    if (isReload) {
+                      $xeTable.clearAll();
+                    } else {
+                      sortList = $xeTable.getSortColumns();
+                      filterList = $xeTable.getCheckedFilters();
+                    }
+                  }
                 }
                 const commitParams = {
                   code,
@@ -25139,9 +25153,6 @@ const Grid = VxeGrid;
         ss: '秒'
       }
     },
-    /**
-     * 扩展插件
-     */
     plugins: {
       extendCellArea: {
         area: {
@@ -25246,10 +25257,6 @@ const Grid = VxeGrid;
         notData: '无匹配项'
       }
     },
-    /**
-     * 以下废弃
-     * @deprecated
-     */
     pro: {
       area: {
         mergeErr: '无法对合并单元格进行该操作',