vxe-table 3.22.8 → 3.22.10

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

@@ -1325,7 +1325,7 @@ function handleExportAndPrint ($xeTable: VxeTableConstructor, options: VxeTableP
     const isColGroup = column.children && column.children.length > 0
     let isChecked = false
     const isExtraChecked = extraFdMaps[column.field]
-    if (columns && columns.length) {
+    if (columns) {
       isChecked = handleFilterColumns(defOpts, column, columns)
     } else if (excludeFields || includeFields) {
       isChecked = handleFilterFields(defOpts, column, includeFields, includeFdMaps, excludeFdMaps, extraFdMaps)
@@ -1536,7 +1536,7 @@ export default {
 
       let isCustomCol = false
       let customCols = []
-      if (columns && columns.length) {
+      if (columns) {
         isCustomCol = true
         customCols = XEUtils.searchTree(columns, () => true, { children: 'children', mapChildren: 'childNodes', original: true })
       } else {
@@ -1544,7 +1544,7 @@ export default {
           const isColGroup = column.children && column.children.length > 0
           let isChecked = false
           const isExtraChecked = extraFdMaps[column.field]
-          if (columns && columns.length) {
+          if (columns) {
             isChecked = handleFilterColumns(opts, column, columns)
           } else if (excludeFields || includeFields) {
             isChecked = handleFilterFields(opts, column, includeFields, includeFdMaps, excludeFdMaps, extraFdMaps)
@@ -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

@@ -10258,6 +10258,7 @@ const tableMethods: any = {
       status: false
     }
     if (!(el && prevDragRow && dragRow)) {
+      handleRowDragEndClearStatus($xeTable)
       return Promise.resolve(errRest)
     }
     // 判断是否有拖动
@@ -10366,6 +10367,9 @@ const tableMethods: any = {
       }
 
       const isDragToChildFlag = isSelfToChildDrag && dragToChildMethod ? dragToChildMethod(dragParams) : prevDragToChild
+      if (dEndMethod) {
+        handleRowDragEndClearStatus($xeTable)
+      }
       return Promise.resolve(dEndMethod ? dEndMethod(dragParams) : true).then((status) => {
         if (!status) {
           return errRest
@@ -10686,6 +10690,9 @@ const tableMethods: any = {
         const errRest = {
           status: false
         }
+        if (dragEndMethod) {
+          handleRowDragEndClearStatus($xeTable)
+        }
         Promise.resolve(dragEndMethod ? dragEndMethod(dragParams) : true).then((status) => {
           if (!status) {
             if ($oldTable) {

package/styles/components/table.scss

@@ -4,6 +4,27 @@
 @use './icon.scss';
 @use './table-module/all.scss';
 
+
+// 局部变量
+.vxe-table {
+  --vxe-ui-table-current-font-size: var(--vxe-ui-font-size-default);
+  &.size--xlarge {
+    --vxe-ui-table-current-font-size: var(--vxe-ui-font-size-xlarge);
+  }
+  &.size--large {
+    --vxe-ui-table-current-font-size: var(--vxe-ui-font-size-large);
+  }
+  &.size--medium {
+    --vxe-ui-table-current-font-size: var(--vxe-ui-font-size-medium);
+  }
+  &.size--small {
+    --vxe-ui-table-current-font-size: var(--vxe-ui-font-size-small);
+  }
+  &.size--mini {
+    --vxe-ui-table-current-font-size: var(--vxe-ui-font-size-mini);
+  }
+}
+
 $btnThemeList: (
   (
     name: "primary",
@@ -1374,7 +1395,7 @@ $btnThemeList: (
 /*table*/
 .vxe-table--render-default {
   position: relative;
-  font-size: var(--vxe-ui-font-size-default);
+  font-size: var(--vxe-ui-table-current-font-size);
   color: var(--vxe-ui-font-color);
   font-family: var(--vxe-ui-font-family);
   direction: ltr;
@@ -1832,7 +1853,6 @@ $btnThemeList: (
   }
   
   &.size--medium {
-    font-size: var(--vxe-ui-font-size-medium);
     .vxe-table--empty-placeholder,
     .vxe-table--empty-block {
       min-height: var(--vxe-ui-table-row-height-medium);
@@ -1866,7 +1886,6 @@ $btnThemeList: (
     }
   }
   &.size--small {
-    font-size: var(--vxe-ui-font-size-small);
     .vxe-table--empty-placeholder,
     .vxe-table--empty-block {
       min-height: var(--vxe-ui-table-row-height-small);
@@ -1900,7 +1919,6 @@ $btnThemeList: (
     }
   }
   &.size--mini {
-    font-size: var(--vxe-ui-font-size-mini);
     .vxe-table--empty-placeholder,
     .vxe-table--empty-block {
       min-height: var(--vxe-ui-table-row-height-mini);
@@ -2447,7 +2465,7 @@ $btnThemeList: (
       width: 100%;
       position: absolute;
       left: 50%;
-      font-size: var(--vxe-ui-table-validate-error-font-size);
+      font-size: var(--vxe-ui-table-validate-error-font-size, var(--vxe-ui-table-current-font-size));
       line-height: 1em;
       transform: translate(-50%, -2px);
       text-align: left;
@@ -2473,7 +2491,7 @@ $btnThemeList: (
       // }
     }
     .vxe-cell--valid-error-theme-beautify {
-      padding: 0.2em 0.6em 0.25em 0.6em;
+      padding: var(--vxe-ui-table-validate-error-padding, 0.2em 0.6em);
       color: #fff;
       background-color: var(--vxe-ui-table-validate-error-color);
       .vxe-cell--valid-error-msg {

package/styles/theme/base.scss

@@ -91,7 +91,6 @@
   --vxe-ui-table-view-scrollbar-width: 18px;
   --vxe-ui-table-view-scrollbar-height: 18px;
 
-  --vxe-ui-table-validate-error-font-size: 12px;
   --vxe-ui-table-validate-error-color: #f56c6c;
   --vxe-ui-table-validate-error-cell-background-color: rgba(245, 108,108, 0.1);
   --vxe-ui-table-validate-error-theme-normal-background-color: var(--vxe-ui-layout-background-color);