vap1 0.0.7 → 0.0.8

package/components/SearchBar/ActionButtons.d.ts

@@ -1,5 +1,6 @@
 import React from 'react';
-import type { ButtonType, OButtonProps as ButtonProps } from '../_adapt/Button';
+import type { ButtonType } from '../_adapt/_Antd5';
+import type { ButtonProps } from '../_adapt/Button';
 import type { ButtonSize } from 'antd/es/button';
 export type ActButton = {
     /**

package/components/SearchBar/ByKeyword.js

@@ -27,7 +27,7 @@ const SearchBarByKeyword = (props) => {
                 react_1.default.createElement("div", { className: 'c-searchbar' },
                     react_1.default.createElement(ByField_1.SearchBarByField, Object.assign({}, props, { 
                         // @ts-ignore
-                        __innerExpand: true, __innerOutside: true })))), rootClassName: 'c-searchbar-keyword-more', getPopupContainer: () => document.getElementById('vap-app-content') },
+                        __innerExpand: true, __innerOutside: true })))), overlayClassName: 'c-searchbar-keyword-more', getPopupContainer: () => document.getElementById('vap-app-content') },
             react_1.default.createElement("span", { className: 'vicon vicon-menu', title: utils_1.i18n.txt(Const_1.V.INPUT_SEARCH_ADVANCE) }));
     }
     return react_1.default.createElement(antd_1.Input.Search, Object.assign({}, inputProps, { onSearch: keyword => props.onSearch({ keyword_: keyword }), enterButton: utils_1.i18n.txt(Const_1.V.BTN_SEARCH) }));

package/components/Tables/ApiTableModal.d.ts

@@ -1,8 +1,8 @@
 import React from "react";
-import type { VModalProps } from '../_adapt/Modal';
+import type { ModalProps } from '../_adapt/Modal';
 import type { ApiTableProps } from './ApiTable';
 import type { ApiModel } from '../../hooks/_list';
-export type ApiTableModalProps = ApiTableProps & VModalProps;
+export type ApiTableModalProps = ApiTableProps & ModalProps;
 export declare const ApiTableModal: React.ForwardRefExoticComponent<import(".").TableDefine & {
     mode?: import("../Box/Box").BoxMode;
     columns: import(".").TableColumn[];

package/components/Tables/TopTable.js

@@ -29,7 +29,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TopTable = void 0;
 const lodash_1 = __importDefault(require("lodash"));
 const react_1 = __importStar(require("react"));
-const antd_1 = require("antd");
+const Table_1 = require("../_adapt/Table");
 const utils_1 = require("../../utils");
 const Util_1 = require("./Util");
 const VTable_1 = require("./VTable");
@@ -127,7 +127,7 @@ const TopTable = props => {
         tableLayout: 'fixed',
         rowKey,
         size: utils_1.GLOBAL.CONFIG.TABLE.SIZE,
-        // showSorterTooltip: false,
+        showSorterTooltip: false,
         pagination: false,
     };
     if (lodash_1.default.isFunction(props.onRowSelect)) {
@@ -137,7 +137,7 @@ const TopTable = props => {
             }
         });
     }
-    return react_1.default.createElement(antd_1.Table, Object.assign({}, tableProps, props, { 
+    return react_1.default.createElement(Table_1.Table, Object.assign({}, tableProps, props, { 
         // ref={tableRef}
         rowClassName: (record, i) => {
             let clazz = [];

package/components/Tables/TopTableModal.d.ts

@@ -1,5 +1,5 @@
 import React from "react";
-import type { VModalProps } from '../_adapt/Modal';
+import type { ModalProps } from '../_adapt/Modal';
 import type { TopTableProps } from './TopTable';
-export type TopTableModalProps = TopTableProps & VModalProps;
+export type TopTableModalProps = TopTableProps & ModalProps;
 export declare const TopTableModal: React.FC<TopTableModalProps>;

package/components/Tables/VTable.js

@@ -178,7 +178,9 @@ const _VTable = react_1.default.forwardRef((props, ref) => {
             },
         };
     }
-    return react_1.default.createElement(antd_1.Table, Object.assign({ rowKey: props.rowKey || rowKey, scroll: scroll, tableLayout: "fixed", 
+    return react_1.default.createElement(antd_1.Table, Object.assign({ rowKey: record => record[props.rowKey || rowKey], 
+        // scroll={scroll}
+        // tableLayout="fixed"
         // showSorterTooltip={false}
         size: utils_1.GLOBAL.CONFIG.TABLE.SIZE }, props, tableProps, { className: utils_1.StringUtil.className(['c-table'], props.className), pagination: false, columns: columns, locale: { emptyText: react_1.default.createElement(antd_1.Empty, { style: { marginTop: 24 } }) }, dataSource: list, loading: isQuerying, onChange: (x, y, field) => {
             if (field.column) {

package/components/Trees/ActionTree.d.ts

@@ -45,7 +45,9 @@ export declare const ActionTree: React.ForwardRefExoticComponent<import("../../u
     defaultExpandAll?: boolean;
     mustSelect?: boolean;
     disabled?: boolean;
-    disabledNode?: (node: PlainObject) => boolean;
+    disabledNode?: (node: PlainObject) => boolean; /**
+     * 清理缓存方法
+    */
     onSelect?: (key: Key, node: PlainObject, parentNode: PlainObject, crumb: PlainObject[], pos: number[]) => void;
     searchValue?: string;
 } & ActionProps & CacheTree & React.RefAttributes<ActionRef>>;

package/components/Trees/ActionTree.js

@@ -81,6 +81,7 @@ const _Actiontree = (0, react_1.forwardRef)((props, ref) => {
         canUpdate: false,
         canUpdateRoot: false,
         canDelete: false,
+        canDeleteRoot: false,
         canSort: false,
         notCache: false,
     };
@@ -99,8 +100,11 @@ const _Actiontree = (0, react_1.forwardRef)((props, ref) => {
             if (props.canUpdateRoot)
                 action.canUpdateRoot = true;
         }
-        if (props.canDelete)
+        if (props.canDelete) {
             action.canDelete = true;
+            if (props.canDeleteRoot)
+                action.canDeleteRoot = true;
+        }
         if (props.canSort && treeState.sortField)
             action.canSort = true;
     }
@@ -393,9 +397,8 @@ const _Actiontree = (0, react_1.forwardRef)((props, ref) => {
         let rootPath = '';
         let arr;
         const { idForApiField } = props;
-        const { keyField, parentField, titleField, treeData } = treeState;
+        const { keyField, parentField, titleField, treeData, } = treeState;
         const { api, objectName } = action;
-        const idField = idForApiField || keyField;
         if (root.length == 0) {
             arr = lodash_1.default.concat([], treeData);
         }
@@ -404,8 +407,7 @@ const _Actiontree = (0, react_1.forwardRef)((props, ref) => {
             rootPath = nodePath + '.children';
             arr = lodash_1.default.concat([], lodash_1.default.get(treeData, rootPath));
         }
-        const delId = node[idField];
-        const resp = yield utils_1.Ajax.DELETE(api, { ids: delId });
+        const resp = yield utils_1.Ajax.DELETE(api, { ids: node[idForApiField || keyField] });
         if (resp.code != '0') {
             antd_1.message.error(txt(Const_1.V.ACT_DELETE_FAIL_NAMED, `${objectName} : ${node[titleField]}`));
             return;
@@ -413,10 +415,10 @@ const _Actiontree = (0, react_1.forwardRef)((props, ref) => {
         props.clearCache(node[parentField]);
         let tree = lodash_1.default.concat([], treeData);
         if (rootPath) {
-            lodash_1.default.set(tree, rootPath, utils_1.ArrayUtil.del(lodash_1.default.get(tree, rootPath), delId, keyField));
+            lodash_1.default.set(tree, rootPath, utils_1.ArrayUtil.del(lodash_1.default.get(tree, rootPath), node[keyField], keyField));
         }
         else {
-            tree = utils_1.ArrayUtil.del(tree, delId, keyField);
+            tree = utils_1.ArrayUtil.del(tree, node[keyField], keyField);
         }
         setTreeData(tree);
         antd_1.message.success(txt(Const_1.V.ACT_DELETE_SUCCESS_NAMED, `${objectName} : ${node[titleField]}`));
@@ -501,12 +503,64 @@ const _Actiontree = (0, react_1.forwardRef)((props, ref) => {
         setTreeData(tree);
         antd_1.message.success(txt(Const_1.V.TREE_SORT_SUCCESS));
     });
-    return react_1.default.createElement(ActionTreeContext.Provider, { value: {
-            action,
-            showAdd, showEdit, del, up, down,
-        } },
+    const ADD_TITLE = () => {
+        // console.log(modals.modalState)
+        const { pos, node } = modals.modalState.extra || {};
+        if (!action.canSort) {
+            if (pos == INSER_POS.INNER) {
+                return react_1.default.createElement("span", null,
+                    "\u6DFB\u52A0 ",
+                    react_1.default.createElement("b", null, action.objectName),
+                    " (\u4ECE\u5C5E\u4E8E ",
+                    react_1.default.createElement("b", null, node[treeState.titleField]),
+                    ") ");
+            }
+            return react_1.default.createElement("span", null,
+                "\u5728\u6839\u8282\u70B9\u6DFB\u52A0 ",
+                react_1.default.createElement("b", null, action.objectName));
+        }
+        switch (pos) {
+            case INSER_POS.TOP:
+                return react_1.default.createElement("span", null,
+                    "\u5728\u9876\u90E8\u6DFB\u52A0 ",
+                    react_1.default.createElement("b", null, action.objectName));
+            case INSER_POS.BOTTOM:
+                return react_1.default.createElement("span", null,
+                    "\u5728\u5E95\u90E8\u6DFB\u52A0 ",
+                    react_1.default.createElement("b", null, action.objectName));
+            case INSER_POS.INNER:
+                return react_1.default.createElement("span", null,
+                    "\u6DFB\u52A0 ",
+                    react_1.default.createElement("b", null, action.objectName),
+                    " (\u4ECE\u5C5E\u4E8E ",
+                    react_1.default.createElement("b", null, node[treeState.titleField]),
+                    ") ");
+            case INSER_POS.BEFORE:
+                return react_1.default.createElement("span", null,
+                    "\u5728 ",
+                    react_1.default.createElement("b", null, node[treeState.titleField]),
+                    " \u524D\u9762\u6DFB\u52A0 ",
+                    react_1.default.createElement("b", null, action.objectName));
+            case INSER_POS.AFTER:
+                return react_1.default.createElement("span", null,
+                    "\u5728 ",
+                    react_1.default.createElement("b", null, node[treeState.titleField]),
+                    " \u540E\u9762\u6DFB\u52A0 ",
+                    react_1.default.createElement("b", null, action.objectName));
+            default:
+                return react_1.default.createElement("span", null,
+                    "\u6DFB\u52A0 ",
+                    react_1.default.createElement("b", null, action.objectName));
+        }
+    };
+    return react_1.default.createElement(ActionTreeContext.Provider, { value: { action, showAdd, showEdit, del, up, down, } },
         props.children,
-        react_1.default.createElement(UFormModal_1.UFormModal, Object.assign({ autoTitle: { field: treeState.titleField, label: action.objectName } }, modals.modalState.modalProps, { fields: FIELDS.current, default: getDefault(), onOk: data => {
+        react_1.default.createElement(UFormModal_1.UFormModal, Object.assign({ title: modals.modalState.isEdit ? react_1.default.createElement("span", null,
+                " ",
+                txt(Const_1.V.ACT_UPDATE),
+                action.objectName,
+                " : ",
+                react_1.default.createElement("b", null, treeState.titleField)) : ADD_TITLE() }, modals.modalState.modalProps, { fields: FIELDS.current, default: getDefault(), onOk: data => {
                 modals.hide();
                 if (modals.modalState.isEdit) {
                     update(data, modals.modalState.extra.position);
@@ -521,14 +575,17 @@ const _Actiontree = (0, react_1.forwardRef)((props, ref) => {
 */
 exports.ActionTree = (0, react_1.forwardRef)((props, ref) => react_1.default.createElement(BaseTree_1.BaseTree, Object.assign({}, props),
     react_1.default.createElement(_Actiontree, Object.assign({}, props, { ref: ref }))));
-const getActionParam = (node, position, state, search, disabledNode, context, parentLen) => {
-    const param = (0, BaseTree_1.getNodeParam)(node, position, state, search, disabledNode);
+const getActionParam = (node, position, state, search, disabledNode, folderChecker, context, parentLen) => {
+    const param = (0, BaseTree_1.getNodeParam)(node, position, state, search, disabledNode, folderChecker);
     const isRoot = position.length == 1;
     if (param.disabled)
         return param;
-    const { action: { canAdd, canAddRoot, canUpdate, canUpdateRoot, canDelete, canSort } } = context;
+    const { action: { canAdd, canAddRoot, canUpdate, canUpdateRoot, canDelete, canDeleteRoot, canSort } } = context;
+    if (param.selectable === false && (canAdd || canDelete || canSort || canUpdate)) {
+        param.selectable = true;
+    }
     const actions = [];
-    if (canAdd) {
+    if (canAdd && (!lodash_1.default.isFunction(folderChecker) || folderChecker(node))) {
         if (!canSort || !canAddRoot && isRoot) {
             actions.push(react_1.default.createElement(Dropdown_1.Dropdown, { trigger: ["click"], menu: {
                     items: [
@@ -560,7 +617,7 @@ const getActionParam = (node, position, state, search, disabledNode, context, pa
             actions.push(react_1.default.createElement(Icon_1.Icon, { type: "arrow-down", title: txt(Const_1.V.ACT_UPDATE_TITLE_NAMED, node[state.titleField]), onClick: () => context.down(node, position) }));
         }
     }
-    if (!isRoot && canDelete) {
+    if (canDelete && (!isRoot || canDeleteRoot)) {
         actions.push(react_1.default.createElement(Popconfirm_1.Popconfirm, { onConfirm: () => context.del(node, position), title: txt(Const_1.V.ACT_DELETE_CONFIRM, node[state.titleField]) },
             react_1.default.createElement("span", { onClick: (e) => utils_1.PageUtil.stopEvent(e), className: "vicon vicon-delete vicon-clickable", title: txt(Const_1.V.ACT_DELETE) + ' ' + node[state.titleField] })));
     }
@@ -575,7 +632,7 @@ const getActionParam = (node, position, state, search, disabledNode, context, pa
 const renderNode = (props, node, position, state, search, context, parentLen) => {
     if (search.keyword && !search.match.has(position.join('-')))
         return utils_1.Const.NONE;
-    const param = getActionParam(node, position, state, search, props.disabledNode, context, parentLen);
+    const param = getActionParam(node, position, state, search, props.disabledNode, props.folderChecker, context, parentLen);
     if (lodash_1.default.isArray(node.children) && node.children.length) {
         return react_1.default.createElement(antd_1.Tree.TreeNode, Object.assign({ isLeaf: false }, param), renderNodes(props, state, node.children, position, search, context));
     }
@@ -590,7 +647,7 @@ const renderNode = (props, node, position, state, search, context, parentLen) =>
 };
 const renderNodes = (props, state, data, position, search, context) => data.map((item, idx) => renderNode(props, item, [...position, idx], state, search, context, data.length));
 const renderRoot = (props, state, context) => {
-    const { search, treeData } = state;
+    const { search, treeData, folderChecker } = state;
     if (search.keyword) {
         if (search.match.size == 0)
             return react_1.default.createElement(antd_1.Tree.TreeNode, { isLeaf: true, title: react_1.default.createElement(antd_1.Empty, { description: txt(Const_1.V.TXT_FIND_NULL, search.word) }), selectable: false, className: "c-tree-empty" });
@@ -616,7 +673,7 @@ const renderRoot = (props, state, context) => {
     else if (canAdd && treeData.length == 1) {
         // 说明 兼容树业务：有些项目技术上使用一个根节点，
         // 当根节点只有一个时，则在业务上认为此节点为固定根节点
-        const param = getActionParam(treeData[0], [0], state, search, props.disabledNode, context, 1);
+        const param = getActionParam(treeData[0], [0], state, search, props.disabledNode, props.folderChecker, context, 1);
         const childs = (treeData[0].children || []);
         return react_1.default.createElement(antd_1.Tree.TreeNode, Object.assign({}, param),
             react_1.default.createElement(antd_1.Tree.TreeNode, { isLeaf: true, className: 'c-tree-add-root', selectable: false, checkable: false, selected: false, title: react_1.default.createElement("a", { onClick: evt => {

package/components/Trees/BaseTree.d.ts

@@ -4,7 +4,7 @@ import type { BaseTreeOpts, SearchResult, TreeNodeData } from '../../utils/TreeU
 import type { AntTreeNodeProps, TreeProps } from 'antd/es/tree';
 import type { PropsWithChildren, ReactNode } from 'react';
 import type { BaseTreeProps } from './index';
-import type { PlainObject } from '../../basetype';
+import type { Key, PlainObject } from '../../basetype';
 export type BaseTreeState = Required<BaseTreeOpts> & {
     className: string;
     baseProps: TreeProps;
@@ -19,13 +19,18 @@ export type BaseTreeState = Required<BaseTreeOpts> & {
         field: string;
     }[];
 };
+type OnSelectFunction = (selectedKeys: Key[], info: {
+    selected?: boolean;
+    selectedNodes: any[];
+    nativeEvent?: MouseEvent;
+}, tree?: PlainObject[]) => void;
 type BaseTreeContext = {
     treeState: BaseTreeState;
-    onSelect: TreeProps['onSelect'];
+    onSelect: OnSelectFunction;
     setTreeData: (treeData: TreeNodeData[]) => void;
 };
 declare const BaseTreeContext: React.Context<BaseTreeContext>;
 export declare const useBaseTree: () => BaseTreeContext;
 export declare const BaseTree: React.FC<PropsWithChildren<BaseTreeProps>>;
-export declare const getNodeParam: (node: any, position: number[], state: BaseTreeState, search: SearchResult, disabledNode: (node: PlainObject) => boolean) => AntTreeNodeProps;
+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/BaseTree.js

@@ -60,6 +60,7 @@ const BaseTree = (props) => {
         sortField: null,
         parentField: null,
         langs: null,
+        folderChecker: null,
     };
     if (props.rootCode)
         DEFAULT.rootCode = props.rootCode;
@@ -71,6 +72,9 @@ const BaseTree = (props) => {
         DEFAULT.sortField = props.sortField;
     if (props.parentField)
         DEFAULT.parentField = props.parentField;
+    if (props.folderChecker)
+        DEFAULT.folderChecker = props.folderChecker;
+    // DEFAULT.
     // if(props.searchValue) DEFAULT.searchValue = props.searchValue;
     // Support I18N Title Field
     if (lodash_1.default.isString(props.titleField)) {
@@ -115,7 +119,7 @@ const BaseTree = (props) => {
     }, [state.treeData]);
     const setTreeData = (treeData) => setState({ treeData: [...treeData] });
     (0, react_1.useEffect)(() => searchByKeyWord(props.searchValue), [props.searchValue]);
-    const onSelect = (0, react_1.useCallback)((selectedKeys, evt) => {
+    const onSelect = (0, react_1.useCallback)((selectedKeys, evt, tree) => {
         utils_1.PageUtil.stopEvent(evt === null || evt === void 0 ? void 0 : evt.nativeEvent);
         if (props.mustSelect && selectedKeys.length == 0)
             return;
@@ -137,7 +141,7 @@ const BaseTree = (props) => {
             let key = '';
             for (let idx of position) {
                 key += `[${idx}]`;
-                // crumb.push(_.omit(_.get(tree || state.treeData, key), 'children'));
+                crumb.push(lodash_1.default.omit(lodash_1.default.get(tree || state.treeData, key), 'children'));
                 key += `.children`;
             }
             props.onSelect(selectedKeys[0], crumb[crumb.length - 1], crumb.length > 1 ? crumb[crumb.length - 2] : null, crumb, position);
@@ -146,7 +150,7 @@ const BaseTree = (props) => {
     return react_1.default.createElement(BaseTreeContext.Provider, { value: { treeState: state, onSelect, setTreeData } }, props.children);
 };
 exports.BaseTree = BaseTree;
-const getNodeParam = (node, position, state, search, disabledNode) => {
+const getNodeParam = (node, position, state, search, disabledNode, folderChecker) => {
     const { titleField, keyField, iconField, } = state;
     let param = { key: node[keyField], data: { node, position } };
     if (search.keyword) {
@@ -160,6 +164,11 @@ const getNodeParam = (node, position, state, search, disabledNode) => {
             param.disabled = true;
         }
     }
+    else if (lodash_1.default.isFunction(folderChecker)) {
+        if (folderChecker(node)) {
+            param.selectable = false;
+        }
+    }
     if (iconField != null) {
         if (lodash_1.default.isString(iconField)) {
             let icon = node[iconField];

package/components/Trees/FTree.js

@@ -59,7 +59,6 @@ const _Ftree = (props) => {
         const tree = utils_1.TreeUtil.buildFlatTree(treeState, (0, ActionTree_1.getResponseList)(rootResp));
         setTreeData(tree);
         if (props.mustSelect && tree.length > 0) {
-            //@ts-ignore
             onSelect([tree[0][treeState.keyField]], { selectedNodes: [{ data: { node: tree[0], position: [0] } }] }, tree);
         }
         setInit(true);

package/components/Trees/STree.js

@@ -56,11 +56,10 @@ const _Stree = (props) => {
         }
         setTreeData(tree);
         if (props.mustSelect && tree.length > 0) {
-            // @ts-ignore
             onSelect([tree[0][treeState.keyField]], { selectedNodes: [{ data: { node: tree[0], position: [0] } }] }, tree);
         }
         setInit(true);
-    }, []);
+    }, [props.treeData]);
     if (!init)
         return utils_1.Const.NONE;
     const treeProps = {};
@@ -73,20 +72,20 @@ const _Stree = (props) => {
     }
     return react_1.default.createElement(antd_1.Tree, Object.assign({}, treeState.baseProps, treeProps, { className: treeState.className, disabled: props.disabled, selectedKeys: treeState.selectedKeys, onSelect: onSelect }), renderRoot(props, treeState));
 };
-const renderNode = (node, position, state, search, disabledNode) => {
+const renderNode = (node, position, state, search, disabledNode, folderChecker) => {
     if (search.keyword && !search.match.has(position.join('-')))
         return utils_1.Const.NONE;
-    const param = (0, BaseTree_1.getNodeParam)(node, position, state, search, disabledNode);
+    const param = (0, BaseTree_1.getNodeParam)(node, position, state, search, disabledNode, folderChecker);
     if (lodash_1.default.isArray(node.children) && node.children.length) {
-        return react_1.default.createElement(antd_1.Tree.TreeNode, Object.assign({}, param, { isLeaf: false }), renderNodes(node.children, position, state, search, disabledNode));
+        return react_1.default.createElement(antd_1.Tree.TreeNode, Object.assign({}, param, { isLeaf: false }), renderNodes(node.children, position, state, search, disabledNode, folderChecker));
     }
     return react_1.default.createElement(antd_1.Tree.TreeNode, Object.assign({}, param, { isLeaf: true }));
 };
-const renderNodes = (data, position, state, search, disabledNode) => data.map((item, idx) => renderNode(item, [...position, idx], state, search, disabledNode));
+const renderNodes = (data, position, state, search, disabledNode, folderChecker) => data.map((item, idx) => renderNode(item, [...position, idx], state, search, disabledNode, folderChecker));
 const renderRoot = (props, state) => {
     const { search } = state;
     if (search.keyword && search.match.size == 0) {
         return react_1.default.createElement(antd_1.Tree.TreeNode, { isLeaf: true, title: react_1.default.createElement(antd_1.Empty, { description: utils_1.i18n.txt(Const_1.V.TXT_FIND_NULL, search.word) }), selectable: false, className: "c-tree-empty" });
     }
-    return state.treeData.map((node, idx) => renderNode(node, [idx], state, search, props.disabledNode));
+    return state.treeData.map((node, idx) => renderNode(node, [idx], state, search, props.disabledNode, props.folderChecker));
 };

package/components/Trees/index.d.ts

@@ -49,7 +49,8 @@ export type BaseTreeProps = BaseTreeOpts & {
      *  */
     disabled?: boolean;
     /**
-     * 是否禁用结点，返回true为禁用
+     * 是否禁用结点，返回true为禁用,
+     * 说明：如果是要禁用文件夹，建议使用  folderChecker
     */
     disabledNode?: (node: PlainObject) => boolean;
     /**
@@ -100,6 +101,10 @@ export type ActionProps = {
      * 是否可以删除节点
     */
     canDelete?: boolean;
+    /**
+     * 是否可以删除根节点（第一层的节点）
+    */
+    canDeleteRoot?: boolean;
     /**
      * 是否支持排序
     */

package/components/UForm/UForm.js

@@ -147,6 +147,7 @@ const renderFormField = (state, field, form, update, data) => {
     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, {
             form,
+            // initValue:
             field,
             disabled: disableFields.current.has(field.field),
             options: (0, _FormUtils_1.getOptions)(optionFields.current.has(field.field) ? optionFields.current.get(field.field) : (field.options || []), field, data)
@@ -154,7 +155,7 @@ const renderFormField = (state, field, form, update, data) => {
     }
     const [required, rules] = (0, _FormUtils_1.requireStatus)(field, requireFields.current, disableFields.current, hiddenFields.current);
     const options = {
-        // initialValue: form.getFieldValue(field.field),
+        initialValue: form.getFieldValue(field.field),
         validateFirst: true,
         rules,
         getValueFromEvent: (value, extra) => onChangeEvent(state, field, form, update, value, extra),
@@ -346,9 +347,11 @@ const _FormField = (props) => {
     const { form } = props;
     const update = (0, useUpdate_1.useUpdate)();
     (0, react_1.useEffect)(() => {
+        // console.log('dfdsaupdate')
         const values = (0, exports.initValue)(props);
         props.initRef.current = values;
-        form.setFieldsValue(values);
+        console.log(values);
+        form.setFieldsValue(props.initRef.current);
         props.fields.map(field => {
             if (field == null || field == false)
                 return;
@@ -358,10 +361,12 @@ const _FormField = (props) => {
             if (lodash_1.default.isArray(field.link) && field.link.length > 0)
                 setTimeout(() => onChangeEvent(props.state, field, form, update, values[field.field]), 2);
         });
+        // console.log('google')
         update();
     }, []);
-    if (props.initRef.current === null)
-        return utils_1.Const.NONE;
+    // console.log(props.initRef.current)
+    // return Const.NONE
+    // if (props.initRef.current === null) return Const.NONE;
     const data = form.getFieldsValue();
     return props.fields.map(field => {
         if (field == null || field === false)
@@ -392,8 +397,7 @@ const _FormGroup = (props) => {
         });
         update();
     }, []);
-    if (props.initRef.current === null)
-        return utils_1.Const.NONE;
+    // if (props.initRef.current === null) return Const.NONE;
     const data = form.getFieldsValue();
     return props.fields.map(group => {
         if (group == null || group === false)
@@ -449,12 +453,39 @@ const _UForm = (0, react_1.forwardRef)((props, ref) => {
                 checkMultiple(item);
             }
         });
+        // initRef.current = initValue({ ...props, state })
+        // if (state.isGroup) {
+        //     props.fields.map(group => {
+        //         if (group == null || group == false) return;
+        //         (group as UFormFieldGroup).fields.map(field => {
+        //             // @ts-ignore
+        //             if (field == null || field == false) return;
+        //             if (!_.has(initRef.current, field.field) || initRef.current[field.field] === null || initRef.current[field.field] === undefined) return;
+        //             // setFieldsValue 要 render 后才能get ,延时执行 link事件
+        //             // if (_.isArray(field.link) && field.link.length > 0) setTimeout(() => onChangeEvent(state, field, form, update, values[field.field]), 2);
+        //         })
+        //     })
+        // } else {
+        //     props.fields.map(field => {
+        //         if (field == null || field == false) return;
+        //         if (!_.has(initRef.current, field.field) || initRef.current[field.field] === null || initRef.current[field.field] === undefined) return;
+        //         // setFieldsValue 要 render 后才能get ,延时执行 link事件
+        //         // if (_.isArray(field.link) && field.link.length > 0) setTimeout(() => onChangeEvent(props.state, field, form, update, values[field.field]), 2);
+        //     })
+        // }
+        // form.setFieldsValue(initRef.current, () => setChecked(true))
         setChecked(true);
     }, []);
-    return checked && react_1.default.createElement(antd_1.Form
+    if (!checked)
+        return utils_1.Const.NONE;
+    // console.log(initRef)
+    // console.log('fdsafd')
+    return react_1.default.createElement(antd_1.Form
+    // defaultValue={initRef.current}
     // initialValues={props.default}
     // size={props.size || GLOBAL.CONFIG.FORM.SIZE}
     , { 
+        // defaultValue={initRef.current}
         // initialValues={props.default}
         // size={props.size || GLOBAL.CONFIG.FORM.SIZE}
         className: state.isGroup ? 'c-form c-form-group' : 'c-form', style: { width: state.width }, form: form },
@@ -470,6 +501,7 @@ class _UFormAdaptor extends react_1.default.Component {
 // 3.0 适配层
 const UFormAdaptor = (0, react_1.memo)((0, react_1.forwardRef)((props, ref) => {
     const FROM = antd_1.Form.create()(_UFormAdaptor);
+    // <ConfigProvider ></ConfigProvider>
     return react_1.default.createElement(FROM, Object.assign({}, props, { aref: ref }));
 }));
 /**
@@ -480,5 +512,5 @@ const UFormAdaptor = (0, react_1.memo)((0, react_1.forwardRef)((props, ref) => {
  * 3. 支持 ref 控制方法
  * 4. filed 支持更多提示，验证方法
 */
-exports.UForm = react_1.default.forwardRef((props, ref) => react_1.default.createElement(FormWrapper_1.FormWrapper, Object.assign({ isInfo: false }, props),
+exports.UForm = (0, react_1.forwardRef)((props, ref) => react_1.default.createElement(FormWrapper_1.FormWrapper, Object.assign({ isInfo: false }, props),
     react_1.default.createElement(UFormAdaptor, Object.assign({}, props, { ref: ref }))));

package/components/UForm/UFormModal.js

@@ -48,6 +48,9 @@ const FormWrapper_1 = require("./FormWrapper");
 const FORM_FIELDS = ['layout', 'fields', 'groupType', 'isEdit', 'tip', 'default', 'data', 'mode', 'size'];
 const UFormModal = (props) => {
     const ref = (0, react_1.useRef)(null);
+    const [open, afterClose] = (0, Modal_1.useDestoryModal)(props);
+    if (!open)
+        return utils_1.Const.NONE;
     let modalProps = {
         onOk: () => __awaiter(void 0, void 0, void 0, function* () {
             const result = yield ref.current.validate();
@@ -143,7 +146,7 @@ const UFormModal = (props) => {
             });
         }
     }
-    return react_1.default.createElement(Modal_1.Modal, Object.assign({ maskClosable: utils_1.GLOBAL.CONFIG.FORM.maskClosable, destroyOnClose: true }, lodash_1.default.omit(props, FORM_FIELDS), { className: utils_1.StringUtil.className(['u-form-modal'], props.className), onCancel: () => props.onCancel() }, modalProps),
+    return react_1.default.createElement(Modal_1.Modal, Object.assign({ maskClosable: utils_1.GLOBAL.CONFIG.FORM.maskClosable, destroyOnClose: true, afterClose: afterClose }, lodash_1.default.omit(props, FORM_FIELDS), { className: utils_1.StringUtil.className(['u-form-modal'], props.className), onCancel: () => props.onCancel() }, modalProps),
         react_1.default.createElement(UForm_1.UForm, Object.assign({}, lodash_1.default.pick(props, FORM_FIELDS), { ref: ref })));
 };
 exports.UFormModal = UFormModal;

package/components/UForm/UInfoModal.js

@@ -13,6 +13,9 @@ const Const_1 = require("../_setup/Const");
 const FormWrapper_1 = require("./FormWrapper");
 const FORM_FIELDS = ['layout', 'fields', 'groupType', 'isEdit', 'tip', 'default', 'data', 'mode', 'hideBorder', 'theme'];
 const UInfoModal = (props) => {
+    const [open, afterClose] = (0, Modal_1.useDestoryModal)(props);
+    if (!open)
+        return utils_1.Const.NONE;
     const param = lodash_1.default.omit(props, FORM_FIELDS);
     if (!lodash_1.default.has(props, 'title') && lodash_1.default.has(props, 'autoTitle')) {
         let name = null;

package/components/UForm/UModal.js

@@ -8,17 +8,22 @@ const react_1 = __importDefault(require("react"));
 const lodash_1 = __importDefault(require("lodash"));
 const UFormModal_1 = require("./UFormModal");
 const UInfoModal_1 = require("./UInfoModal");
+const Modal_1 = require("../_adapt/Modal");
+const utils_1 = require("../../utils");
 const UModal = (props) => {
+    const [open, afterClose] = (0, Modal_1.useDestoryModal)(props);
+    if (!open)
+        return utils_1.Const.NONE;
     // 指定模式时，以指定的模式为准
     if (lodash_1.default.has(props, 'mode')) {
         if (props.mode == 'INFO')
-            return react_1.default.createElement(UInfoModal_1.UInfoModal, Object.assign({}, props));
-        return react_1.default.createElement(UFormModal_1.UFormModal, Object.assign({}, props));
+            return react_1.default.createElement(UInfoModal_1.UInfoModal, Object.assign({ afterClose: afterClose }, props));
+        return react_1.default.createElement(UFormModal_1.UFormModal, Object.assign({ afterClose: afterClose }, props));
     }
     if (props.isEdit)
-        return react_1.default.createElement(UFormModal_1.UFormModal, Object.assign({}, props));
+        return react_1.default.createElement(UFormModal_1.UFormModal, Object.assign({ afterClose: afterClose }, props));
     if (props.data && lodash_1.default.keys(props.data).length)
-        return react_1.default.createElement(UInfoModal_1.UInfoModal, Object.assign({}, props));
-    return react_1.default.createElement(UFormModal_1.UFormModal, Object.assign({}, props));
+        return react_1.default.createElement(UInfoModal_1.UInfoModal, Object.assign({ afterClose: afterClose }, props));
+    return react_1.default.createElement(UFormModal_1.UFormModal, Object.assign({ afterClose: afterClose }, props));
 };
 exports.UModal = UModal;

package/components/UForm/index.d.ts

@@ -6,8 +6,8 @@ export { UInfoModal } from './UInfoModal';
 export { UModal } from './UModal';
 export { UDescriptions } from './UDescriptions';
 import type { BaseOption, PlainObject, BaseItem } from '../../basetype';
-import type { VModalProps } from '../_adapt/Modal';
-import type { OButtonProps as ButtonProps } from '../_adapt/Button';
+import type { ModalProps } from '../_adapt/Modal';
+import type { ButtonProps } from '../_adapt/Button';
 import type { ValidationRule } from 'antd/es/form/Form';
 /**
  * 表单布局方式 simple = 1 列 （比较宽松） | common = 2 列 （常规） |  compress = 3列 （紧凑）
@@ -22,6 +22,7 @@ export type UFormLayout = 'common' | 'simple' | 'compress';
 export type GroupType = 'default' | 'tabs' | 'collapse';
 export type LinkValue = string | number | boolean;
 import type { _FieldType } from './_FieldType';
+import type { SizeType } from '../_adapt/_Antd5';
 /**
  * 联动结果 ： 改变目标字段的交互属性
  * 所有属性为可选，需要改变几项属性，则只返回包含几个属性的对象，
@@ -223,6 +224,10 @@ export type UFromProps = {
      * 表单宽度，仅支持数字，一般不传，需要时使用，
     */
     width?: number;
+    /**
+     * 表单大小
+    */
+    size?: SizeType;
     /**
      * 说明：
      *
@@ -286,7 +291,7 @@ export type UFromAction = ButtonProps & {
  * 新版本 ModalProps 只支持 open 且必传，
  * 不使用 deprecated 属性
 */
-export type UModalProps = UFromProps & Omit<VModalProps, 'children'> & {
+export type UModalProps = UFromProps & Omit<ModalProps, 'children'> & {
     /**
      * open 为必填项，不使用废弃的 visable 属性
     */