vxe-table 3.22.9 → 3.22.11

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

@@ -1680,17 +1680,19 @@ export default {
             const gridReactData = $xeGGWrapper.reactData
             const proxyOpts = $xeGGWrapper.computeProxyOpts
             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,
@@ -1701,35 +1703,54 @@ export default {
                 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($xeTable, handleOptions)
-                })
-                .catch((rest) => {
-                  if (queryAllErrorMethods) {
-                    queryAllErrorMethods({ ...params, response: rest })
+                    return handleExport($xeTable, 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()
             }
           }
         } else if (mode === 'current') {

package/packages/table/render/index.ts

@@ -980,7 +980,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)
@@ -1031,7 +1036,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/methods.ts

@@ -5744,6 +5744,18 @@ const tableMethods: any = {
     }
     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
@@ -5762,7 +5774,8 @@ const tableMethods: any = {
           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
           }
         }
@@ -5791,7 +5804,8 @@ const tableMethods: any = {
         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