@canlooks/can-ui 0.0.52 → 0.0.54

package/dist/cjs/components/curd/curd.d.ts

@@ -24,7 +24,13 @@ export type LoadRowsReturn<R extends RowType> = {
     total: number;
 };
 type EachRowType<R extends RowType, T> = T | ((row: R) => T);
-export interface CurdBaseProps<R extends RowType, F extends FormValue> extends DataGridBaseProps<R> {
+export type CurdRef<R extends RowType = RowType, F extends FormValue = FormValue> = {
+    openCreateDialog(initialValue?: R): Promise<F> | undefined;
+    selectSingle(): Promise<R> | undefined;
+    selectMultiple(selected?: Id[]): Promise<Id[]> | undefined;
+};
+export interface CurdBaseProps<R extends RowType, F extends FormValue> extends Omit<DataGridBaseProps<R>, 'ref'> {
+    ref?: Ref<CurdRef<R, F>>;
     /** 默认属性会传递给DataGrid组件，外层包裹元素的属性使用wrapperProps */
     wrapperProps?: DivProps;
     wrapperRef?: Ref<HTMLDivElement>;
@@ -87,9 +93,9 @@ export interface CurdBaseProps<R extends RowType, F extends FormValue> extends D
     formProps?: FormProps<F>;
     formRef?: Ref<FormRef<F>>;
 }
-interface CurdSingleProps<R extends RowType, F extends FormValue = FormValue, V extends Id = Id> extends Omit<DataGridSingleProps<R, V>, 'columns'>, CurdBaseProps<R, F> {
+interface CurdSingleProps<R extends RowType, F extends FormValue = FormValue, V extends Id = Id> extends Omit<DataGridSingleProps<R, V>, 'ref' | 'columns'>, CurdBaseProps<R, F> {
 }
-interface CurdMultipleProps<R extends RowType, F extends FormValue = FormValue, V extends Id = Id> extends Omit<DataGridMultipleProps<R, V>, 'columns'>, CurdBaseProps<R, F> {
+interface CurdMultipleProps<R extends RowType, F extends FormValue = FormValue, V extends Id = Id> extends Omit<DataGridMultipleProps<R, V>, 'ref' | 'columns'>, CurdBaseProps<R, F> {
 }
 export type CurdProps<R extends RowType, F extends FormValue = FormValue, V extends Id = Id> = CurdSingleProps<R, F, V> | CurdMultipleProps<R, F, V>;
 export declare const Curd: {

package/dist/cjs/components/curd/curd.js

@@ -23,7 +23,22 @@ const faPenToSquare_1 = require("@fortawesome/free-regular-svg-icons/faPenToSqua
 const faPlus_1 = require("@fortawesome/free-solid-svg-icons/faPlus");
 const faRotateRight_1 = require("@fortawesome/free-solid-svg-icons/faRotateRight");
 exports.Curd = (0, react_1.memo)((props) => {
-    const { wrapperProps, wrapperRef, variant = 'standard', loadRows, columns, toolbarLeft, toolbarRight, reloadable = true, onReload, resizable = true, columnConfigurable = true, filterProps, filterRef, initialFilterValue, onFilter, renderFilter, copyable, creatable = true, updatable = true, deletable = true, createButtonProps, updateButtonProps, deleteButtonProps, deleteConfirmProps, controlColumnTitle = '操作', renderExtraControl, titleKey, dataName = '', createName = '添加', updateName = '编辑', deleteName = '删除', onCreate, onUpdate, onDelete, postData, dialogProps, formProps, formRef, onChange, ...dataGridProps } = props;
+    const { ref, wrapperProps, wrapperRef, variant = 'standard', loadRows, columns, toolbarLeft, toolbarRight, reloadable = true, onReload, resizable = true, columnConfigurable = true, filterProps, filterRef, initialFilterValue, onFilter, renderFilter, copyable, creatable = true, updatable = true, deletable = true, createButtonProps, updateButtonProps, deleteButtonProps, deleteConfirmProps, controlColumnTitle = '操作', renderExtraControl, titleKey, dataName = '', createName = '添加', updateName = '编辑', deleteName = '删除', onCreate, onUpdate, onDelete, postData, dialogProps, formProps, formRef, onChange, ...dataGridProps } = props;
+    /**
+     * -------------------------------------------------------------
+     * ref
+     */
+    (0, react_1.useImperativeHandle)(ref, () => ({
+        openCreateDialog(initialValue) {
+            return curdDialogRef.current?.open(initialValue);
+        },
+        selectSingle() {
+            return curdDialogRef.current?.selectSingle();
+        },
+        selectMultiple(selected) {
+            return curdDialogRef.current?.selectMultiple(selected);
+        }
+    }));
     /**
      * -------------------------------------------------------------
      * 筛选部分

package/dist/cjs/components/curd/curd.style.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.dialogStyle = exports.style = exports.classes = void 0;
 const react_1 = require("@emotion/react");
 const utils_1 = require("../../utils");
+const button_style_1 = require("../button/button.style");
 exports.classes = (0, utils_1.defineInnerClasses)('curd', [
     'filter',
     'filterGridContainer',
@@ -94,5 +95,9 @@ exports.dialogStyle = (0, utils_1.defineCss)(({ spacing }) => (0, react_1.css) `
         display: flex;
         align-items: center;
         gap: ${spacing[8]}px;
+        
+        .${button_style_1.classes.root} {
+            font-size: 1rem;
+        }
     }
 `);

package/dist/cjs/components/curd/curdDialog.d.ts

@@ -3,8 +3,11 @@ import { DialogProps } from '../dialog';
 import { RowType } from '../dataGrid';
 import { FormValue } from '../form';
 import { CurdBaseProps } from './curd';
+import { Id } from '../../types';
 export type CurdDialogRef<R extends RowType = RowType, F extends FormValue = FormValue> = {
     open(activeRow?: R): Promise<F>;
+    selectSingle(): Promise<R>;
+    selectMultiple(selected?: Id[]): Promise<Id[]>;
 };
 export interface CurdDialogProps<R extends RowType, F extends FormValue = FormValue> extends Omit<DialogProps, 'ref'> {
     ref?: Ref<CurdDialogRef<R, F>>;

package/dist/cjs/components/curd/curdDialog.js

@@ -23,26 +23,40 @@ curdProps, ...props }) => {
      * ref与promise部分
      */
     const innerFormRef = (0, react_2.useRef)(null);
-    const resolvers = (0, react_2.useRef)(void 0);
+    const openResolvers = (0, react_2.useRef)(void 0);
     const [innerOpen, setInnerOpen] = (0, utils_1.useControlled)(props.defaultOpen, props.open);
     const closeHandler = (reason) => {
         if (reason === 'confirmed') {
             return;
         }
         props.onClose?.(reason);
-        resolvers.current?.reject({
+        openResolvers.current?.reject({
             type: 'canceled',
             value: innerFormRef.current.getFormValue()
         });
         setInnerOpen(false);
     };
+    const [selectMode, setSelectMode] = (0, react_2.useState)('single');
+    const selectResolvers = (0, react_2.useRef)(void 0);
     (0, react_2.useImperativeHandle)(ref, () => ({
         open(row) {
             innerFormRef.current?.resetForm();
             setInnerOpen(true);
             setActiveRow(row);
-            const { promise } = resolvers.current = Promise.withResolvers();
+            const { promise } = openResolvers.current = Promise.withResolvers();
             return promise;
+        },
+        selectSingle() {
+            isCopying.current = false;
+            setSelectMode('single');
+            pickerDialogRef.current.open().then();
+            const { promise } = selectResolvers.current = Promise.withResolvers();
+            return promise;
+        },
+        selectMultiple(selected) {
+            isCopying.current = false;
+            setSelectMode('multiple');
+            return pickerDialogRef.current.open(selected);
         }
     }));
     /**
@@ -58,7 +72,13 @@ curdProps, ...props }) => {
         innerOpen.current && setFormValue(activeRow);
     }, [innerOpen.current]); // 依赖innerOpen而不依赖activeRow的原因是，有可能连续两次打开的activeRow是相同的
     const renderedFormItems = (0, react_2.useMemo)(() => {
-        return (0, utils_1.columnsToFormItem)(columns, activeRow)?.map(({ key, ...p }) => (0, react_1.createElement)(form_1.FormItem, { ...p, key: key }));
+        return (0, utils_1.columnsToFormItem)(columns, activeRow)?.map(col => {
+            if ((0, react_2.isValidElement)(col)) {
+                return col;
+            }
+            const { key, ...p } = col;
+            return (0, react_1.createElement)(form_1.FormItem, { ...p, key: key });
+        });
     }, [columns, activeRow]);
     /**
      * ----------------------------------------------------------------
@@ -69,7 +89,7 @@ curdProps, ...props }) => {
     };
     const [innerLoading, finishHandler] = (0, utils_1.useLoading)(async (value) => {
         formProps?.onFinish?.(value);
-        resolvers.current?.resolve(value);
+        openResolvers.current?.resolve(value);
         await onFinish?.(value);
         setInnerOpen(false);
     }, props.confirmLoading);
@@ -77,20 +97,32 @@ curdProps, ...props }) => {
      * ----------------------------------------------------------------
      * 复制
      */
+    const isCopying = (0, react_2.useRef)(false);
     const pickerDialogRef = (0, react_2.useRef)(null);
-    const copiedHandler = (checked, value, row) => {
-        const title = !(0, utils_1.isUnset)(titleKey) ? row[titleKey] : void 0;
-        typeof title === 'string'
-            ? setFormValue({
-                ...row,
-                [titleKey]: `${title} - 副本`
-            })
-            : setFormValue(row);
+    const onCopyButtonClick = () => {
+        isCopying.current = true;
+        setSelectMode('single');
+        pickerDialogRef.current.open().then();
+    };
+    const toggleHandler = (checked, value, row) => {
+        if (isCopying.current) {
+            const title = !(0, utils_1.isUnset)(titleKey) ? row[titleKey] : void 0;
+            typeof title === 'string'
+                ? setFormValue({
+                    ...row,
+                    [titleKey]: `${title} - 副本`
+                })
+                : setFormValue(row);
+        }
+        else {
+            // 处理selectSingle
+            selectResolvers.current?.resolve(row);
+        }
     };
     const rowTitle = activeRow && !(0, utils_1.isUnset)(titleKey) ? activeRow[titleKey] : void 0;
     return ((0, jsx_runtime_1.jsxs)(dialog_1.Dialog, { css: curd_style_1.dialogStyle, width: 600, title: activeRow
             ? `${updateName}${dataName}${rowTitle ? ' - ' + rowTitle : ''}`
             : (0, jsx_runtime_1.jsxs)("div", { className: curd_style_1.classes.dialogTitle, children: [(0, jsx_runtime_1.jsxs)("span", { children: [createName, dataName] }), copyable &&
-                        (0, jsx_runtime_1.jsxs)(button_1.Button, { variant: "plain", prefix: (0, jsx_runtime_1.jsx)(__1.Icon, { icon: faCopy_1.faCopy }), onClick: () => pickerDialogRef.current.open(), children: ["\u4ECE\u5DF2\u6709", dataName || '数据', "\u590D\u5236"] })] }), ...props, open: innerOpen.current, onClose: closeHandler, onConfirm: confirmHandler, confirmLoading: innerLoading.current, children: [(0, jsx_runtime_1.jsx)(loading_1.Loading, { open: transforming.current, children: (0, jsx_runtime_1.jsx)(form_1.Form, { labelWidth: "20%", ...formProps, ref: (0, utils_1.cloneRef)(formRef, innerFormRef), onFinish: finishHandler, children: renderedFormItems }) }), copyable &&
-                (0, jsx_runtime_1.jsx)(pickerDialog_1.PickerDialog, { ref: pickerDialogRef, onToggle: copiedHandler, children: (0, jsx_runtime_1.jsx)(curd_1.Curd, { ...curdProps, variant: "embeded", copyable: false, creatable: false, updatable: false, deletable: false }) })] }));
+                        (0, jsx_runtime_1.jsxs)(button_1.Button, { variant: "plain", prefix: (0, jsx_runtime_1.jsx)(__1.Icon, { icon: faCopy_1.faCopy }), onClick: onCopyButtonClick, children: ["\u4ECE\u5DF2\u6709", dataName || '数据', "\u590D\u5236"] })] }), ...props, open: innerOpen.current, onClose: closeHandler, onConfirm: confirmHandler, confirmLoading: innerLoading.current, children: [(0, jsx_runtime_1.jsx)(loading_1.Loading, { open: transforming.current, children: (0, jsx_runtime_1.jsx)(form_1.Form, { labelWidth: "20%", ...formProps, ref: (0, utils_1.cloneRef)(formRef, innerFormRef), onFinish: finishHandler, children: renderedFormItems }) }), copyable &&
+                (0, jsx_runtime_1.jsx)(pickerDialog_1.PickerDialog, { ref: pickerDialogRef, multiple: selectMode === 'multiple', onToggle: toggleHandler, children: (0, jsx_runtime_1.jsx)(curd_1.Curd, { ...curdProps, variant: "embeded", copyable: false, creatable: false, updatable: false, deletable: false }) })] }));
 });

package/dist/cjs/components/pickerDialog/pickerDialog.js

@@ -16,13 +16,6 @@ exports.PickerDialog = (({ ref, dialogRef, multiple, children, showSelectedList
 // 以下属性从SelectionContextBaseProps继承
 options = rows ?? nodes, primaryKey = 'id', childrenKey = 'children', relation = 'dependent', integration = 'shallowest', disabled, clearable = !!multiple, onToggle, ...props }) => {
     const resolvers = (0, react_1.useRef)(void 0);
-    const [innerValue, _setInnerValue] = (0, react_1.useState)(multiple ? [] : null);
-    const setInnerValue = (value) => {
-        _setInnerValue(value);
-        // 单选模式，值每次改变都触发确认
-        !multiple && confirmHandler(value);
-    };
-    const [innerOpen, setInnerOpen] = (0, utils_1.useControlled)(props.defaultOpen, props.open);
     (0, react_1.useImperativeHandle)(ref, () => ({
         open(value) {
             _setInnerValue(value ?? null);
@@ -31,6 +24,13 @@ options = rows ?? nodes, primaryKey = 'id', childrenKey = 'children', relation =
             return promise;
         }
     }));
+    const [innerValue, _setInnerValue] = (0, react_1.useState)(multiple ? [] : null);
+    const setInnerValue = (value) => {
+        _setInnerValue(value);
+        // 单选模式，值每次改变都触发确认
+        !multiple && confirmHandler(value);
+    };
+    const [innerOpen, setInnerOpen] = (0, utils_1.useControlled)(props.defaultOpen, props.open);
     const onCloseHandler = (reason) => {
         if (reason === 'confirmed') {
             return;

package/dist/cjs/utils/curd.d.ts

@@ -1,3 +1,4 @@
+import { ReactElement } from 'react';
 import { CurdColumn, CurdFormItemProps, CurdProps } from '../components/curd';
 import { ColumnType, RowType } from '../components/dataGrid';
 import { Id, Obj } from '../types';
@@ -6,13 +7,13 @@ import { FormValue } from '../components/form';
  * 将Curd的Columns转换为FilterItem
  * @param columns
  */
-export declare function columnsToFilterItem(columns?: (CurdColumn<any> | symbol)[]): CurdFormItemProps[] | undefined;
+export declare function columnsToFilterItem(columns?: (CurdColumn<any> | symbol)[]): (ReactElement<unknown, string | import("react").JSXElementConstructor<any>> | CurdFormItemProps)[] | undefined;
 /**
  * 将Curd的Columns转换为FormItem
  * @param columns
  * @param row
  */
-export declare function columnsToFormItem(columns?: (CurdColumn<any> | symbol)[], row?: Obj): CurdFormItemProps[] | undefined;
+export declare function columnsToFormItem(columns?: (CurdColumn<any> | symbol)[], row?: Obj): (ReactElement<unknown, string | import("react").JSXElementConstructor<any>> | CurdFormItemProps)[] | undefined;
 /**
  * 统一处理Columns
  */

package/dist/esm/components/curd/curd.d.ts

@@ -24,7 +24,13 @@ export type LoadRowsReturn<R extends RowType> = {
     total: number;
 };
 type EachRowType<R extends RowType, T> = T | ((row: R) => T);
-export interface CurdBaseProps<R extends RowType, F extends FormValue> extends DataGridBaseProps<R> {
+export type CurdRef<R extends RowType = RowType, F extends FormValue = FormValue> = {
+    openCreateDialog(initialValue?: R): Promise<F> | undefined;
+    selectSingle(): Promise<R> | undefined;
+    selectMultiple(selected?: Id[]): Promise<Id[]> | undefined;
+};
+export interface CurdBaseProps<R extends RowType, F extends FormValue> extends Omit<DataGridBaseProps<R>, 'ref'> {
+    ref?: Ref<CurdRef<R, F>>;
     /** 默认属性会传递给DataGrid组件，外层包裹元素的属性使用wrapperProps */
     wrapperProps?: DivProps;
     wrapperRef?: Ref<HTMLDivElement>;
@@ -87,9 +93,9 @@ export interface CurdBaseProps<R extends RowType, F extends FormValue> extends D
     formProps?: FormProps<F>;
     formRef?: Ref<FormRef<F>>;
 }
-interface CurdSingleProps<R extends RowType, F extends FormValue = FormValue, V extends Id = Id> extends Omit<DataGridSingleProps<R, V>, 'columns'>, CurdBaseProps<R, F> {
+interface CurdSingleProps<R extends RowType, F extends FormValue = FormValue, V extends Id = Id> extends Omit<DataGridSingleProps<R, V>, 'ref' | 'columns'>, CurdBaseProps<R, F> {
 }
-interface CurdMultipleProps<R extends RowType, F extends FormValue = FormValue, V extends Id = Id> extends Omit<DataGridMultipleProps<R, V>, 'columns'>, CurdBaseProps<R, F> {
+interface CurdMultipleProps<R extends RowType, F extends FormValue = FormValue, V extends Id = Id> extends Omit<DataGridMultipleProps<R, V>, 'ref' | 'columns'>, CurdBaseProps<R, F> {
 }
 export type CurdProps<R extends RowType, F extends FormValue = FormValue, V extends Id = Id> = CurdSingleProps<R, F, V> | CurdMultipleProps<R, F, V>;
 export declare const Curd: {

package/dist/esm/components/curd/curd.js

@@ -1,5 +1,5 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "@emotion/react/jsx-runtime";
-import { memo, useCallback, useEffect, useMemo, useRef } from 'react';
+import { memo, useCallback, useEffect, useMemo, useRef, useImperativeHandle } from 'react';
 import { DataGrid } from '../dataGrid';
 import { CurdFilter } from './curdFilter';
 import { classes, style } from './curd.style';
@@ -20,7 +20,22 @@ import { faPenToSquare } from '@fortawesome/free-regular-svg-icons/faPenToSquare
 import { faPlus } from '@fortawesome/free-solid-svg-icons/faPlus';
 import { faRotateRight } from '@fortawesome/free-solid-svg-icons/faRotateRight';
 export const Curd = memo((props) => {
-    const { wrapperProps, wrapperRef, variant = 'standard', loadRows, columns, toolbarLeft, toolbarRight, reloadable = true, onReload, resizable = true, columnConfigurable = true, filterProps, filterRef, initialFilterValue, onFilter, renderFilter, copyable, creatable = true, updatable = true, deletable = true, createButtonProps, updateButtonProps, deleteButtonProps, deleteConfirmProps, controlColumnTitle = '操作', renderExtraControl, titleKey, dataName = '', createName = '添加', updateName = '编辑', deleteName = '删除', onCreate, onUpdate, onDelete, postData, dialogProps, formProps, formRef, onChange, ...dataGridProps } = props;
+    const { ref, wrapperProps, wrapperRef, variant = 'standard', loadRows, columns, toolbarLeft, toolbarRight, reloadable = true, onReload, resizable = true, columnConfigurable = true, filterProps, filterRef, initialFilterValue, onFilter, renderFilter, copyable, creatable = true, updatable = true, deletable = true, createButtonProps, updateButtonProps, deleteButtonProps, deleteConfirmProps, controlColumnTitle = '操作', renderExtraControl, titleKey, dataName = '', createName = '添加', updateName = '编辑', deleteName = '删除', onCreate, onUpdate, onDelete, postData, dialogProps, formProps, formRef, onChange, ...dataGridProps } = props;
+    /**
+     * -------------------------------------------------------------
+     * ref
+     */
+    useImperativeHandle(ref, () => ({
+        openCreateDialog(initialValue) {
+            return curdDialogRef.current?.open(initialValue);
+        },
+        selectSingle() {
+            return curdDialogRef.current?.selectSingle();
+        },
+        selectMultiple(selected) {
+            return curdDialogRef.current?.selectMultiple(selected);
+        }
+    }));
     /**
      * -------------------------------------------------------------
      * 筛选部分

package/dist/esm/components/curd/curd.style.js

@@ -1,5 +1,6 @@
 import { css } from '@emotion/react';
 import { defineInnerClasses, defineCss } from '../../utils';
+import { classes as buttonClasses } from '../button/button.style';
 export const classes = defineInnerClasses('curd', [
     'filter',
     'filterGridContainer',
@@ -91,5 +92,9 @@ export const dialogStyle = defineCss(({ spacing }) => css `
         display: flex;
         align-items: center;
         gap: ${spacing[8]}px;
+        
+        .${buttonClasses.root} {
+            font-size: 1rem;
+        }
     }
 `);

package/dist/esm/components/curd/curdDialog.d.ts

@@ -3,8 +3,11 @@ import { DialogProps } from '../dialog';
 import { RowType } from '../dataGrid';
 import { FormValue } from '../form';
 import { CurdBaseProps } from './curd';
+import { Id } from '../../types';
 export type CurdDialogRef<R extends RowType = RowType, F extends FormValue = FormValue> = {
     open(activeRow?: R): Promise<F>;
+    selectSingle(): Promise<R>;
+    selectMultiple(selected?: Id[]): Promise<Id[]>;
 };
 export interface CurdDialogProps<R extends RowType, F extends FormValue = FormValue> extends Omit<DialogProps, 'ref'> {
     ref?: Ref<CurdDialogRef<R, F>>;

package/dist/esm/components/curd/curdDialog.js

@@ -1,6 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs } from "@emotion/react/jsx-runtime";
 import { createElement as _createElement } from "@emotion/react";
-import { memo, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
+import { memo, useEffect, useImperativeHandle, useMemo, useRef, useState, isValidElement } from 'react';
 import { Dialog } from '../dialog';
 import { Form, FormItem } from '../form';
 import { Curd } from './curd';
@@ -20,26 +20,40 @@ curdProps, ...props }) => {
      * ref与promise部分
      */
     const innerFormRef = useRef(null);
-    const resolvers = useRef(void 0);
+    const openResolvers = useRef(void 0);
     const [innerOpen, setInnerOpen] = useControlled(props.defaultOpen, props.open);
     const closeHandler = (reason) => {
         if (reason === 'confirmed') {
             return;
         }
         props.onClose?.(reason);
-        resolvers.current?.reject({
+        openResolvers.current?.reject({
             type: 'canceled',
             value: innerFormRef.current.getFormValue()
         });
         setInnerOpen(false);
     };
+    const [selectMode, setSelectMode] = useState('single');
+    const selectResolvers = useRef(void 0);
     useImperativeHandle(ref, () => ({
         open(row) {
             innerFormRef.current?.resetForm();
             setInnerOpen(true);
             setActiveRow(row);
-            const { promise } = resolvers.current = Promise.withResolvers();
+            const { promise } = openResolvers.current = Promise.withResolvers();
             return promise;
+        },
+        selectSingle() {
+            isCopying.current = false;
+            setSelectMode('single');
+            pickerDialogRef.current.open().then();
+            const { promise } = selectResolvers.current = Promise.withResolvers();
+            return promise;
+        },
+        selectMultiple(selected) {
+            isCopying.current = false;
+            setSelectMode('multiple');
+            return pickerDialogRef.current.open(selected);
         }
     }));
     /**
@@ -55,7 +69,13 @@ curdProps, ...props }) => {
         innerOpen.current && setFormValue(activeRow);
     }, [innerOpen.current]); // 依赖innerOpen而不依赖activeRow的原因是，有可能连续两次打开的activeRow是相同的
     const renderedFormItems = useMemo(() => {
-        return columnsToFormItem(columns, activeRow)?.map(({ key, ...p }) => _createElement(FormItem, { ...p, key: key }));
+        return columnsToFormItem(columns, activeRow)?.map(col => {
+            if (isValidElement(col)) {
+                return col;
+            }
+            const { key, ...p } = col;
+            return _createElement(FormItem, { ...p, key: key });
+        });
     }, [columns, activeRow]);
     /**
      * ----------------------------------------------------------------
@@ -66,7 +86,7 @@ curdProps, ...props }) => {
     };
     const [innerLoading, finishHandler] = useLoading(async (value) => {
         formProps?.onFinish?.(value);
-        resolvers.current?.resolve(value);
+        openResolvers.current?.resolve(value);
         await onFinish?.(value);
         setInnerOpen(false);
     }, props.confirmLoading);
@@ -74,20 +94,32 @@ curdProps, ...props }) => {
      * ----------------------------------------------------------------
      * 复制
      */
+    const isCopying = useRef(false);
     const pickerDialogRef = useRef(null);
-    const copiedHandler = (checked, value, row) => {
-        const title = !isUnset(titleKey) ? row[titleKey] : void 0;
-        typeof title === 'string'
-            ? setFormValue({
-                ...row,
-                [titleKey]: `${title} - 副本`
-            })
-            : setFormValue(row);
+    const onCopyButtonClick = () => {
+        isCopying.current = true;
+        setSelectMode('single');
+        pickerDialogRef.current.open().then();
+    };
+    const toggleHandler = (checked, value, row) => {
+        if (isCopying.current) {
+            const title = !isUnset(titleKey) ? row[titleKey] : void 0;
+            typeof title === 'string'
+                ? setFormValue({
+                    ...row,
+                    [titleKey]: `${title} - 副本`
+                })
+                : setFormValue(row);
+        }
+        else {
+            // 处理selectSingle
+            selectResolvers.current?.resolve(row);
+        }
     };
     const rowTitle = activeRow && !isUnset(titleKey) ? activeRow[titleKey] : void 0;
     return (_jsxs(Dialog, { css: dialogStyle, width: 600, title: activeRow
             ? `${updateName}${dataName}${rowTitle ? ' - ' + rowTitle : ''}`
             : _jsxs("div", { className: classes.dialogTitle, children: [_jsxs("span", { children: [createName, dataName] }), copyable &&
-                        _jsxs(Button, { variant: "plain", prefix: _jsx(Icon, { icon: faCopy }), onClick: () => pickerDialogRef.current.open(), children: ["\u4ECE\u5DF2\u6709", dataName || '数据', "\u590D\u5236"] })] }), ...props, open: innerOpen.current, onClose: closeHandler, onConfirm: confirmHandler, confirmLoading: innerLoading.current, children: [_jsx(Loading, { open: transforming.current, children: _jsx(Form, { labelWidth: "20%", ...formProps, ref: cloneRef(formRef, innerFormRef), onFinish: finishHandler, children: renderedFormItems }) }), copyable &&
-                _jsx(PickerDialog, { ref: pickerDialogRef, onToggle: copiedHandler, children: _jsx(Curd, { ...curdProps, variant: "embeded", copyable: false, creatable: false, updatable: false, deletable: false }) })] }));
+                        _jsxs(Button, { variant: "plain", prefix: _jsx(Icon, { icon: faCopy }), onClick: onCopyButtonClick, children: ["\u4ECE\u5DF2\u6709", dataName || '数据', "\u590D\u5236"] })] }), ...props, open: innerOpen.current, onClose: closeHandler, onConfirm: confirmHandler, confirmLoading: innerLoading.current, children: [_jsx(Loading, { open: transforming.current, children: _jsx(Form, { labelWidth: "20%", ...formProps, ref: cloneRef(formRef, innerFormRef), onFinish: finishHandler, children: renderedFormItems }) }), copyable &&
+                _jsx(PickerDialog, { ref: pickerDialogRef, multiple: selectMode === 'multiple', onToggle: toggleHandler, children: _jsx(Curd, { ...curdProps, variant: "embeded", copyable: false, creatable: false, updatable: false, deletable: false }) })] }));
 });

package/dist/esm/components/pickerDialog/pickerDialog.js

@@ -13,13 +13,6 @@ export const PickerDialog = (({ ref, dialogRef, multiple, children, showSelected
 // 以下属性从SelectionContextBaseProps继承
 options = rows ?? nodes, primaryKey = 'id', childrenKey = 'children', relation = 'dependent', integration = 'shallowest', disabled, clearable = !!multiple, onToggle, ...props }) => {
     const resolvers = useRef(void 0);
-    const [innerValue, _setInnerValue] = useState(multiple ? [] : null);
-    const setInnerValue = (value) => {
-        _setInnerValue(value);
-        // 单选模式，值每次改变都触发确认
-        !multiple && confirmHandler(value);
-    };
-    const [innerOpen, setInnerOpen] = useControlled(props.defaultOpen, props.open);
     useImperativeHandle(ref, () => ({
         open(value) {
             _setInnerValue(value ?? null);
@@ -28,6 +21,13 @@ options = rows ?? nodes, primaryKey = 'id', childrenKey = 'children', relation =
             return promise;
         }
     }));
+    const [innerValue, _setInnerValue] = useState(multiple ? [] : null);
+    const setInnerValue = (value) => {
+        _setInnerValue(value);
+        // 单选模式，值每次改变都触发确认
+        !multiple && confirmHandler(value);
+    };
+    const [innerOpen, setInnerOpen] = useControlled(props.defaultOpen, props.open);
     const onCloseHandler = (reason) => {
         if (reason === 'confirmed') {
             return;

package/dist/esm/utils/curd.d.ts

@@ -1,3 +1,4 @@
+import { ReactElement } from 'react';
 import { CurdColumn, CurdFormItemProps, CurdProps } from '../components/curd';
 import { ColumnType, RowType } from '../components/dataGrid';
 import { Id, Obj } from '../types';
@@ -6,13 +7,13 @@ import { FormValue } from '../components/form';
  * 将Curd的Columns转换为FilterItem
  * @param columns
  */
-export declare function columnsToFilterItem(columns?: (CurdColumn<any> | symbol)[]): CurdFormItemProps[] | undefined;
+export declare function columnsToFilterItem(columns?: (CurdColumn<any> | symbol)[]): (ReactElement<unknown, string | import("react").JSXElementConstructor<any>> | CurdFormItemProps)[] | undefined;
 /**
  * 将Curd的Columns转换为FormItem
  * @param columns
  * @param row
  */
-export declare function columnsToFormItem(columns?: (CurdColumn<any> | symbol)[], row?: Obj): CurdFormItemProps[] | undefined;
+export declare function columnsToFormItem(columns?: (CurdColumn<any> | symbol)[], row?: Obj): (ReactElement<unknown, string | import("react").JSXElementConstructor<any>> | CurdFormItemProps)[] | undefined;
 /**
  * 统一处理Columns
  */