vap1 0.1.9 → 0.2.1

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/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/package.json

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

package/uform/FormViewer.d.ts

@@ -1,12 +1,12 @@
-import React from 'react';
 import type { FormSchema } from './schema';
-import type { UModalProps, PlainObject } from '../index';
+import type { RefAttributes, ForwardRefExoticComponent, FC } from 'react';
+import type { UModalProps, UFormRef, PlainObject } from '../index';
 type ModalProps = Pick<UModalProps, 'open' | 'onOk' | 'onCancel' | 'title' | 'data'>;
 type FormViewProps = {
     schema: FormSchema | string;
     data?: PlainObject;
 };
 export declare const initSchama: (data: string | FormSchema) => FormSchema;
-export declare const FormViewer: React.FC<FormViewProps>;
-export declare const FormModal: React.FC<FormViewProps & ModalProps>;
+export declare const FormViewer: ForwardRefExoticComponent<FormViewProps & RefAttributes<UFormRef>>;
+export declare const FormModal: FC<FormViewProps & ModalProps>;
 export {};

package/uform/FormViewer.js

@@ -49,21 +49,20 @@ const initSchama = (data) => {
     return DEFAULT;
 };
 exports.initSchama = initSchama;
-const _FormRender = props => {
+const _FormRender = (0, react_1.forwardRef)((props, ref) => {
     const uformProps = (0, react_1.useMemo)(() => (0, Convert_1.schemaToForm)(props.schema), [props]);
-    return react_1.default.createElement(index_1.UForm, Object.assign({}, uformProps, { data: props.data }));
-};
+    return react_1.default.createElement(index_1.UForm, Object.assign({}, uformProps, { data: props.data, ref: ref }));
+});
 const _ModalRender = props => {
     const uformProps = (0, react_1.useMemo)(() => (0, Convert_1.schemaToForm)(props.schema), [props]);
     let modalProps = {};
     modalProps.title = props.title || props.schema.title || '';
     return react_1.default.createElement(index_1.UFormModal, Object.assign({}, uformProps, modalProps, { data: props.data, open: props.open, onOk: props.onOk, onCancel: props.onCancel }));
 };
-const FormViewer = props => {
+exports.FormViewer = (0, react_1.forwardRef)((props, ref) => {
     const schema = (0, react_1.useMemo)(() => (0, exports.initSchama)(props.schema), [props.schema]);
-    return react_1.default.createElement(_FormRender, { schema: schema, data: props.data });
-};
-exports.FormViewer = FormViewer;
+    return react_1.default.createElement(_FormRender, { schema: schema, data: props.data, ref: ref });
+});
 const FormModal = props => {
     const schema = (0, react_1.useMemo)(() => (0, exports.initSchama)(props.schema), [props.schema]);
     return react_1.default.createElement(_ModalRender, Object.assign({}, props, { schema: schema }));

package/utils/Global.d.ts

@@ -16,8 +16,20 @@ export type GlobalSetting = {
      * 应用相关参数：
     */
     APP: {
+        /**
+         * 默认语言，默认简体中文
+        */
         LANG: Language;
+        /**
+         * 显示：回到首页，默认为 true
+        */
+        USER_MENU_HOMEPAGE: boolean;
     };
+    /**
+     * 基础API设置，
+     * 说明，如果只是前缀与通用版不同，则只需设置 PREFIX 即可，
+     * 其它还有不同的可单独设置
+    */
     BASIC: {
         PREFIX: string;
         SYSTEM: string;

package/utils/Global.js

@@ -20,6 +20,7 @@ var LOG_LEVEL;
 const DEFAULT = {
     APP: {
         LANG: _Support_1.Language.ZH_CN,
+        USER_MENU_HOMEPAGE: true,
     },
     BASIC: {
         PREFIX: '/api-common',

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