@ccs-ui/rc-pro 2.4.1-alpha.2 → 2.4.1-alpha.3

package/es/dialog/button.d.ts

@@ -1,14 +1,13 @@
 import { FormProps } from 'antd';
 import React, { RefObject } from 'react';
-import * as CCS from '../ccs';
 import { DialogButtonsProps, DialogModalProps } from './_api';
 import { DialogFormRef } from './form';
 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<CCS.DialogModalProps<TParams, TData>, "request" | "auth" | "onOk" | "onClose" | "extraBtn" | "requestFieldNames" | "preventRequestHandle"> & {
+export declare const DialogButtonHolder: <TParams, TData>({ auth, extraBtn, formRef, request, onOk, onClose, buttonRef, requestFieldNames, formInitialValues, preventRequestHandle, }: Pick<DialogModalProps<TParams, TData>, "onOk" | "onClose" | "auth" | "extraBtn" | "request" | "requestFieldNames" | "preventRequestHandle"> & {
     formRef: React.RefObject<DialogFormRef<TParams>>;
     formInitialValues: FormProps['initialValues'];
     buttonRef: RefObject<DialogButtonRef>;
 }) => import("react/jsx-runtime").JSX.Element;
-export default function CcsDialogButtons<TParams>({ okText, okType, okAuth, loading, children, hideCancel, cancelText, onOk, }: DialogButtonsProps<TParams>): import("react/jsx-runtime").JSX.Element;
+export default function CcsDialogButtons<TParams>({ children, hideCancel, cancelText, onOk, okBtnProps, }: DialogButtonsProps<TParams>): import("react/jsx-runtime").JSX.Element;

package/es/dialog/button.js

@@ -13,6 +13,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+import CcsUtils from '@ccs-ui/utils';
 import { Button, Form } from 'antd';
 import React, { useEffect, useImperativeHandle, useState } from 'react';
 import CcsDialog from '.';
@@ -125,7 +126,7 @@ export var DialogButtonHolder = function DialogButtonHolder(_ref) {
               });
             }).catch(function (err) {
               setLoading(false);
-              console.log('e', err);
+              console.log('err', err);
             });
             return _context.abrupt("return");
           case 11:
@@ -159,54 +160,56 @@ export var DialogButtonHolder = function DialogButtonHolder(_ref) {
   });
 };
 export default function CcsDialogButtons(_ref3) {
-  var okText = _ref3.okText,
-    okType = _ref3.okType,
-    okAuth = _ref3.okAuth,
-    loading = _ref3.loading,
-    children = _ref3.children,
+  var children = _ref3.children,
     hideCancel = _ref3.hideCancel,
     cancelText = _ref3.cancelText,
-    onOk = _ref3.onOk;
+    onOk = _ref3.onOk,
+    okBtnProps = _ref3.okBtnProps;
   var _CcsDialog$useInstanc = CcsDialog.useInstance(),
-    closeDialog = _CcsDialog$useInstanc.closeDialog,
     buttonRef = _CcsDialog$useInstanc.buttonRef,
-    formInitialValues = _CcsDialog$useInstanc.formInitialValues,
     buttonType = _CcsDialog$useInstanc.buttonType,
-    onOkCallBack = _CcsDialog$useInstanc.onOkCallBack;
+    formInitialValues = _CcsDialog$useInstanc.formInitialValues,
+    closeDialog = _CcsDialog$useInstanc.closeDialog,
+    onOkCallBack = _CcsDialog$useInstanc.onOkCallBack,
+    request = _CcsDialog$useInstanc.request;
   var form = Form.useFormInstance();
+  CcsUtils.showWarning(!request, '使用了CcsDialog.Buttons自定义按钮行为，request请求将不会执行。');
   var onOkClick = /*#__PURE__*/function () {
     var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
       var values, formValues, okResult;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            if (onOk) {
-              _context2.next = 2;
-              break;
-            }
-            return _context2.abrupt("return");
-          case 2:
             // form返回表单值和所有初始值
             values = {};
             if (!form) {
-              _context2.next = 8;
+              _context2.next = 6;
               break;
             }
-            _context2.next = 6;
+            _context2.next = 4;
             return form.validateFields();
-          case 6:
+          case 4:
             formValues = _context2.sent;
             values = _objectSpread(_objectSpread({}, formInitialValues), formValues);
-          case 8:
+          case 6:
+            if (onOk) {
+              _context2.next = 10;
+              break;
+            }
+            closeDialog();
+            onOkCallBack === null || onOkCallBack === void 0 || onOkCallBack(values);
+            return _context2.abrupt("return");
+          case 10:
+            // 执行结果
             okResult = onOk(values); // 返回false阻止关闭对话框
             if (!(okResult === false)) {
-              _context2.next = 11;
+              _context2.next = 13;
               break;
             }
             return _context2.abrupt("return");
-          case 11:
+          case 13:
             if (!(_typeof(okResult) === 'object' && okResult.then)) {
-              _context2.next = 14;
+              _context2.next = 16;
               break;
             }
             okResult.then(function (d) {
@@ -216,10 +219,10 @@ export default function CcsDialogButtons(_ref3) {
               }
             });
             return _context2.abrupt("return");
-          case 14:
+          case 16:
             closeDialog();
             onOkCallBack === null || onOkCallBack === void 0 || onOkCallBack(okResult);
-          case 16:
+          case 18:
           case "end":
             return _context2.stop();
         }
@@ -229,28 +232,19 @@ export default function CcsDialogButtons(_ref3) {
       return _ref4.apply(this, arguments);
     };
   }();
+  var $okBtnProps = CcsUtils.mergeProps({
+    type: 'primary',
+    text: '确定'
+  }, okBtnProps);
   useEffect(function () {
     var _buttonRef$current;
-    if (!onOk && !children) return;
-    var btnProps = {
-      auth: okAuth,
-      loading: loading,
-      onClick: onOkClick
-    };
-    if (okType === 'danger') {
-      btnProps.danger = true;
-    } else {
-      btnProps.type = okType || 'primary';
-    }
     var btns = /*#__PURE__*/_jsxs(_Fragment, {
-      children: [children, onOk && /*#__PURE__*/_jsxs(_Fragment, {
-        children: [!hideCancel && /*#__PURE__*/_jsx(Button, {
-          onClick: closeDialog,
-          children: cancelText || '取消'
-        }), /*#__PURE__*/_jsx(CcsButton, _objectSpread(_objectSpread({}, btnProps), {}, {
-          children: okText || '确定'
-        }))]
-      })]
+      children: [!hideCancel && /*#__PURE__*/_jsx(Button, {
+        onClick: closeDialog,
+        children: cancelText || '取消'
+      }), children, (okBtnProps || onOk) && /*#__PURE__*/_jsx(CcsButton, _objectSpread(_objectSpread({}, $okBtnProps), {}, {
+        onClick: onOkClick
+      }))]
     });
     if (buttonType === 'modal') {
       btns = /*#__PURE__*/_jsx(_Fragment, {

package/es/dialog/index.js

@@ -1,12 +1,12 @@
 import ThemeDialog from "../theme-dialog";
-import CcsDialogFooter from "./button";
+import CcsDialogButtons from "./button";
 import { useDialogContext } from "./context";
 import CcsDrawerFooter from "./drawer-footer";
 import useCcsDialog from "./hook";
 var CcsDialog = ThemeDialog;
 
 /** 对话框按钮 */
-CcsDialog.Buttons = CcsDialogFooter;
+CcsDialog.Buttons = CcsDialogButtons;
 
 // 获取对话框open方法
 CcsDialog.useDialog = useCcsDialog;

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

@@ -114,7 +114,7 @@ export type TableFormItem = Omit<FormItemProps, 'mb'> & {
      * @deprecated
      * 请使用 children 代替
      */
-    value: ReactElement;
+    value?: ReactElement;
     /** form item element */
     /** @deprecated 请使用shouldUpdateNames */
     depends?: string[];

package/es/pro-table/table.js

@@ -36,6 +36,18 @@ import TableTree from "./tree";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
+function getNamesByJsonPath(names) {
+  return Object.keys(names).forEach(function (name) {
+    var nameValue = names[name];
+    if (nameValue === 'string') {
+      names[name] = nameValue.split('.');
+      return;
+    }
+    if (!Array.isArray(nameValue)) {
+      names[name] = [];
+    }
+  });
+}
 function onSetObj(target, paths, value) {
   while (paths.length > 0) {
     var path = paths.shift();
@@ -75,9 +87,14 @@ var InternalProTable = function InternalProTable(props) {
     _props$formInitValues = props.formInitValues,
     formInitValues = _props$formInitValues === void 0 ? {} : _props$formInitValues,
     onEvent = props.onEvent;
+
+  // 权限判断方法
   var _useCcsPage = useCcsPage(),
     onAuth = _useCcsPage.onAuth;
+  // antd config
   var config = useContext(ConfigContext);
+
+  // table 参数
   var _ref = table || {},
     pagination = _ref.pagination,
     _ref$requestParam = _ref.requestParam,
@@ -131,27 +148,29 @@ var InternalProTable = function InternalProTable(props) {
     _useState2 = _slicedToArray(_useState, 2),
     data = _useState2[0],
     setData = _useState2[1];
+  // table tree ref
   var treeRef = useRef(null);
+  // table size change
   var _useState3 = useState((table === null || table === void 0 ? void 0 : table.size) || 'middle'),
     _useState4 = _slicedToArray(_useState3, 2),
     tableRowSize = _useState4[0],
     setTableRowSize = _useState4[1];
-  // 上下文配置
+  // CCS 组件上下文配置
   var _useAppConfig = useAppConfig(),
     theme = _useAppConfig.theme;
   // 接口字段指定全局配置
   var globalFieldNames = useProTableFields();
+  // antd theme token
   var _antTheme$useToken = antTheme.useToken(),
     token = _antTheme$useToken.token;
 
-  // 暗黑模式
-  var isDark = theme === 'dark';
-
   // 权限判断
   var isAuth = useMemo(function () {
     if (auth) return onAuth && onAuth(auth);
     return true;
   }, [auth]);
+
+  // 获取有格式方法的查询条件
   var formatFormItems = useMemo(function () {
     return formItems.flat(Infinity).filter(function (f) {
       return f.onFormat;
@@ -181,8 +200,9 @@ var InternalProTable = function InternalProTable(props) {
                 });
               }
             }
+
+            // 格式化条件，格式化结果数据
             if (formatFormItems.length) {
-              // 格式化条件
               Object.keys(formValues).forEach(function (k) {
                 if (formValues[k] !== undefined) {
                   var s = formatFormItems.find(function (f) {
@@ -211,16 +231,16 @@ var InternalProTable = function InternalProTable(props) {
       var pageNo,
         pageSize,
         record,
-        allParams,
+        filterValues,
         fieldNames,
-        _fieldNames$requestPa,
-        _fieldNames$requestPa2,
+        _ref4,
+        _ref4$filters,
         fsFilters,
-        _fieldNames$requestPa3,
+        _ref4$pageNo,
         fsPageNo,
-        _fieldNames$requestPa4,
+        _ref4$pageSize,
         fsPageSize,
-        _fieldNames$requestPa5,
+        _ref4$orderProps,
         fsOrderProps,
         fsQuery,
         params,
@@ -248,15 +268,15 @@ var InternalProTable = function InternalProTable(props) {
             _context2.next = 7;
             return getFormValues();
           case 7:
-            allParams = _context2.sent;
+            filterValues = _context2.sent;
             // 接口字段指定
             fieldNames = _objectSpread(_objectSpread({}, globalFieldNames), (_props$table = props.table) === null || _props$table === void 0 ? void 0 : _props$table.fieldNames); // 请求字段
-            _fieldNames$requestPa = fieldNames.requestParam, _fieldNames$requestPa2 = _fieldNames$requestPa.filters, fsFilters = _fieldNames$requestPa2 === void 0 ? ['filters'] : _fieldNames$requestPa2, _fieldNames$requestPa3 = _fieldNames$requestPa.pageNo, fsPageNo = _fieldNames$requestPa3 === void 0 ? ['pageNo'] : _fieldNames$requestPa3, _fieldNames$requestPa4 = _fieldNames$requestPa.pageSize, fsPageSize = _fieldNames$requestPa4 === void 0 ? ['pageSize'] : _fieldNames$requestPa4, _fieldNames$requestPa5 = _fieldNames$requestPa.orderProps, fsOrderProps = _fieldNames$requestPa5 === void 0 ? ['orderProps'] : _fieldNames$requestPa5, fsQuery = _fieldNames$requestPa.query; // 构建请求参数
+            _ref4 = getNamesByJsonPath(fieldNames.requestParam) || {}, _ref4$filters = _ref4.filters, fsFilters = _ref4$filters === void 0 ? ['filters'] : _ref4$filters, _ref4$pageNo = _ref4.pageNo, fsPageNo = _ref4$pageNo === void 0 ? ['pageNo'] : _ref4$pageNo, _ref4$pageSize = _ref4.pageSize, fsPageSize = _ref4$pageSize === void 0 ? ['pageSize'] : _ref4$pageSize, _ref4$orderProps = _ref4.orderProps, fsOrderProps = _ref4$orderProps === void 0 ? ['orderProps'] : _ref4$orderProps, fsQuery = _ref4.query; // 构建请求参数
             params = {};
             if (fsQuery && fsQuery.length > 0) {
-              onSetObj(params, _toConsumableArray(fsQuery), allParams);
+              onSetObj(params, _toConsumableArray(fsQuery), filterValues);
             } else {
-              params = allParams;
+              params = filterValues;
             }
             if (pagination !== false) {
               // 分页
@@ -278,7 +298,7 @@ var InternalProTable = function InternalProTable(props) {
               _context2.next = 19;
               break;
             }
-            (_treeRef$current = treeRef.current) === null || _treeRef$current === void 0 || _treeRef$current.onRequestTree(eventType, params.query, record);
+            (_treeRef$current = treeRef.current) === null || _treeRef$current === void 0 || _treeRef$current.onRequestTree(eventType, params.query || params, record);
             return _context2.abrupt("return");
           case 19:
             // 事件回调，请求中
@@ -581,9 +601,9 @@ var InternalProTable = function InternalProTable(props) {
     }, rootStyle);
   }
   var onFullScreen = function onFullScreen(isFull) {
-    var _ref4 = containerRef.current || {},
-      classList = _ref4.classList,
-      style = _ref4.style;
+    var _ref5 = containerRef.current || {},
+      classList = _ref5.classList,
+      style = _ref5.style;
     if (isFull) {
       classList === null || classList === void 0 || classList.add('css-table-full');
       style.backgroundColor = token.colorBgContainer;
@@ -626,7 +646,7 @@ var InternalProTable = function InternalProTable(props) {
       targetRef: tableContentRef,
       onResize: onResize
     }), /*#__PURE__*/_jsxs("div", {
-      className: classNames(classPrefix, className, _defineProperty({}, 'dark-table', isDark)),
+      className: classNames(classPrefix, className, _defineProperty({}, 'dark-table', theme === 'dark')),
       style: _objectSpread(_objectSpread({}, rootStyle), (table === null || table === void 0 || (_table$scroll2 = table.scroll) === null || _table$scroll2 === void 0 ? void 0 : _table$scroll2.y) === 'auto' ? {
         overflow: 'hidden',
         height: '100%'

package/es/select/_api.d.ts

@@ -1,5 +1,10 @@
 import { SelectProps as AntSelectProps, ModalProps } from 'antd';
+import { NamePath } from 'antd/es/form/interface';
 import { ReactElement, ReactNode } from 'react';
+type SelectFieldNames = {
+    label?: NamePath;
+    value?: NamePath;
+};
 export type SelectProps = Omit<AntSelectProps, 'fieldNames'> & {
     /** 配置全部选项 */
     showAll?: boolean | {
@@ -7,10 +12,7 @@ export type SelectProps = Omit<AntSelectProps, 'fieldNames'> & {
         value: any;
     };
     /** 接口数据字段 */
-    fieldNames?: {
-        label?: string[] | string;
-        value?: string[] | string;
-    };
+    fieldNames?: SelectFieldNames;
 };
 export type SelectChildrenProps = Pick<AntSelectProps, 'value' | 'onChange' | 'mode'> & {
     /** 关闭弹框 */
@@ -50,3 +52,4 @@ export type ModalSelectProps = Omit<AntSelectProps, 'children' | 'title'> & {
     /** 自定义内容 */
     children?: ReactElement | ((props: SelectChildrenProps) => ReactNode);
 };
+export {};

package/es/utils.js

@@ -76,6 +76,8 @@ export function extractGender(idCard) {
 export function isUrl(str) {
   return /^https?:\/\/.+/.test(str);
 }
+
+// 根据namepath获取数据
 export function getDataByNamePath(data, name) {
   if (!data || !name) return;
   if (typeof name === 'string') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ccs-ui/rc-pro",
-  "version": "2.4.1-alpha.2",
+  "version": "2.4.1-alpha.3",
   "description": "",
   "license": "MIT",
   "author": {