@pointcloud/pcloud-components 1.0.9 → 1.0.11

package/dist/esm/CRUD/index.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import { type ModalFuncProps, type ButtonProps } from 'antd';
+import { type ModalFuncProps, type ButtonProps, type PopoverProps } from 'antd';
 import { type DFormProps } from '../DForm';
 import { type DTableSourceProps, type DTableProps } from '../DTable';
 import type { DModalProps } from '../DModal/interface';
@@ -24,6 +24,16 @@ export type CRUDRefProps = {
     openDetailModal: (_record?: any) => void;
 };
 export type MoreActionColumnRender<T = Record<string, any>> = (_text: any, _record: T) => React.ReactNode;
+export type MoreActionProps<T = Record<string, any>> = MoreActionColumnRender<T> | {
+    /** 内容渲染函数 */
+    render: MoreActionColumnRender<T>;
+    /** Popover 属性 */
+    popoverProps?: PopoverProps;
+    /** 更多按钮文字，默认为"更多" */
+    label?: string;
+    /** 更多按钮配置 */
+    buttonProps?: ButtonProps;
+};
 export type CRUDProps = {
     className?: string;
     style?: React.CSSProperties;
@@ -33,7 +43,7 @@ export type CRUDProps = {
     };
     /** 表格配置 */
     tableProps: DTableProps & {
-        moreActionColumn?: MoreActionColumnRender;
+        moreActionColumn?: MoreActionProps;
     };
     /** 新增/编辑表单配置 */
     modalFormProps?: {
@@ -57,18 +67,24 @@ export type CRUDProps = {
     batchDeleteButtonProps?: ButtonProps;
     /** 显示行编辑 */
     showEdit?: boolean;
+    /** 根据行数据动态控制编辑按钮显隐 */
+    showEditPerRow?: (_record: any) => boolean;
     /** 行编辑按钮文本 */
     editButtonText?: string;
     /** 编辑按钮配置 */
     editButtonProps?: ButtonProps;
     /** 显示行删除 */
     showDelete?: boolean;
+    /** 根据行数据动态控制删除按钮显隐 */
+    showDeletePerRow?: (_record: any) => boolean;
     /** 删除按钮文本 */
     deleteButtonText?: string;
     /** 删除按钮配置 */
     deleteButtonProps?: ButtonProps;
     /** 显示行查看 */
     showView?: boolean;
+    /** 根据行数据动态控制查看按钮显隐 */
+    showViewPerRow?: (_record: any) => boolean;
     /** 行查看按钮文本 */
     viewButtonText?: string;
     /** 行查看按钮配置 */
@@ -80,13 +96,13 @@ export type CRUDProps = {
     crudApi: {
         list: (_params: any) => Promise<DTableSourceProps>;
         /** 删除数据接口 */
-        delete?: (_params: any) => Promise<any>;
+        delete?: (_currentRecord: any) => Promise<any>;
         /** 新增数据接口 */
         add?: (_params: any) => Promise<any>;
         /** 编辑数据接口 */
-        edit?: (_params: any) => Promise<any>;
+        edit?: (_params: any, _currentRecord: any) => Promise<any>;
         /** 详情数据接口 */
-        detail?: (_params: any) => Promise<any>;
+        detail?: (_currentRecord: any) => Promise<any>;
     };
     /** 全局刷新策略 */
     refreshStrategy?: RefreshStrategy;

package/dist/esm/CRUD/index.js

@@ -6,7 +6,7 @@ import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 var _excluded = ["immediate"],
-  _excluded2 = ["columns", "extraParams"];
+  _excluded2 = ["columns"];
 import React, { useMemo, useState, useContext, useCallback, useRef, forwardRef, useImperativeHandle, useEffect } from 'react';
 import classNames from 'classnames';
 import { Button, Popover } from 'antd';
@@ -25,7 +25,7 @@ import { jsxs as _jsxs } from "react/jsx-runtime";
 var defaultStrategies = {
   add: {
     keepSearchValues: true,
-    keepPage: false
+    keepPage: true
   },
   edit: {
     keepSearchValues: true,
@@ -54,10 +54,13 @@ var forwardCRUD = /*#__PURE__*/forwardRef(function (props, ref) {
     batchDeleteButtonProps = props.batchDeleteButtonProps,
     _props$showEdit = props.showEdit,
     showEdit = _props$showEdit === void 0 ? true : _props$showEdit,
+    showEditPerRow = props.showEditPerRow,
     _props$showDelete = props.showDelete,
     showDelete = _props$showDelete === void 0 ? true : _props$showDelete,
+    showDeletePerRow = props.showDeletePerRow,
     _props$showView = props.showView,
     showView = _props$showView === void 0 ? true : _props$showView,
+    showViewPerRow = props.showViewPerRow,
     _props$editButtonProp = props.editButtonProps,
     editButtonProps = _props$editButtonProp === void 0 ? {} : _props$editButtonProp,
     _props$deleteButtonPr = props.deleteButtonProps,
@@ -365,9 +368,10 @@ var forwardCRUD = /*#__PURE__*/forwardRef(function (props, ref) {
           return _regeneratorRuntime().wrap(function _callee6$(_context6) {
             while (1) switch (_context6.prev = _context6.next) {
               case 0:
-                _context6.next = 2;
+                _context6.prev = 0;
+                _context6.next = 3;
                 return deleteApi(_objectSpread({}, selectedData));
-              case 2:
+              case 3:
                 _isNeedRefreshToPage = isNeedRefreshToPage(selectedData.selectedRows.length), needRefreshToPage = _isNeedRefreshToPage.needRefreshToPage, targetPage = _isNeedRefreshToPage.targetPage;
                 handleRefresh(memoizedDeleteRefreshStrategy, {
                   needRefreshToPage: needRefreshToPage,
@@ -377,11 +381,17 @@ var forwardCRUD = /*#__PURE__*/forwardRef(function (props, ref) {
                   selectedRowKeys: [],
                   selectedRows: []
                 });
-              case 5:
+                _context6.next = 11;
+                break;
+              case 8:
+                _context6.prev = 8;
+                _context6.t0 = _context6["catch"](0);
+                return _context6.abrupt("return", Promise.reject(_context6.t0));
+              case 11:
               case "end":
                 return _context6.stop();
             }
-          }, _callee6);
+          }, _callee6, null, [[0, 8]]);
         }));
         function onOk() {
           return _onOk.apply(this, arguments);
@@ -403,19 +413,26 @@ var forwardCRUD = /*#__PURE__*/forwardRef(function (props, ref) {
                   return _regeneratorRuntime().wrap(function _callee7$(_context7) {
                     while (1) switch (_context7.prev = _context7.next) {
                       case 0:
-                        _context7.next = 2;
+                        _context7.prev = 0;
+                        _context7.next = 3;
                         return deleteApi(record);
-                      case 2:
+                      case 3:
                         _isNeedRefreshToPage2 = isNeedRefreshToPage(), needRefreshToPage = _isNeedRefreshToPage2.needRefreshToPage, targetPage = _isNeedRefreshToPage2.targetPage;
                         handleRefresh(memoizedDeleteRefreshStrategy, {
                           needRefreshToPage: needRefreshToPage,
                           targetPage: targetPage
                         });
-                      case 4:
+                        _context7.next = 10;
+                        break;
+                      case 7:
+                        _context7.prev = 7;
+                        _context7.t0 = _context7["catch"](0);
+                        return _context7.abrupt("return", Promise.reject(_context7.t0));
+                      case 10:
                       case "end":
                         return _context7.stop();
                     }
-                  }, _callee7);
+                  }, _callee7, null, [[0, 7]]);
                 }));
                 function onOk() {
                   return _onOk2.apply(this, arguments);
@@ -444,7 +461,7 @@ var forwardCRUD = /*#__PURE__*/forwardRef(function (props, ref) {
               break;
             }
             _context9.next = 4;
-            return editApi(_objectSpread(_objectSpread({}, currentRecordRef.current || {}), values));
+            return editApi(_objectSpread(_objectSpread({}, currentRecordRef.current || {}), values), currentRecordRef.current);
           case 4:
             handleRefresh(memoizedEditRefreshStrategy);
             _context9.next = 11;
@@ -529,10 +546,15 @@ var forwardCRUD = /*#__PURE__*/forwardRef(function (props, ref) {
     var currentHandleEdit = handleEdit;
     var currentHandleDelete = handleDelete;
     var currentHandleView = handleView;
+    var moreActionConfig = tableProps !== null && tableProps !== void 0 && tableProps.moreActionColumn ? typeof tableProps.moreActionColumn === 'function' ? {
+      render: tableProps.moreActionColumn
+    } : tableProps.moreActionColumn : null;
     return function (_text, record) {
+      var moreContent = moreActionConfig === null || moreActionConfig === void 0 ? void 0 : moreActionConfig.render(_text, record);
+      var showContent = !!moreContent;
       return /*#__PURE__*/_jsxs("div", {
         className: actionColumnClass,
-        children: [showEdit && /*#__PURE__*/_jsx(Button, _objectSpread(_objectSpread({
+        children: [showEdit && (!showEditPerRow || showEditPerRow(record)) && /*#__PURE__*/_jsx(Button, _objectSpread(_objectSpread({
           type: "link",
           icon: /*#__PURE__*/_jsx(EditOutlined, {}),
           onClick: function onClick() {
@@ -541,7 +563,7 @@ var forwardCRUD = /*#__PURE__*/forwardRef(function (props, ref) {
           size: "small"
         }, editButtonProps), {}, {
           children: editButtonText
-        })), showDelete && /*#__PURE__*/_jsx(Button, _objectSpread(_objectSpread({
+        })), showDelete && (!showDeletePerRow || showDeletePerRow(record)) && /*#__PURE__*/_jsx(Button, _objectSpread(_objectSpread({
           type: "link",
           danger: true,
           icon: /*#__PURE__*/_jsx(DeleteOutlined, {}),
@@ -551,7 +573,7 @@ var forwardCRUD = /*#__PURE__*/forwardRef(function (props, ref) {
           size: "small"
         }, deleteButtonProps), {}, {
           children: deleteButtonText
-        })), showView && /*#__PURE__*/_jsx(Button, _objectSpread(_objectSpread({
+        })), showView && (!showViewPerRow || showViewPerRow(record)) && /*#__PURE__*/_jsx(Button, _objectSpread(_objectSpread({
           type: "link",
           icon: /*#__PURE__*/_jsx(EyeOutlined, {}),
           onClick: function onClick() {
@@ -560,34 +582,38 @@ var forwardCRUD = /*#__PURE__*/forwardRef(function (props, ref) {
           size: "small"
         }, viewButtonProps), {}, {
           children: viewButtonText
-        })), (tableProps === null || tableProps === void 0 ? void 0 : tableProps.moreActionColumn) && /*#__PURE__*/_jsx(Popover, {
+        })), moreActionConfig && showContent && /*#__PURE__*/_jsx(Popover, _objectSpread(_objectSpread({
           trigger: "click",
           placement: "bottomRight",
-          content: tableProps === null || tableProps === void 0 ? void 0 : tableProps.moreActionColumn(_text, record),
+          content: moreContent,
           zIndex: 5,
           getPopupContainer: function getPopupContainer(e) {
             return e.parentElement || document.body;
-          },
-          children: /*#__PURE__*/_jsx(Button, {
+          }
+        }, moreActionConfig.popoverProps), {}, {
+          children: /*#__PURE__*/_jsx(Button, _objectSpread(_objectSpread({
             type: "link",
             icon: /*#__PURE__*/_jsx(MoreOutlined, {}),
-            size: "small",
-            children: "\u66F4\u591A"
-          })
-        })]
+            size: "small"
+          }, moreActionConfig.buttonProps), {}, {
+            children: moreActionConfig.label || '更多'
+          }))
+        }))]
       });
     };
-  }, [handleEdit, handleDelete, handleView, showEdit, showDelete, showView, editButtonText, deleteButtonText, viewButtonText, tableProps === null || tableProps === void 0 ? void 0 : tableProps.moreActionColumn]);
+  }, [handleEdit, handleDelete, handleView, showEdit, showEditPerRow, showDelete, showDeletePerRow, showView, showViewPerRow, editButtonText, deleteButtonText, viewButtonText, tableProps === null || tableProps === void 0 ? void 0 : tableProps.moreActionColumn]);
+  // 缓存搜索参数
+  var tableExtraParams = useMemo(function () {
+    return _objectSpread(_objectSpread({}, (tableProps === null || tableProps === void 0 ? void 0 : tableProps.extraParams) || {}), searchValues);
+  }, [JSON.stringify(tableProps === null || tableProps === void 0 ? void 0 : tableProps.extraParams), JSON.stringify(searchValues)]);
   var tablePropsWithSearch = useMemo(function () {
     var _ref9 = tableProps || {},
       _ref9$columns = _ref9.columns,
       columns = _ref9$columns === void 0 ? [] : _ref9$columns,
-      tableExtraParams = _ref9.extraParams,
       otherTableProps = _objectWithoutProperties(_ref9, _excluded2);
-    return _objectSpread({
+    return _objectSpread(_objectSpread({
       actionColumn: actionColumn,
       columns: tablePropsState.columns || columns,
-      extraParams: _objectSpread(_objectSpread({}, tableExtraParams || {}), searchValues),
       rowSelection: {
         fixed: true,
         onChange: function onChange(selectedRowKeys, selectedRows) {
@@ -598,13 +624,23 @@ var forwardCRUD = /*#__PURE__*/forwardRef(function (props, ref) {
         }
       },
       loadMore: listApi
-    }, otherTableProps);
-  }, [tableProps, tablePropsState.columns, searchValues, actionColumn, listApi]);
+    }, otherTableProps), {}, {
+      extraParams: tableExtraParams
+    });
+  }, [tableProps, tablePropsState.columns, tableExtraParams, actionColumn, listApi]);
   var mergedModalFormProps = useMemo(function () {
-    var _modalFormProps$modal;
+    var _modalFormProps$modal, _modalFormProps$formP;
     if (!(modalFormProps !== null && modalFormProps !== void 0 && modalFormProps.formProps)) return null;
     var isViewMode = modalConfig.mode === 'view';
     var modalTitle = (modalFormProps === null || modalFormProps === void 0 || (_modalFormProps$modal = modalFormProps.modalProps) === null || _modalFormProps$modal === void 0 ? void 0 : _modalFormProps$modal.title) || '';
+
+    // 详情模式下，显式禁用每个表单项（避免依赖 Ant Design Form 的 disabled 级联）
+    var baseItems = (_modalFormProps$formP = modalFormProps.formProps) === null || _modalFormProps$formP === void 0 ? void 0 : _modalFormProps$formP.items;
+    var items = isViewMode && baseItems !== null && baseItems !== void 0 && baseItems.length ? baseItems.map(function (item) {
+      return _objectSpread(_objectSpread({}, item), {}, {
+        disabled: true
+      });
+    }) : baseItems;
     return {
       modalProps: _objectSpread(_objectSpread({
         open: modalConfig.visible,
@@ -613,12 +649,13 @@ var forwardCRUD = /*#__PURE__*/forwardRef(function (props, ref) {
       }, modalFormProps === null || modalFormProps === void 0 ? void 0 : modalFormProps.modalProps), {}, {
         title: isViewMode ? "".concat(modalTitle, "\u8BE6\u60C5") : modalConfig.mode === 'edit' ? "\u7F16\u8F91".concat(modalTitle) : "\u65B0\u589E".concat(modalTitle)
       }),
-      formProps: _objectSpread({
+      formProps: _objectSpread(_objectSpread({
         values: detailData || currentRecordRef.current || {},
         disabled: isViewMode,
-        // 详情模式下禁用表单编辑
         className: "".concat(classname, "-modalform-").concat(modalConfig.mode)
-      }, modalFormProps === null || modalFormProps === void 0 ? void 0 : modalFormProps.formProps)
+      }, modalFormProps === null || modalFormProps === void 0 ? void 0 : modalFormProps.formProps), {}, {
+        items: items
+      })
     };
   }, [modalConfig, detailData, handleCancel, handleModalOk, modalFormProps, classname]);
   var onActions = useMemo(function () {

package/dist/esm/index.d.ts

@@ -65,6 +65,6 @@ export type { AnimatedScrollListProps } from './AnimatedScrollList/interface';
 export { default as DRangePicker } from './DRangePicker';
 export type { DRangePickerProps } from './DRangePicker/interface';
 export { default as CRUD } from './CRUD';
-export { type CRUDProps, type CRUDRefProps, type MoreActionColumnRender } from './CRUD';
+export { type CRUDProps, type CRUDRefProps, type MoreActionProps, type MoreActionColumnRender } from './CRUD';
 export { default as DynamicFormItem } from './DynamicFormItem';
 export type { DynamicFormItemProps } from './DynamicFormItem';