vap1 0.4.3 → 0.4.5

package/components/Tables/TopTableModal.d.ts

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

package/components/Tables/TopTableModal.js

@@ -25,7 +25,7 @@ var TOP_TABLE_PROPERTIES = [
 var TopTableModal = function (props) {
     var modalProps = lodash_1.default.omit(props, TOP_TABLE_PROPERTIES);
     var tableProps = lodash_1.default.pick(props, TOP_TABLE_PROPERTIES);
-    return react_1.default.createElement(Modal_1.Modal, __assign({}, modalProps),
+    return react_1.default.createElement(Modal_1.Modal, __assign({ footer: null }, modalProps),
         react_1.default.createElement(TopTable_1.TopTable, __assign({}, tableProps)));
 };
 exports.TopTableModal = TopTableModal;

package/components/Tables/Util.d.ts

@@ -1,3 +1,7 @@
 import type { MutableRefObject } from 'react';
+import type { BaseTableProps } from './index';
 import type { ColumnProps } from 'antd/es/table/interface';
-export declare const getIdxColumn: (ref: MutableRefObject<number>, showIndex?: string, isRank?: boolean) => ColumnProps<any>;
+export declare const convertColumns: (props: BaseTableProps, rank: {
+    ref: MutableRefObject<number>;
+    isRank?: boolean;
+}) => ColumnProps<any>[];

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

@@ -37,9 +37,12 @@ export declare const useActionTree: () => ActionTreeContext;
 export declare const ActionTree: React.ForwardRefExoticComponent<import("../../utils/TreeUtil").BaseTreeOpts & Pick<import("antd/es/tree/Tree").TreeProps, "className" | "disabled" | "defaultExpandAll"> & {
     iconField?: string | ((item: any) => React.ReactNode);
     titleField: string | import("./index").LanguageField;
+    titleRender?: (node: PlainObject) => React.ReactNode;
     mustSelect?: boolean;
     disabledNode?: (node: PlainObject) => boolean;
-    onSelect?: (key: Key, node: PlainObject, parentNode: PlainObject, crumb: PlainObject[], pos: number[]) => void;
+    onSelect?: (key: Key, node: PlainObject, parentNode: PlainObject, crumb: PlainObject[], pos: number[]) => void; /**
+     * 获取子节点方法
+    */
     searchValue?: string;
 } & BaseActionTreeProps & CacheTree & React.RefAttributes<ActionTreeRef>>;
 export declare const renderRoot: (props: ActionTreeProps, state: BaseTreeState, context: ActionTreeContext) => ReactNode;

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> & {
@@ -11,6 +11,7 @@ export type BaseTreeState = Required<BaseTreeOpts> & {
     selectedKeys: string[];
     selectedNode: PlainObject;
     titleField: string;
+    titleRender?: (item: any) => ReactNode;
     iconField: string | ((item: any) => ReactNode);
     inited: boolean;
     langs: {
@@ -27,6 +28,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/BaseTree.js

@@ -99,6 +99,7 @@ var BaseTree = function (props) {
         rootCode: '0',
         search: { word: null, keyword: null, match: null },
         titleField: 'name',
+        titleRender: null,
         keyField: 'id',
         iconField: null,
         sortField: null,
@@ -145,6 +146,9 @@ var BaseTree = function (props) {
             DEFAULT.langs = langs;
         }
     }
+    if (props.titleRender && lodash_1.default.isFunction(props.titleRender)) {
+        DEFAULT.titleRender = props.titleRender;
+    }
     var _a = __read((0, hooks_1.useSetState)(DEFAULT), 2), state = _a[0], setState = _a[1];
     var PID = (0, react_1.useRef)(null);
     var searchByKeyWord = (0, react_1.useCallback)(function (word) {
@@ -203,13 +207,18 @@ var BaseTree = function (props) {
 };
 exports.BaseTree = BaseTree;
 var getNodeParam = function (node, position, state, search, disabledNode, folderChecker) {
-    var titleField = state.titleField, keyField = state.keyField, iconField = state.iconField;
+    var titleField = state.titleField, keyField = state.keyField, iconField = state.iconField, titleRender = state.titleRender;
     var param = { key: node[keyField], data: { node: node, position: position } };
     if (search.keyword) {
         param.title = react_1.default.createElement(HighLight_1.HighLight, { keyword: search.keyword, text: node[titleField] });
     }
     else {
-        param.title = node[titleField];
+        if (titleRender) {
+            param.title = titleRender(node);
+        }
+        else {
+            param.title = node[titleField];
+        }
     }
     if (lodash_1.default.isFunction(disabledNode)) {
         if (disabledNode(node)) {

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,7 +34,15 @@ 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;
+    titleRender?: (node: PlainObject) => React.ReactNode;
     mustSelect?: boolean;
     disabledNode?: (node: PlainObject) => boolean;
     onSelect?: (key: Key, node: PlainObject, parentNode: PlainObject, crumb: PlainObject[], pos: number[]) => void;

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模式代替
@@ -19,8 +18,9 @@ export type FTreeProps = BaseTreeProps & BaseActionTreeProps & FTreeData;
 export declare const FTree: React.MemoExoticComponent<React.ForwardRefExoticComponent<TreeUtil.BaseTreeOpts & Pick<TreeProps, "className" | "disabled" | "defaultExpandAll"> & {
     iconField?: string | ((item: any) => React.ReactNode);
     titleField: string | import("./index").LanguageField;
+    titleRender?: (node: import("../..").PlainObject) => React.ReactNode;
     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/Trees/index.d.ts

@@ -36,6 +36,10 @@ export type BaseTreeProps = BaseTreeOpts & Pick<TreeProps, 'className' | 'defaul
      * 如果需要支持 i18n ，则传一个对象，支持3个字段
     */
     titleField: string | LanguageField;
+    /**
+     * 自定义标题
+    */
+    titleRender?: (node: PlainObject) => ReactNode;
     /**
      * 是否必选，
     */

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>;
 };