vxe-table 4.7.59 → 4.7.61

package/packages/table/module/export/hook.ts

@@ -1171,9 +1171,12 @@ hooks.add('tableExportModule', {
             if ($xeGrid && !opts.remote) {
               const { reactData: gridReactData } = $xeGrid
               const { computeProxyOpts } = $xeGrid.getComputeMaps()
+              const { sortData } = gridReactData
               const proxyOpts = computeProxyOpts.value
               const { beforeQueryAll, afterQueryAll, ajax = {}, props = {} } = proxyOpts
               const ajaxMethods = ajax.queryAll
+              const queryAllSuccessMethods = ajax.queryAllSuccess
+              const queryAllErrorMethods = ajax.queryAllError
 
               if (process.env.VUE_APP_VXE_ENV === 'development') {
                 if (!ajaxMethods) {
@@ -1185,21 +1188,28 @@ hooks.add('tableExportModule', {
                 const params = {
                   $table: $xeTable,
                   $grid: $xeGrid,
-                  sort: gridReactData.sortData,
+                  sort: sortData.length ? sortData[0] : {} as any,
+                  sorts: sortData as any[],
                   filters: gridReactData.filterData,
                   form: gridReactData.formData,
-                  target: ajaxMethods,
                   options: opts
                 }
                 return Promise.resolve((beforeQueryAll || ajaxMethods)(params))
-                  .catch(e => e)
                   .then(rest => {
                     opts.data = (props.list ? XEUtils.get(rest, props.list) : rest) || []
                     if (afterQueryAll) {
                       afterQueryAll(params)
                     }
+                    if (queryAllSuccessMethods) {
+                      queryAllSuccessMethods({ ...params, response: rest })
+                    }
                     return handleExport(opts)
                   })
+                  .catch((rest) => {
+                    if (queryAllErrorMethods) {
+                      queryAllErrorMethods({ ...params, response: rest })
+                    }
+                  })
               }
             }
           } else if (mode === 'current') {

package/packages/table/render/index.ts

@@ -505,7 +505,7 @@ function getSelectCellValue (renderOpts: any, { row, column }: any) {
   let selectItem: any
   const labelProp = optionProps.label || 'label'
   const valueProp = optionProps.value || 'value'
-  if (!isEmptyValue(cellValue)) {
+  if (!(cellValue === null || cellValue === undefined)) {
     return XEUtils.map(XEUtils.isArray(cellValue) ? cellValue : [cellValue],
       optionGroups
         ? (value) => {
@@ -540,7 +540,7 @@ function getTreeSelectCellValue (renderOpts: any, { row, column }: any) {
   const labelProp = optionProps.label || 'label'
   const valueProp = optionProps.value || 'value'
   const childrenProp = optionProps.children || 'children'
-  if (!isEmptyValue(cellValue)) {
+  if (!(cellValue === null || cellValue === undefined)) {
     const keyMaps: Record<string, any> = {}
     XEUtils.eachTree(options, item => {
       keyMaps[XEUtils.get(item, valueProp)] = item
@@ -596,7 +596,7 @@ renderer.mixin({
     exportMethod: handleExportSelectMethod
   },
   VxeInput: {
-    autofocus: '.vxe-input--inner',
+    autofocus: 'input',
     renderEdit: defaultEditRender,
     renderCell (renderOpts, params) {
       const { props = {} } = renderOpts
@@ -624,7 +624,7 @@ renderer.mixin({
     defaultFilterMethod: handleInputFilterMethod
   },
   VxeNumberInput: {
-    autofocus: '.vxe-number-input--inner',
+    autofocus: 'input',
     renderEdit: defaultEditRender,
     renderCell (renderOpts, params) {
       const { props = {} } = renderOpts
@@ -645,7 +645,7 @@ renderer.mixin({
     defaultFilterMethod: handleInputFilterMethod
   },
   VxeDatePicker: {
-    autofocus: '.vxe-date-picker--inner',
+    autofocus: 'input',
     renderEdit: defaultEditRender,
     renderCell (renderOpts, params) {
       const { props = {} } = renderOpts
@@ -669,7 +669,7 @@ renderer.mixin({
     defaultFilterMethod: handleFilterMethod
   },
   VxeTextarea: {
-    autofocus: '.vxe-textarea--inner'
+    autofocus: 'VxeTextarea'
   },
   VxeButton: {
     renderDefault: buttonCellRender
@@ -687,7 +687,7 @@ renderer.mixin({
     }
   },
   VxeSelect: {
-    autofocus: '.vxe-input--inner',
+    autofocus: 'input',
     renderEdit: defaultSelectEditRender,
     renderDefault: defaultSelectEditRender,
     renderCell (renderOpts, params) {
@@ -709,7 +709,7 @@ renderer.mixin({
     exportMethod: handleExportSelectMethod
   },
   VxeTreeSelect: {
-    autofocus: '.vxe-input--inner',
+    autofocus: 'input',
     renderEdit: defaultTreeSelectEditRender,
     renderCell (renderOpts, params) {
       return getCellLabelVNs(renderOpts, params, getTreeSelectCellValue(renderOpts, params))
@@ -723,7 +723,7 @@ renderer.mixin({
     renderDefault: radioAndCheckboxEditRender
   },
   VxeSwitch: {
-    autofocus: '.vxe-switch--button',
+    autofocus: 'button',
     renderEdit: defaultEditRender,
     renderDefault: defaultEditRender
   },

package/packages/table/src/footer.ts

@@ -172,7 +172,7 @@ export default defineComponent({
               const showAllTip = tooltipOpts.showAll
               const isColGroup = column.children && column.children.length
               const fixedHiddenColumn = fixedType ? column.fixed !== fixedType && !isColGroup : column.fixed && overflowX
-              const footOverflow = XEUtils.isUndefined(showFooterOverflow) || XEUtils.isNull(showFooterOverflow) ? allColumnFooterOverflow : showFooterOverflow
+              const footOverflow = XEUtils.eqNull(showFooterOverflow) ? allColumnFooterOverflow : showFooterOverflow
               const footAlign = footerAlign || align || allFooterAlign || allAlign
               let showEllipsis = footOverflow === 'ellipsis'
               const showTitle = footOverflow === 'title'

package/packages/table/src/header.ts

@@ -228,7 +228,7 @@ export default defineComponent({
               const { type, showHeaderOverflow, headerAlign, align, headerClassName } = column
               const isColGroup = column.children && column.children.length
               const fixedHiddenColumn = fixedType ? (column.fixed !== fixedType && !isColGroup) : !!column.fixed && overflowX
-              const headOverflow = XEUtils.isUndefined(showHeaderOverflow) || XEUtils.isNull(showHeaderOverflow) ? allColumnHeaderOverflow : showHeaderOverflow
+              const headOverflow = XEUtils.eqNull(showHeaderOverflow) ? allColumnHeaderOverflow : showHeaderOverflow
               const headAlign = headerAlign || align || allHeaderAlign || allAlign
               let showEllipsis = headOverflow === 'ellipsis'
               const showTitle = headOverflow === 'title'

package/packages/toolbar/src/toolbar.ts

@@ -315,6 +315,7 @@ export default defineComponent({
                     round: item.round,
                     status: item.status,
                     content: item.name,
+                    permissionCode: item.permissionCode,
                     destroyOnClose: item.destroyOnClose,
                     placement: item.placement,
                     transfer: item.transfer,

package/styles/theme/base.scss

@@ -8,11 +8,6 @@
   --vxe-ui-font-size-small: 13px;
   --vxe-ui-font-size-mini: 12px;
 
-  /*font color*/
-  --vxe-ui-font-primary-color: #409eff;
-  --vxe-ui-font-lighten-color: lighten(#606266, 10%);
-  --vxe-ui-font-disabled-color: #BFBFBF;
-
   /*base border*/
   --vxe-ui-border-radius: 4px;
 
@@ -79,8 +74,8 @@
   --vxe-ui-table-checkbox-range-border-color: #006af1;
   --vxe-ui-table-checkbox-range-background-color: rgba(50,128,252,0.2);
 
-  --vxe-ui-table-fixed-left-scrolling-box-shadow: 8px 0px 10px -5px rgba(0, 0, 0, 0.12);
-  --vxe-ui-table-fixed-right-scrolling-box-shadow: -8px 0px 10px -5px rgba(0, 0, 0, 0.12);
+  --vxe-ui-table-fixed-left-scrolling-box-shadow: 8px 0px 10px -5px var(--vxe-ui-table-fixed-scrolling-box-shadow-color);
+  --vxe-ui-table-fixed-right-scrolling-box-shadow: -8px 0px 10px -5px var(--vxe-ui-table-fixed-scrolling-box-shadow-color);
 
   --vxe-ui-table-menu-item-width: 178px;
   --vxe-ui-table-menu-background-color: #fff;

package/styles/theme/dark.scss

@@ -3,10 +3,12 @@
 [data-vxe-ui-theme="dark"] {
   color-scheme: dark;
 
-  /*font*/
+  /*font color*/
   --vxe-ui-font-color: #a0a3a7;
+  --vxe-ui-font-primary-color: #409eff;
   --vxe-ui-font-lighten-color: #babdc0;
   --vxe-ui-font-darken-color: #86898e;
+  --vxe-ui-font-disabled-color: #BFBFBF;
 
   /*base*/
   --vxe-ui-base-popup-border-color: var(--vxe-ui-layout-background-color);
@@ -35,4 +37,5 @@
   --vxe-ui-table-row-hover-checkbox-checked-background-color: #6e5326;
   --vxe-ui-table-row-current-background-color: #18222c;
   --vxe-ui-table-row-hover-current-background-color: #262727;
+  --vxe-ui-table-fixed-scrolling-box-shadow-color: rgba(0, 0, 0, 0.8);
 }

package/styles/theme/light.scss

@@ -1,10 +1,12 @@
 @import './base.scss';
 
 [data-vxe-ui-theme="light"] {
-  /*font*/
+  /*font color*/
   --vxe-ui-font-color: #606266;
+  --vxe-ui-font-primary-color: #409eff;
   --vxe-ui-font-lighten-color: #797b80;
   --vxe-ui-font-darken-color: #47494c;
+  --vxe-ui-font-disabled-color: #BFBFBF;
 
   /*base*/
   --vxe-ui-base-popup-border-color: #DADCE0;
@@ -33,4 +35,5 @@
   --vxe-ui-table-row-hover-checkbox-checked-background-color: #ffebbc;
   --vxe-ui-table-row-current-background-color: #e6f7ff;
   --vxe-ui-table-row-hover-current-background-color: #d7effb;
+  --vxe-ui-table-fixed-scrolling-box-shadow-color: rgba(0, 0, 0, 0.12);
 }