vap1 0.0.7 → 0.0.9

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/ActionButtons.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ActionButtons = void 0;
 const react_1 = __importDefault(require("react"));
 const lodash_1 = __importDefault(require("lodash"));
-const antd_1 = require("antd");
+const Popconfirm_1 = require("../_adapt/Popconfirm");
 const Icon_1 = require("../_adapt/Icon");
 const Button_1 = require("../_adapt/Button");
 const Dropdown_1 = require("../_adapt/Dropdown");
@@ -64,7 +64,7 @@ const ActionButton = (props) => {
     if (props.danger)
         btnParam.danger = true;
     if (props.confirm && props.disabled !== true) {
-        return react_1.default.createElement(antd_1.Popconfirm, { trigger: "click", placement: "bottomLeft", onConfirm: props.onClick, title: lodash_1.default.isString(props.confirm) ? props.confirm : props.confirm() },
+        return react_1.default.createElement(Popconfirm_1.Popconfirm, { trigger: "click", placement: "bottomLeft", onConfirm: props.onClick, title: lodash_1.default.isString(props.confirm) ? props.confirm : props.confirm() },
             react_1.default.createElement(Button_1.Button, Object.assign({}, props.config, btnParam), props.label));
     }
     btnParam.onClick = (evt) => utils_1.PageUtil.stopEvent(evt, props.onClick);

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/SearchBar/SearchTags.js

@@ -5,12 +5,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SearchTags = void 0;
 const react_1 = __importDefault(require("react"));
-const antd_1 = require("antd");
+const Tag_1 = require("../_adapt/Tag");
 const SearchTags = () => {
     return react_1.default.createElement("div", null,
         react_1.default.createElement("h1", null,
             "\u5168\u90E8\u7ED3\u679C >  ",
-            react_1.default.createElement(antd_1.Tag, { closable: true, onClose: () => { } }, "aa")),
+            react_1.default.createElement(Tag_1.Tag, { closable: true, onClose: () => { } }, "aa")),
         react_1.default.createElement("div", null,
             react_1.default.createElement("label", { htmlFor: 'p' }),
             react_1.default.createElement("p", null)));

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/Components/Actions.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.COL_OPERACTION = exports.ACTION = exports.DELETE = exports.EDIT = exports.INFO = void 0;
 const react_1 = __importDefault(require("react"));
 const lodash_1 = __importDefault(require("lodash"));
-const antd_1 = require("antd");
+const Popconfirm_1 = require("../../_adapt/Popconfirm");
 const Icon_1 = require("../../_adapt/Icon");
 const utils_1 = require("../../../utils");
 const Const_1 = require("../../_setup/Const");
@@ -38,7 +38,7 @@ const DELETE = props => {
         return react_1.default.createElement(react_1.default.Fragment, null);
     const title = utils_1.i18n.getText(props.ik, props.title, Const_1.V.ACT_DELETE);
     let popTitle = utils_1.i18n.txt(Const_1.V.ACT_DELETE_CONFIRM, props.name || '');
-    return react_1.default.createElement(antd_1.Popconfirm, { onConfirm: e => utils_1.PageUtil.stopEvent(e, () => props.onClick()), placement: "right", title: react_1.default.createElement("span", null, popTitle), overlayClassName: 'c-table-action-confirm' },
+    return react_1.default.createElement(Popconfirm_1.Popconfirm, { onConfirm: e => utils_1.PageUtil.stopEvent(e, () => props.onClick()), placement: "right", title: react_1.default.createElement("span", null, popTitle), overlayClassName: 'c-table-action-confirm' },
         react_1.default.createElement("span", { className: DEFAULT_CLASS.DELETE, title: `${title} ${props.name || ''}` },
             react_1.default.createElement(Icon_1.Icon, { type: 'delete' }),
             react_1.default.createElement("span", null, title)));
@@ -54,7 +54,7 @@ const ACTION = props => {
             props.icon && react_1.default.createElement(Icon_1.Icon, { type: props.icon }),
             react_1.default.createElement("span", null, title));
     }
-    return react_1.default.createElement(antd_1.Popconfirm, { onConfirm: () => props.onClick(), title: props.confrim, placement: "right", overlayClassName: 'c-table-action-confirm' },
+    return react_1.default.createElement(Popconfirm_1.Popconfirm, { onConfirm: () => props.onClick(), title: props.confrim, placement: "right", overlayClassName: 'c-table-action-confirm' },
         react_1.default.createElement("span", { className: className, title: props.name || undefined, onClick: utils_1.PageUtil.stopEvent },
             props.icon && react_1.default.createElement(Icon_1.Icon, { type: props.icon }),
             react_1.default.createElement("span", null, title)));

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

@@ -29,6 +29,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.VTable = exports.getHeightByTagName = void 0;
 const lodash_1 = __importDefault(require("lodash"));
 const react_1 = __importStar(require("react"));
+const Table_1 = require("../_adapt/Table");
 const antd_1 = require("antd");
 const ActionBar_1 = require("./Components/ActionBar");
 const utils_1 = require("../../utils");
@@ -178,7 +179,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(Table_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/Tables/index.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
 import type { TableDefined } from './Components';
 import type { ForwardRefExoticComponent, ExoticComponent } from 'react';
-import type { TableProps } from 'antd/es/table';
+import type { TableProps } from '../_adapt/Table';
 import type { ColumnProps } from 'antd/es/table/interface';
 import type { SearchBarProps } from '../SearchBar/index';
 import type { TableActionButton } from './Components/ActionBar';

package/components/TreeSelect/BaseTreeSelect.js

@@ -38,7 +38,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getData = exports.renderRoot = exports.getNodeParam = exports.BaseTreeSelect = exports.useBaseTree = void 0;
 const lodash_1 = __importDefault(require("lodash"));
 const react_1 = __importStar(require("react"));
-const antd_1 = require("antd");
+const TreeSelect_1 = require("../_adapt/TreeSelect");
 const utils_1 = require("../../utils");
 const hooks_1 = require("../../hooks");
 const _Support_1 = require("../../utils/_Support");
@@ -154,13 +154,13 @@ exports.getNodeParam = getNodeParam;
 const renderNode = (node, state, props) => {
     const param = (0, exports.getNodeParam)(node, state, props.disabledNode);
     if (lodash_1.default.isArray(node.children) && node.children.length) {
-        return react_1.default.createElement(antd_1.TreeSelect.TreeNode, Object.assign({}, param, { isLeaf: false }), renderNodes(node.children, state, props));
+        return react_1.default.createElement(TreeSelect_1.TreeSelect.TreeNode, Object.assign({}, param, { isLeaf: false }), renderNodes(node.children, state, props));
     }
     let isLeaf = true;
     if (props.checkField) {
         isLeaf = !node[props.checkField];
     }
-    return react_1.default.createElement(antd_1.TreeSelect.TreeNode, Object.assign({}, param, { isLeaf: isLeaf }));
+    return react_1.default.createElement(TreeSelect_1.TreeSelect.TreeNode, Object.assign({}, param, { isLeaf: isLeaf }));
 };
 const renderNodes = (data, state, props) => data.map((item) => renderNode(item, state, props));
 const renderRoot = (props, state) => renderNodes(state.treeData, state, props);

package/components/TreeSelect/DTreeSelect.js

@@ -14,7 +14,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DTreeSelect = void 0;
 const react_1 = __importDefault(require("react"));
-const antd_1 = require("antd");
+const TreeSelect_1 = require("../_adapt/TreeSelect");
 const lodash_1 = __importDefault(require("lodash"));
 const BaseTreeSelect_1 = require("./BaseTreeSelect");
 const hooks_1 = require("../../hooks");
@@ -59,7 +59,7 @@ const _DTreeSelect = (props) => {
             r(undefined);
         }));
     });
-    return react_1.default.createElement(antd_1.TreeSelect, Object.assign({}, treeState.baseProps, treeProps, { disabled: props.disabled, loadData: loadData, onChange: onChange, onSelect: onSelect }), (0, BaseTreeSelect_1.renderRoot)(props, treeState));
+    return react_1.default.createElement(TreeSelect_1.TreeSelect, Object.assign({}, treeState.baseProps, treeProps, { disabled: props.disabled, loadData: loadData, onChange: onChange, onSelect: onSelect }), (0, BaseTreeSelect_1.renderRoot)(props, treeState));
 };
 const DTreeSelect = (props) => react_1.default.createElement(BaseTreeSelect_1.BaseTreeSelect, Object.assign({}, props),
     react_1.default.createElement(_DTreeSelect, Object.assign({}, props)));

package/components/TreeSelect/FTreeSelect.js

@@ -14,7 +14,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FTreeSelect = void 0;
 const react_1 = __importDefault(require("react"));
-const antd_1 = require("antd");
+const TreeSelect_1 = require("../_adapt/TreeSelect");
 const BaseTreeSelect_1 = require("./BaseTreeSelect");
 const hooks_1 = require("../../hooks");
 const _FTreeSelect = (props) => {
@@ -32,7 +32,7 @@ const _FTreeSelect = (props) => {
         // 如果根节点只有一个，则自动展开这个根结点
         treeProps.treeDefaultExpandedKeys = [treeState.treeData[0][treeState.keyField]];
     }
-    return react_1.default.createElement(antd_1.TreeSelect, Object.assign({}, treeState.baseProps, treeProps, { disabled: props.disabled, onChange: onChange, onSelect: onSelect }), (0, BaseTreeSelect_1.renderRoot)(props, treeState));
+    return react_1.default.createElement(TreeSelect_1.TreeSelect, Object.assign({}, treeState.baseProps, treeProps, { disabled: props.disabled, onChange: onChange, onSelect: onSelect }), (0, BaseTreeSelect_1.renderRoot)(props, treeState));
 };
 const FTreeSelect = (props) => react_1.default.createElement(BaseTreeSelect_1.BaseTreeSelect, Object.assign({}, props),
     react_1.default.createElement(_FTreeSelect, Object.assign({}, props)));

package/components/TreeSelect/STreeSelect.js

@@ -25,7 +25,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.STreeSelect = void 0;
 const react_1 = __importStar(require("react"));
-const antd_1 = require("antd");
+const TreeSelect_1 = require("../_adapt/TreeSelect");
 const BaseTreeSelect_1 = require("./BaseTreeSelect");
 const TreeUtil_1 = require("../../utils/TreeUtil");
 const utils_1 = require("../../utils");
@@ -45,7 +45,7 @@ const _STreeSelect = (props) => {
     }, []);
     if (!init)
         return utils_1.Const.NONE;
-    return react_1.default.createElement(antd_1.TreeSelect, Object.assign({}, treeState.baseProps, { disabled: props.disabled, onChange: onChange, onSelect: onSelect }), (0, BaseTreeSelect_1.renderRoot)(props, treeState));
+    return react_1.default.createElement(TreeSelect_1.TreeSelect, Object.assign({}, treeState.baseProps, { disabled: props.disabled, onChange: onChange, onSelect: onSelect }), (0, BaseTreeSelect_1.renderRoot)(props, treeState));
 };
 const STreeSelect = (props) => react_1.default.createElement(BaseTreeSelect_1.BaseTreeSelect, Object.assign({}, props),
     react_1.default.createElement(_STreeSelect, Object.assign({}, props)));

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.d.ts

@@ -2,7 +2,7 @@ import React from 'react';
 import type { UFromProps } from './index';
 import type { FormState } from './FormWrapper';
 import type { PlainObject } from '../../basetype';
-export type UFomFunctions = {
+export type UFormFunctions = {
     /**
      * 获取当前表单数据
     */
@@ -30,4 +30,4 @@ export declare const initValue: (props: UFromProps & {
  * 3. 支持 ref 控制方法
  * 4. filed 支持更多提示，验证方法
 */
-export declare const UForm: React.ForwardRefExoticComponent<UFromProps & React.RefAttributes<UFomFunctions>>;
+export declare const UForm: React.ForwardRefExoticComponent<UFromProps & React.RefAttributes<UFormFunctions>>;