vap1 0.1.7 → 0.1.8

package/components/SearchBar/ByKeyword.js

@@ -46,9 +46,7 @@ const SearchBarByKeyword = (props) => {
     if (props.fields && props.fields.length) {
         inputProps.suffix = react_1.default.createElement(react_1.default.Fragment, null,
             react_1.default.createElement("span", { ref: spanRef, onClick: () => setOpen(true), style: { pointerEvents: props.disabled ? 'none' : 'unset' }, className: 'vicon vicon-menu', title: utils_1.i18n.txt(Const_1.V.INPUT_SEARCH_ADVANCE) }, "\u00A0"),
-            react_1.default.createElement(Popover_1.Popover, { open: open, 
-                // open={true}
-                onOpenChange: setOpen, trigger: "click", placement: "bottom", content: react_1.default.createElement(react_1.default.Fragment, null,
+            react_1.default.createElement(Popover_1.Popover, { open: open, onOpenChange: setOpen, trigger: "click", placement: "bottom", content: react_1.default.createElement(react_1.default.Fragment, null,
                     react_1.default.createElement("h3", null, utils_1.i18n.txt(Const_1.V.INPUT_SEARCH_ADVANCE)),
                     react_1.default.createElement("div", { className: 'c-searchbar' },
                         react_1.default.createElement(ByField_1.SearchBarByField, Object.assign({}, props, { onSearch: (param) => {
@@ -56,9 +54,7 @@ const SearchBarByKeyword = (props) => {
                                 setOpen(false);
                             }, 
                             // @ts-ignore
-                            __innerExpand: true, __innerOutside: true })))), 
-                // autoAdjustOverflow={false}
-                overlayClassName: 'c-searchbar-keyword-more', getPopupContainer: () => {
+                            __innerExpand: true, __innerOutside: true })))), overlayClassName: 'c-searchbar-keyword-more', getPopupContainer: () => {
                     const maskEls = document.getElementsByClassName('ant-modal-mask');
                     let hasMask = false;
                     for (let i = 0, _i = maskEls.length; i < _i; i++) {

package/components/SearchBar/_FieldType.d.ts

@@ -5,4 +5,4 @@
 | text ||
  *
 */
-export declare const _FieldType: readonly ["text", "number", "select", "multi-select", "radio", "radio-button", "checkbox", "switch", "date", "daterange", "daterange-single", "datetime", "timerange", "timerange-single", "month", "monthrange", "autocomplete"];
+export declare const _FieldType: readonly ["text", "number", "select", "multi-select", "radio", "radio-button", "checkbox", "switch", "date", "daterange", "daterange-single", "datetime", "datetimerange", "datetimerange-single", "month", "monthrange", "autocomplete"];

package/components/SearchBar/_FieldType.js

@@ -21,8 +21,8 @@ exports._FieldType = [
     'daterange',
     'daterange-single',
     'datetime',
-    'timerange',
-    'timerange-single',
+    'datetimerange',
+    'datetimerange-single',
     'month',
     'monthrange',
     'autocomplete',

package/components/TreeSelect/BaseTreeSelect.d.ts

@@ -1,33 +1,31 @@
 import React from 'react';
-import { Language } from '../../utils/_Support';
+import type { ReactNode, PropsWithChildren } from 'react';
 import type { TreeNodeData } from '../../utils/TreeUtil';
 import type { TreeSelectProps } from 'antd/es/tree-select';
-import type { AntTreeNodeProps } from 'antd/es/tree';
-import type { PropsWithChildren } from 'react';
 import type { BaseTreeSelectProps } from './index';
-import type { PlainObject } from '../../basetype';
+import type { PlainObject, Key } from '../../basetype';
 export type BaseTreeSelectState = {
-    baseProps: TreeSelectProps<any>;
     treeData: TreeNodeData[];
     keyField: string;
+    iconField?: string | ((item: any) => ReactNode);
+    sortField?: string;
     titleField: string;
-    valueField: string;
-    rootCode?: string | number;
-    langs: {
-        lang: Language;
-        field: string;
-    }[];
+    rootCode?: Key;
+    parentField: string;
+    inited: boolean;
+    valueField?: string;
+    searchValue?: string;
 };
 type BaseTreeSelectContext = {
+    baseProps: TreeSelectProps<any>;
     treeState: BaseTreeSelectState;
     setTreeData: (treeData: TreeNodeData[]) => void;
-    onSelect: TreeSelectProps<any>['onSelect'];
-    onChange: TreeSelectProps<any>['onChange'];
+    extraProps: TreeSelectProps<any>;
+    value: Key[];
 };
 declare const BaseTreeSelectContext: React.Context<BaseTreeSelectContext>;
 export declare const useBaseTree: () => BaseTreeSelectContext;
 export declare const BaseTreeSelect: React.FC<PropsWithChildren<BaseTreeSelectProps>>;
-export declare const getNodeParam: (node: any, state: BaseTreeSelectState, disabledNode: (node: PlainObject) => boolean) => AntTreeNodeProps;
+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 getData: (api: string, notCache: boolean) => Promise<PlainObject[]>;
 export {};

package/components/TreeSelect/BaseTreeSelect.js

@@ -22,169 +22,198 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getData = exports.renderRoot = exports.getNodeParam = exports.BaseTreeSelect = exports.useBaseTree = void 0;
-const lodash_1 = __importDefault(require("lodash"));
+exports.renderRoot = exports.getNodeParam = exports.BaseTreeSelect = exports.useBaseTree = void 0;
+const lodash_1 = __importStar(require("lodash"));
 const react_1 = __importStar(require("react"));
-const TreeSelect_1 = require("../_adapt/TreeSelect");
+const antd_1 = require("antd");
+// import { HighLight, Icon } from '';
+const HighLight_1 = require("../_common/HighLight");
+;
+const Icon_1 = require("../_adapt/Icon");
 const utils_1 = require("../../utils");
 const hooks_1 = require("../../hooks");
-const _Support_1 = require("../../utils/_Support");
 const BaseTreeSelectContext = (0, react_1.createContext)(null);
 const useBaseTree = () => (0, react_1.useContext)(BaseTreeSelectContext);
 exports.useBaseTree = useBaseTree;
 const BaseTreeSelect = (props) => {
-    const clazz = utils_1.StringUtil.className(['c-tree'], props.className);
-    const basePropsKeys = [
-        'defaultValue',
-        'multiple',
-        'treeDefaultExpandAll',
-        'treeCheckable',
-        'disabled',
-        'showSearch',
-        'style'
-    ];
-    const stateKeys = [
-        'rootCode',
-        'keyField',
-        'valueField',
-        // 'parentField'
-    ];
     const DEFAULT = {
-        baseProps: {
-            dropdownStyle: { maxHeight: 400, overflow: 'auto' },
-            showSearch: true,
-            allowClear: true,
-            className: clazz,
-            style: { width: '300px' },
-            treeNodeFilterProp: 'title',
-        },
+        inited: false,
         treeData: [],
-        rootCode: '0',
+        rootCode: lodash_1.default.has(props, 'rootCode') ? props.rootCode : '0',
         titleField: 'name',
-        keyField: 'id',
-        valueField: null,
-        // parentField: null,
-        langs: null,
+        iconField: props.iconField,
+        keyField: props.keyField || 'id',
+        sortField: props.sortField,
+        parentField: props.parentField || 'parent',
     };
-    lodash_1.default.forEach(stateKeys, (k) => {
-        if (props[k] != null) {
-            DEFAULT[k] = props[k];
-        }
-    });
-    lodash_1.default.forEach(basePropsKeys, (k) => {
-        if (props[k] != null) {
-            DEFAULT.baseProps[k] = props[k];
-        }
-    });
     if (lodash_1.default.isString(props.titleField)) {
         DEFAULT.titleField = props.titleField;
     }
     else {
-        let langs = [];
-        if (props.titleField.zhCN) {
-            langs.push({ lang: _Support_1.Language.ZH_CN, field: props.titleField.zhCN });
-            if (utils_1.GLOBAL.CONFIG.APP.LANG == _Support_1.Language.ZH_CN) {
-                DEFAULT.titleField = props.titleField.zhCN;
-            }
+        let sysLang = utils_1.GLOBAL.CONFIG.APP.LANG.replace('-', '');
+        if (lodash_1.default.has(props.titleField, sysLang)) {
+            DEFAULT.titleField = props.titleField[sysLang];
         }
-        if (props.titleField.enUS) {
-            langs.push({ lang: _Support_1.Language.EN_US, field: props.titleField.enUS });
-            if (utils_1.GLOBAL.CONFIG.APP.LANG == _Support_1.Language.EN_US) {
-                DEFAULT.titleField = props.titleField.enUS;
-            }
-        }
-        if (props.titleField.zhHK) {
-            langs.push({ lang: _Support_1.Language.ZH_HK, field: props.titleField.zhHK });
-            if (utils_1.GLOBAL.CONFIG.APP.LANG == _Support_1.Language.ZH_HK) {
-                DEFAULT.titleField = props.titleField.zhHK;
-            }
-        }
-        if (langs.length > 1) {
-            DEFAULT.langs = langs;
+        else {
+            DEFAULT.titleField = props.titleField.zhCN || props.titleField.zhHK || props.titleField.enUS || 'title';
         }
     }
+    if (props.valueField && props.value != DEFAULT.keyField) {
+        DEFAULT.valueField = props.valueField;
+    }
     const [state, setState] = (0, hooks_1.useSetState)(DEFAULT);
-    const setTreeData = (treeData) => setState({ treeData: [...treeData] });
-    const onSelect = (0, react_1.useCallback)((value, info, extra) => {
-        const data = info.data.node;
-        if (props.onSelect) {
-            props.onSelect(value, data[DEFAULT.keyField], data);
+    const baseProps = (0, react_1.useMemo)(() => {
+        const treeSelectProps = {
+            // virtual: false,
+            // treeLine: true,
+            showSearch: true,
+            className: props.className,
+            placeholder: props.placeholder,
+            allowClear: true,
+            dropdownClassName: 'c-treeselect',
+            style: { width: '100%' },
+        };
+        if (props.style)
+            treeSelectProps.style = lodash_1.default.merge(treeSelectProps.style, props.style);
+        if (lodash_1.default.has(props, 'showSearch'))
+            treeSelectProps.showSearch = props.showSearch;
+        if (treeSelectProps.showSearch) {
+            treeSelectProps.onSearch = (searchValue) => {
+                setState({ searchValue: utils_1.StringUtil.trimLower(searchValue) });
+            };
         }
-    }, [state.treeData]);
-    const onChange = (0, react_1.useCallback)((value, labelList, extra) => {
-        let nodes = [];
-        if (value.length > 0) {
-            const allCheckedNodes = extra.allCheckedNodes;
-            allCheckedNodes.forEach(({ pos, node }) => {
-                nodes.push(Object.assign({ pos }, node.props.data.node));
-            });
+        if (props.multiple) {
+            treeSelectProps.multiple = true;
+            treeSelectProps.treeCheckable = true;
+            treeSelectProps.maxTagCount = props.maxTagCount || 3;
+            // treeSelectProps.maxTagTextLength = props.maxTagTextLength || 5;
         }
-        if (lodash_1.default.isFunction(props.onChange)) {
-            props.onChange(value, labelList, nodes);
+        treeSelectProps.filterTreeNode = (inputValue, node) => {
+            let word = utils_1.StringUtil.trimLower(inputValue);
+            ;
+            if (word.length == 0)
+                return true;
+            return utils_1.StringUtil.trimLower(node.data[state.titleField]).indexOf(word) >= 0;
+        };
+        if (lodash_1.default.has(props, 'allowClear'))
+            treeSelectProps.allowClear = props.allowClear;
+        return treeSelectProps;
+    }, []);
+    const value = (0, react_1.useMemo)(() => {
+        if (props.multiple) {
+            if ((0, lodash_1.isArray)(props.value))
+                return props.value;
+            if (props.value)
+                return [props.value];
+            return [];
         }
-    }, [state.treeData]);
-    return react_1.default.createElement(BaseTreeSelectContext.Provider, { value: { treeState: state, setTreeData, onSelect, onChange } }, props.children);
+        if (props.value == null)
+            return [];
+        if (lodash_1.default.isNumber(props.value) || lodash_1.default.isString(props.value))
+            return [props.value];
+        if (lodash_1.default.isArray(props.value) && props.value.length > 0)
+            return [props.value[0]];
+        return [];
+    }, [props.value]);
+    const setTreeData = (treeData) => setState({ treeData: [...treeData], inited: true, });
+    const extraProps = (0, react_1.useMemo)(() => {
+        if (!lodash_1.default.isFunction(props.onChange))
+            return {};
+        const extProps = {};
+        if (props.multiple === true) {
+            extProps.onChange = (value, label, extra) => {
+                if (!lodash_1.default.isFunction(props.onChange))
+                    return;
+                let selected = [];
+                if (lodash_1.default.has(extra, 'allCheckedNodes')) {
+                    selected = extra.allCheckedNodes.map(item => item.node.props.data);
+                }
+                const valueField = state.valueField || state.keyField;
+                props.onChange(selected.map(item => item[valueField]), selected);
+            };
+        }
+        else {
+            extProps.onChange = (v) => {
+                if (v === undefined) {
+                    props.onChange(undefined, undefined);
+                }
+            };
+            extProps.onSelect = (value, node) => {
+                const data = lodash_1.default.has(node, 'props.data') ? node.props.data : null;
+                if (data == null) {
+                    props.onChange(undefined, undefined);
+                }
+                else {
+                    const valueField = state.valueField || state.keyField;
+                    props.onChange(data[valueField], data);
+                }
+            };
+            // props.onChange(selected.map(item => item[valueField]), selected);
+        }
+        return extProps;
+    }, []);
+    return react_1.default.createElement(BaseTreeSelectContext.Provider, { value: { value, baseProps, treeState: state, setTreeData, extraProps } }, props.children);
 };
 exports.BaseTreeSelect = BaseTreeSelect;
 const getNodeParam = (node, state, disabledNode) => {
-    const { titleField, keyField, valueField, } = state;
-    let param = { key: node[keyField], data: { node }, value: node[valueField] };
-    param.title = node[titleField];
+    const { titleField, keyField, iconField, searchValue } = state;
+    let param = { value: node[keyField], key: node[keyField], data: node };
     if (lodash_1.default.isFunction(disabledNode)) {
         if (disabledNode(node)) {
             param.disabled = true;
         }
     }
+    let title = node[titleField];
+    if (searchValue)
+        title = react_1.default.createElement(HighLight_1.HighLight, { text: node[titleField], keyword: searchValue });
+    if (iconField != null) {
+        if (lodash_1.default.isString(iconField)) {
+            let icon = node[iconField];
+            if (icon) {
+                if (icon.indexOf('/') >= 0) {
+                    param.title = react_1.default.createElement(react_1.default.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,
+                        react_1.default.createElement(Icon_1.Icon, { type: node[iconField] }),
+                        title);
+                }
+            }
+        }
+        else if (lodash_1.default.isFunction(iconField)) {
+            let icon = iconField(node);
+            if (icon) {
+                param.title = react_1.default.createElement(react_1.default.Fragment, null,
+                    icon,
+                    title);
+            }
+        }
+    }
+    if (param.title == null)
+        param.title = title;
     return param;
 };
 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(TreeSelect_1.TreeSelect.TreeNode, Object.assign({}, param, { isLeaf: false }), renderNodes(node.children, state, props));
+        return react_1.default.createElement(antd_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(TreeSelect_1.TreeSelect.TreeNode, Object.assign({}, param, { isLeaf: isLeaf }));
+    return react_1.default.createElement(antd_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);
 exports.renderRoot = renderRoot;
-const getResponseList = (resp) => {
-    let data;
-    if (lodash_1.default.has(resp, 'data')) {
-        data = resp.data;
-    }
-    else if (lodash_1.default.has(resp, 'list')) {
-        data = resp.list;
-    }
-    else {
-        data = [];
-    }
-    if (lodash_1.default.isArray(data)) {
-        return data;
-    }
-    return [data];
-};
-const getData = (api, notCache) => __awaiter(void 0, void 0, void 0, function* () {
-    if (!notCache)
-        utils_1.Ajax.SESSION(api);
-    const resp = yield utils_1.Ajax.GET(api);
-    return getResponseList(resp);
-});
-exports.getData = getData;
+// export const getData = async (api: string, sortField: string) => {
+//     Ajax.SESSION(api);
+//     const resp = await Ajax.GET(api);
+//     return getResponseList(resp, sortField);
+// }

package/components/TreeSelect/DTreeSelect.d.ts

@@ -1,24 +1,5 @@
 import React from 'react';
 import type { BaseTreeSelectProps } from './index';
-import type { Key, PlainObject } from '../../basetype';
-export type DTreeProps = {
-    /**
-     * 根节点API 与rootCode 二选一
-    */
-    rootApi?: string;
-    /**
-     * 展开子节点：
-     *
-     * 方式一：传一个 api 接口地址，必须返回 VData<Array<Object>> 格式
-     *
-     * 方式二：传一个方法 ，接收一个父节点参数，必须返回  Promise<TreeNodeData[]> (不要返回 children, 仅返回一级)
-    */
-    childApi: string | ((parentId: Key) => Promise<PlainObject[]>);
-    /**
-     * 接口是否缓存
-     */
-    notCache?: boolean;
-};
-type DTreeSelectProps = BaseTreeSelectProps & DTreeProps;
+import type { DTreeData } from '../Trees/DTree';
+export type DTreeSelectProps = BaseTreeSelectProps & DTreeData;
 export declare const DTreeSelect: React.FC<DTreeSelectProps>;
-export {};

package/components/TreeSelect/DTreeSelect.js

@@ -1,4 +1,27 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -13,52 +36,89 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DTreeSelect = void 0;
-const react_1 = __importDefault(require("react"));
-const TreeSelect_1 = require("../_adapt/TreeSelect");
+const react_1 = __importStar(require("react"));
+const antd_1 = require("antd");
 const lodash_1 = __importDefault(require("lodash"));
 const BaseTreeSelect_1 = require("./BaseTreeSelect");
 const hooks_1 = require("../../hooks");
+const utils_1 = require("../../utils");
+const ActionTree_1 = require("../Trees/ActionTree");
+;
+const setChildrenByKey = (treeData, keyField, keyValue, children) => {
+    for (let node of treeData) {
+        if (lodash_1.default.isArray(node.children)) {
+            if (node.children.length) {
+                let result = setChildrenByKey(node.children, keyField, keyValue, children);
+                if (result) {
+                    return true;
+                }
+            }
+        }
+        else {
+            if (node[keyField] == keyValue) {
+                node.children = children;
+                return true;
+            }
+        }
+    }
+    return false;
+};
 const _DTreeSelect = (props) => {
-    const { treeState, setTreeData, onChange, onSelect } = (0, BaseTreeSelect_1.useBaseTree)();
-    const { rootApi, notCache, childApi } = props;
+    const { baseProps, treeState, setTreeData, extraProps, value } = (0, BaseTreeSelect_1.useBaseTree)();
+    const { rootApi, childApi } = props;
+    const getChildren = (0, react_1.useCallback)((parent) => __awaiter(void 0, void 0, void 0, function* () {
+        let result = [];
+        if (lodash_1.default.isString(childApi)) {
+            const api = childApi + parent;
+            utils_1.Ajax.SESSION(api);
+            const resp = yield utils_1.Ajax.GET(api);
+            result = (0, ActionTree_1.getResponseList)(resp);
+        }
+        else if (lodash_1.default.isFunction(childApi)) {
+            result = yield childApi(parent);
+        }
+        if (props.sortField)
+            result = lodash_1.default.orderBy(result, props.sortField, 'asc');
+        return result;
+    }), []);
     (0, hooks_1.useEffectFunction)(() => __awaiter(void 0, void 0, void 0, function* () {
         let treeData = [];
         if (rootApi) {
-            treeData = yield (0, BaseTreeSelect_1.getData)(rootApi, notCache);
+            utils_1.Ajax.SESSION(rootApi);
+            const resp = yield utils_1.Ajax.GET(rootApi);
+            treeData = (0, ActionTree_1.getResponseList)(resp);
+            if (props.sortField)
+                treeData = lodash_1.default.orderBy(treeData, props.sortField, 'asc');
         }
         else if (lodash_1.default.isFunction(props.childApi)) {
             treeData = yield props.childApi(treeState.rootCode);
         }
         else {
-            treeData = yield (0, BaseTreeSelect_1.getData)(childApi + treeState.rootCode, notCache);
-        }
-        if (treeData.length == 1) {
-            treeData[0].children = yield (0, BaseTreeSelect_1.getData)(childApi + treeData[0][treeState.keyField], notCache);
+            treeData = yield getChildren(props.rootCode);
         }
+        if (treeData.length == 1)
+            treeData[0].children = yield getChildren(treeData[0][treeState.keyField]);
         setTreeData(treeData);
     }), []);
+    if (!treeState.inited)
+        return utils_1.Const.NONE;
     const treeProps = {};
     if (treeState.treeData.length == 1) {
         // 如果根节点只有一个，则自动展开这个根结点
         const key = treeState.treeData[0][treeState.keyField];
         treeProps.treeDefaultExpandedKeys = [key];
-        // treeProps.treeLoadedKeys = [key];
     }
+    if (treeState.valueField == null)
+        treeProps.value = value;
     const loadData = (dataNode) => __awaiter(void 0, void 0, void 0, function* () {
-        return new Promise((r) => __awaiter(void 0, void 0, void 0, function* () {
-            const { node } = dataNode.data;
-            const API = props.childApi + node[treeState.keyField];
-            const children = yield (0, BaseTreeSelect_1.getData)(API, notCache);
-            const pathArr = dataNode.pos.split('-');
-            pathArr.splice(0, 1);
-            let nodePath = pathArr.map(i => `[${i}]`).join('.children');
-            const data = lodash_1.default.get(treeState.treeData, nodePath);
-            data.children = children;
-            setTreeData(treeState.treeData);
-            r(undefined);
-        }));
+        const { data } = dataNode.props;
+        const children = yield getChildren(data[treeState.keyField]);
+        setChildrenByKey(treeState.treeData, treeState.keyField, data[treeState.keyField], children);
+        setTreeData([...treeState.treeData]);
     });
-    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));
+    if (!treeState.inited)
+        return utils_1.Const.NONE;
+    return react_1.default.createElement(antd_1.TreeSelect, Object.assign({}, baseProps, treeProps, extraProps, { disabled: props.disabled, loadData: loadData }), (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.d.ts

@@ -1,11 +1,5 @@
 import React from 'react';
 import type { BaseTreeSelectProps } from './index';
-export type FTreeFetch = {
-    /**
-     * 获取数据的接口地址
-    */
-    api?: string;
-};
-type FTreeSelectProps = BaseTreeSelectProps & FTreeFetch;
+import type { FTreeData } from '../Trees/FTree';
+export type FTreeSelectProps = BaseTreeSelectProps & Required<FTreeData>;
 export declare const FTreeSelect: React.FC<FTreeSelectProps>;
-export {};

package/components/TreeSelect/FTreeSelect.js

@@ -14,25 +14,30 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FTreeSelect = void 0;
 const react_1 = __importDefault(require("react"));
-const TreeSelect_1 = require("../_adapt/TreeSelect");
+const antd_1 = require("antd");
 const BaseTreeSelect_1 = require("./BaseTreeSelect");
 const hooks_1 = require("../../hooks");
+const utils_1 = require("../../utils");
+const ActionTree_1 = require("../Trees/ActionTree");
 const _FTreeSelect = (props) => {
-    const { treeState, setTreeData, onChange, onSelect } = (0, BaseTreeSelect_1.useBaseTree)();
-    const { api } = props;
+    const { baseProps, treeState, setTreeData, extraProps, value } = (0, BaseTreeSelect_1.useBaseTree)();
     (0, hooks_1.useEffectFunction)(() => __awaiter(void 0, void 0, void 0, function* () {
-        let treeData = [];
-        if (api) {
-            treeData = yield (0, BaseTreeSelect_1.getData)(api, false);
-        }
-        setTreeData(treeData);
-    }), []);
+        const { fetchApi } = props;
+        utils_1.Ajax.SESSION(fetchApi);
+        const resp = yield utils_1.Ajax.GET(fetchApi);
+        const data = (0, ActionTree_1.getResponseList)(resp);
+        setTreeData(utils_1.TreeUtil.buildFlatTree(props, data));
+        ;
+    }));
     const treeProps = {};
-    if (treeState.treeData.length == 1) {
-        // 如果根节点只有一个，则自动展开这个根结点
+    // 如果根节点只有一个，则自动展开这个根结点
+    if (treeState.treeData.length == 1)
         treeProps.treeDefaultExpandedKeys = [treeState.treeData[0][treeState.keyField]];
-    }
-    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));
+    if (treeState.valueField == null)
+        treeProps.value = value;
+    if (!treeState.inited)
+        return utils_1.Const.NONE;
+    return react_1.default.createElement(antd_1.TreeSelect, Object.assign({}, baseProps, treeProps, extraProps, { disabled: props.disabled }), (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.d.ts

@@ -1,14 +1,5 @@
 import React from 'react';
+import type { STreeData } from '../Trees/STree';
 import type { BaseTreeSelectProps } from './index';
-import type { TreeNodeData } from '../../utils/TreeUtil';
-export type SSelectTreeProps = BaseTreeSelectProps & {
-    /**
-      * 树数据
-      *  */
-    treeData: TreeNodeData[];
-    /**
-      * 是否扁平数据,默认非扁平数据
-     */
-    isFlat?: boolean;
-};
-export declare const STreeSelect: React.FC<SSelectTreeProps>;
+export type STreeSelectProps = BaseTreeSelectProps & STreeData;
+export declare const STreeSelect: React.FC<STreeSelectProps>;