vxe-table 4.20.9 → 4.20.11

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

@@ -1654,17 +1654,19 @@ hooks.add('tableExportModule', {
               const { computeProxyOpts } = $xeGGWrapper.getComputeMaps()
               const proxyOpts = computeProxyOpts.value
               const { sortData } = gridReactData
-              const { beforeQueryAll, afterQueryAll, ajax = {} } = proxyOpts
+              const { beforeQueryAll: oldBeforeQueryAll, afterQueryAll: oldAfterQueryAll, ajax = {} } = proxyOpts
               const resConfigs = proxyOpts.response || proxyOpts.props || {}
-              const ajaxMethods = ajax.queryAll
-              const queryAllSuccessMethods = ajax.queryAllSuccess
-              const queryAllErrorMethods = ajax.queryAllError
+              const beforeQueryAllMethod = ajax.beforeQueryAll
+              const queryAllMethod = ajax.queryAll
+              const afterQueryAllMethod = ajax.afterQueryAll
+              const queryAllSuccessMethod = ajax.queryAllSuccess
+              const queryAllErrorMethod = ajax.queryAllError
 
-              if (!ajaxMethods) {
+              if (!queryAllMethod) {
                 errLog('vxe.error.notFunc', ['proxy-config.ajax.queryAll'])
               }
 
-              if (ajaxMethods) {
+              if (queryAllMethod) {
                 const params = {
                   $table: $xeTable,
                   $grid: $xeGrid,
@@ -1675,35 +1677,54 @@ hooks.add('tableExportModule', {
                   form: gridReactData.formData,
                   options: handleOptions
                 }
-                return Promise.resolve((beforeQueryAll || ajaxMethods)(params))
-                  .then(rest => {
-                    const listProp = resConfigs.list
-                    let tdData: any[] = []
-                    if (listProp) {
-                      if (XEUtils.isFunction(listProp)) {
-                        tdData = listProp({ data: rest, $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt })
+
+                const handleQueryAll = () => {
+                  return Promise.resolve((oldBeforeQueryAll || queryAllMethod)(params))
+                    .then((rest) => {
+                      if (afterQueryAllMethod) {
+                        afterQueryAllMethod({ ...params, response: rest, status: 'success' })
                       } else {
-                        tdData = XEUtils.isArray(rest) ? rest : XEUtils.get(rest, listProp)
+                        const listProp = resConfigs.list
+                        let tdData: any[] = []
+                        if (listProp) {
+                          if (XEUtils.isFunction(listProp)) {
+                            tdData = listProp({ data: rest, $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt })
+                          } else {
+                            tdData = XEUtils.isArray(rest) ? rest : XEUtils.get(rest, listProp)
+                          }
+                        } else {
+                          if (XEUtils.isArray(rest)) {
+                            tdData = rest
+                          }
+                        }
+                        handleOptions.data = tdData
+                        if (oldAfterQueryAll) {
+                          oldAfterQueryAll({ ...params, response: rest })
+                        }
                       }
-                    } else {
-                      if (XEUtils.isArray(rest)) {
-                        tdData = rest
+                      if (queryAllSuccessMethod) {
+                        queryAllSuccessMethod({ ...params, response: rest })
                       }
-                    }
-                    handleOptions.data = tdData
-                    if (afterQueryAll) {
-                      afterQueryAll(params)
-                    }
-                    if (queryAllSuccessMethods) {
-                      queryAllSuccessMethods({ ...params, response: rest })
-                    }
-                    return handleExport(handleOptions)
-                  })
-                  .catch((rest) => {
-                    if (queryAllErrorMethods) {
-                      queryAllErrorMethods({ ...params, response: rest })
+                      return handleExport(handleOptions)
+                    })
+                    .catch((rest) => {
+                      if (afterQueryAllMethod) {
+                        afterQueryAllMethod({ ...params, response: rest, status: 'error' })
+                      }
+                      if (queryAllErrorMethod) {
+                        queryAllErrorMethod({ ...params, response: rest })
+                      }
+                    })
+                }
+
+                if (beforeQueryAllMethod) {
+                  return Promise.resolve(beforeQueryAllMethod(params)).then(status => {
+                    if (status !== false) {
+                      return handleQueryAll()
                     }
                   })
+                }
+                return handleQueryAll()
               }
             }
           } if (mode === 'current') {

package/packages/table/render/index.ts

@@ -970,7 +970,12 @@ renderer.mixin({
   },
   FormatNumberInput: {
     renderTableDefault: handleNumberCell,
-    tableFilterDefaultMethod: handleInputFilterMethod,
+    tableFilterDefaultMethod ({ option, row, column }) {
+      const { data } = option
+      const cellValue = XEUtils.get(row, column.field)
+      /* eslint-disable eqeqeq */
+      return cellValue == data
+    },
     tableExportMethod (params) {
       const { row, column } = params
       const cellValue = XEUtils.get(row, column.field)
@@ -1021,7 +1026,12 @@ renderer.mixin({
     createTableFilterOptions: defaultFilterOptions,
     renderTableFilter: defaultFilterRender,
     renderTableFloatingFilter: defaultFloatingFilterRender,
-    tableFilterDefaultMethod: handleInputFilterMethod,
+    tableFilterDefaultMethod ({ option, row, column }) {
+      const { data } = option
+      const cellValue = XEUtils.get(row, column.field)
+      /* eslint-disable eqeqeq */
+      return cellValue == data
+    },
     tableExportMethod (params) {
       const { row, column } = params
       const cellValue = XEUtils.get(row, column.field)

package/packages/table/src/table.ts

@@ -3608,7 +3608,7 @@ export default defineVxeComponent({
         return
       }
       internalData.rsePending = true
-      handleLazyRecalculate(false, true, true, {
+      handleLazyRecalculate(true, true, true, {
         minRunDelay: 200
       }).then(() => {
         internalData.rsePending = false
@@ -5579,6 +5579,18 @@ export default defineVxeComponent({
         }
         const { editConfig } = props
         const { formatter, editRender, cellRender } = column
+        let etOpSize = null
+        let etOgSize = null
+        let clOpSize = null
+        let clOgSize = null
+        if (editRender) {
+          etOpSize = editRender.options ? editRender.options.length : 0
+          etOgSize = editRender.optionGroups ? editRender.optionGroups.length : 0
+        }
+        if (cellRender) {
+          clOpSize = cellRender.options ? cellRender.options.length : 0
+          clOgSize = cellRender.optionGroups ? cellRender.optionGroups.length : 0
+        }
         // formatter > tableCellFormatter
         const renderOpts = formatter ? null : (editConfig && isEnableConf(editRender) ? editRender : (isEnableConf(cellRender) ? cellRender : null))
         const compConf = renderOpts ? renderer.get(renderOpts.name) : null
@@ -5597,7 +5609,8 @@ export default defineVxeComponent({
               formatData = fullAllDataRowIdData[rowid].formatData = {}
             }
             if (rowRest && formatData[colid]) {
-              if (formatData[colid].value === cellValue) {
+              const ftValue = formatData[colid].value
+              if (ftValue && ftValue[0] === cellValue && ftValue[1] === etOpSize && ftValue[2] === etOgSize && ftValue[3] === clOpSize && ftValue[4] === clOgSize) {
                 return formatData[colid].label
               }
             }
@@ -5626,7 +5639,8 @@ export default defineVxeComponent({
             cellLabel = tcFormatter(renderOpts, formatParams)
           }
           if (formatData) {
-            formatData[colid] = { value: cellValue, label: cellLabel }
+            const ftValue = [cellValue, etOpSize, etOgSize, clOpSize, clOgSize]
+            formatData[colid] = { value: ftValue, label: cellLabel }
           }
         }
         return cellLabel