vap1 0.1.8 → 0.2.0

package/components/Box/Box.js

@@ -76,8 +76,7 @@ exports.Box = (0, react_1.forwardRef)((props, ref) => {
     if (props.nobg)
         className.push('c-box-nobg');
     const style = Object.assign({}, props.style);
-    if (props.mode)
-        className.push('c-box-' + props.mode);
+    className.push(props.mode ? ('c-box-' + props.mode) : 'c-box-common');
     if (props.mode == 'inner') {
         if (rootRef.current == null) {
             // style.height = 0;

package/components/SearchBar/ActionButtons.js

@@ -64,7 +64,7 @@ const ActionButton = (props) => {
     if (props.danger)
         btnParam.danger = true;
     if (props.confirm && props.disabled !== true) {
-        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() },
+        return react_1.default.createElement(Popconfirm_1.Popconfirm, { key: Math.floor(lodash_1.default.random() * 1000000) + '', 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/_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", "datetimerange", "datetimerange-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", "stree-select", "dtree-select", "ftree-select", "multi-stree-select", "multi-dtree-select", "multi-ftree-select", "autocomplete"];

package/components/SearchBar/_FieldType.js

@@ -25,6 +25,12 @@ exports._FieldType = [
     'datetimerange-single',
     'month',
     'monthrange',
+    'stree-select',
+    'dtree-select',
+    'ftree-select',
+    'multi-stree-select',
+    'multi-dtree-select',
+    'multi-ftree-select',
     'autocomplete',
 ];
 // * text                文本输入（默认）

package/components/Tables/Components/ActionBar.js

@@ -48,24 +48,27 @@ const ActionBar = props => {
             update();
         };
     }, []);
-    let buttons = [];
     const [selectedRowKeys, selectedObjects] = props.selectedRef.current.selected;
-    (props.buttons || []).map(btn => {
-        if (btn === false)
-            return;
-        if (btn === null) {
-            buttons.push(null);
-            return;
-        }
-        let sub = convertButton(btn, selectedRowKeys, selectedObjects, props.queryParam);
-        if (lodash_1.default.isArray(btn.children) && btn.children.length > 0) {
-            sub.children = [];
-            btn.children.map(item => {
-                sub.children.push(convertButton(item, selectedRowKeys, selectedObjects, props.queryParam));
-            });
-        }
-        buttons.push(sub);
-    });
+    const buttons = (0, react_1.useMemo)(() => {
+        const btns = [];
+        (props.buttons || []).map(btn => {
+            if (btn === false)
+                return;
+            if (btn === null) {
+                btns.push(null);
+                return;
+            }
+            let sub = convertButton(btn, selectedRowKeys, selectedObjects, props.queryParam);
+            if (lodash_1.default.isArray(btn.children) && btn.children.length > 0) {
+                sub.children = [];
+                btn.children.map(item => {
+                    sub.children.push(convertButton(item, selectedRowKeys, selectedObjects, props.queryParam));
+                });
+            }
+            btns.push(sub);
+        });
+        return btns;
+    }, [selectedRowKeys, props.buttons, props.queryParam]);
     return react_1.default.createElement(ActionButtons_1.ActionButtons, { buttons: buttons });
 };
 exports.ActionBar = ActionBar;

package/components/Tables/STable.d.ts

@@ -3,10 +3,10 @@ import { ListInit } from '../../hooks/_list';
 import type { BaseTableProps } from './index';
 export type STableProps = BaseTableProps & ListInit & {
     /**
-     * ˵�� pageSize : Ĭ��Ϊ false �� ����ҳ��
+     * 说明 pageSize : 默认为 false ： 不分页。
      *
-     * Ϊ true ʱ����ϵͳĬ�Ϸ�ҳ�����з�ҳ
-     * Ϊ ���� ʱ�� ��ָ���ķ�ҳ��С���з�ҳ
+     * 为 true 时，以系统默认分页数进行分页
+     * 为 数字 时， 以指定的分页大小进行分页
     */
     pageSize?: true | number;
 };

package/components/Tables/VTable.js

@@ -201,7 +201,6 @@ const _VTable = (0, react_1.forwardRef)((props, ref) => {
         } }));
 });
 exports.VTable = (0, react_1.forwardRef)((props, ref) => {
-    var _a;
     const { isQuerying, pageNo, pageSize, total, totalAcc, param, pageTo, query, cost } = props.model;
     // 通过 ref 方式交互，后续扩展方法实现定制联页选择
     const selectedRef = (0, react_1.useRef)({ selected: [[], []], onSelected: () => { }, });
@@ -215,7 +214,7 @@ exports.VTable = (0, react_1.forwardRef)((props, ref) => {
                 return props.model.param;
             }
         };
-    }, [(_a = props.model) === null || _a === void 0 ? void 0 : _a.param]);
+    }, [param]);
     let boxProps = lodash_1.default.pick(props, ['selectBar', 'style', 'className', 'default', 'mode']);
     if (props.searchBar) {
         boxProps.searchBar = Object.assign(Object.assign({}, props.searchBar), { disabled: isQuerying, onSearch: (data) => {

package/components/TreeSelect/BaseTreeSelect.js

@@ -27,7 +27,6 @@ exports.renderRoot = exports.getNodeParam = exports.BaseTreeSelect = exports.use
 const lodash_1 = __importStar(require("lodash"));
 const react_1 = __importStar(require("react"));
 const antd_1 = require("antd");
-// import { HighLight, Icon } from '';
 const HighLight_1 = require("../_common/HighLight");
 ;
 const Icon_1 = require("../_adapt/Icon");

package/components/_setup/SearchField/SearchFieldTree.js

@@ -1,191 +1,151 @@
 "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 __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-// registerSearchField('treeselect', (props: TableSelectFieldProps) => {
-//     const { field, onChange, width, data } = props;
-//     if (!_.has(field.config, 'treeData')) {
-//         console.error('field type : dictselect must have a treeData field')
-//         return <TEXT {...props} style={width ? { width } : {}} />
-//     }
-//     let param: any = {
-//         allowClear: true,
-//         placeholder: _.has(field.config, 'placeholder') ? field.config.placeholder : null || field.placeholder || `请选择${field.label}`,
-//     };
-//     if (field.allowClear === false) {
-//         param.allowClear = false;
-//     }
-//     if (_.has(data, field.field)) {
-//         param.value = data[field.field] || undefined;
-//     }
-//     if (_.has(props, 'width')) {
-//         param.style = { width: props.width }
-//     }
-//     return <TreeSelect
-//         treeDefaultExpandAll
-//         {...field.config}
-//         {...param}
-//         dropdownStyle={{ maxHeight: 400, overflow: 'auto' }}
-//         onChange={value => onChange(value)}
-//     />
-// });
-// 动态树
-// type TreeNodeData = {
-//     children?: TreeNodeData[];
-//     [props: string]: any
-// }
-// export type BaseTreeOpts = {
-//     /**
-//      * 树取值的字段，默认为 `id`
-//     */
-//     keyField?: string,
-//     /**
-//      * 树显示名称的字段 ，默认为 `name`
-//     */
-//     titleField?: string,
-//     /**
-//      * 排序字段,默认为空，传入后，以此字段做为排序依据
-//     */
-//     sortField?: string;
-//     /**
-//     * 根节点 Code 标识
-//     */
-//     rootCode?: string;
-//     /**
-//      * 根节点API 与rootCode 二选一
-//     */
-//     rootApi?: string;
-//     /**
-//      * 是否存在子节点，如果有些属性，则根据此值不必多点一次加号
-//     */
-//     checkField?: string;
-//     /**
-//      * 展开子节点：
-//      *
-//      * 方式一：传一个 api 接口地址，必须返回 VData<Array<Object>> 格式
-//      *
-//      * 方式二：传一个方法 ，接收一个父节点参数，必须返回  Promise<TreeNodeData[]> (不要返回 children, 仅返回一级)
-//     */
-//     childApi?: string | ((parentId: string) => Promise<TreeNodeData[]>);
-// }
-// class DynamicTreeSelect extends React.PureComponent<TableSelectFieldProps> {
-//     fields: BaseTreeOpts = {
-//         keyField: 'id',
-//         titleField: 'title',
-//     }
-//     state = {
-//         treeData: [],
-//     }
-//     async getChildren(parentCode) {
-//         if (typeof this.props.field.config.childApi == 'string') {
-//             const resp = await Ajax.GET(`${this.props.field.config.childApi}${parentCode}`);
-//             if (resp.code == '0') {
-//                 return resp.data;
-//             }
-//             return []
-//         }
-//         let children = await this.props.field.config.childApi(parentCode);
-//         return children;
-//     }
-//     async componentDidMount() {
-//         const { field } = this.props;
-//         if (!_.has(field, 'config.childApi')) {
-//             return;
-//         }
-//         const config: BaseTreeOpts = field.config;
-//         if (config.keyField) {
-//             this.fields.keyField = config.keyField;
-//         }
-//         if (config.titleField) {
-//             this.fields.titleField = config.titleField;
-//         }
-//         if (config.sortField) {
-//             this.fields.sortField = config.sortField;
-//         }
-//         if (config.checkField) {
-//             this.fields.checkField = config.checkField;
-//         }
-//         let treeData = [];
-//         if (config.rootCode) {
-//             treeData = await this.getChildren(config.rootCode);
-//         } else if (config.rootApi) {
-//             const resp = await Ajax.GET(config.rootApi);
-//             if (resp.code == '0') {
-//                 if (_.isArray(resp.data)) {
-//                     treeData = resp.data;
-//                 } else {
-//                     treeData = [resp.data];
-//                 }
-//             }
-//         }
-//         this.setState({ treeData });
-//     };
-//     setChidren(treeData: any[], key: string, children: any[]) {
-//         for (let node of treeData) {
-//             if (node[this.fields.keyField] == key) {
-//                 node.children = children;
-//                 return true;
-//             } else if (_.isArray(node.children) && node.children.length) {
-//                 return this.setChidren(node.children, key, children);
-//             }
-//         }
-//         return false;
-//     }
-//     async onLoadData(node) {
-//         const children = await this.getChildren(node.props.eventKey);
-//         if (children.length == 0) {
-//             return;
-//         }
-//         const treeData = _.concat([], this.state.treeData);
-//         this.setChidren(treeData, node.props.eventKey, children)
-//         this.setState({ treeData })
-//     };
-//     renderNode(data: any) {
-//         let isLeaf = false;
-//         if (_.has(data, 'children') && _.isArray(data.children)) {
-//             if (data.children.length) {
-//                 isLeaf = false;
-//             } else {
-//                 isLeaf = true;
-//             }
-//         } else if (this.fields.checkField) {
-//             if (!data[this.fields.checkField]) {
-//                 isLeaf = true;
-//             }
-//         }
-//         if (isLeaf) {
-//             return <TreeSelect.TreeNode value={data[this.fields.keyField]} key={data[this.fields.keyField]} title={data[this.fields.titleField]} isLeaf>  </TreeSelect.TreeNode>
-//         }
-//         if (_.isArray(data.children) && data.children.length) {
-//             return <TreeSelect.TreeNode value={data[this.fields.keyField]} key={data[this.fields.keyField]} title={data[this.fields.titleField]}>
-//                 {data.children.map(item => this.renderNode(item))}
-//             </TreeSelect.TreeNode>
-//         }
-//         return <TreeSelect.TreeNode value={data[this.fields.keyField]} key={data[this.fields.keyField]} title={data[this.fields.titleField]}>  </TreeSelect.TreeNode>
-//     }
-//     render() {
-//         const { field, onChange, data } = this.props;
-//         const { treeData } = this.state;
-//         let param: any = {
-//             allowClear: true,
-//             placeholder: _.has(field.config, 'placeholder') ? field.config.placeholder : null || field.placeholder || `请选择 ${field.label}`,
-//         }
-//         if (field.allowClear === false) {
-//             param.allowClear = false;
-//         }
-//         if (_.has(data, field.field)) {
-//             param.value = data[field.field];
-//         }
-//         if (_.has(this.props, 'width')) {
-//             param.style = { width: this.props.width }
-//         }
-//         return <TreeSelect
-//             {...param}
-//             onChange={(value, label, extra) => {
-//                 onChange(value)
-//             }}
-//             loadData={(node) => this.onLoadData(node)}
-//         >
-//             {treeData.map(item => this.renderNode(item))}
-//         </TreeSelect>
-//     }
-// }
-// registerSearchField('dynamic-tree-select', DynamicTreeSelect);
+const react_1 = __importStar(require("react"));
+const lodash_1 = __importDefault(require("lodash"));
+const _register_1 = require("../../SearchBar/_register");
+const STreeSelect_1 = require("../../TreeSelect/STreeSelect");
+const DTreeSelect_1 = require("../../TreeSelect/DTreeSelect");
+const FTreeSelect_1 = require("../../TreeSelect/FTreeSelect");
+const SearchFieldInput_1 = require("./SearchFieldInput");
+const toArr = (value) => (0, react_1.useMemo)(() => {
+    if (value == undefined)
+        return [];
+    if (lodash_1.default.isArray(value))
+        return value;
+    if (lodash_1.default.isString(value))
+        return value.split(',');
+    return [];
+}, [value]);
+(0, _register_1.registerSearchField)('stree-select', (props) => {
+    const { field: { field, config, placeholder, allowClear, options }, disabled, onChange, data, width } = props;
+    if (!lodash_1.default.has(config, 'titleField')) {
+        console.error('field type : STree select must have a config with titleField');
+        return react_1.default.createElement(SearchFieldInput_1.TEXT, Object.assign({}, props));
+    }
+    let treeData = lodash_1.default.has(config, 'treeData') ? config.treeData : options;
+    let params = {
+        titleField: config.titleFField,
+        disabled: disabled,
+        treeData,
+        multiple: false,
+        allowClear: typeof allowClear == 'boolean' ? allowClear : true,
+        placeholder: lodash_1.default.has(config, 'placeholder') ? config.placeholder : placeholder,
+        style: { width },
+    };
+    return react_1.default.createElement(STreeSelect_1.STreeSelect, Object.assign({}, params, config, { multiple: false, value: (lodash_1.default.has(data, field) && data[field] !== null) ? data[field] : undefined, onChange: onChange }));
+});
+(0, _register_1.registerSearchField)('dtree-select', (props) => {
+    const { field: { field, config, placeholder, allowClear, options }, disabled, onChange, data, width } = props;
+    if (!lodash_1.default.has(config, 'titleField') || !lodash_1.default.has(config, 'childApi')) {
+        console.error('field type : DTree select must have a config with titleField and childApi');
+        return react_1.default.createElement(SearchFieldInput_1.TEXT, Object.assign({}, props));
+    }
+    let params = {
+        titleField: config.titleFField,
+        childApi: config.childApi,
+        disabled: disabled,
+        multiple: false,
+        allowClear: typeof allowClear == 'boolean' ? allowClear : true,
+        placeholder: lodash_1.default.has(config, 'placeholder') ? config.placeholder : placeholder,
+        style: { width },
+    };
+    return react_1.default.createElement(DTreeSelect_1.DTreeSelect, Object.assign({}, params, config, { multiple: false, value: (lodash_1.default.has(data, field) && data[field] !== null) ? data[field] : undefined, onChange: onChange }));
+});
+(0, _register_1.registerSearchField)('ftree-select', (props) => {
+    const { field: { field, config, placeholder, allowClear }, disabled, onChange, data, width } = props;
+    if (!lodash_1.default.has(config, 'titleField') || !lodash_1.default.has(config, 'fetchApi')) {
+        console.error('field type : FTree select must have a config with titleField and fetchApi');
+        return react_1.default.createElement(SearchFieldInput_1.TEXT, Object.assign({}, props));
+    }
+    let params = {
+        titleField: config.titleFField,
+        fetchApi: config.fetchApi,
+        disabled: disabled,
+        multiple: false,
+        allowClear: typeof allowClear == 'boolean' ? allowClear : true,
+        placeholder: lodash_1.default.has(config, 'placeholder') ? config.placeholder : placeholder,
+        style: { width },
+    };
+    return react_1.default.createElement(FTreeSelect_1.FTreeSelect, Object.assign({}, params, config, { multiple: false, value: (lodash_1.default.has(data, field) && data[field] !== null) ? data[field] : undefined, onChange: onChange }));
+});
+(0, _register_1.registerSearchField)('multi-stree-select', (props) => {
+    const { field: { field, config, placeholder, allowClear, options }, disabled, onChange, data, width } = props;
+    if (!lodash_1.default.has(config, 'titleField')) {
+        console.error('field type : tree-select must have a config with title field');
+        return react_1.default.createElement(SearchFieldInput_1.TEXT, Object.assign({}, props));
+    }
+    let treeData = lodash_1.default.has(config, 'treeData') ? config.treeData : options;
+    let params = {
+        titleField: config.titleFField,
+        disabled: disabled,
+        treeData,
+        multiple: true,
+        allowClear: typeof allowClear == 'boolean' ? allowClear : true,
+        placeholder: lodash_1.default.has(config, 'placeholder') ? config.placeholder : placeholder,
+        style: { width },
+    };
+    const value = (lodash_1.default.has(data, field) && data[field] !== null) ? data[field] : undefined;
+    return react_1.default.createElement(STreeSelect_1.STreeSelect, Object.assign({}, params, config, { multiple: true, value: toArr(value), onChange: (ids) => onChange(ids.join(',')) }));
+});
+(0, _register_1.registerSearchField)('multi-dtree-select', (props) => {
+    const { field: { field, config, placeholder, allowClear, options }, disabled, onChange, data, width } = props;
+    if (!lodash_1.default.has(config, 'titleField') || !lodash_1.default.has(config, 'childApi')) {
+        console.error('field type : DTree select must have a config with titleField and childApi');
+        return react_1.default.createElement(SearchFieldInput_1.TEXT, Object.assign({}, props));
+    }
+    let params = {
+        titleField: config.titleFField,
+        childApi: config.childApi,
+        disabled: disabled,
+        multiple: false,
+        allowClear: typeof allowClear == 'boolean' ? allowClear : true,
+        placeholder: lodash_1.default.has(config, 'placeholder') ? config.placeholder : placeholder,
+        style: { width },
+    };
+    const value = (lodash_1.default.has(data, field) && data[field] !== null) ? data[field] : undefined;
+    return react_1.default.createElement(DTreeSelect_1.DTreeSelect, Object.assign({}, params, config, { multiple: true, value: toArr(value), onChange: (ids) => onChange(ids.join(',')) }));
+});
+(0, _register_1.registerSearchField)('multi-ftree-select', (props) => {
+    const { field: { field, config, placeholder, allowClear }, disabled, onChange, data, width } = props;
+    if (!lodash_1.default.has(config, 'titleField') || !lodash_1.default.has(config, 'fetchApi')) {
+        console.error('field type : FTree select must have a config with titleField and fetchApi');
+        return react_1.default.createElement(SearchFieldInput_1.TEXT, Object.assign({}, props));
+    }
+    let params = {
+        titleField: config.titleFField,
+        fetchApi: config.fetchApi,
+        disabled: disabled,
+        multiple: false,
+        allowClear: typeof allowClear == 'boolean' ? allowClear : true,
+        placeholder: lodash_1.default.has(config, 'placeholder') ? config.placeholder : placeholder,
+        style: { width },
+    };
+    const value = (lodash_1.default.has(data, field) && data[field] !== null) ? data[field] : undefined;
+    return react_1.default.createElement(FTreeSelect_1.FTreeSelect, Object.assign({}, params, config, { multiple: true, value: toArr(value), onChange: (ids) => onChange(ids.join(',')) }));
+});

package/components/_setup/UForm/UFormTree.js

@@ -33,6 +33,15 @@ const _input_1 = require("../../UForm/_input");
 const STreeSelect_1 = require("../../TreeSelect/STreeSelect");
 const DTreeSelect_1 = require("../../TreeSelect/DTreeSelect");
 const FTreeSelect_1 = require("../../TreeSelect/FTreeSelect");
+const toArr = (value) => (0, react_1.useMemo)(() => {
+    if (value == undefined)
+        return [];
+    if (lodash_1.default.isArray(value))
+        return value;
+    if (lodash_1.default.isString(value))
+        return value.split(',');
+    return [];
+}, [value]);
 (0, _register_1.registerFormField)('stree-select', (props) => {
     const { field, disabled, value, onChange } = props;
     let params = { placeholder: (0, _input_1.getPlaceholder)(field, true), disabled, allowClear: true };
@@ -54,15 +63,6 @@ const FTreeSelect_1 = require("../../TreeSelect/FTreeSelect");
         params.allowClear = false;
     return react_1.default.createElement(FTreeSelect_1.FTreeSelect, Object.assign({}, params, field.config, { multiple: false, value: value === null ? undefined : value, onChange: onChange }));
 });
-const toArr = (value) => (0, react_1.useMemo)(() => {
-    if (value == undefined)
-        return [];
-    if (lodash_1.default.isArray(value))
-        return value;
-    if (lodash_1.default.isString(value))
-        return value.split(',');
-    return [];
-}, [value]);
 const treeChange = (onChange, dataType) => (0, react_1.useCallback)((value) => {
     if (dataType == 'array') {
         onChange(value);

package/package.json

@@ -1 +1 @@
-{"name":"vap1","version":"0.1.8","description":"vap1, Both support MicroService and SAP FrameWork, Support IE>9","main":"index.js","author":"Xiang da","license":"ISC"}
+{"name":"vap1","version":"0.2.0","description":"vap1, Both support MicroService and SAP FrameWork, Support IE>9","main":"index.js","author":"Xiang da","license":"ISC"}

package/utils/Renders/DictRender.d.ts

@@ -19,5 +19,8 @@ interface DictRender extends Render {
     options: (config?: OptionConvertConfig) => BaseOption[];
 }
 export declare const DictRender: (options: string | DictRenderOptions) => DictRender;
+/**
+ * 初始化字典，将字典接口的响应数组传入
+*/
 export declare const initDict: (dict: PlainObject[]) => void;
 export { _V_DICT as DICT };

package/utils/Renders/DictRender.js

@@ -166,22 +166,6 @@ const _DictRender = (props) => {
         return props.default || Const_2.NONE;
     return renderDictValue(dictInfo, dictInfo.nodes[idx]);
 };
-// if (config.valueFormat) {
-//     switch (config.valueFormat) {
-//         case 'string':
-//             format = val => val + '';
-//             break;
-//         case 'number':
-//             format = val => {
-//                 if (_.isNumber(val)) return val;
-//                 try {
-//                     return parseInt(val);
-//                 } catch {
-//                     return val;
-//                 }
-//             }
-//     }
-// }
 const putOptions = (arr, config) => {
     if (config === undefined)
         return arr;
@@ -221,14 +205,14 @@ const DictRender = (options) => {
     };
     fn.getText = (key, def) => {
         if (key === null)
-            return def || '';
+            return lodash_1.default.isString(def) ? def : '';
         const dictInfo = DICT.get(props.dictType);
         if (dictInfo == null)
-            return def || '';
+            return lodash_1.default.isString(def) ? def : '';
         const dictKey = key + '';
         let idx = lodash_1.default.findIndex(dictInfo.nodes, (item) => dictKey == item.value);
         if (idx < 0)
-            return def || '';
+            return lodash_1.default.isString(def) ? def : '';
         return dictInfo.nodes[idx].label;
     };
     if (lodash_1.default.isString(options))
@@ -236,22 +220,30 @@ const DictRender = (options) => {
     return fn;
 };
 exports.DictRender = DictRender;
-// TODO ，目前结构只支持两层，多层等做
+const initNodes = (parentType, dict, nodes) => {
+    let childs = lodash_1.default.filter(dict, item => item.parentType == parentType);
+    childs.map(item => {
+        let value = lodash_1.default.trim(item.code);
+        if (value.length > 0)
+            nodes.push({ label: item.codeValue, value });
+        let subChildren = lodash_1.default.filter(dict, sub => sub.parentType == item.type);
+        if (subChildren.length > 0) {
+            initNodes(item.type, dict, nodes);
+        }
+    });
+};
+/**
+ * 初始化字典，将字典接口的响应数组传入
+*/
 const initDict = (dict) => {
     const roots = lodash_1.default.filter(dict, item => item['parentType'] == '0' || item['parentType'] == '');
     _V_DICT.DICTS = [];
     roots.map(root => {
-        let info = { code: root.type, nodes: [], };
-        if (root.format && VALIDATE_FORMAT.has(root.format)) {
-            info.format = root.format;
-        }
+        const info = { code: root.type, nodes: [] };
         _V_DICT.DICTS.push({ label: root.codeValue, value: root.type });
-        let childs = lodash_1.default.filter(dict, item => item.parentType == root.type);
-        childs.map(item => {
-            let value = lodash_1.default.trim(item.code);
-            if (value.length > 0)
-                info.nodes.push({ label: item.codeValue, value });
-        });
+        if (root.format && VALIDATE_FORMAT.has(root.format))
+            info.format = root.format;
+        initNodes(root.type, dict, info.nodes);
         DICT.set(root.type, info);
     });
 };