vap1 0.4.4 → 0.4.7

package/basetype.d.ts

@@ -60,3 +60,7 @@ export type BaseOption = BaseItem & {
     [propName: string]: any;
 };
 export type { ApiModel } from './hooks/_list';
+export type Without<T, U> = {
+    [P in Exclude<keyof T, keyof U>]?: never;
+};
+export type XOR<T, U> = (T | U) extends object ? (T extends object ? U extends object ? (Without<T, U> & U) | (Without<U, T> & T) : T | U : T | U) : T | U;

package/components/Box/Box.d.ts

@@ -1,8 +1,8 @@
 import React from 'react';
 import type { MutableRefObject, ReactNode, CSSProperties } from 'react';
 import type { SelectBarProps } from './SelectBar';
-import type { SearchBarProps } from '../SearchBar';
-import type { ActButton } from '../SearchBar/ActionButtons';
+import type { SearchBarProps } from '../SearchTool/SearchBar';
+import type { ActButton } from '../SearchTool/SearchBar/ActionButtons';
 import type { Key, PlainObject } from '../../basetype';
 import type { UPaginationProps } from '../_common/Upagination';
 type BoxState = {

package/components/Box/Box.js

@@ -59,7 +59,7 @@ var lodash_1 = __importDefault(require("lodash"));
 var Layout_1 = require("../_adapt/Layout");
 var hooks_1 = require("../../hooks");
 var SelectBar_1 = require("./SelectBar");
-var SearchBar_1 = require("../SearchBar");
+var SearchBar_1 = require("../SearchTool/SearchBar");
 var Upagination_1 = require("../_common/Upagination");
 var utils_1 = require("../../utils");
 var _register_1 = require("./_register");

package/components/Box/index.d.ts

@@ -1,5 +1,5 @@
 import { useBox } from './Box';
-import { ForwardRefExoticComponent, PropsWithChildren, RefAttributes } from 'react';
+import type { ForwardRefExoticComponent, PropsWithChildren, RefAttributes } from 'react';
 import type { BoxProps } from './Box';
 export type BoxComponent = ForwardRefExoticComponent<PropsWithChildren<BoxProps> & RefAttributes<{
     resize: () => void;

package/components/Lists/SList.d.ts

@@ -1,5 +1,5 @@
-import type { FC, CSSProperties, ReactNode } from 'react';
 import type { PlainObject, Key } from '../../basetype';
+import type { FC, ReactNode, CSSProperties } from 'react';
 import type { IconProps } from '../_adapt/Icon';
 type ItemRenderFunction = (record: PlainObject, searchValue?: string) => ReactNode;
 export type SListProps = {

package/components/Lists/SList.js

@@ -55,6 +55,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SList = void 0;
 var react_1 = __importStar(require("react"));
+var py_1 = require("../../utils/py");
 var lodash_1 = __importDefault(require("lodash"));
 var utils_1 = require("../../utils");
 var Icon_1 = require("../_adapt/Icon");
@@ -131,8 +132,8 @@ exports.SList = (0, react_1.memo)(function (props) {
             return;
         }
         setList(lodash_1.default.filter(all, function (item) {
-            var title = lodash_1.default.toLower(item[props.titleField]);
-            return title.indexOf(searchValue) >= 0;
+            var hited = (0, py_1.spellHit)(item[props.titleField], searchValue);
+            return hited.length > 0;
         }));
     }, [searchValue, props.list]);
     (0, react_1.useLayoutEffect)(function () {

package/components/{SearchBar → SearchTool/SearchBar}/ActionButtons.d.ts

@@ -1,6 +1,6 @@
 import type { FC, ReactNode } from 'react';
-import type { ButtonType } from '../_adapt/_Antd5';
-import type { 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 → SearchTool/SearchBar}/ActionButtons.js

@@ -51,11 +51,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ActionButtons = void 0;
 var react_1 = __importStar(require("react"));
 var lodash_1 = __importDefault(require("lodash"));
-var Popconfirm_1 = require("../_adapt/Popconfirm");
-var Icon_1 = require("../_adapt/Icon");
-var Button_1 = require("../_adapt/Button");
-var Dropdown_1 = require("../_adapt/Dropdown");
-var utils_1 = require("../../utils");
+var Popconfirm_1 = require("../../_adapt/Popconfirm");
+var Icon_1 = require("../../_adapt/Icon");
+var Button_1 = require("../../_adapt/Button");
+var Dropdown_1 = require("../../_adapt/Dropdown");
+var utils_1 = require("../../../utils");
 var getIcon = function (icon) {
     if (lodash_1.default.isString(icon)) {
         return react_1.default.createElement(Icon_1.Icon, { type: icon });

package/components/{SearchBar → SearchTool/SearchBar}/ByField.js

@@ -57,10 +57,10 @@ exports.SearchBarByField = exports.InnerSearchBarByField = void 0;
 var react_1 = __importStar(require("react"));
 var lodash_1 = __importDefault(require("lodash"));
 var antd_1 = require("antd");
-var Button_1 = require("../_adapt/Button");
-var Popover_1 = require("../_adapt/Popover");
-var utils_1 = require("../../utils");
-var _i18n_1 = require("../_i18n");
+var Button_1 = require("../../_adapt/Button");
+var Popover_1 = require("../../_adapt/Popover");
+var utils_1 = require("../../../utils");
+var _i18n_1 = require("../../_i18n");
 var SearchField_1 = require("./SearchField");
 var _register_1 = require("./_register");
 exports.InnerSearchBarByField = (0, react_1.forwardRef)(function (props, ref) {

package/components/{SearchBar → SearchTool/SearchBar}/ByKeyword.js

@@ -53,10 +53,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SearchBarByKeyword = void 0;
 var react_1 = __importStar(require("react"));
 var antd_1 = require("antd");
-var Popover_1 = require("../_adapt/Popover");
+var Popover_1 = require("../../_adapt/Popover");
 var ByField_1 = require("./ByField");
-var utils_1 = require("../../utils");
-var _i18n_1 = require("../_i18n");
+var utils_1 = require("../../../utils");
+var _i18n_1 = require("../../_i18n");
 var SearchBarByKeyword = function (props) {
     var _a = __read((0, react_1.useState)(false), 2), open = _a[0], setOpen = _a[1];
     var spanRef = (0, react_1.useRef)(null);

package/components/{SearchBar → SearchTool/SearchBar}/SearchField.d.ts

@@ -1,6 +1,6 @@
 import { SearchFieldComponent } from './_register';
 import type { FC } from 'react';
-import type { Field } from './index';
+import type { Field } from '../index';
 export type FieldInput = FC<{
     SearchField: SearchFieldComponent;
     disabled: boolean;

package/components/{SearchBar → SearchTool/SearchBar}/SearchTags.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SearchTags = void 0;
 var react_1 = __importDefault(require("react"));
-var Tag_1 = require("../_adapt/Tag");
+var Tag_1 = require("../../_adapt/Tag");
 var SearchTags = function () {
     return react_1.default.createElement("div", null,
         react_1.default.createElement("h1", null,

package/components/{SearchBar → SearchTool/SearchBar}/_register.d.ts

@@ -1,4 +1,4 @@
-import type { Field } from './index';
+import type { Field } from '../index';
 import type { ComponentType } from 'react';
 export type SearchFieldProps = {
     /**

package/components/{SearchBar → SearchTool/SearchBar}/_register.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getSearchField = exports.registerSearchField = void 0;
-var _Support_1 = require("../../utils/_Support");
-var StringUtil_1 = require("../../utils/StringUtil");
-var _RegisterUtil_1 = require("../_RegisterUtil");
+var _Support_1 = require("../../../utils/_Support");
+var StringUtil_1 = require("../../../utils/StringUtil");
+var _RegisterUtil_1 = require("../../_RegisterUtil");
 var DEFAULT = { outside: false, fieldNum: 1, defaultSpan: 1, };
 var _C_SEARCH_FIELD = (0, _Support_1.globalDefault)('_C_SEARCH_FIELD', new Map());
 /**

package/components/SearchTool/SearchBar/index.d.ts

@@ -0,0 +1,71 @@
+import { ActionButtons } from './ActionButtons';
+import type { PropsWithChildren, ExoticComponent } from 'react';
+import type { Field } from '../index';
+import type { PlainObject } from '../../../basetype';
+/**
+ * 当没有指定 keyword时，SearchBar的配置参数
+ * 指字 keyword 时，将出以弹出方式展示
+*/
+export type SearchBarByFieldProps = {
+    /**
+     * 禁用
+    */
+    disabled?: boolean;
+    /**
+     * searchBar扩展类名称
+     */
+    className?: string;
+    /**
+     * 1. 传一个字，代表 inside 模式宽度
+     * 2. 传一个数字数组，
+     *      代表 outside 模式 [label宽度，input宽度]
+     *      或是 inside 模式加各的结果
+     */
+    fieldWidth?: number | [number, number];
+    /**
+     * 搜索参数
+     */
+    fields?: Field[];
+    /**
+     * 搜索参数支持的列，最多支持4，默认为3
+     */
+    cols?: 1 | 2 | 3 | 4;
+    /**
+     * 变量有变动时使用
+    */
+    onChange?: (param: PlainObject) => void;
+    /**
+     * 搜索被触发时
+     */
+    onSearch: (param: PlainObject) => void;
+    /**
+     * 显示更多时触发
+     */
+    onExpand?: (isShowMore: boolean) => void;
+    /**
+     * 默认参数
+     */
+    default?: any;
+    /**
+     * 用于单独使用时，不需要按钮的情况
+    */
+    hideAction?: boolean;
+};
+export type KeyWord = true | {
+    /**
+     * 提示，默认为 "请填写关键字"
+    */
+    placeholder?: string;
+    /**
+     * 需要高亮的字段
+     * 高亮设定： 说明：高亮设定后， column 指定的 render 会失效
+    */
+    highlight?: string[];
+};
+export type SearchBarProps = SearchBarByFieldProps & {
+    keyword?: KeyWord;
+};
+export interface SearchBar extends ExoticComponent<PropsWithChildren<SearchBarProps>> {
+    ActionButtons: typeof ActionButtons;
+}
+export declare const SearchBar: SearchBar;

package/components/{SearchBar → SearchTool/SearchBar}/index.js

@@ -17,7 +17,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SearchBar = void 0;
 var react_1 = __importDefault(require("react"));
 var lodash_1 = __importDefault(require("lodash"));
-var utils_1 = require("../../utils");
+var utils_1 = require("../../../utils");
 var ByField_1 = require("./ByField");
 var ByKeyword_1 = require("./ByKeyword");
 var ActionButtons_1 = require("./ActionButtons");

package/components/{SearchBar → SearchTool}/index.d.ts

@@ -1,6 +1,4 @@
-import { ActionButtons } from './ActionButtons';
-import type { PropsWithChildren, ExoticComponent } from 'react';
-import type { BaseOption, PlainObject, BaseItem } from '../../basetype';
+import type { BaseOption, BaseItem } from '../../basetype';
 import type { _FieldType } from './_FieldType';
 /**
  * 搜索条件字段
@@ -63,70 +61,3 @@ export type Field = BaseItem & {
      *  */
     config?: any;
 };
-/**
- * 当没有指定 keyword时，SearchBar的配置参数
- * 指字 keyword 时，将出以弹出方式展示
-*/
-export type SearchBarByFieldProps = {
-    /**
-     * 禁用
-    */
-    disabled?: boolean;
-    /**
-     * searchBar扩展类名称
-     */
-    className?: string;
-    /**
-     * 1. 传一个字，代表 inside 模式宽度
-     * 2. 传一个数字数组，
-     *      代表 outside 模式 [label宽度，input宽度]
-     *      或是 inside 模式加各的结果
-     */
-    fieldWidth?: number | [number, number];
-    /**
-     * 搜索参数
-     */
-    fields?: Field[];
-    /**
-     * 搜索参数支持的列，最多支持4，默认为3
-     */
-    cols?: 1 | 2 | 3 | 4;
-    /**
-     * 变量有变动时使用
-    */
-    onChange?: (param: PlainObject) => void;
-    /**
-     * 搜索被触发时
-     */
-    onSearch: (param: PlainObject) => void;
-    /**
-     * 显示更多时触发
-     */
-    onExpand?: (isShowMore: boolean) => void;
-    /**
-     * 默认参数
-     */
-    default?: any;
-    /**
-     * 用于单独使用时，不需要按钮的情况
-    */
-    hideAction?: boolean;
-};
-export type KeyWord = true | {
-    /**
-     * 提示，默认为 "请填写关键字"
-    */
-    placeholder?: string;
-    /**
-     * 需要高亮的字段
-     * 高亮设定： 说明：高亮设定后， column 指定的 render 会失效
-    */
-    highlight?: string[];
-};
-export type SearchBarProps = SearchBarByFieldProps & {
-    keyword?: KeyWord;
-};
-export interface SearchBar extends ExoticComponent<PropsWithChildren<SearchBarProps>> {
-    ActionButtons: typeof ActionButtons;
-}
-export declare const SearchBar: SearchBar;

package/components/SearchTool/index.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/components/Tables/ApiTable.d.ts

@@ -12,7 +12,7 @@ export declare const ApiTable: React.ForwardRefExoticComponent<import("./index")
     selectDisabled?: (record: any) => boolean;
     actionBar?: React.ReactNode | import("./Components/ActionBar").TableActionButton[];
     selectBar?: import("../Box/SelectBar").SelectBarProps;
-    searchBar?: Omit<import("../SearchBar").SearchBarProps, "onChange" | "onSearch">;
+    searchBar?: Omit<import("../..").SearchBarProps, "onChange" | "onSearch">;
     default?: import("../..").PlainObject;
     autoLoad?: false;
 } & Pick<ApiOption, "api" | "tipField" | "tipDisabled" | "aop"> & React.RefAttributes<ApiModel>>;

package/components/Tables/ApiTableModal.d.ts

@@ -12,7 +12,7 @@ export declare const ApiTableModal: React.ForwardRefExoticComponent<import(".").
     selectDisabled?: (record: any) => boolean;
     actionBar?: React.ReactNode | import("./Components/ActionBar").TableActionButton[];
     selectBar?: import("../Box/SelectBar").SelectBarProps;
-    searchBar?: Omit<import("../SearchBar").SearchBarProps, "onChange" | "onSearch">;
+    searchBar?: Omit<import("../..").SearchBarProps, "onChange" | "onSearch">;
     default?: import("../..").PlainObject;
     autoLoad?: false;
 } & Pick<import("../../hooks/useApiBase").ApiOption, "api" | "tipField" | "tipDisabled" | "aop"> & Omit<import("antd/es/modal").ModalProps, "visible" | "onCancel" | "onOk"> & {

package/components/Tables/Components/ActionBar.d.ts

@@ -1,6 +1,6 @@
 import type { FC, MutableRefObject } from 'react';
 import type { Key, PlainObject } from '../../../basetype';
-import type { ActButton } from '../../SearchBar/ActionButtons';
+import type { ActButton } from '../../SearchTool/SearchBar/ActionButtons';
 export type TableAction = (ids?: Key[], objs?: PlainObject[], param?: PlainObject) => void;
 /**
  * VTable Button 区域点击后的方法，支持三个参数

package/components/Tables/Components/ActionBar.js

@@ -56,7 +56,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.BUTTON_EXPORT = exports.BUTTON_IMPORT = exports.BUTTON_MORE = exports.BUTTON_DELETE = exports.BUTTON_ADD = exports.ActionBar = void 0;
 var react_1 = __importStar(require("react"));
 var lodash_1 = __importDefault(require("lodash"));
-var ActionButtons_1 = require("../../SearchBar/ActionButtons");
+var ActionButtons_1 = require("../../SearchTool/SearchBar/ActionButtons");
 var _i18n_1 = require("../../_i18n");
 var i18n_1 = require("../../../utils/i18n");
 var hooks_1 = require("../../../hooks");

package/components/Tables/STable.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
-import { ListInit } from '../../hooks/_list';
 import type { VTableProps, VTableRef } from './VTable';
+import type { ListInit } from '../../hooks/_list';
 export type STableProps = Omit<VTableProps, 'model'> & ListInit & {
     /**
      * 说明 pageSize : 默认为 false ： 不分页。

package/components/Tables/TopTable.js

@@ -149,7 +149,6 @@ var TopTable = function (props) {
             }
         }); };
     }
-    console.log(scroll);
     return react_1.default.createElement("div", { ref: tableRef, className: 'c-table-top-container' },
         react_1.default.createElement(Table_1.Table, __assign({}, tableProps, props, { rowClassName: function (record, i) {
                 var clazz = [];

package/components/Tables/VTable.d.ts

@@ -28,13 +28,15 @@ export type VTableProps = BaseTableProps & {
 export declare const VTable: React.ForwardRefExoticComponent<import("./index").TableDefine & {
     mode?: import("../Box/Box").BoxMode;
     columns: import("./index").TableCol[];
-    showIndex?: string | false;
+    showIndex?: string | false; /**
+     * 列表模型，可以使用系统提供的 useApi/useArray 等，也可自行实现列表模型
+    */
     rowKey?: string;
     select?: true | "DEFAULT" | "QUERY";
     selectDisabled?: (record: any) => boolean;
     actionBar?: React.ReactNode | import("./Components/ActionBar").TableActionButton[];
     selectBar?: import("../Box/SelectBar").SelectBarProps;
-    searchBar?: Omit<import("../SearchBar").SearchBarProps, "onChange" | "onSearch">;
+    searchBar?: Omit<import("../..").SearchBarProps, "onChange" | "onSearch">;
     default?: PlainObject;
     autoLoad?: false;
 } & {

package/components/Tables/index.d.ts

@@ -2,7 +2,7 @@ import type { TableDefined } from './Components';
 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';
+import type { SearchBarProps } from '../SearchTool/SearchBar/index';
 import type { TableActionButton } from './Components/ActionBar';
 import type { PlainObject, BaseItem, ApiModel } from '../../basetype';
 import type { BoxMode } from '../Box/Box';

package/components/TreeSelect/STreeSelect.js

@@ -26,7 +26,7 @@ var _STreeSelect = function (props) {
     // 说明，等待数据处理好了再绑定，让 defaultExpand 之类的默认属性能生效
     if (!treeState.inited)
         return utils_1.Const.NONE;
-    return react_1.default.createElement(antd_1.TreeSelect, __assign({}, baseProps, extraProps, { value: value == null ? undefined : value, disabled: props.disabled }), (0, BaseTreeSelect_1.renderRoot)(props, treeState));
+    return react_1.default.createElement(antd_1.TreeSelect, __assign({}, baseProps, extraProps, { treeDefaultExpandAll: props.treeDefaultExpandAll, allowClear: props.allowClear, value: value == null ? undefined : value, disabled: props.disabled }), (0, BaseTreeSelect_1.renderRoot)(props, treeState));
 };
 var STreeSelect = function (props) { return react_1.default.createElement(BaseTreeSelect_1.BaseTreeSelect, __assign({}, props),
     react_1.default.createElement(_STreeSelect, __assign({}, props))); };

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

@@ -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: {

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

@@ -42,6 +42,7 @@ export declare const DTree: React.MemoExoticComponent<React.ForwardRefExoticComp
      * 方式二：传一个方法 ，接收一个父节点参数，必须返回  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

@@ -18,6 +18,7 @@ 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: import("../..").PlainObject) => boolean;
     onSelect?: (key: import("../..").Key, node: import("../..").PlainObject, parentNode: import("../..").PlainObject, crumb: import("../..").PlainObject[], pos: number[]) => void;

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

@@ -5,4 +5,4 @@
 | text ||
  *
 */
-export declare const _FieldType: readonly ["text", "textarea", "password", "color", "number", "slider", "slider-range", "slider-range", "input-with-select", "button", "select", "multi-select", "switch", "switch-checkbox", "radio", "radio-button", "radio-with-more", "checkbox", "checkbox-with-all", "icon", "stree-select", "dtree-select", "ftree-select", "multi-stree-select", "multi-dtree-select", "multi-ftree-select", "date", "datetime", "month", "week", "time", "daterange", "datetimerange", "daterange-single", "datetimerange-single", "timerange", "monthrange", "json-array", "json-table", "file", "multi-file", "img", "idcard", "ip", "ip4", "ip6", "phone", "telephone", "mobilephone", "port", "mac", "url", "email", "crontab", "organization", "role", "roles", "cems-org-button"];
+export declare const _FieldType: readonly ["text", "textarea", "password", "color", "number", "slider", "slider-range", "slider-range", "input-with-select", "button", "divider", "select", "multi-select", "switch", "switch-checkbox", "radio", "radio-button", "radio-with-more", "checkbox", "checkbox-with-all", "icon", "stree-select", "dtree-select", "ftree-select", "multi-stree-select", "multi-dtree-select", "multi-ftree-select", "date", "datetime", "month", "week", "time", "daterange", "datetimerange", "daterange-single", "datetimerange-single", "timerange", "monthrange", "json-array", "json-table", "file", "multi-file", "img", "idcard", "ip", "ip4", "ip6", "phone", "telephone", "mobilephone", "port", "mac", "url", "email", "crontab", "organization", "role", "roles", "cems-org-button"];

package/components/UForm/_FieldType.js

@@ -51,6 +51,10 @@ exports._FieldType = [
      * 一个没有任何意义的按钮，使用时，请设置 dataType:'none'
     */
     'button',
+    /**
+    * 一个没有任何意义的分割，使用时，请设置 dataType:'none'
+    */
+    'divider',
     /**
      * 下拉选择
     */

package/components/UForm/_input.d.ts

@@ -2,7 +2,7 @@ import type { ReactNode } from 'react';
 import type { UFormField } from './index';
 import type { PlainObject } from '../../basetype';
 import type { TableColumn } from '../Tables';
-import type { SearchBarProps } from '../SearchBar';
+import type { SearchBarProps } from '../SearchTool/SearchBar';
 export declare const copyMultiValue: (fields: string[], data: PlainObject, properties: string[]) => PlainObject;
 /**
  * 获取复合字段的 字段与值，以数组形式返回

package/components/UForm/_register.d.ts

@@ -1,4 +1,4 @@
-import type { ComponentType, ReactNode } from 'react';
+import type { ReactNode, ComponentType } from 'react';
 import type { BaseOption, PlainObject } from '../../basetype';
 import type { UFormField } from './index';
 import type { ValidationRule, WrappedFormUtils } from 'antd/es/form/Form';

package/components/_adapt/Col.d.ts

@@ -1,6 +1,6 @@
 import type { FC, CSSProperties, ReactNode } from 'react';
 import type { ColProps as AntdColprops } from 'antd/es/grid/col';
-import type { ActButton } from '../SearchBar/ActionButtons';
+import type { ActButton } from '../SearchTool/SearchBar/ActionButtons';
 import type { UTitleProps } from '../_common/UTitle';
 export type ColProps = Omit<AntdColprops, 'title'> & UTitleProps & {
     /**

package/components/_common/HighLight.js

@@ -48,6 +48,6 @@ var StringUtil_1 = require("../../utils/StringUtil");
 var HighLight = function (props) {
     var _a = __read((0, react_1.useState)([]), 2), ptns = _a[0], setPtns = _a[1];
     (0, react_1.useLayoutEffect)(function () { return setPtns((0, StringUtil_1.searchText)(props.text, props.keyword)); }, [props]);
-    return react_1.default.createElement(react_1.Fragment, null, ptns.map(function (ptn) { return ptn.hit ? react_1.default.createElement("span", { className: 'v-highlight' }, ptn.text) : ptn.text; }));
+    return ptns.map(function (ptn) { return ptn.hit ? react_1.default.createElement("span", { className: 'v-highlight' }, ptn.text) : ptn.text; });
 };
 exports.HighLight = HighLight;

package/components/_common/UTitle.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 import type { ReactNode, CSSProperties } from 'react';
-import type { ActButton } from '../SearchBar/ActionButtons';
+import type { ActButton } from '../SearchTool/SearchBar/ActionButtons';
 export type UTitleProps = {
     className?: string;
     style?: CSSProperties;

package/components/_common/UTitle.js

@@ -32,7 +32,7 @@ var lodash_1 = __importDefault(require("lodash"));
 var utils_1 = require("../../utils");
 var Popover_1 = require("../_adapt/Popover");
 var Icon_1 = require("../_adapt/Icon");
-var ActionButtons_1 = require("../SearchBar/ActionButtons");
+var ActionButtons_1 = require("../SearchTool/SearchBar/ActionButtons");
 var UTitle = function (props) {
     var elAction = '';
     var actions = [];

package/components/index.d.ts

@@ -1,7 +1,7 @@
 export { registerFormField, } from './UForm/_register';
 export { getPlaceholder, getMultiFieldValues, registerApiTableSelector, copyMultiValue } from './UForm/_input';
 export type { FormFieldComponent, FormFieldProps, FormFieldOptions, } from './UForm/_register';
-export { registerSearchField, } from './SearchBar/_register';
-export type { SearchFieldComponent, SearchFieldProps, SearchFieldOptions, } from './SearchBar/_register';
+export { registerSearchField, } from './SearchTool/SearchBar/_register';
+export type { SearchFieldComponent, SearchFieldProps, SearchFieldOptions, } from './SearchTool/SearchBar/_register';
 export { registerSelectBar } from './Box/_register';
 export type { SelectBarComponent, SelectBarProps, SelectBarOptions, } from './Box/_register';

package/components/index.js

@@ -10,7 +10,7 @@ Object.defineProperty(exports, "getMultiFieldValues", { enumerable: true, get: f
 Object.defineProperty(exports, "registerApiTableSelector", { enumerable: true, get: function () { return _input_1.registerApiTableSelector; } });
 Object.defineProperty(exports, "copyMultiValue", { enumerable: true, get: function () { return _input_1.copyMultiValue; } });
 // SearchField 搜索条件输入字段
-var _register_2 = require("./SearchBar/_register");
+var _register_2 = require("./SearchTool/SearchBar/_register");
 Object.defineProperty(exports, "registerSearchField", { enumerable: true, get: function () { return _register_2.registerSearchField; } });
 // SelectBar - 左侧边栏
 var _register_3 = require("./Box/_register");