@ccs-ui/rc-pro 2.1.4 → 2.1.6

package/es/cascader/index.js

@@ -19,8 +19,7 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 import { useRequest } from 'ahooks';
 import { Cascader } from 'antd';
 import { useEffect } from 'react';
-import { useApiCascaderInterceptor } from "../hooks/use-app";
-import { getDataFromArrayField } from "../select";
+import { getDataFromFields } from "../select";
 import { jsx as _jsx } from "react/jsx-runtime";
 function onIsArray(data) {
   if (Array.isArray(data)) return data;
@@ -42,11 +41,6 @@ export default function CcsApiCascader(_ref) {
   var labelField = _toConsumableArray(onIsArray((fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.label) || ['data', 'label']));
   var valueField = _toConsumableArray(onIsArray((fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.value) || ['data', 'value']));
   var childrenField = _toConsumableArray(onIsArray((fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || ['data', 'children']));
-
-  // 上下午接口格式化方法
-  var _useApiCascaderInterc = useApiCascaderInterceptor(),
-    onRequestFormat = _useApiCascaderInterc.onRequestFormat,
-    onResponseFormat = _useApiCascaderInterc.onResponseFormat;
   var _useRequest = useRequest( /*#__PURE__*/function () {
       var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(params) {
         var result, value;
@@ -59,39 +53,37 @@ export default function CcsApiCascader(_ref) {
               }
               return _context.abrupt("return", []);
             case 2:
-              _context.t0 = onResponseFormat;
-              _context.next = 5;
-              return onQuery(onRequestFormat(params));
+              _context.next = 4;
+              return onQuery(params);
+            case 4:
+              result = _context.sent;
             case 5:
-              _context.t1 = _context.sent;
-              result = (0, _context.t0)(_context.t1);
-            case 7:
               if (!(labelField.length > 0 || valueField.length > 0)) {
-                _context.next = 17;
+                _context.next = 15;
                 break;
               }
               if (!Array.isArray(result)) {
-                _context.next = 11;
+                _context.next = 9;
                 break;
               }
               result.forEach(function (r) {
-                r.label = getDataFromArrayField(r, labelField);
-                r.value = getDataFromArrayField(r, valueField);
-                r.children = getDataFromArrayField(r, childrenField);
+                r.label = getDataFromFields(r, labelField);
+                r.value = getDataFromFields(r, valueField);
+                r.children = getDataFromFields(r, childrenField);
               });
-              return _context.abrupt("break", 17);
-            case 11:
+              return _context.abrupt("break", 15);
+            case 9:
               labelField.shift();
               childrenField.shift();
               value = valueField.shift();
               if (value) {
                 result = result[value];
               }
-              _context.next = 7;
+              _context.next = 5;
               break;
-            case 17:
+            case 15:
               return _context.abrupt("return", result);
-            case 18:
+            case 16:
             case "end":
               return _context.stop();
           }

package/es/ccs.d.ts

@@ -1,4 +1,4 @@
-import { ButtonProps } from 'antd';
+import { ButtonProps, PaginationProps } from 'antd';
 import { Rule } from 'antd/es/form';
 import { CSSProperties, MutableRefObject, ReactElement, ReactNode } from 'react';
 import { TableColumn } from './pro-table/table';
@@ -21,64 +21,9 @@ type MenuType = {
 type TableData<T> = {
     /** loading */
     loading?: boolean;
-    /** 总条数 */
-    totalNum?: number;
-    /** 单页记录数 */
-    pageSize?: number;
-    /** 页码 */
-    pageNo?: number;
     /** Array List 数据 */
-    result?: T[];
-};
-type HttpResult<T = any> = {
-    code?: string;
-    success?: boolean;
-    data?: T;
-    msg?: string;
-};
-type PageType<T> = {
-    hasNext: boolean;
-    totalNum: number;
-    pageNo: number;
-    pageSize: number;
-    result: T[];
-};
-type HttpPageResult<T = any> = Omit<HttpResult<T>, 'data'> & {
-    data: PageType<T>;
-};
-type HttpListResult<T = any> = Omit<HttpResult<T>, 'data'> & {
-    data: T[];
-};
-type OrderProp = {
-    ascending: boolean;
-    prop: string;
-};
-type QueryLimit = {
-    fetchSize: number;
-    startIndex: number;
-};
-type PageQuery<T = any> = {
-    /** 查询的开始行数和取多少行，从0开始 */
-    limit?: QueryLimit;
-    /** 排序字段,一般前端不传，由后端指定 */
-    orderProps?: OrderProp[];
-    /** 过滤字段 */
-    filters?: Record<string, any[]>;
-    /** 页码 */
-    pageNo?: number;
-    /** 页长 */
-    pageSize?: number;
-    /** 查询条件 */
-    query: T;
-};
-type ListQuery<T = any> = {
-    /** 查询的开始行数和取多少行，从0开始 */
-    limit?: QueryLimit;
-    /** 排序字段,一般前端不传，由后端指定 */
-    orderProps?: OrderProp[];
-    /** 查询条件 */
-    query: T;
-};
+    dataSource?: T[];
+} & PaginationProps;
 type RecordType = Record<string, any>;
 type RouteHistory = {
     menuName: string;
@@ -185,4 +130,4 @@ type PropsWithNodeChildren = {
 type PropsWithElementChildren = {
     children?: ReactElement;
 };
-export type { AuthButtonItem, HttpListResult, HttpPageResult, HttpResult, ListQuery, MenuType, PageQuery, PageType, PropsWithCss, PropsWithElementChildren, PropsWithNodeChildren, RecordType, RouteHistory, TableColumns, TableData, TableFormItems, TableInstance, TableInstanceRef, TriggerChildrenProps, };
+export type { AuthButtonItem, MenuType, PropsWithCss, PropsWithElementChildren, PropsWithNodeChildren, RecordType, RouteHistory, TableColumns, TableData, TableFormItems, TableInstance, TableInstanceRef, TriggerChildrenProps, };

package/es/config.js

@@ -68,8 +68,7 @@ function AppConfig(_ref) {
     isCompact = _ref.isCompact,
     watermark = _ref.watermark,
     themeConfig = _ref.themeConfig,
-    _ref$interceptors = _ref.interceptors,
-    interceptors = _ref$interceptors === void 0 ? {} : _ref$interceptors;
+    CcsProTableFieldNames = _ref.CcsProTableFieldNames;
   var holderRef = React.useRef(null);
   // 主题
   var appTheme = theme === 'dark' ? darkTheme : defaultTheme;
@@ -98,7 +97,7 @@ function AppConfig(_ref) {
         theme: theme,
         themeConfig: themeConfig,
         holderRef: holderRef,
-        interceptors: interceptors
+        CcsProTableFieldNames: CcsProTableFieldNames
       },
       children: [children, /*#__PURE__*/_jsx(AppDialog, {}), /*#__PURE__*/_jsx(ElementsHolder, {
         ref: holderRef

package/es/context/index.d.ts

@@ -48,12 +48,6 @@ type FnContextType<T = Store> = {
     formInitialValues: T;
     close: () => void;
 };
-type RequestType = {
-    /** 请求参数格式化 */
-    onRequestFormat?: (query: any) => any;
-    /** 返回参数格式化 */
-    onResponseFormat?: (response: any) => any;
-};
 type CssAppConfigType = {
     /** 主题 */
     theme?: 'dark' | 'light' | 'colorful';
@@ -65,16 +59,12 @@ type CssAppConfigType = {
     watermark?: WaterMarkProps;
     /** modal or drawer holder */
     holderRef?: React.RefObject<ElementsHolderRef>;
-    /** 全局拦截接口请 */
-    interceptors?: {
-        /** table 分页请求 */
-        CcsProTable?: RequestType;
-        /** 选择接口请求 */
-        CcsApiSelect?: RequestType;
-        /** 级联接口请求 */
-        CcsApiCascader?: RequestType;
-        /** 弹框表单请求 */
-        CcsDialog?: RequestType;
+    /** CcsProTable 组件字段全局指定 */
+    CcsProTableFieldNames?: {
+        dataSource: string[];
+        total: string[];
+        current: string[];
+        pageSize: string[];
     };
 };
 declare const DrawerAndModalContext: React.Context<FnContextType<any>>;

package/es/dialog/DialogRequestButton.d.ts

@@ -1,7 +1,7 @@
 import { FormProps } from 'antd';
 import { DialogFormRef } from './form';
 import { CcsDialogModalProps } from './hook';
-declare const DialogRequestButton: ({ auth, formRef, extraBtn, formInitialValues, request, onCancel, onRequestBefore, }: Pick<CcsDialogModalProps, "auth" | "request" | "onCancel" | "onRequestBefore" | "extraBtn"> & {
+declare const DialogRequestButton: ({ auth, formRef, extraBtn, formInitialValues, request, onCancel, onRequestBefore, }: Pick<CcsDialogModalProps, "auth" | "onCancel" | "extraBtn" | "request" | "onRequestBefore"> & {
     formRef: React.RefObject<DialogFormRef>;
     formInitialValues: FormProps['initialValues'];
 }) => import("react/jsx-runtime").JSX.Element;

package/es/dialog/DialogRequestButton.js

@@ -17,7 +17,6 @@ import CcsUtils from '@ccs-ui/utils';
 import { Button } from 'antd';
 import { useState } from 'react';
 import { CcsButton, CcsDialog } from '..';
-import { useDialogInterceptor } from "../hooks/use-app";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
@@ -34,9 +33,6 @@ var DialogRequestButton = function DialogRequestButton(_ref) {
     _useState2 = _slicedToArray(_useState, 2),
     loading = _useState2[0],
     setLoading = _useState2[1];
-  var _useDialogInterceptor = useDialogInterceptor(),
-    onRequestFormat = _useDialogInterceptor.onRequestFormat,
-    onResponseFormat = _useDialogInterceptor.onResponseFormat;
   var onOk = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var _formRef$current;
@@ -53,8 +49,7 @@ var DialogRequestButton = function DialogRequestButton(_ref) {
             formRef.current.formInstance.validateFields().then(function (values) {
               setLoading(true);
               var params = _objectSpread(_objectSpread({}, formInitialValues), onRequestBefore ? onRequestBefore(values) : values);
-              request(onRequestFormat(params)).then(function (e) {
-                var result = onResponseFormat(e);
+              request(params).then(function (result) {
                 setLoading(false);
                 if (result !== null && result !== void 0 && result.success && onCancel) {
                   onCancel(params);

package/es/dialog/DialogSelfOkButton.d.ts

@@ -1,7 +1,7 @@
 import { FormProps } from 'antd';
 import { DialogFormRef } from './form';
 import { CcsDialogModalProps } from './hook';
-declare const DialogSelfOkButton: ({ auth, formRef, extraBtn, formInitialValues, onCancel, onOk, }: Pick<CcsDialogModalProps, "auth" | "onCancel" | "extraBtn" | "onOk"> & {
+declare const DialogSelfOkButton: ({ auth, formRef, extraBtn, formInitialValues, onCancel, onOk, }: Pick<CcsDialogModalProps, "auth" | "onCancel" | "onOk" | "extraBtn"> & {
     formRef: React.RefObject<DialogFormRef>;
     formInitialValues: FormProps['initialValues'];
 }) => import("react/jsx-runtime").JSX.Element;

package/es/dialog/hook.d.ts

@@ -17,6 +17,12 @@ type DrawerFunc = (props: CcsDialogDrawerProps) => {
     destroy: () => void;
     update: (configUpdate: CcsDialogDrawerProps) => void;
 };
+export type DialogRequestData = {
+    /** 成功标识 */
+    success: boolean;
+    /** 失败消息 */
+    msg: string;
+};
 export type CcsDialogModalProps = ModalFuncProps & {
     /** antd form */
     form?: FormProps;
@@ -27,7 +33,7 @@ export type CcsDialogModalProps = ModalFuncProps & {
     /** 通过参数传递的扩展按钮 */
     extraBtn?: ReactNode;
     /** 表单接口请求 */
-    request?: (values: any) => Promise<any>;
+    request?: (values: any) => Promise<DialogRequestData>;
     /** request执行前参数处理 */
     onRequestBefore?: (values: any) => any;
     /** 通过closeDialog方法关闭dialog */

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

@@ -1,23 +1,12 @@
-import { onDefaultFormat } from '../config';
 /**
  * app配置
  * @returns
  */
 declare const useAppConfig: () => import("../context").CssAppConfigType;
-export declare const useProTableInterceptor: () => {
-    onRequestFormat: typeof onDefaultFormat;
-    onResponseFormat: typeof onDefaultFormat;
-};
-export declare const useApiCascaderInterceptor: () => {
-    onRequestFormat: typeof onDefaultFormat;
-    onResponseFormat: typeof onDefaultFormat;
-};
-export declare const useApiSelectInterceptor: () => {
-    onRequestFormat: typeof onDefaultFormat;
-    onResponseFormat: typeof onDefaultFormat;
-};
-export declare const useDialogInterceptor: () => {
-    onRequestFormat: typeof onDefaultFormat;
-    onResponseFormat: typeof onDefaultFormat;
-};
+export declare const useProTableFields: () => {
+    dataSource: string[];
+    total: string[];
+    current: string[];
+    pageSize: string[];
+} | undefined;
 export default useAppConfig;

package/es/hooks/use-app.js

@@ -1,11 +1,4 @@
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
-function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { useContext } from 'react';
-import { onDefaultFormat } from "../config";
 import { AppConfigContext } from "../context";
 
 /**
@@ -19,40 +12,8 @@ var useAppConfig = function useAppConfig() {
   }
   return context;
 };
-export var useProTableInterceptor = function useProTableInterceptor() {
-  var _context$interceptors;
+export var useProTableFields = function useProTableFields() {
   var context = useContext(AppConfigContext) || {};
-  var interceptor = _objectSpread({
-    onRequestFormat: onDefaultFormat,
-    onResponseFormat: onDefaultFormat
-  }, (_context$interceptors = context.interceptors) === null || _context$interceptors === void 0 ? void 0 : _context$interceptors.CcsProTable);
-  return interceptor;
-};
-export var useApiCascaderInterceptor = function useApiCascaderInterceptor() {
-  var _context$interceptors2;
-  var context = useContext(AppConfigContext) || {};
-  var interceptor = _objectSpread({
-    onRequestFormat: onDefaultFormat,
-    onResponseFormat: onDefaultFormat
-  }, (_context$interceptors2 = context.interceptors) === null || _context$interceptors2 === void 0 ? void 0 : _context$interceptors2.CcsApiCascader);
-  return interceptor;
-};
-export var useApiSelectInterceptor = function useApiSelectInterceptor() {
-  var _context$interceptors3;
-  var context = useContext(AppConfigContext) || {};
-  var interceptor = _objectSpread({
-    onRequestFormat: onDefaultFormat,
-    onResponseFormat: onDefaultFormat
-  }, (_context$interceptors3 = context.interceptors) === null || _context$interceptors3 === void 0 ? void 0 : _context$interceptors3.CcsApiSelect);
-  return interceptor;
-};
-export var useDialogInterceptor = function useDialogInterceptor() {
-  var _context$interceptors4;
-  var context = useContext(AppConfigContext) || {};
-  var interceptor = _objectSpread({
-    onRequestFormat: onDefaultFormat,
-    onResponseFormat: onDefaultFormat
-  }, (_context$interceptors4 = context.interceptors) === null || _context$interceptors4 === void 0 ? void 0 : _context$interceptors4.CcsDialog);
-  return interceptor;
+  return context === null || context === void 0 ? void 0 : context.CcsProTableFieldNames;
 };
 export default useAppConfig;

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

@@ -1,17 +1,14 @@
-import { HttpPageResult, HttpResult } from '../ccs';
 import './index.less';
 import { CcsProTableProps, SearchEventType } from './table';
 type TableProps<T> = Omit<CcsProTableProps<T>, 'onSearchAfter' | 'parentFieldName'> & {
     /** 请求后格式化结果 */
-    onSearchAfter?: (data: HttpPageResult<T>, eventType?: SearchEventType) => any;
+    onSearchAfter?: (data: any, eventType?: SearchEventType) => any;
 };
 type TableTreeProps<T> = Omit<CcsProTableProps<T>, 'onSearchAfter'> & {
     /** 父级值字段 */
     parentFieldName: string;
     /** 请求后格式化结果 */
-    onSearchAfter?: (data: HttpResult<(T & {
-        children?: T[];
-    })[]>, eventType?: SearchEventType) => any;
+    onSearchAfter?: (data: any, eventType?: SearchEventType) => any;
 };
 /**
  * 查询表格组件

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

@@ -3,7 +3,8 @@ import { ColumnGroupType, ColumnType } from 'antd/es/table';
 import { TableSticky } from 'rc-table/lib/interface';
 import React, { CSSProperties, ReactElement, ReactNode } from 'react';
 import CCS from '..';
-import { HttpPageResult, PropsWithCss, PropsWithNodeChildren, TableColumns } from '../ccs';
+import { PropsWithCss, PropsWithNodeChildren, TableColumns } from '../ccs';
+import { CssAppConfigType } from '../context';
 import './index.less';
 type ParamType = Record<string, any>;
 export type ShowDependType = {
@@ -29,8 +30,10 @@ export type CcsTableProps<T> = Omit<TableProps<T>, 'columns' | 'title'> & {
     data?: CCS.TableData<T>;
     /** request 方法 */
     request?: (params: any) => Promise<any>;
-    /** request 额外参数 */
+    /** request 额外参数 dataSource: ['data', 'result']; current: ['data', 'pageNo']; pageSize: ['data', 'pageSize']; total: ['data', 'totalNum'] */
     requestParam?: ParamType;
+    /** 接口字段指定,默认： */
+    fieldNames?: CssAppConfigType['CcsProTableFieldNames'];
     /** class name */
     className?: string;
     /** style */
@@ -78,7 +81,7 @@ export type CcsProTableProps<RecordType> = Pick<PropsWithCss, 'className'> & Pro
     /** 请求前格式化参数 */
     onSearchBefore?: (params: SearchBeforeType, eventType?: SearchEventType) => SearchBeforeType;
     /** 请求后格式化结果 */
-    onSearchAfter?: (data: HttpPageResult<RecordType>, eventType?: SearchEventType) => any;
+    onSearchAfter?: (result: any, eventType?: SearchEventType) => any;
 };
 export type TableEventType = {
     key: 'columnFilter' | 'fullScreen';

package/es/pro-table/table.js

@@ -20,7 +20,9 @@ import classNames from 'classnames';
 import React, { useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
 import { useAppConfig } from '..';
 import { useCcsPage } from "../";
-import { useProTableInterceptor } from "../hooks/use-app";
+import { onDefaultFormat } from "../config";
+import { useProTableFields } from "../hooks/use-app";
+import { getDataFromFields } from "../select";
 import CcsTable from "../table";
 import { getAllChildrenId, getDataById, onTableInModalOrDrawer, onTableInTabItem } from "./_utils";
 import HeadComponent from "./head";
@@ -42,7 +44,7 @@ export var TableSelectionContext = /*#__PURE__*/React.createContext({
  * @returns
  */
 var InternalProTable = function InternalProTable(props) {
-  var _table$scroll2, _table$scroll3;
+  var _props$table, _table$scroll2, _table$scroll3;
   var init = props.init,
     auth = props.auth,
     table = props.table,
@@ -59,9 +61,7 @@ var InternalProTable = function InternalProTable(props) {
     formItems = _props$formItems === void 0 ? [] : _props$formItems,
     parentFieldName = props.parentFieldName,
     _props$formInitValues = props.formInitValues,
-    formInitValues = _props$formInitValues === void 0 ? {} : _props$formInitValues,
-    onSearchBefore = props.onSearchBefore,
-    onSearchAfter = props.onSearchAfter;
+    formInitValues = _props$formInitValues === void 0 ? {} : _props$formInitValues;
   var _useCcsPage = useCcsPage(),
     onAuth = _useCcsPage.onAuth;
   var _ref = table || {},
@@ -87,10 +87,10 @@ var InternalProTable = function InternalProTable(props) {
     form = _Form$useForm2[0];
   // table data
   var _useState = useState({
-      totalNum: 0,
-      result: [],
+      total: 0,
+      dataSource: [],
       pageSize: 10,
-      pageNo: 1
+      current: 1
     }),
     _useState2 = _slicedToArray(_useState, 2),
     data = _useState2[0],
@@ -107,10 +107,17 @@ var InternalProTable = function InternalProTable(props) {
   // 上下文配置
   var _useAppConfig = useAppConfig(),
     theme = _useAppConfig.theme;
-  // 接口格式化方法
-  var _useProTableIntercept = useProTableInterceptor(),
-    onRequestFormat = _useProTableIntercept.onRequestFormat,
-    onResponseFormat = _useProTableIntercept.onResponseFormat;
+  // 接口字段指定全局配置
+  var globalFieldNames = useProTableFields();
+  // 接口字段指定
+  var fieldNames = ((_props$table = props.table) === null || _props$table === void 0 ? void 0 : _props$table.fieldNames) || globalFieldNames || {
+    dataSource: ['data', 'result'],
+    current: ['data', 'pageNo'],
+    pageSize: ['data', 'pageSize'],
+    total: ['data', 'totalNum']
+  };
+  var onSearchBefore = props.onSearchBefore || onDefaultFormat;
+  var onSearchAfter = props.onSearchAfter || onDefaultFormat;
 
   // 暗黑模式
   var isDark = theme === 'dark';
@@ -163,12 +170,11 @@ var InternalProTable = function InternalProTable(props) {
                 _treeRef$current,
                 newParams,
                 requestResult,
-                newRequestResult,
-                _newRequestResult$dat,
-                totalNum,
-                _size,
-                no,
-                result,
+                newReqResult,
+                dataSource,
+                _pageSize,
+                current,
+                total,
                 _args = arguments;
               return _regeneratorRuntime().wrap(function _callee$(_context) {
                 while (1) switch (_context.prev = _context.next) {
@@ -200,56 +206,61 @@ var InternalProTable = function InternalProTable(props) {
                     return _context.abrupt("return");
                   case 7:
                     // onSearchBefore 请求前回传参数，可以在父组件进行修改
-                    newParams = onSearchBefore ? onSearchBefore(params, eventType) : params; // 发起请求
+                    newParams = onSearchBefore(params, eventType); // 发起请求
                     setData(function (d) {
                       return _objectSpread(_objectSpread({}, d), {}, {
                         loading: true
                       });
                     });
-                    _context.t0 = onResponseFormat;
-                    _context.next = 12;
-                    return httpRequest(onRequestFormat(_objectSpread({}, newParams)));
-                  case 12:
-                    _context.t1 = _context.sent;
-                    requestResult = (0, _context.t0)(_context.t1);
-                    if (!(requestResult && requestResult.success)) {
-                      _context.next = 24;
+                    _context.next = 11;
+                    return httpRequest(_objectSpread({}, newParams));
+                  case 11:
+                    requestResult = _context.sent;
+                    if (!requestResult) {
+                      _context.next = 25;
                       break;
                     }
                     // onSearchAfter 处理请求结果
-                    newRequestResult = onSearchAfter ? onSearchAfter(requestResult, eventType) : requestResult;
-                    _newRequestResult$dat = newRequestResult.data, totalNum = _newRequestResult$dat.totalNum, _size = _newRequestResult$dat.pageSize, no = _newRequestResult$dat.pageNo, result = _newRequestResult$dat.result;
-                    if (!(totalNum === undefined || pageSize === undefined || no === undefined || result === undefined)) {
-                      _context.next = 21;
+                    newReqResult = onSearchAfter(requestResult, eventType); // 获取table数据
+                    dataSource = getDataFromFields(newReqResult, fieldNames.dataSource);
+                    _pageSize = getDataFromFields(newReqResult, fieldNames.pageSize);
+                    current = getDataFromFields(newReqResult, fieldNames.current);
+                    total = getDataFromFields(newReqResult, fieldNames.total);
+                    if (!(total === undefined || _pageSize === undefined || current === undefined || dataSource === undefined)) {
+                      _context.next = 22;
                       break;
                     }
-                    CcsUtils.showLogWarning('分页返回对象，totalNum,pageSize,no,result不能为空');
-                    setData(_objectSpread(_objectSpread({}, data), {}, {
+                    CcsUtils.showLogWarning('分页返回对象，total,pageSize,current,dataSource不能为空');
+                    setData({
+                      dataSource: dataSource,
+                      pageSize: _pageSize,
+                      current: current,
+                      total: total,
                       loading: false
-                    }));
+                    });
                     return _context.abrupt("return");
-                  case 21:
+                  case 22:
                     // 当前页无数据，返回上一页
-                    if (!result.length && no !== 1 && no !== undefined) {
-                      onRequest('reload', no - 1);
+                    if (!dataSource.length && current !== 1 && current !== undefined) {
+                      onRequest('reload', current - 1);
                     } else {
                       setData({
-                        pageNo: no,
-                        pageSize: _size,
+                        current: current,
+                        pageSize: _pageSize,
                         loading: false,
-                        result: result,
-                        totalNum: totalNum || 0
+                        dataSource: dataSource,
+                        total: total || 0
                       });
                     }
-                    _context.next = 25;
+                    _context.next = 26;
                     break;
-                  case 24:
+                  case 25:
                     setData(function (d) {
                       return _objectSpread(_objectSpread({}, d), {}, {
                         loading: false
                       });
                     });
-                  case 25:
+                  case 26:
                   case "end":
                     return _context.stop();
                 }
@@ -270,7 +281,7 @@ var InternalProTable = function InternalProTable(props) {
   var _onPartialReload = function onPartialReload(id) {
     var _treeRef$current2, _treeRef$current3;
     // 查找需要刷新的节点
-    var treeNode = getDataById(data.result || [], rowKey, id);
+    var treeNode = getDataById(data.dataSource || [], rowKey, id);
     // 没有查找到、全部刷新
     if (!treeNode) {
       onRequest('search');
@@ -337,7 +348,7 @@ var InternalProTable = function InternalProTable(props) {
 
   // 刷新
   var _onReload = function onReload() {
-    onRequest('reload', data.pageNo, data.pageSize);
+    onRequest('reload', data.current, data.pageSize);
   };
 
   // form 数据 查询，重载，重置方法
@@ -456,7 +467,7 @@ var InternalProTable = function InternalProTable(props) {
     // table title
     var tableTitle = table.title ? table.title({
       selectedRows: selectedRows,
-      data: data.result || [],
+      data: data.dataSource || [],
       onClear: function onClear() {
         return setSelectedRows([]);
       }
@@ -467,6 +478,7 @@ var InternalProTable = function InternalProTable(props) {
       return /*#__PURE__*/_jsx(TableTree, {
         data: data,
         table: _objectSpread(_objectSpread({}, table), {}, {
+          fieldNames: fieldNames,
           rowSelection: rowSelection,
           title: tableTitle ? function () {
             return tableTitle;

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

@@ -2,14 +2,13 @@ import { TableProps } from 'antd';
 import { TableSticky } from 'rc-table/lib/interface';
 import { RefObject } from 'react';
 import CCS from '..';
-import { HttpResult } from '../ccs';
 import { TableRefType } from '../table';
-import { CcsProTableProps, SearchEventType } from './table';
+import { CcsProTableProps } from './table';
 export type TreeInstance<T> = {
     onRequestTree: (query: any, record: T | any) => void;
     onExpandKeys: (ids: string[]) => void;
 };
-type TreeTableProps<T> = Pick<CcsProTableProps<T>, 'table' | 'onSearchBefore' | 'parentFieldName'> & {
+type TreeTableProps<T> = Pick<CcsProTableProps<T>, 'table' | 'onSearchBefore' | 'parentFieldName' | 'onSearchAfter'> & {
     data: CCS.TableData<T>;
     sticky: boolean | TableSticky;
     tableRowSize: TableProps['size'];
@@ -18,9 +17,6 @@ type TreeTableProps<T> = Pick<CcsProTableProps<T>, 'table' | 'onSearchBefore' |
     tableContentRef: React.RefObject<HTMLDivElement>;
     setData: React.Dispatch<React.SetStateAction<CCS.TableData<T>>>;
     handlePageChange: any;
-    onSearchAfter: (data: HttpResult<T[]>, eventType?: SearchEventType) => HttpResult<(T & {
-        children: T[];
-    })[]>;
 };
-declare const TableTree: <T extends object = any>({ data, table, sticky, treeRef, tableRef, tableRowSize, tableContentRef, parentFieldName, handlePageChange, setData, onSearchAfter, onSearchBefore, }: TreeTableProps<T>) => import("react/jsx-runtime").JSX.Element;
+declare const TableTree: <T extends object = any>(props: TreeTableProps<T>) => import("react/jsx-runtime").JSX.Element;
 export default TableTree;

package/es/pro-table/tree.js

@@ -20,48 +20,44 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import CcsUtils from '@ccs-ui/utils';
 import { useImperativeHandle, useState } from 'react';
 import { CcsTable } from '..';
-import { useProTableInterceptor } from "../hooks/use-app";
+import { getDataFromFields } from "../select";
 import { jsx as _jsx } from "react/jsx-runtime";
-var TableTree = function TableTree(_ref) {
-  var data = _ref.data,
-    table = _ref.table,
-    sticky = _ref.sticky,
-    treeRef = _ref.treeRef,
-    tableRef = _ref.tableRef,
-    tableRowSize = _ref.tableRowSize,
-    tableContentRef = _ref.tableContentRef,
-    parentFieldName = _ref.parentFieldName,
-    handlePageChange = _ref.handlePageChange,
-    setData = _ref.setData,
-    onSearchAfter = _ref.onSearchAfter,
-    onSearchBefore = _ref.onSearchBefore;
+var TableTree = function TableTree(props) {
+  var data = props.data,
+    table = props.table,
+    sticky = props.sticky,
+    treeRef = props.treeRef,
+    tableRef = props.tableRef,
+    tableRowSize = props.tableRowSize,
+    tableContentRef = props.tableContentRef,
+    parentFieldName = props.parentFieldName,
+    handlePageChange = props.handlePageChange,
+    onSearchAfter = props.onSearchAfter,
+    onSearchBefore = props.onSearchBefore,
+    setData = props.setData;
   // async tree expand key
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     expandKeys = _useState2[0],
     setExpandKeys = _useState2[1];
-  var _ref2 = table,
-    rowKey = _ref2.rowKey,
-    expandable = _ref2.expandable,
-    columns = _ref2.columns,
-    httpRequest = _ref2.request;
+  var _ref = table,
+    rowKey = _ref.rowKey,
+    expandable = _ref.expandable,
+    columns = _ref.columns,
+    httpRequest = _ref.request,
+    fieldNames = _ref.fieldNames;
   var childrenColumnName = (expandable === null || expandable === void 0 ? void 0 : expandable.childrenColumnName) || 'children';
 
-  // 接口格式化方法
-  var _useProTableIntercept = useProTableInterceptor(),
-    onRequestFormat = _useProTableIntercept.onRequestFormat,
-    onResponseFormat = _useProTableIntercept.onResponseFormat;
-
   // 获取数据
   var _onRequestTree = /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var query,
         record,
         params,
         newParams,
         requestResult,
-        newRequestResult,
-        treeData,
+        newReqResult,
+        dataSource,
         _args = arguments;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -74,7 +70,7 @@ var TableTree = function TableTree(_ref) {
             }
 
             // onSearchBefore 请求前回传参数，可以在父组件进行修改
-            newParams = onSearchBefore ? onSearchBefore(params) : params; // 发起请求
+            newParams = onSearchBefore(params); // 发起请求
             setData(function (d) {
               return _objectSpread(_objectSpread({}, d), {}, {
                 loading: true
@@ -82,28 +78,26 @@ var TableTree = function TableTree(_ref) {
             });
             _context.t0 = httpRequest;
             if (!_context.t0) {
-              _context.next = 13;
+              _context.next = 11;
               break;
             }
-            _context.t1 = onResponseFormat;
-            _context.next = 11;
-            return httpRequest(onRequestFormat(_objectSpread({}, newParams)));
+            _context.next = 10;
+            return httpRequest(_objectSpread({}, newParams));
+          case 10:
+            _context.t0 = _context.sent;
           case 11:
-            _context.t2 = _context.sent;
-            _context.t0 = (0, _context.t1)(_context.t2);
-          case 13:
             requestResult = _context.t0;
             // 请求结果
-            if (requestResult && requestResult.success) {
+            if (requestResult) {
               // onSearchAfter 处理请求结果
-              newRequestResult = onSearchAfter ? onSearchAfter(requestResult) : requestResult;
-              treeData = newRequestResult.data;
+              newReqResult = onSearchAfter(requestResult); // 获取table数据
+              dataSource = getDataFromFields(newReqResult, fieldNames.dataSource);
               if (record) {
                 // 异步树
-                record[childrenColumnName] = treeData;
+                record[childrenColumnName] = dataSource;
                 setData(function (d) {
                   return _objectSpread(_objectSpread({}, d), {}, {
-                    result: _toConsumableArray(d.result || []),
+                    dataSource: _toConsumableArray(d.dataSource || []),
                     loading: false
                   });
                 });
@@ -111,7 +105,7 @@ var TableTree = function TableTree(_ref) {
                 setExpandKeys([]);
                 setData({
                   loading: false,
-                  result: treeData || []
+                  dataSource: dataSource
                 });
               }
             } else {
@@ -121,14 +115,14 @@ var TableTree = function TableTree(_ref) {
                 });
               });
             }
-          case 15:
+          case 13:
           case "end":
             return _context.stop();
         }
       }, _callee);
     }));
     return function onRequestTree() {
-      return _ref3.apply(this, arguments);
+      return _ref2.apply(this, arguments);
     };
   }();
   useImperativeHandle(treeRef, function () {

package/es/select/index.d.ts

@@ -20,7 +20,7 @@ type ApiSelectProps = Omit<SelectProps, 'fieldNames'> & {
     /** 查询请求 */
     onQuery?: (params?: any) => Promise<any>;
 };
-export declare function getDataFromArrayField(data: Record<string, any>, fields: string[]): any;
+export declare function getDataFromFields(data: Record<string, any>, fields: string[]): any;
 /**
  * 基于接口查询的select组件
  * @param CcsSelectProps

package/es/select/index.js

@@ -19,15 +19,14 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 import { useRequest } from 'ahooks';
 import { Select } from 'antd';
 import { useEffect } from 'react';
-import { useApiSelectInterceptor } from "../hooks/use-app";
 import { jsx as _jsx } from "react/jsx-runtime";
-export function getDataFromArrayField(data, fields) {
+export function getDataFromFields(data, fields) {
   if (!data || fields.length === 0) return;
   var newFields = _toConsumableArray(fields);
   var field = newFields.shift();
   var newData = data[field];
   if (_typeof(newData) === 'object' && newFields.length > 0) {
-    return getDataFromArrayField(newData, newFields);
+    return getDataFromFields(newData, newFields);
   }
   return newData;
 }
@@ -50,10 +49,6 @@ export default function CcsApiSelect(_ref) {
     restProps = _objectWithoutProperties(_ref, _excluded);
   var labelField = _toConsumableArray(onIsArray((fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.label) || ['data', 'label']));
   var valueField = _toConsumableArray(onIsArray((fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.value) || ['data', 'value']));
-  //  接口格式化方法
-  var _useApiSelectIntercep = useApiSelectInterceptor(),
-    onRequestFormat = _useApiSelectIntercep.onRequestFormat,
-    onResponseFormat = _useApiSelectIntercep.onResponseFormat;
   var _useRequest = useRequest( /*#__PURE__*/function () {
       var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(params) {
         var result, value;
@@ -67,7 +62,7 @@ export default function CcsApiSelect(_ref) {
               return _context.abrupt("return", []);
             case 2:
               _context.next = 4;
-              return onResponseFormat(onQuery(onRequestFormat(params)));
+              return onQuery(params);
             case 4:
               result = _context.sent;
             case 5:
@@ -80,8 +75,8 @@ export default function CcsApiSelect(_ref) {
                 break;
               }
               result.forEach(function (r) {
-                r.label = getDataFromArrayField(r, labelField);
-                r.value = getDataFromArrayField(r, valueField);
+                r.label = getDataFromFields(r, labelField);
+                r.value = getDataFromFields(r, valueField);
               });
               return _context.abrupt("break", 14);
             case 9:

package/es/table/index.js

@@ -15,12 +15,6 @@ import { useEffect, useImperativeHandle } from 'react';
 import { Resizable } from 'react-resizable';
 import "./index.less";
 import { jsx as _jsx } from "react/jsx-runtime";
-var DEFAULT_PAGE = {
-  totalNum: 0,
-  result: [],
-  pageSize: 10,
-  pageNo: 1
-};
 var ResizableTitle = function ResizableTitle(props) {
   var onResize = props.onResize,
     width = props.width,
@@ -58,11 +52,15 @@ var CustomTable = function CustomTable(props) {
     tableContentRef = props.tableContentRef,
     restProps = _objectWithoutProperties(props, _excluded2);
   var update = useUpdate();
-  var _ref = data || DEFAULT_PAGE,
-    totalNum = _ref.totalNum,
-    result = _ref.result,
-    pageNo = _ref.pageNo,
-    pageSize = _ref.pageSize;
+  var _ref = data || {},
+    _ref$dataSource = _ref.dataSource,
+    dataSource = _ref$dataSource === void 0 ? [] : _ref$dataSource,
+    _ref$pageSize = _ref.pageSize,
+    pageSize = _ref$pageSize === void 0 ? 10 : _ref$pageSize,
+    _ref$current = _ref.current,
+    current = _ref$current === void 0 ? 1 : _ref$current,
+    _ref$total = _ref.total,
+    total = _ref$total === void 0 ? 0 : _ref$total;
 
   // table 固定表头，内容滚动
   var _useDebounceFn = useDebounceFn(function () {
@@ -101,7 +99,7 @@ var CustomTable = function CustomTable(props) {
     onFixedThead = _useDebounceFn.run;
   useEffect(function () {
     onFixedThead();
-  }, [totalNum]);
+  }, [total]);
 
   // 监听窗口变化
   // useEventListener('resize', onFixedThead, { target: window });
@@ -169,7 +167,7 @@ var CustomTable = function CustomTable(props) {
         ellipsis: true,
         width: 60,
         render: function render(_value, _record, index) {
-          return index + 1 + ((pageNo || 1) - 1) * (pageSize || 10);
+          return index + 1 + ((current || 1) - 1) * (pageSize || 10);
         }
       });
     }
@@ -184,15 +182,15 @@ var CustomTable = function CustomTable(props) {
     }),
     children: /*#__PURE__*/_jsx(Table, _objectSpread(_objectSpread({
       rowKey: rowKey,
-      dataSource: result,
+      dataSource: dataSource,
       pagination: pagination === false ? false : _objectSpread({
-        total: totalNum,
+        total: total,
         pageSize: pageSize,
-        current: pageNo,
+        current: current,
         showSizeChanger: true,
         showQuickJumper: true,
         showTotal: function showTotal() {
-          return "\u5171".concat(totalNum, "\u6761\u8BB0\u5F55");
+          return "\u5171".concat(total, "\u6761\u8BB0\u5F55");
         },
         pageSizeOptions: ['10', '20', '30', '50', '100'],
         size: restProps.size === 'small' ? 'small' : 'default',
@@ -209,7 +207,7 @@ var CustomTable = function CustomTable(props) {
       }
     }, restProps), {}, {
       size: restProps.size || 'middle',
-      className: classNames(_defineProperty(_defineProperty(_defineProperty({}, 'ccs-table-nodata', !result || result.length === 0), 'ccs-table-wrapper', !rowSelection), "className", className)),
+      className: classNames(_defineProperty(_defineProperty(_defineProperty({}, 'ccs-table-nodata', !dataSource || dataSource.length === 0), 'ccs-table-wrapper', !rowSelection), "className", className)),
       scroll: scroll
     }))
   });

package/es/theme-dialog.d.ts

@@ -1,7 +1,6 @@
 import { MessageInstance } from 'antd/es/message/interface';
 import { HookAPI } from 'antd/es/modal/useModal';
 import { NotificationInstance } from 'antd/es/notification/interface';
-import CCS from '.';
 export default class ThemeDialog {
     static message: MessageInstance;
     static notice: NotificationInstance;
@@ -13,7 +12,12 @@ export default class ThemeDialog {
      * @param successText // 成功提示
      * @param failText // 失败提示
      */
-    static easyMessage(result: CCS.HttpResult, successText?: string, failText?: string): void;
+    static easyMessage(result?: {
+        /** 成功标识 */
+        success?: boolean;
+        /** 失败信息 */
+        msg?: string;
+    }, successText?: string, failText?: string): void;
     static confirm(content?: string): Promise<boolean>;
     /**
      * 确认提示框

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ccs-ui/rc-pro",
-  "version": "2.1.4",
+  "version": "2.1.6",
   "description": "",
   "license": "MIT",
   "author": {