vap1 0.4.3 → 0.4.4

package/components/Tables/Util.js

@@ -1,9 +1,20 @@
 "use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getIdxColumn = void 0;
+exports.convertColumns = void 0;
 var lodash_1 = __importDefault(require("lodash"));
 var utils_1 = require("../../utils");
 var _i18n_1 = require("../_i18n");
@@ -40,4 +51,60 @@ var getIdxColumn = function (ref, showIndex, isRank) {
         render: idxRender
     };
 };
-exports.getIdxColumn = getIdxColumn;
+var convertCol = function (col) {
+    if (col.roleCode && !utils_1.PageUtil.hasRole(col.roleCode))
+        return null;
+    var item = __assign({}, col);
+    if (col.ik) {
+        var title = utils_1.i18n.txt(col.ik);
+        item.title = title == '' ? item.title : title;
+    }
+    var clazz = [];
+    if (col.wrap) {
+        clazz.push('c-table-col-wrap');
+    }
+    else if (!lodash_1.default.has(col, 'ellipsis')) {
+        item.ellipsis = true;
+    }
+    if (!lodash_1.default.has(item, 'width')) {
+        if (lodash_1.default.isString(item.title)) {
+            clazz.push('c-table-col-' + (item.title.length + (item.sorter ? 2 : 0)));
+        }
+        if (lodash_1.default.isString(col.dataIndex) && col.dataIndex.length && col.dataIndex.indexOf('.') < 0 && col.dataIndex.indexOf('[') < 0) {
+            clazz.push('table-col-' + col.dataIndex);
+            if (col.sorter) {
+                clazz.push('c-table-col-has-sorter');
+            }
+        }
+    }
+    if (col.className) {
+        clazz.push(col.className);
+    }
+    item.className = clazz.join(' ');
+    return item;
+};
+var convertColumns = function (props, rank) {
+    // props.columns[0]
+    var cols = (props.showIndex == false) ? [] : [getIdxColumn(rank.ref, props.showIndex, rank.isRank)];
+    props.columns.map(function (col) {
+        // @ts-ignore
+        var isGroup = lodash_1.default.has(col, 'children') && lodash_1.default.isArray(col.children);
+        if (isGroup) {
+            console.error('Not Support group mode in 1.5');
+            // let column: ColumnGroupType<any> = { ..._.pick(col, ['width', 'align']), children: [], title: col.title, className: 'c-table-header-group' };
+            // if (col.className) column.className = `c-table-header-group ${col.className}`;
+            // (col as TableColumnGroup).children.map((item => {
+            //     let subCol = convertCol(item);
+            //     if (subCol != null) column.children.push(subCol);
+            // }));
+            // if (column.children.length > 0) cols.push(column);
+        }
+        else {
+            var column = convertCol(col);
+            if (column != null)
+                cols.push(column);
+        }
+    });
+    return cols;
+};
+exports.convertColumns = convertColumns;

package/components/Tables/VTable.js

@@ -98,6 +98,13 @@ exports.getHeightByTagName = getHeightByTagName;
 var _VTable = (0, react_1.forwardRef)(function (props, ref) {
     var update = (0, hooks_1.useUpdate)();
     var _a = (0, Box_1.useBox)(), state = _a.state, root = _a.root, resize = _a.resize;
+    var inModal = (0, react_1.useMemo)(function () {
+        if (root.current == null)
+            return false;
+        return root.current.parentElement.parentElement.classList.contains('ant-modal-body')
+            || root.current.parentElement.parentElement.parentElement.classList.contains('ant-modal-body')
+            || root.current.parentElement.parentElement.parentElement.parentElement.classList.contains('ant-modal-body');
+    }, []);
     // const [scroll, setScroll] = useState<TableProps<PlainObject>['scroll']>(undefined);
     var _b = props.model, rowKey = _b.rowKey, list = _b.list, isQuerying = _b.isQuerying, pageNo = _b.pageNo, pageSize = _b.pageSize, orderBy = _b.orderBy, query = _b.query, total = _b.total;
     var start = (0, react_1.useRef)(0);
@@ -173,85 +180,45 @@ var _VTable = (0, react_1.forwardRef)(function (props, ref) {
     }, [isFristMounted]);
     // 计算 clolum 及 高亮keyword
     var columns = (0, react_1.useMemo)(function () {
-        var cols = [];
-        if (props.showIndex !== false)
-            cols.push((0, Util_1.getIdxColumn)(start, props.showIndex));
+        var cols = (0, Util_1.convertColumns)(props, { ref: start, isRank: false });
+        if (!utils_1.GLOBAL.CONFIG.SEARCHBAR.DISABLE_KEYWORD || !lodash_1.default.has(props, 'searchBar.keyword'))
+            return cols;
         var HighKeys = new Set();
-        if (!utils_1.GLOBAL.CONFIG.SEARCHBAR.DISABLE_KEYWORD && lodash_1.default.has(props, 'searchBar.keyword')) {
-            if (lodash_1.default.isObject(props.searchBar.keyword)) {
-                (props.searchBar.keyword.highlight || []).map(function (key) { return HighKeys.add(key); });
-            }
-            else {
-                props.columns.map(function (col) {
-                    // @ts-ignore
-                    var isGroup = lodash_1.default.has(col, 'children') && lodash_1.default.isArray(col.children);
-                    if (isGroup) {
-                        col.children.map((function (item) {
-                            if (lodash_1.default.isString(item.dataIndex))
-                                HighKeys.add(item.dataIndex);
-                        }));
-                    }
-                    else {
-                        var dataIndex = col.dataIndex;
-                        if (lodash_1.default.isString(dataIndex))
-                            HighKeys.add(dataIndex);
-                    }
-                });
-            }
+        if (lodash_1.default.isObject(props.searchBar.keyword)) {
+            (props.searchBar.keyword.highlight || []).map(function (key) { return HighKeys.add(key); });
         }
-        var convertCol = function (col) {
-            if (col.roleCode && !utils_1.PageUtil.hasRole(col.roleCode))
-                return null;
-            var item = __assign({}, col);
-            if (col.ik) {
-                var title = utils_1.i18n.txt(col.ik);
-                item.title = title == '' ? item.title : title;
-            }
-            if (HighKeys.has(item.dataIndex) && item.render == null) {
-                item.render = function (record) {
-                    if (!lodash_1.default.isString(record))
-                        return record;
-                    var keyword = '';
-                    if (record && keyword) {
-                        return react_1.default.createElement(HighLight_1.HighLight, { text: record, keyword: keyword });
-                    }
-                    return record;
-                };
-            }
-            if (!lodash_1.default.has(item, 'ellipsis'))
-                item.ellipsis = true;
-            if (!lodash_1.default.has(item, 'width') && lodash_1.default.isString(item.title)) {
-                var clz = item.title.length + (item.sorter ? 2 : 0);
-                if (col.className) {
-                    item.className = 'c-table-col-' + clz + ' ' + col.className;
+        else {
+            props.columns.map(function (col) {
+                // @ts-ignore
+                var isGroup = lodash_1.default.has(col, 'children') && lodash_1.default.isArray(col.children);
+                if (isGroup) {
+                    col.children.map((function (item) {
+                        if (lodash_1.default.isString(item.dataIndex))
+                            HighKeys.add(item.dataIndex);
+                    }));
                 }
                 else {
-                    item.className = 'c-table-col-' + clz;
+                    var dataIndex = col.dataIndex;
+                    if (lodash_1.default.isString(dataIndex))
+                        HighKeys.add(dataIndex);
                 }
-            }
-            return item;
-        };
-        props.columns.map(function (col) {
-            // @ts-ignore
-            var isGroup = lodash_1.default.has(col, 'children') && lodash_1.default.isArray(col.children);
-            if (isGroup) {
-                var column_1 = __assign(__assign({}, lodash_1.default.pick(col, ['width', 'align'])), { children: [], title: col.title, className: 'c-table-header-group' });
-                if (col.className)
-                    column_1.className = "c-table-header-group ".concat(col.className);
-                col.children.map((function (item) {
-                    var subCol = convertCol(item);
-                    if (subCol != null)
-                        column_1.children.push(subCol);
-                }));
-                if (column_1.children.length > 0)
-                    cols.push(column_1);
-            }
-            else {
-                var column = convertCol(col);
-                if (column != null)
-                    cols.push(column);
-            }
-        });
+            });
+        }
+        if (HighKeys.size > 0) {
+            cols.map(function (col) {
+                if (HighKeys.has(col.dataIndex) && col.render == null) {
+                    col.render = function (record) {
+                        if (!lodash_1.default.isString(record))
+                            return record;
+                        var keyword = '';
+                        if (record && keyword) {
+                            return react_1.default.createElement(HighLight_1.HighLight, { text: record, keyword: keyword });
+                        }
+                        return record;
+                    };
+                }
+            });
+        }
         return cols;
     }, [props.columns]);
     (0, react_1.useLayoutEffect)(function () {
@@ -269,6 +236,10 @@ var _VTable = (0, react_1.forwardRef)(function (props, ref) {
     }, []);
     // 更新高度 table 需要把 head 排除设置滚动
     // useEffect(() => {
+    //     if (inModal) {
+    //         setScroll({ x: true })
+    //         return;
+    //     }
     //     if (props.scroll === null) return;
     //     if (props.mode == undefined || props.mode == 'common') return;
     //     let height = state?.height;

package/components/Tables/index.d.ts

@@ -1,6 +1,5 @@
-import React from 'react';
 import type { TableDefined } from './Components';
-import type { ForwardRefExoticComponent, ExoticComponent, RefAttributes } from 'react';
+import type { ReactNode, ForwardRefExoticComponent, ExoticComponent, RefAttributes } from 'react';
 import type { TableProps } from '../_adapt/Table';
 import type { ColumnProps } from 'antd/es/table/interface';
 import type { SearchBarProps } from '../SearchBar/index';
@@ -8,7 +7,9 @@ import type { TableActionButton } from './Components/ActionBar';
 import type { PlainObject, BaseItem, ApiModel } from '../../basetype';
 import type { BoxMode } from '../Box/Box';
 import type { SelectBarProps } from '../Box/SelectBar';
-export type TableColumn = BaseItem & Omit<ColumnProps<any>, 'children'>;
+export type TableColumn = BaseItem & Omit<ColumnProps<any>, 'children'> & {
+    wrap?: boolean;
+};
 export type TableColumnGroup = Pick<TableColumn, 'className' | 'width' | 'align'> & {
     title: string;
     children: TableColumn[];
@@ -52,7 +53,7 @@ export type BaseTableProps = TableDefine & {
     /**
      * 表格操作区域
     */
-    actionBar?: (TableActionButton[]) | React.ReactNode;
+    actionBar?: (TableActionButton[]) | ReactNode;
     /**
      * 表格选择区域
     */

package/components/TreeSelect/BaseTreeSelect.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import type { ReactNode, PropsWithChildren } from 'react';
+import type { FC, ReactNode, PropsWithChildren } from 'react';
 import type { TreeNodeData } from '../../utils/TreeUtil';
 import type { TreeSelectProps } from 'antd/es/tree-select';
 import type { BaseTreeSelectProps } from './index';
@@ -25,7 +25,7 @@ type BaseTreeSelectContext = {
 };
 declare const BaseTreeSelectContext: React.Context<BaseTreeSelectContext>;
 export declare const useBaseTree: () => BaseTreeSelectContext;
-export declare const BaseTreeSelect: React.FC<PropsWithChildren<BaseTreeSelectProps>>;
+export declare const BaseTreeSelect: FC<PropsWithChildren<BaseTreeSelectProps>>;
 export declare const getNodeParam: (node: any, state: BaseTreeSelectState, disabledNode: (node: PlainObject) => boolean) => any;
-export declare const renderRoot: (props: BaseTreeSelectProps, state: BaseTreeSelectState) => React.ReactNode;
+export declare const renderRoot: (props: BaseTreeSelectProps, state: BaseTreeSelectState) => ReactNode;
 export {};

package/components/TreeSelect/BaseTreeSelect.js

@@ -58,10 +58,13 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     }
     return to.concat(ar || Array.prototype.slice.call(from));
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.renderRoot = exports.getNodeParam = exports.BaseTreeSelect = exports.useBaseTree = void 0;
-var lodash_1 = __importStar(require("lodash"));
 var react_1 = __importStar(require("react"));
+var lodash_1 = __importDefault(require("lodash"));
 var antd_1 = require("antd");
 var HighLight_1 = require("../_common/HighLight");
 var Icon_1 = require("../_adapt/Icon");
@@ -136,7 +139,7 @@ var BaseTreeSelect = function (props) {
     }, []);
     var value = (0, react_1.useMemo)(function () {
         if (props.multiple) {
-            if ((0, lodash_1.isArray)(props.value))
+            if (lodash_1.default.isArray(props.value))
                 return props.value;
             if (props.value)
                 return [props.value];
@@ -206,13 +209,13 @@ var getNodeParam = function (node, state, disabledNode) {
             var icon = node[iconField];
             if (icon) {
                 if (icon.indexOf('/') >= 0) {
-                    param.title = react_1.default.createElement(react_1.default.Fragment, null,
+                    param.title = react_1.default.createElement(react_1.Fragment, null,
                         react_1.default.createElement("span", { className: 'v-icon-bg' },
                             react_1.default.createElement("img", { style: { marginTop: -4 }, src: node[iconField] })),
                         title);
                 }
                 else {
-                    param.title = react_1.default.createElement(react_1.default.Fragment, null,
+                    param.title = react_1.default.createElement(react_1.Fragment, null,
                         react_1.default.createElement(Icon_1.Icon, { type: node[iconField] }),
                         title);
                 }
@@ -221,7 +224,7 @@ var getNodeParam = function (node, state, disabledNode) {
         else if (lodash_1.default.isFunction(iconField)) {
             var icon = iconField(node);
             if (icon) {
-                param.title = react_1.default.createElement(react_1.default.Fragment, null,
+                param.title = react_1.default.createElement(react_1.Fragment, null,
                     icon,
                     title);
             }

package/components/TreeSelect/DTreeSelect.d.ts

@@ -1,5 +1,5 @@
-import React from 'react';
 import type { BaseTreeSelectProps } from './index';
 import type { DTreeData } from '../Trees/DTree';
+import type { FC } from 'react';
 export type DTreeSelectProps = BaseTreeSelectProps & DTreeData;
-export declare const DTreeSelect: React.FC<DTreeSelectProps>;
+export declare const DTreeSelect: FC<DTreeSelectProps>;

package/components/TreeSelect/DTreeSelect.js

@@ -111,8 +111,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DTreeSelect = void 0;
 var react_1 = __importStar(require("react"));
-var antd_1 = require("antd");
 var lodash_1 = __importDefault(require("lodash"));
+var antd_1 = require("antd");
 var BaseTreeSelect_1 = require("./BaseTreeSelect");
 var hooks_1 = require("../../hooks");
 var utils_1 = require("../../utils");

package/components/TreeSelect/FTreeSelect.d.ts

@@ -1,5 +1,5 @@
-import React from 'react';
+import type { FC } from 'react';
 import type { BaseTreeSelectProps } from './index';
 import type { FTreeData } from '../Trees/FTree';
 export type FTreeSelectProps = BaseTreeSelectProps & Required<FTreeData>;
-export declare const FTreeSelect: React.FC<FTreeSelectProps>;
+export declare const FTreeSelect: FC<FTreeSelectProps>;

package/components/TreeSelect/STreeSelect.d.ts

@@ -1,5 +1,5 @@
-import React from 'react';
+import type { FC } from 'react';
 import type { STreeData } from '../Trees/STree';
 import type { BaseTreeSelectProps } from './index';
 export type STreeSelectProps = BaseTreeSelectProps & STreeData;
-export declare const STreeSelect: React.FC<STreeSelectProps>;
+export declare const STreeSelect: FC<STreeSelectProps>;

package/components/Trees/BaseTree.d.ts

@@ -1,8 +1,8 @@
 import React from 'react';
 import { Language } from '../../utils/_Support';
+import type { FC, PropsWithChildren, ReactNode } from 'react';
 import type { BaseTreeOpts, SearchResult, TreeNodeData } from '../../utils/TreeUtil';
 import type { AntTreeNodeProps, AntTreeNodeSelectedEvent, TreeProps } from 'antd/es/tree';
-import type { PropsWithChildren, ReactNode } from 'react';
 import type { BaseTreeProps } from './index';
 import type { Key, PlainObject } from '../../basetype';
 export type BaseTreeState = Required<BaseTreeOpts> & {
@@ -27,6 +27,6 @@ type BaseTreeContext = {
 };
 declare const BaseTreeContext: React.Context<BaseTreeContext>;
 export declare const useBaseTree: () => BaseTreeContext;
-export declare const BaseTree: React.FC<PropsWithChildren<BaseTreeProps>>;
+export declare const BaseTree: FC<PropsWithChildren<BaseTreeProps>>;
 export declare const getNodeParam: (node: any, position: number[], state: BaseTreeState, search: SearchResult, disabledNode: (node: PlainObject) => boolean, folderChecker: (node: PlainObject) => boolean) => AntTreeNodeProps;
 export {};

package/components/Trees/COTree/COButton.js

@@ -134,7 +134,7 @@ var COButton = function (props) {
         value.length > 0 && react_1.default.createElement(index_1.Popover, { style: { width: 480 }, overlayClassName: 'co-button-content', content: react_1.default.createElement(COSelect_1.SelectedTable, __assign({}, props, { value: value })) },
             react_1.default.createElement(index_1.Button, { icon: "unordered-list", type: "primary", style: { paddingRight: 0, paddingLeft: 4 } })),
         react_1.default.createElement(index_1.Modal, { open: open, title: "\u8BF7\u9009\u62E9\u673A\u6784", bodyStyle: { maxHeight: 540, overflow: 'auto' }, width: 720, onCancel: function () { return setOpen(false); }, onOk: onOk },
-            react_1.default.createElement(index_1.Alert, { message: react_1.default.createElement(react_1.default.Fragment, null,
+            react_1.default.createElement(index_1.Alert, { message: react_1.default.createElement(react_1.Fragment, null,
                     "\u9009\u4E2D\u72B6\u6001\u8BF4\u660E \uFF1A ",
                     (0, COTreeUtil_1.flagRender)(0, ' :'),
                     " ",

package/components/Trees/COTree/COSelect.js

@@ -103,7 +103,7 @@ var COSelect = function (props) {
         }
     }, [convert]);
     return react_1.default.createElement(index_1.Input.Group, { compact: true, style: { width: props.width || '100%', display: 'flex' } },
-        react_1.default.createElement(index_1.Select, { maxTagCount: 1, mode: "tags", disabled: props.disabled, maxTagPlaceholder: react_1.default.createElement(react_1.default.Fragment, null), showSearch: false, className: 'co-select', allowClear: props.allowClear, 
+        react_1.default.createElement(index_1.Select, { maxTagCount: 1, mode: "tags", disabled: props.disabled, maxTagPlaceholder: utils_1.Const.NONE, showSearch: false, className: 'co-select', allowClear: props.allowClear, 
             // onClear={() => props.onChange([])}
             placeholder: props.placeholder || '请选择机构', style: { flexGrow: 1 }, showAction: ["click"], options: [], labelInValue: true, value: selectValue, dropdownStyle: { width: props.width || '100%', maxHeight: 360, overflow: 'auto' }, dropdownRender: function () { return react_1.default.createElement(COTree_1.COTree, __assign({}, props, { value: value, onChange: onChange })); }, getPopupContainer: function (evt) {
                 return evt.parentElement.parentElement;

package/components/Trees/COTree/COTreeUtil.d.ts

@@ -1,4 +1,5 @@
 import React from 'react';
+import type { ReactNode } from 'react';
 import type { TreeProps } from 'antd/es/tree/Tree';
 import type { COTreeProps, COTreeValueItem, FLAG } from './COTree';
 import type { PlainObject } from '../../../basetype';
@@ -9,7 +10,7 @@ export type TreeFields = {
     parentField: string;
     checkField?: string;
 };
-export declare const flagRender: (flag: FLAG, split?: React.ReactNode) => React.JSX.Element;
+export declare const flagRender: (flag: FLAG, split?: ReactNode) => React.JSX.Element;
 export declare const getTreeDataByLoaded: (all: any[], treeProps: COTreeProps, FIELDS: TreeFields) => [TreeProps, Set<string>, Set<string>, Set<string>];
 export declare const convertFormObject: (obj: PlainObject) => COTreeValueItem[];
 export declare const invertToObject: (items: COTreeValueItem[]) => PlainObject;

package/components/Trees/DTree.d.ts

@@ -34,6 +34,13 @@ export type DTreeProps = BaseTreeProps & BaseActionTreeProps & DTreeData;
 */
 export declare const DTree: React.MemoExoticComponent<React.ForwardRefExoticComponent<import("../../utils/TreeUtil").BaseTreeOpts & Pick<TreeProps, "className" | "disabled" | "defaultExpandAll"> & {
     iconField?: string | ((item: any) => React.ReactNode);
+    /**
+     * 展开子节点：
+     *
+     * 方式一：传一个 api 接口地址，必须返回 VData<Array<Object>> 格式
+     *
+     * 方式二：传一个方法 ，接收一个父节点参数，必须返回  Promise<TreeNodeData[]> (不要返回 children, 仅返回一级)
+    */
     titleField: string | import("./index").LanguageField;
     mustSelect?: boolean;
     disabledNode?: (node: PlainObject) => boolean;

package/components/Trees/FTree.d.ts

@@ -2,7 +2,6 @@ import React from 'react';
 import { TreeUtil } from '../../utils';
 import type { TreeProps } from 'antd/es/tree';
 import type { BaseTreeProps, BaseActionTreeProps, ActionTreeRef } from './index';
-import type { PlainObject } from '../../basetype';
 export type FTreeData = {
     /**
      * 获取全部节点的API，如果不传，刚用 API 的GET模式代替
@@ -20,7 +19,7 @@ export declare const FTree: React.MemoExoticComponent<React.ForwardRefExoticComp
     iconField?: string | ((item: any) => React.ReactNode);
     titleField: string | import("./index").LanguageField;
     mustSelect?: boolean;
-    disabledNode?: (node: PlainObject) => boolean;
-    onSelect?: (key: import("../../basetype").Key, node: PlainObject, parentNode: PlainObject, crumb: PlainObject[], pos: number[]) => void;
+    disabledNode?: (node: import("../..").PlainObject) => boolean;
+    onSelect?: (key: import("../..").Key, node: import("../..").PlainObject, parentNode: import("../..").PlainObject, crumb: import("../..").PlainObject[], pos: number[]) => void;
     searchValue?: string;
 } & BaseActionTreeProps & FTreeData & React.RefAttributes<ActionTreeRef>>>;

package/components/Trees/STree.d.ts

@@ -1,4 +1,4 @@
-import React from 'react';
+import type { FC } from 'react';
 import type { BaseTreeProps } from './index';
 import type { TreeNodeData } from '../../utils/TreeUtil';
 export type STreeData = {
@@ -19,4 +19,4 @@ export type STreeProps = BaseTreeProps & STreeData;
  * 搜索         ： 支持
  * 数据         ： 需要组装好后传入
 */
-export declare const STree: React.FC<STreeProps>;
+export declare const STree: FC<STreeProps>;

package/components/UForm/FormWrapper.d.ts

@@ -1,6 +1,5 @@
-import React from 'react';
+import type { FC, MutableRefObject, PropsWithChildren } from 'react';
 import type { UFromProps } from './index';
-import type { MutableRefObject, PropsWithChildren } from 'react';
 export type FormState = {
     width: number;
     cols: 1 | 2 | 3;
@@ -17,6 +16,6 @@ export type FormState = {
 };
 export declare const useFormLayout: () => FormState;
 export declare const getDefault: (props: UFromProps) => [boolean, number, 1 | 2 | 3, number];
-export declare const FormWrapper: React.FC<PropsWithChildren<UFromProps & {
+export declare const FormWrapper: FC<PropsWithChildren<UFromProps & {
     isInfo: boolean;
 }>>;

package/components/UForm/UDescriptions.d.ts

@@ -1,5 +1,6 @@
 import React from 'react';
+import type { FC } from 'react';
 import type { UDescriptionsItemProps, UDescriptionsProps } from './index';
 export declare const UDescriptions: React.ExoticComponent<React.PropsWithChildren<UDescriptionsProps>> & {
-    Item: React.FC<UDescriptionsItemProps>;
+    Item: FC<UDescriptionsItemProps>;
 };

package/components/UForm/UDescriptions.js

@@ -1,20 +1,43 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UDescriptions = void 0;
-var react_1 = __importDefault(require("react"));
+var react_1 = __importStar(require("react"));
 var lodash_1 = __importDefault(require("lodash"));
 var utils_1 = require("../../utils");
 var isReactFragment = function (variableToInspect) {
     if (variableToInspect.type)
-        return variableToInspect.type === react_1.default.Fragment;
+        return variableToInspect.type === react_1.Fragment;
     return false;
 };
 var toArray = function (children) {
     var ret = [];
-    react_1.default.Children.forEach(children, function (child) {
+    react_1.Children.forEach(children, function (child) {
         if (child === undefined || child === null) {
             return;
         }
@@ -88,12 +111,12 @@ var generateChildrenRows = function (items, column) {
             var cells = columns.map(function (item) { return item.props.span; });
             var diffSpan = column - lodash_1.default.sum(cells);
             var lastNode = columns.pop();
-            columns.push(react_1.default.cloneElement(lastNode, { span: lastNode.props.span + diffSpan }));
+            columns.push((0, react_1.cloneElement)(lastNode, { span: lastNode.props.span + diffSpan }));
             leftSpans = column - span;
             columns = [];
             rows.push(columns);
         }
-        columns.push(react_1.default.cloneElement(node, { span: span }));
+        columns.push((0, react_1.cloneElement)(node, { span: span }));
         if (leftSpans <= 0) {
             columns = null;
         }

package/components/UForm/UForm.js

@@ -219,7 +219,7 @@ var renderFormField = function (state, field, form, update, data) {
     var input = (0, _register_1.getUFormInput)(field.type || 'text');
     var labelSpan = state.labelSpan, inputSpan = state.inputSpan, colSpan = state.colSpan, cols = state.cols, disableFields = state.disableFields, hiddenFields = state.hiddenFields, requireFields = state.requireFields, optionFields = state.optionFields;
     if (hiddenFields.current.has(field.field)) {
-        return react_1.default.createElement(antd_1.Form.Item, { style: { display: 'none' } }, form.getFieldDecorator(field.field)(react_1.default.createElement(input.component, {
+        return react_1.default.createElement(antd_1.Form.Item, { style: { display: 'none' } }, form.getFieldDecorator(field.field)((0, react_1.createElement)(input.component, {
             form: form,
             field: field,
             disabled: disableFields.current.has(field.field),
@@ -298,7 +298,7 @@ var renderFormField = function (state, field, form, update, data) {
         }
     }
     return react_1.default.createElement(antd_1.Col, __assign({}, colProps),
-        react_1.default.createElement(antd_1.Form.Item, __assign({}, itemProps), form.getFieldDecorator(field.field, options)(react_1.default.createElement(input.component, {
+        react_1.default.createElement(antd_1.Form.Item, __assign({}, itemProps), form.getFieldDecorator(field.field, options)((0, react_1.createElement)(input.component, {
             form: form,
             field: field,
             disabled: disableFields.current.has(field.field),
@@ -494,7 +494,7 @@ var _FormGroup = function (props) {
     return props.fields.map(function (group) {
         if (group == null || group === false)
             return utils_1.Const.NONE;
-        return react_1.default.createElement(react_1.default.Fragment, null,
+        return react_1.default.createElement(react_1.Fragment, null,
             react_1.default.createElement(antd_1.Col, { span: 24, className: "c-form-group-title" }, utils_1.i18n.getText(group.ik, group.title)),
             group.fields.map(function (field) {
                 if (field == null || field === false)
@@ -570,7 +570,7 @@ var _UFormAdaptor = /** @class */ (function (_super) {
         return react_1.default.createElement(_UForm, __assign({}, this.props, { ref: this.props.aref }));
     };
     return _UFormAdaptor;
-}(react_1.default.Component));
+}(react_1.Component));
 // 3.0 适配层
 var UFormAdaptor = (0, react_1.memo)((0, react_1.forwardRef)(function (props, ref) {
     var FROM = antd_1.Form.create()(_UFormAdaptor);

package/components/UForm/UFormModal.d.ts

@@ -1,3 +1,3 @@
-import React from 'react';
+import type { FC } from 'react';
 import type { UModalProps } from './index';
-export declare const UFormModal: React.FC<UModalProps>;
+export declare const UFormModal: FC<UModalProps>;

package/components/UForm/UInfo.d.ts

@@ -1,4 +1,4 @@
-import React from 'react';
+import type { FC } from 'react';
 import type { UFromProps, UDescriptionsProps } from './index';
 import type { PlainObject } from '../../basetype';
 export type UInfoProps = Omit<UFromProps, 'buttons' | 'mode' | 'isEdit'> & Pick<UDescriptionsProps, 'hideBorder' | 'theme'> & {
@@ -7,4 +7,4 @@ export type UInfoProps = Omit<UFromProps, 'buttons' | 'mode' | 'isEdit'> & Pick<
     */
     data: PlainObject;
 };
-export declare const UInfo: React.FC<UInfoProps>;
+export declare const UInfo: FC<UInfoProps>;

package/components/UForm/UInfoModal.d.ts

@@ -1,3 +1,3 @@
-import React from 'react';
+import type { FC } from 'react';
 import type { UModalProps } from './index';
-export declare const UInfoModal: React.FC<UModalProps>;
+export declare const UInfoModal: FC<UModalProps>;

package/components/UForm/UInfoModal.js

@@ -55,7 +55,7 @@ var UInfoModal = function (props) {
     }
     if (!lodash_1.default.has(props, 'width'))
         param.width = (0, FormWrapper_1.getDefault)(props)[1];
-    return react_1.default.createElement(Modal_1.Modal, __assign({ maskClosable: true, footer: null }, param),
+    return react_1.default.createElement(Modal_1.Modal, __assign({ className: utils_1.StringUtil.className(['c-info-modal'], props.className), maskClosable: true, footer: null }, param),
         react_1.default.createElement(UInfo_1.UInfo, __assign({}, lodash_1.default.pick(props, FORM_FIELDS))));
 };
 exports.UInfoModal = UInfoModal;

package/components/UForm/UModal.d.ts

@@ -1,3 +1,3 @@
-import React from 'react';
+import type { FC } from 'react';
 import type { UModalProps } from './index';
-export declare const UModal: React.FC<UModalProps>;
+export declare const UModal: FC<UModalProps>;