@ccs-ui/rc-pro 2.1.5 → 2.1.7

package/es/config.js

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

package/es/context/index.d.ts

@@ -48,6 +48,12 @@ type FnContextType<T = Store> = {
     formInitialValues: T;
     close: () => void;
 };
+type CcsFieldNamesType = {
+    dataSource: string[];
+    total: string[];
+    current: string[];
+    pageSize: string[];
+};
 type CssAppConfigType = {
     /** 主题 */
     theme?: 'dark' | 'light' | 'colorful';
@@ -59,12 +65,12 @@ type CssAppConfigType = {
     watermark?: WaterMarkProps;
     /** modal or drawer holder */
     holderRef?: React.RefObject<ElementsHolderRef>;
-    /** CcsProTable 组件字段全局指定 */
-    CcsProTableFieldNames?: {
-        dataSource: string[];
-        total: string[];
-        current: string[];
-        pageSize: string[];
+    /** 接口字段指定 */
+    fieldNames?: {
+        /** CcsProTable 组件字段全局指定 */
+        proTable?: CcsFieldNamesType;
+        /** CcsProTable.Tree 组件字段全局指定 */
+        proTableTree?: Pick<CcsFieldNamesType, 'dataSource'>;
     };
 };
 declare const DrawerAndModalContext: React.Context<FnContextType<any>>;
@@ -72,4 +78,4 @@ declare const PageContext: React.Context<PageContextType>;
 declare const TabsContext: React.Context<CcsTabsContextType>;
 declare const AppConfigContext: React.Context<CssAppConfigType>;
 export { AppConfigContext, DrawerAndModalContext, PageContext, TabsContext };
-export type { CcsTabsChangeProps, CcsTabsContextType, CssAppConfigType, FnContextType, };
+export type { CcsFieldNamesType, CcsTabsChangeProps, CcsTabsContextType, CssAppConfigType, FnContextType, };

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

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

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

@@ -3,10 +3,6 @@
  * @returns
  */
 declare const useAppConfig: () => import("../context").CssAppConfigType;
-export declare const useProTableFields: () => {
-    dataSource: string[];
-    total: string[];
-    current: string[];
-    pageSize: string[];
-} | undefined;
+export declare const useProTableFields: () => import("../context").CcsFieldNamesType | undefined;
+export declare const useProTableTreeFields: () => Pick<import("../context").CcsFieldNamesType, "dataSource"> | undefined;
 export default useAppConfig;

package/es/hooks/use-app.js

@@ -13,7 +13,13 @@ var useAppConfig = function useAppConfig() {
   return context;
 };
 export var useProTableFields = function useProTableFields() {
+  var _context$fieldNames;
   var context = useContext(AppConfigContext) || {};
-  return context === null || context === void 0 ? void 0 : context.CcsProTableFieldNames;
+  return context === null || context === void 0 || (_context$fieldNames = context.fieldNames) === null || _context$fieldNames === void 0 ? void 0 : _context$fieldNames.proTable;
+};
+export var useProTableTreeFields = function useProTableTreeFields() {
+  var _context$fieldNames2;
+  var context = useContext(AppConfigContext) || {};
+  return context === null || context === void 0 || (_context$fieldNames2 = context.fieldNames) === null || _context$fieldNames2 === void 0 ? void 0 : _context$fieldNames2.proTableTree;
 };
 export default useAppConfig;

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

@@ -4,7 +4,7 @@ import { TableSticky } from 'rc-table/lib/interface';
 import React, { CSSProperties, ReactElement, ReactNode } from 'react';
 import CCS from '..';
 import { PropsWithCss, PropsWithNodeChildren, TableColumns } from '../ccs';
-import { CssAppConfigType } from '../context';
+import { CcsFieldNamesType } from '../context';
 import './index.less';
 type ParamType = Record<string, any>;
 export type ShowDependType = {
@@ -33,7 +33,7 @@ export type CcsTableProps<T> = Omit<TableProps<T>, 'columns' | 'title'> & {
     /** request 额外参数 dataSource: ['data', 'result']; current: ['data', 'pageNo']; pageSize: ['data', 'pageSize']; total: ['data', 'totalNum'] */
     requestParam?: ParamType;
     /** 接口字段指定,默认： */
-    fieldNames?: CssAppConfigType['CcsProTableFieldNames'];
+    fieldNames?: CcsFieldNamesType;
     /** class name */
     className?: string;
     /** style */

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

@@ -2,6 +2,7 @@ import { TableProps } from 'antd';
 import { TableSticky } from 'rc-table/lib/interface';
 import { RefObject } from 'react';
 import CCS from '..';
+import { CcsFieldNamesType } from '../context';
 import { TableRefType } from '../table';
 import { CcsProTableProps } from './table';
 export type TreeInstance<T> = {
@@ -17,6 +18,7 @@ type TreeTableProps<T> = Pick<CcsProTableProps<T>, 'table' | 'onSearchBefore' |
     tableContentRef: React.RefObject<HTMLDivElement>;
     setData: React.Dispatch<React.SetStateAction<CCS.TableData<T>>>;
     handlePageChange: any;
+    fieldNames?: Pick<CcsFieldNamesType, 'dataSource'>;
 };
 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,6 +20,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import CcsUtils from '@ccs-ui/utils';
 import { useImperativeHandle, useState } from 'react';
 import { CcsTable } from '..';
+import { useProTableTreeFields } from "../hooks/use-app";
 import { getDataFromFields } from "../select";
 import { jsx as _jsx } from "react/jsx-runtime";
 var TableTree = function TableTree(props) {
@@ -44,10 +45,16 @@ var TableTree = function TableTree(props) {
     rowKey = _ref.rowKey,
     expandable = _ref.expandable,
     columns = _ref.columns,
-    httpRequest = _ref.request,
-    fieldNames = _ref.fieldNames;
+    httpRequest = _ref.request;
   var childrenColumnName = (expandable === null || expandable === void 0 ? void 0 : expandable.childrenColumnName) || 'children';
 
+  // 接口字段指定全局配置
+  var globalFieldNames = useProTableTreeFields();
+  // 接口字段指定
+  var fieldNames = props.fieldNames || globalFieldNames || {
+    dataSource: ['data']
+  };
+
   // 获取数据
   var _onRequestTree = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {

package/package.json

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