vxe-table 4.7.79 → 4.7.81

package/packages/table/render/index.ts

@@ -25,7 +25,7 @@ function getFormatDate (value: any, props: any, defaultFormat: string) {
 }
 
 function getLabelFormatDate (value: any, props: any) {
-  return getFormatDate(value, props, getI18n(`vxe.input.date.labelFormat.${props.type}`))
+  return getFormatDate(value, props, getI18n(`vxe.input.date.labelFormat.${props.type || 'date'}`))
 }
 
 /**
@@ -629,15 +629,7 @@ renderer.mixin({
       const { row, column } = params
       let cellValue = XEUtils.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)
     },

package/packages/table/src/table.ts

@@ -410,7 +410,7 @@ export default defineComponent({
       return Object.assign({}, getConfig().table.rowConfig, props.rowConfig) as VxeTablePropTypes.RowOpts
     })
 
-    const computeResizeleOpts = computed(() => {
+    const computeResizeOpts = computed(() => {
       return Object.assign({}, getConfig().table.resizeConfig, props.resizeConfig) as VxeTablePropTypes.ResizeOpts
     })
 
@@ -647,7 +647,7 @@ export default defineComponent({
       computeSYOpts,
       computeColumnOpts,
       computeRowOpts,
-      computeResizeleOpts,
+      computeResizeOpts,
       computeResizableOpts,
       computeSeqOpts,
       computeRadioOpts,
@@ -1132,10 +1132,20 @@ export default defineComponent({
               paddingSize = Math.floor(XEUtils.toNumber(cellStyle.paddingLeft) + XEUtils.toNumber(cellStyle.paddingRight)) + 2
             }
             let colWidth = column.renderAutoWidth - paddingSize
-            XEUtils.arrayEach(cellElList, (cellEl) => {
-              const labelEl = cellEl.firstChild as HTMLElement
-              if (labelEl) {
-                colWidth = Math.max(colWidth, Math.ceil(labelEl.offsetWidth) + 4)
+            XEUtils.arrayEach(cellElList, (itemEl) => {
+              const cellEl = itemEl as HTMLElement
+              const thElem = cellEl.parentNode as HTMLElement
+              let titleWidth = 0
+              if (`${thElem.tagName}`.toLowerCase() === 'th') {
+                XEUtils.arrayEach(cellEl.children, (btnEl) => {
+                  titleWidth += (btnEl as HTMLElement).offsetWidth + 1
+                })
+              } else {
+                const labelEl = cellEl.firstChild as HTMLElement
+                titleWidth = labelEl.offsetWidth
+              }
+              if (titleWidth) {
+                colWidth = Math.max(colWidth, Math.ceil(titleWidth) + 4)
               }
             })
             column.renderAutoWidth = colWidth + paddingSize
@@ -6936,7 +6946,7 @@ export default defineComponent({
         })
 
         if (props.autoResize) {
-          const resizeOpts = computeResizeleOpts.value
+          const resizeOpts = computeResizeOpts.value
           const { refreshDelay } = resizeOpts
           const el = refElem.value
           const parentEl = tablePrivateMethods.getParentElem()

package/packages/toolbar/src/toolbar.ts

@@ -310,6 +310,8 @@ export default defineComponent({
               round: child.round,
               status: child.status,
               content: child.name,
+              routerLink: item.routerLink,
+              permissionCode: item.permissionCode,
               onClick: ({ $event }) => isBtn ? btnEvent($event, child) : tolEvent($event, child)
             })
             : createCommentVNode()
@@ -352,6 +354,7 @@ export default defineComponent({
                     round: item.round,
                     status: item.status,
                     content: item.name,
+                    routerLink: item.routerLink,
                     permissionCode: item.permissionCode,
                     destroyOnClose: item.destroyOnClose,
                     placement: item.placement,
@@ -408,6 +411,8 @@ export default defineComponent({
                     round: item.round,
                     status: item.status,
                     content: item.name,
+                    routerLink: item.routerLink,
+                    permissionCode: item.permissionCode,
                     destroyOnClose: item.destroyOnClose,
                     placement: item.placement,
                     transfer: item.transfer,

package/styles/components/table.scss

@@ -456,12 +456,12 @@
   //   vertical-align: middle;
   // }
   .vxe-cell--required-icon {
-    margin-right: 0.1em;
+    padding-right: 0.1em;
   }
   .vxe-cell--edit-icon,
   .vxe-cell-title-prefix-icon,
   .vxe-cell-title-suffix-icon {
-    margin-right: 0.2em;
+    padding: 0.2em;
   }
   .vxe-cell-title-prefix-icon,
   .vxe-cell-title-suffix-icon {