@ccs-ui/rc-pro 2.3.6-beta-15 → 2.3.6-beta-16

package/es/context/index.d.ts

@@ -55,8 +55,6 @@ type FnContextType<T = Store> = {
 type CcsFieldNamesType = {
     dataSource?: string[];
     total?: string[];
-    current?: string[];
-    pageSize?: string[];
 };
 type CcsDialogFieldNames = {
     /** 成功标识字段 */

package/es/dialog/button.d.ts

@@ -16,7 +16,7 @@ export type DialogButtonsProps<T> = Pick<CcsDialogModalProps, 'okText' | 'onClos
 export type DialogButtonRef = {
     onSetButtons: (e: React.ReactElement) => void;
 };
-export declare const DialogButtonHolder: <TParams, TData>({ auth, extraBtn, formRef, request, onOk, onClose, buttonRef, requestFieldNames, formInitialValues, preventRequestHandle, }: Pick<CcsDialogModalProps<TParams, TData>, "auth" | "request" | "onOk" | "onClose" | "extraBtn" | "requestFieldNames" | "preventRequestHandle"> & {
+export declare const DialogButtonHolder: <TParams, TData>({ auth, extraBtn, formRef, request, onOk, onClose, buttonRef, requestFieldNames, formInitialValues, preventRequestHandle, }: Pick<CcsDialogModalProps<TParams, TData>, "auth" | "request" | "onClose" | "onOk" | "extraBtn" | "requestFieldNames" | "preventRequestHandle"> & {
     formRef: React.RefObject<DialogFormRef<TParams>>;
     formInitialValues: FormProps['initialValues'];
     buttonRef: RefObject<DialogButtonRef>;

package/es/hooks/use-app.d.ts

@@ -6,8 +6,6 @@ declare const useAppConfig: () => import("../context").CssAppConfigType;
 export declare const useProTableFields: () => {
     dataSource: string[];
     total: string[];
-    current: string[];
-    pageSize: string[];
 };
 export declare const useProTableTreeFields: () => {
     dataSource: string[];

package/es/hooks/use-app.js

@@ -23,8 +23,8 @@ export var useProTableFields = function useProTableFields() {
   var context = useContext(AppConfigContext) || {};
   return _objectSpread({
     dataSource: ['data', 'result'],
-    current: ['data', 'pageNo'],
-    pageSize: ['data', 'pageSize'],
+    // current: ['data', 'pageNo'],
+    // pageSize: ['data', 'pageSize'],
     total: ['data', 'totalNum']
   }, context === null || context === void 0 || (_context$fieldNames = context.fieldNames) === null || _context$fieldNames === void 0 ? void 0 : _context$fieldNames.proTable);
 };

package/es/pro-table/table.d.ts

@@ -24,6 +24,7 @@ type TableTitleType<T> = {
     data: T[];
     onClear: () => void;
 };
+/** 请求参数类型 */
 export type CcsRequestProps = {
     pageNo?: number;
     pageSize?: number;
@@ -39,7 +40,7 @@ export type CcsTableProps<T> = Omit<TableProps<T>, 'columns' | 'title'> & {
     data?: CCS.TableData<T>;
     /** request 方法 */
     request?: (params: CcsRequestProps) => Promise<any>;
-    /** request 额外参数 dataSource: ['data', 'result']; current: ['data', 'pageNo']; pageSize: ['data', 'pageSize']; total: ['data', 'totalNum'] */
+    /** request 额外参数  */
     requestParam?: ParamType;
     /** 接口字段指定,默认： */
     fieldNames?: CcsFieldNamesType;

package/es/pro-table/table.js

@@ -31,6 +31,8 @@ import HeadComponent from "./head";
 import "./index.less";
 import TableOperation from "./operation";
 import TableTree from "./tree";
+
+/** 请求参数类型 */
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
@@ -176,11 +178,12 @@ var InternalProTable = function InternalProTable(props) {
               var formValues,
                 pageValue,
                 params,
+                _filtersRef$current,
+                filters,
+                orderProps,
                 _treeRef$current,
                 requestResult,
                 dataSource,
-                _pageSize,
-                current,
                 total,
                 _args = arguments;
               return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -198,75 +201,91 @@ var InternalProTable = function InternalProTable(props) {
                         }
                       });
                     }
+
+                    // 构建请求参数
                     pageValue = pagination === false ? {} : {
                       pageNo: pageNo,
                       pageSize: pageSize
                     };
-                    params = _objectSpread(_objectSpread(_objectSpread({
+                    params = _objectSpread(_objectSpread({
                       query: _objectSpread(_objectSpread({}, requestParam), formValues)
-                    }, pageValue), filtersRef.current), {}, {
+                    }, pageValue), {}, {
                       eventType: eventType
-                    }); // 异步树
+                    }); // 列过滤或排序参数
+                    _filtersRef$current = filtersRef.current, filters = _filtersRef$current.filters, orderProps = _filtersRef$current.orderProps;
+                    if (Object.keys(filters).length > 0) {
+                      params.filters = filters;
+                    }
+                    if (orderProps.length > 0) {
+                      params.orderProps = orderProps;
+                    }
+
+                    // 异步树
                     if (!parentFieldName) {
-                      _context.next = 7;
+                      _context.next = 10;
                       break;
                     }
                     (_treeRef$current = treeRef.current) === null || _treeRef$current === void 0 || _treeRef$current.onRequestTree(params.query, record);
                     return _context.abrupt("return");
-                  case 7:
+                  case 10:
                     // 发起请求
                     setData(function (d) {
                       return _objectSpread(_objectSpread({}, d), {}, {
                         loading: true
                       });
                     });
-                    _context.next = 10;
+                    _context.next = 13;
                     return httpRequest(params);
-                  case 10:
+                  case 13:
                     requestResult = _context.sent;
                     if (!requestResult) {
-                      _context.next = 22;
+                      _context.next = 23;
                       break;
                     }
                     // 获取table数据
-                    dataSource = getDataFromFields(requestResult, fieldNames.dataSource);
-                    _pageSize = getDataFromFields(requestResult, fieldNames.pageSize);
-                    current = getDataFromFields(requestResult, fieldNames.current);
+                    dataSource = getDataFromFields(requestResult, fieldNames.dataSource); // const pageSize = getDataFromFields(
+                    //   requestResult,
+                    //   fieldNames.pageSize,
+                    // );
+                    // const current = getDataFromFields(requestResult, fieldNames.current);
                     total = getDataFromFields(requestResult, fieldNames.total);
-                    if (!(total === undefined || _pageSize === undefined || current === undefined || dataSource === undefined)) {
-                      _context.next = 19;
+                    if (!(total === undefined ||
+                    // pageSize === undefined ||
+                    // current === undefined ||
+                    dataSource === undefined)) {
+                      _context.next = 20;
                       break;
                     }
                     setData({
                       dataSource: dataSource,
-                      pageSize: _pageSize,
-                      current: current,
+                      pageSize: pageSize,
+                      current: pageNo,
                       total: total,
                       loading: false
                     });
                     return _context.abrupt("return");
-                  case 19:
+                  case 20:
                     // 当前页无数据，返回上一页
-                    if (!dataSource.length && current !== 1 && current !== undefined) {
-                      onRequest('reload', current - 1);
+                    if (!dataSource.length && pageNo !== 1) {
+                      onRequest('reload', pageNo - 1);
                     } else {
                       setData({
-                        current: current,
-                        pageSize: _pageSize,
+                        current: pageNo,
+                        pageSize: pageSize,
                         loading: false,
                         dataSource: dataSource,
                         total: total || 0
                       });
                     }
-                    _context.next = 23;
+                    _context.next = 24;
                     break;
-                  case 22:
+                  case 23:
                     setData(function (d) {
                       return _objectSpread(_objectSpread({}, d), {}, {
                         loading: false
                       });
                     });
-                  case 23:
+                  case 24:
                   case "end":
                     return _context.stop();
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ccs-ui/rc-pro",
-  "version": "2.3.6-beta-15",
+  "version": "2.3.6-beta-16",
   "description": "",
   "license": "MIT",
   "author": {