@pointcloud/pcloud-components 1.0.11 → 1.0.13

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

@@ -10,18 +10,18 @@ export type RefreshStrategy = {
     /** 是否保持当前页码，默认为false（回到第一页） */
     keepPage?: boolean;
 };
-export type CRUDRefProps = {
+export type CRUDRefProps<T = Record<string, any>> = {
     /** 刷新表格数据 */
     refresh: (_strategy?: RefreshStrategy) => void;
     getSelectedRows: () => {
         selectedRowKeys: string[];
-        selectedRows: any[];
+        selectedRows: T[];
     };
     getSearchValues: () => Record<string, any>;
-    openAddModal: (_record?: any) => void;
-    openEditModal: (_record?: any) => void;
-    openDeleteModal: (_record?: any) => void;
-    openDetailModal: (_record?: any) => void;
+    openAddModal: (_record?: Partial<T>) => void;
+    openEditModal: (_record: T) => void;
+    openDeleteModal: (_record: T) => void;
+    openDetailModal: (_record: T) => void;
 };
 export type MoreActionColumnRender<T = Record<string, any>> = (_text: any, _record: T) => React.ReactNode;
 export type MoreActionProps<T = Record<string, any>> = MoreActionColumnRender<T> | {
@@ -34,7 +34,7 @@ export type MoreActionProps<T = Record<string, any>> = MoreActionColumnRender<T>
     /** 更多按钮配置 */
     buttonProps?: ButtonProps;
 };
-export type CRUDProps = {
+export type CRUDProps<T = Record<string, any>> = {
     className?: string;
     style?: React.CSSProperties;
     /** 查询表单配置 */
@@ -43,7 +43,7 @@ export type CRUDProps = {
     };
     /** 表格配置 */
     tableProps: DTableProps & {
-        moreActionColumn?: MoreActionProps;
+        moreActionColumn?: MoreActionProps<T>;
     };
     /** 新增/编辑表单配置 */
     modalFormProps?: {
@@ -68,7 +68,7 @@ export type CRUDProps = {
     /** 显示行编辑 */
     showEdit?: boolean;
     /** 根据行数据动态控制编辑按钮显隐 */
-    showEditPerRow?: (_record: any) => boolean;
+    showEditPerRow?: (_record: T) => boolean;
     /** 行编辑按钮文本 */
     editButtonText?: string;
     /** 编辑按钮配置 */
@@ -76,7 +76,7 @@ export type CRUDProps = {
     /** 显示行删除 */
     showDelete?: boolean;
     /** 根据行数据动态控制删除按钮显隐 */
-    showDeletePerRow?: (_record: any) => boolean;
+    showDeletePerRow?: (_record: T) => boolean;
     /** 删除按钮文本 */
     deleteButtonText?: string;
     /** 删除按钮配置 */
@@ -84,7 +84,7 @@ export type CRUDProps = {
     /** 显示行查看 */
     showView?: boolean;
     /** 根据行数据动态控制查看按钮显隐 */
-    showViewPerRow?: (_record: any) => boolean;
+    showViewPerRow?: (_record: T) => boolean;
     /** 行查看按钮文本 */
     viewButtonText?: string;
     /** 行查看按钮配置 */
@@ -96,13 +96,13 @@ export type CRUDProps = {
     crudApi: {
         list: (_params: any) => Promise<DTableSourceProps>;
         /** 删除数据接口 */
-        delete?: (_currentRecord: any) => Promise<any>;
+        delete?: (_currentRecord: T) => Promise<any>;
         /** 新增数据接口 */
         add?: (_params: any) => Promise<any>;
         /** 编辑数据接口 */
-        edit?: (_params: any, _currentRecord: any) => Promise<any>;
+        edit?: (_params: any, _currentRecord: T) => Promise<any>;
         /** 详情数据接口 */
-        detail?: (_currentRecord: any) => Promise<any>;
+        detail?: (_currentRecord: T) => Promise<any>;
     };
     /** 全局刷新策略 */
     refreshStrategy?: RefreshStrategy;
@@ -113,5 +113,11 @@ export type CRUDProps = {
     /** 删除场景刷新策略，优先级高于全局配置 */
     deleteRefreshStrategy?: RefreshStrategy;
 };
-declare const forwardCRUD: React.ForwardRefExoticComponent<CRUDProps & React.RefAttributes<CRUDRefProps>>;
+interface CRUDType {
+    <T extends Record<string, any> = Record<string, any>>(_props: CRUDProps<T> & {
+        ref?: React.Ref<CRUDRefProps<T>>;
+    }): React.ReactElement;
+    displayName?: string;
+}
+declare const forwardCRUD: CRUDType;
 export default forwardCRUD;

package/dist/esm/CRUD/index.js

@@ -36,7 +36,7 @@ var defaultStrategies = {
     keepPage: true
   }
 };
-var forwardCRUD = /*#__PURE__*/forwardRef(function (props, ref) {
+function CRUDInner(props, ref) {
   var _props$tableProps;
   var className = props.className,
     _props$style = props.style,
@@ -746,5 +746,7 @@ var forwardCRUD = /*#__PURE__*/forwardRef(function (props, ref) {
       className: "".concat(classname, "-table")
     })), mergedModalFormProps && /*#__PURE__*/_jsx(ModalForm, _objectSpread({}, mergedModalFormProps))]
   });
-});
+}
+var forwardCRUD = /*#__PURE__*/forwardRef(CRUDInner);
+forwardCRUD.displayName = 'CRUD';
 export default forwardCRUD;

package/dist/esm/DForm/DItem/index.js

@@ -21,6 +21,7 @@ function DItem(props) {
     name: name
   }, formItemProps);
   var hasShouldUpdate = typeof (formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.shouldUpdate) !== 'undefined';
+  var form = Form.useFormInstance();
   if (['custom', 'other'].includes(renderType) && hasShouldUpdate) {
     return /*#__PURE__*/_jsx(Form.Item, {
       noStyle: true,
@@ -33,12 +34,12 @@ function DItem(props) {
   }
   if (renderType === 'custom') {
     return render ? /*#__PURE__*/_jsx(_Fragment, {
-      children: render(otherProps, _formItemProps, props)
+      children: render(otherProps, _formItemProps, props, form)
     }) : /*#__PURE__*/_jsx(_Fragment, {
       children: children
     });
   } else if (renderType === 'other') {
-    var _children = render ? render(otherProps, _formItemProps, props) : children;
+    var _children = render ? render(otherProps, _formItemProps, props, form) : children;
     return itemsRender.other(_formItemProps, _children);
   } else if (renderType) {
     return itemsRender[renderType](otherProps, _formItemProps, label, render, children);

package/dist/esm/DynamicFormItem/index.js

@@ -12,8 +12,7 @@ import { Fragment as _Fragment } from "react/jsx-runtime";
 var DynamicFormItem = function DynamicFormItem(props) {
   var _props$name = props.name,
     name = _props$name === void 0 ? 'dynamicItems' : _props$name,
-    _props$initialValue = props.initialValue,
-    initialValue = _props$initialValue === void 0 ? [undefined] : _props$initialValue,
+    initialValue = props.initialValue,
     rules = props.rules,
     itemConfig = props.itemConfig,
     _props$addButtonText = props.addButtonText,
@@ -26,7 +25,7 @@ var DynamicFormItem = function DynamicFormItem(props) {
     _props$removeButtonPr = props.removeButtonProps,
     removeButtonProps = _props$removeButtonPr === void 0 ? {} : _props$removeButtonPr,
     _props$minItems = props.minItems,
-    minItems = _props$minItems === void 0 ? 0 : _props$minItems,
+    minItems = _props$minItems === void 0 ? 1 : _props$minItems,
     maxItems = props.maxItems,
     _props$showAdd = props.showAdd,
     showAdd = _props$showAdd === void 0 ? true : _props$showAdd,
@@ -34,6 +33,9 @@ var DynamicFormItem = function DynamicFormItem(props) {
     showRemove = _props$showRemove === void 0 ? true : _props$showRemove,
     _props$addPosition = props.addPosition,
     addPosition = _props$addPosition === void 0 ? 'bottom' : _props$addPosition;
+  var _initialValue = initialValue !== null && initialValue !== void 0 ? initialValue : minItems === 0 ? [] : Array.from({
+    length: minItems
+  });
   var renderItem = function renderItem(_ref, index, _ref2, totalFieldsCount) {
     var key = _ref.key,
       name = _ref.name;
@@ -86,7 +88,7 @@ var DynamicFormItem = function DynamicFormItem(props) {
   };
   return /*#__PURE__*/_jsx(Form.List, {
     name: name,
-    initialValue: initialValue,
+    initialValue: _initialValue,
     rules: rules,
     children: function children(fields, operation) {
       return /*#__PURE__*/_jsxs(_Fragment, {

package/dist/esm/ModalForm/index.js

@@ -104,7 +104,7 @@ export default (function (props) {
     onOk: handleOk
   })), {}, {
     children: [children, /*#__PURE__*/_jsx(DForm, _objectSpread(_objectSpread({}, formProps), {}, {
-      form: form
+      form: formInstance
     }))]
   }));
 });