@pointcloud/pcloud-components 1.0.6 → 1.0.7

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

@@ -1,7 +1,7 @@
 import React from 'react';
 import { type ModalFuncProps, type ButtonProps } from 'antd';
 import { type DFormProps } from '../DForm';
-import { DTableSourceProps, type DTableProps } from '../DTable';
+import { type DTableSourceProps, type DTableProps } from '../DTable';
 import type { DModalProps } from '../DModal/interface';
 import './index.less';
 export type RefreshStrategy = {
@@ -23,6 +23,7 @@ export type CRUDRefProps = {
     openDeleteModal: (_record?: any) => void;
     openDetailModal: (_record?: any) => void;
 };
+export type MoreActionColumnRender = (_text: any, _record: Record<string, any>) => React.ReactNode;
 export type CRUDProps = {
     className?: string;
     style?: React.CSSProperties;
@@ -70,6 +71,8 @@ export type CRUDProps = {
     viewButtonText?: string;
     /** 行查看按钮配置 */
     viewButtonProps?: ButtonProps;
+    /** 更多操作列自定义渲染，参数为(text, record)，返回ReactNode */
+    moreActionColumn?: MoreActionColumnRender;
     /** 自定义操作栏 */
     actionBar?: React.ReactNode;
     /** 数据刷新回调 */

package/dist/esm/CRUD/index.js

@@ -9,8 +9,8 @@ var _excluded = ["immediate"],
   _excluded2 = ["columns", "extraParams"];
 import React, { useMemo, useState, useContext, useCallback, useRef, forwardRef, useImperativeHandle, useEffect } from 'react';
 import classNames from 'classnames';
-import { Button } from 'antd';
-import { PlusOutlined, EditOutlined, DeleteOutlined, EyeOutlined } from '@ant-design/icons';
+import { Button, Popover } from 'antd';
+import { PlusOutlined, EditOutlined, DeleteOutlined, EyeOutlined, MoreOutlined } from '@ant-design/icons';
 import { ConfigContext } from "../ConfigProvider";
 import { SearchButtons } from "./config";
 import DForm from "../DForm";
@@ -74,6 +74,7 @@ var forwardCRUD = /*#__PURE__*/forwardRef(function (props, ref) {
     viewButtonText = _props$viewButtonText === void 0 ? '查看' : _props$viewButtonText,
     _props$batchDeleteBut = props.batchDeleteButtonText,
     batchDeleteButtonText = _props$batchDeleteBut === void 0 ? '批量删除' : _props$batchDeleteBut,
+    moreActionColumn = props.moreActionColumn,
     actionBar = props.actionBar,
     onRefresh = props.onRefresh,
     crudApi = props.crudApi,
@@ -193,7 +194,7 @@ var forwardCRUD = /*#__PURE__*/forwardRef(function (props, ref) {
     });
   }, [deleteRefreshStrategy.keepSearchValues, deleteRefreshStrategy.keepPage]);
   var mergedFormProps = useMemo(function () {
-    var _restSearchFormProps$;
+    var _restSearchFormProps$, _restSearchFormProps$2;
     if (!searchFormProps) return {};
     var immediate = searchFormProps.immediate,
       restSearchFormProps = _objectWithoutProperties(searchFormProps, _excluded);
@@ -202,9 +203,10 @@ var forwardCRUD = /*#__PURE__*/forwardRef(function (props, ref) {
     });
     var searchBtns = immediate || isExistFormButton ? [] : SearchButtons;
     return _objectSpread(_objectSpread({}, restSearchFormProps), {}, {
+      layout: (_restSearchFormProps$2 = restSearchFormProps.layout) !== null && _restSearchFormProps$2 !== void 0 ? _restSearchFormProps$2 : 'inline',
       items: [].concat(_toConsumableArray((searchFormProps === null || searchFormProps === void 0 ? void 0 : searchFormProps['items']) || []), _toConsumableArray(searchBtns))
     });
-  }, [searchFormProps === null || searchFormProps === void 0 ? void 0 : searchFormProps.immediate, searchFormProps === null || searchFormProps === void 0 ? void 0 : searchFormProps.items, searchFormProps === null || searchFormProps === void 0 ? void 0 : searchFormProps.initialValues]);
+  }, [searchFormProps === null || searchFormProps === void 0 ? void 0 : searchFormProps.immediate, searchFormProps === null || searchFormProps === void 0 ? void 0 : searchFormProps.items, searchFormProps === null || searchFormProps === void 0 ? void 0 : searchFormProps.initialValues, searchFormProps === null || searchFormProps === void 0 ? void 0 : searchFormProps.layout]);
   var isNeedRefreshToPage = useCallback(function () {
     var _tableRef$current, _tableRef$current$get;
     var deletedCount = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 1;
@@ -503,7 +505,6 @@ var forwardCRUD = /*#__PURE__*/forwardRef(function (props, ref) {
     };
   }(), [detailApi]);
   var actionColumn = useMemo(function () {
-    // 捕获当前的API方法引用，避免闭包问题
     var currentHandleEdit = handleEdit;
     var currentHandleDelete = handleDelete;
     var currentHandleView = handleView;
@@ -538,10 +539,20 @@ var forwardCRUD = /*#__PURE__*/forwardRef(function (props, ref) {
           size: "small"
         }, viewButtonProps), {}, {
           children: viewButtonText
-        }))]
+        })), moreActionColumn && /*#__PURE__*/_jsx(Popover, {
+          trigger: "click",
+          placement: "bottomRight",
+          content: moreActionColumn(_text, record),
+          children: /*#__PURE__*/_jsx(Button, {
+            type: "link",
+            icon: /*#__PURE__*/_jsx(MoreOutlined, {}),
+            size: "small",
+            children: "\u66F4\u591A"
+          })
+        })]
       });
     };
-  }, [handleEdit, handleDelete, handleView, showEdit, showDelete, showView, editButtonText, deleteButtonText, viewButtonText]);
+  }, [handleEdit, handleDelete, handleView, showEdit, showDelete, showView, editButtonText, deleteButtonText, viewButtonText, moreActionColumn]);
   var tablePropsWithSearch = useMemo(function () {
     var _ref6 = tableProps || {},
       _ref6$columns = _ref6.columns,

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

@@ -2,16 +2,17 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["formItemProps", "label", "name", "renderType", "render", "children"];
 import React from 'react';
+import { Form } from 'antd';
 import itemsRender from "./itemsRender";
-import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsx as _jsx } from "react/jsx-runtime";
+import { Fragment as _Fragment } from "react/jsx-runtime";
 function DItem(props) {
-  // @ts-ignore
   var formItemProps = props.formItemProps,
     _props$label = props.label,
     label = _props$label === void 0 ? '' : _props$label,
     name = props.name,
-    renderType = props.renderType,
+    _props$renderType = props.renderType,
+    renderType = _props$renderType === void 0 ? '' : _props$renderType,
     render = props.render,
     children = props.children,
     otherProps = _objectWithoutProperties(props, _excluded);
@@ -19,6 +20,17 @@ function DItem(props) {
     label: label,
     name: name
   }, formItemProps);
+  var hasShouldUpdate = typeof (formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.shouldUpdate) !== 'undefined';
+  if (['custom', 'other'].includes(renderType) && hasShouldUpdate) {
+    return /*#__PURE__*/_jsx(Form.Item, {
+      noStyle: true,
+      shouldUpdate: formItemProps.shouldUpdate,
+      children: function children(form) {
+        var renderResult = render ? render(otherProps, _formItemProps, props, form) : null;
+        return renderResult;
+      }
+    });
+  }
   if (renderType === 'custom') {
     return render ? /*#__PURE__*/_jsx(_Fragment, {
       children: render(otherProps, _formItemProps, props)

package/dist/esm/DForm/DItem/itemType.d.ts

@@ -1,5 +1,5 @@
 import { ReactNode } from 'react';
-import { InputProps, InputNumberProps, AutoCompleteProps, CascaderProps, SelectProps, TreeSelectProps, DatePickerProps, TimePickerProps, MentionProps, CheckboxProps, RadioProps, RateProps, SliderSingleProps, SwitchProps, TransferProps, UploadProps, ButtonProps, DividerProps, FormItemProps, RadioGroupProps, ColProps } from 'antd';
+import { InputProps, InputNumberProps, AutoCompleteProps, CascaderProps, SelectProps, TreeSelectProps, DatePickerProps, TimePickerProps, MentionProps, CheckboxProps, RadioProps, RateProps, SliderSingleProps, SwitchProps, TransferProps, UploadProps, ButtonProps, DividerProps, FormItemProps, RadioGroupProps, ColProps, FormInstance } from 'antd';
 import { PasswordProps, TextAreaProps } from 'antd/lib/input';
 import { RangePickerProps } from 'antd/lib/date-picker';
 import { CheckboxGroupProps } from 'antd/lib/checkbox';
@@ -112,6 +112,7 @@ export type DItemProps = {
         grid?: Omit<ColProps, 'prefixCls'>;
     };
     children?: ReactNode;
-    render?: any;
+    render?: (_props: any, _formItemProps: FormItemProps, _allProps?: DItemProps, _form?: FormInstance) => ReactNode;
+} & {
     [key: string]: any;
 };

package/dist/esm/DForm/DItem/itemsRender.d.ts

@@ -39,7 +39,7 @@ declare const renderMap: {
     switch: (props: SwitchProps, formItemProps: FormItemProps) => import("react/jsx-runtime").JSX.Element;
     transfer: (props: TransferProps<any>, formItemProps: FormItemProps, label: DItemBaseProps['label'], render: TransferProps<any>['render']) => import("react/jsx-runtime").JSX.Element;
     upload: (props: UploadProps, formItemProps: FormItemProps, label: DItemBaseProps['label'], render: () => void, children: UploadProps['children']) => import("react/jsx-runtime").JSX.Element;
-    dUpload: (props: DUploadProps, formItemProps: FormItemProps, render: (props: any) => ReactNode, children: DUploadProps['children']) => import("react/jsx-runtime").JSX.Element;
+    dUpload: (props: DUploadProps, formItemProps: FormItemProps, render: (_props: any) => ReactNode, children: DUploadProps['children']) => import("react/jsx-runtime").JSX.Element;
     button: (props: ButtonProps, formItemProps: FormItemProps, label: DItemBaseProps['label']) => import("react/jsx-runtime").JSX.Element;
     divider: (props: DividerProps, formItemProps: FormItemProps, label: DItemBaseProps['label']) => import("react/jsx-runtime").JSX.Element;
     other: (formItemProps: FormItemProps, children: ReactNode) => import("react/jsx-runtime").JSX.Element;

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 } from './CRUD';
+export { type CRUDProps, type CRUDRefProps, type MoreActionColumnRender } from './CRUD';
 export { default as DynamicFormItem } from './DynamicFormItem';
 export type { DynamicFormItemProps } from './DynamicFormItem';