@canlooks/can-ui 0.0.52 → 0.0.53

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

@@ -58,7 +58,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]);
     /**
      * ----------------------------------------------------------------

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/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';
@@ -55,7 +55,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]);
     /**
      * ----------------------------------------------------------------

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
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@canlooks/can-ui",
-  "version": "0.0.52",
+  "version": "0.0.53",
   "author": "C.CanLiang <canlooks@gmail.com>",
   "description": "My ui framework",
   "license": "MIT",