vap1 0.2.0 → 0.2.2

package/components/Box/SelectBar.d.ts

@@ -4,7 +4,7 @@ import type { Key, BaseItem, PlainObject } from '../../basetype';
 import type { STreeProps } from '../Trees/STree';
 import type { DTreeProps } from '../Trees/DTree';
 import type { FTreeProps } from '../Trees/FTree';
-import type { SListPorps } from '../Lists/SList';
+import type { SListProps } from '../Lists/SList';
 type SelectBarAction = BaseItem & {
     /**
      * action 图标
@@ -74,7 +74,7 @@ type ExtendSelectProps = {
     config: Omit<FTreeProps, 'searchValue' | 'onSelect'>;
 } | {
     type: 'slist';
-    config: Omit<SListPorps, 'searchValue' | 'onSelect'>;
+    config: Omit<SListProps, 'searchValue' | 'onSelect'>;
 } | {
     type: 'custom';
     config?: any;

package/components/Lists/SList.d.ts

@@ -3,7 +3,9 @@ import type { PlainObject, Key } from '../../basetype';
 import type { ReactNode } from 'react';
 import type { IconProps } from '../_adapt/Icon';
 type ItemRenderFunction = (record: PlainObject, searchValue?: string) => ReactNode;
-export type SListPorps = {
+export type SListProps = {
+    style?: React.CSSProperties;
+    className?: string;
     /**
      * key 字段，默认为ID
     */
@@ -54,5 +56,5 @@ export type SListPorps = {
     */
     mustSelect?: true | ((list: PlainObject[]) => PlainObject);
 };
-export declare const SList: React.FC<SListPorps>;
+export declare const SList: React.FC<SListProps>;
 export {};

package/components/Lists/SList.js

@@ -134,23 +134,26 @@ exports.SList = (0, react_1.memo)((props) => {
         setSelected(item[keyField]);
         onSelect(item[keyField], item);
     }, [list]);
-    const listProps = {
-        className: 'c-selectbar-list',
-        size: "small",
-        dataSource: list,
-    };
-    if (lodash_1.default.isFunction(props.onSelect)) {
-        listProps.className += ' c-selectbar-list-canselect';
-        listProps.renderItem = (item) => react_1.default.createElement(antd_1.List.Item, { className: item[keyField] == selected ? 'c-selectbar-list-selected' : '', onClick: evt => {
+    const listProps = (0, react_1.useMemo)(() => {
+        const clazz = ['c-selectbar-list'];
+        let listProps = { size: "small", style: props.style };
+        if (lodash_1.default.isFunction(props.onSelect))
+            clazz.push('c-selectbar-list-canselect');
+        if (props.className)
+            clazz.push(props.className);
+        listProps.className = clazz.join(' ');
+        return listProps;
+    }, [props.className]);
+    const renderItem = item => {
+        if (!lodash_1.default.isFunction(props.onSelect))
+            return react_1.default.createElement(antd_1.List.Item, null, render(item, searchValue));
+        return react_1.default.createElement(antd_1.List.Item, { className: item[keyField] == selected ? 'c-selectbar-list-selected' : '', onClick: evt => {
                 utils_1.PageUtil.stopEvent(evt);
                 setSelected(item[keyField]);
                 onSelect(item[keyField], item);
             } }, render(item, searchValue));
-    }
-    else {
-        listProps.renderItem = (item) => react_1.default.createElement(antd_1.List.Item, null, render(item, searchValue));
-    }
-    return react_1.default.createElement(antd_1.List, Object.assign({}, listProps));
+    };
+    return react_1.default.createElement(antd_1.List, Object.assign({}, listProps, { dataSource: list, renderItem: renderItem }));
 }, (prev, next) => {
     if (prev.searchValue != next.searchValue)
         return false;

package/components/Tables/STable.js

@@ -46,7 +46,11 @@ const STable = (props) => {
         arrOption.pageSize = 0;
     }
     const model = (0, useArray_1.useArray)(arrOption);
-    (0, react_1.useEffect)(() => { model.setList(props.list); }, [props.list]);
+    (0, react_1.useEffect)(() => {
+        if (lodash_1.default.isArray(props.list)) {
+            model.setList(props.list);
+        }
+    }, [props.list]);
     return react_1.default.createElement(VTable_1.VTable, Object.assign({}, props, { pagination: arrOption.pageSize == 0 ? false : { hideOnSinglePage: true }, model: model }));
 };
 exports.STable = STable;

package/components/UForm/FormWrapper.js

@@ -79,10 +79,10 @@ const getFormLayout = (props, root) => {
             width = totalWidth;
         }
     }
-    let isInfo = false, isEdit = false, isCreate = false;
+    let isInfo = false, isEdit = false, isAdd = false;
     switch (props.mode) {
         case 'ADD':
-            isCreate = true;
+            isAdd = true;
             break;
         case 'EDIT':
             isEdit = true;
@@ -99,14 +99,14 @@ const getFormLayout = (props, root) => {
                 isEdit = true;
                 break;
             }
-            isCreate = true;
+            isAdd = true;
         // if (props.data != null || _.keys(props.data).length == 0) {
         //     isInfo = true;
         //     break;
         // }
         // isInfo = true;
     }
-    return [isGroup, cols, width, colMax, isInfo, isEdit, isCreate];
+    return [isGroup, cols, width, colMax, isInfo, isEdit, isAdd];
 };
 const getMaxTitleWidth = (field) => {
     if (field.type && (0, _register_1.getUFormInput)(field.type).breakTitle)
@@ -128,7 +128,7 @@ const getMaxTitleWidth = (field) => {
     return Math.ceil(sum);
 };
 // 遍历字段，计算表单属性
-const _LOOP = (fs, maxLabel, isInfo, isEdit, isCreate, hiddFields, disableFields) => {
+const _LOOP = (fs, maxLabel, isInfo, isEdit, isAdd, hiddFields, disableFields) => {
     fs.map(field => {
         // @ts-ignore // 兼容 && 写法
         if (field == null || field === false)
@@ -144,22 +144,22 @@ const _LOOP = (fs, maxLabel, isInfo, isEdit, isCreate, hiddFields, disableFields
             else if (field.show) {
                 switch (field.show) {
                     case 'A':
-                        show = !isInfo && !isEdit;
-                        break;
-                    case 'AE':
-                        show = !isInfo;
+                        show = isAdd;
                         break;
                     case 'I':
                         show = isInfo;
                         break;
-                    case 'IE':
-                        show = !isEdit;
+                    case 'E':
+                        show = isEdit;
+                        break;
+                    case 'AE':
+                        show = isAdd || isEdit;
                         break;
                     case 'IE':
                         show = isInfo || isEdit;
                         break;
-                    case 'E':
-                        show = isEdit && !isInfo;
+                    case 'IA':
+                        show = isAdd || isEdit;
                         break;
                     case 'IAE':
                         show = true;
@@ -222,14 +222,14 @@ const FormWrapper = (props) => {
         const { fields } = props;
         if (fields == null || fields.length == 0)
             throw new Error('Must Have Fields');
-        const [isGroup, cols, width, colMax, isInfo, isEdit, isCreate] = getFormLayout(props, formContainer.current);
+        const [isGroup, cols, width, colMax, isInfo, isEdit, isAdd] = getFormLayout(props, formContainer.current);
         let colSpan = 24 / cols;
         // const MAX_LABEL_SPAN = COLMAX[cols];
         if (isGroup) {
-            fields.map(group => _LOOP(group.fields, maxLabelRef, isInfo, isEdit, isCreate, HiddenFieldRef.current, DisableFieldRef.current));
+            fields.map(group => _LOOP(group.fields, maxLabelRef, isInfo, isEdit, isAdd, HiddenFieldRef.current, DisableFieldRef.current));
         }
         else {
-            _LOOP(fields, maxLabelRef, isInfo, isEdit, isCreate, HiddenFieldRef.current, DisableFieldRef.current);
+            _LOOP(fields, maxLabelRef, isInfo, isEdit, isAdd, HiddenFieldRef.current, DisableFieldRef.current);
         }
         let fieldWidth = width / cols;
         var percent = (maxLabelRef.current * FONT_SIZE + 20) / fieldWidth;

package/components/UForm/index.d.ts

@@ -85,7 +85,7 @@ export type Link = {
  * 1. 传 **data** = Update ，
  * 2. 不传= Add
 */
-export type APPEAR_MODE = 'I' | 'A' | 'E' | 'IE' | 'IE' | 'AE' | 'IAE' | false | true;
+export type APPEAR_MODE = 'I' | 'A' | 'E' | 'IE' | 'IA' | 'AE' | 'IAE' | false | true;
 /**
  * 表单的字段定义
 */

package/components/_setup/SearchField/SearchFieldSelect.js

@@ -70,26 +70,6 @@ const SearchFieldInput_1 = require("./SearchFieldInput");
     let options = utils_1.PageUtil.getOptions(props.field.options);
     return react_1.default.createElement(antd_1.Checkbox.Group, Object.assign({}, config, { className: "i-checkbox", disabled: disabled, onChange: val => onChange(val.join(',')), value: (lodash_1.default.has(data, field) && data[field]) ? data[field].split(',') : [] }), options.map(option => react_1.default.createElement(antd_1.Checkbox, { value: option.value + '' }, option.label)));
 }, { outside: true });
-// registerSearchField('checkbox-button', (props: SearchFieldProps) => {
-//     const { field: { field, config, placeholder, allowClear, }, disabled, onChange, data, width } = props;
-//     if (!_.isArray(props.field.options)) {
-//         console.error('field type : select must have a options field')
-//         return <TEXT {...props} />
-//     }
-//     let options = PageUtil.getOptions(props.field.options);
-//     return <Checkbox.Group
-//         {...config}
-//         style={{ width }}
-//         optionType="button"
-//         buttonStyle="solid"
-//         disabled={disabled}
-//         onChange={val => onChange(val.join(','))}
-//         value={(_.has(data, field) && data[field].split(',')) ? data[field] : undefined}
-//         options={options}
-//     >
-//         {/* {options.map(option => <Checkbox value={option.value + ''}>{option.label}</Checkbox>)} */}
-//     </Checkbox.Group>
-// });
 (0, _register_1.registerSearchField)('switch', (props) => {
     const { field: { field, config, placeholder, allowClear, }, disabled, onChange, data, width } = props;
     if (!lodash_1.default.isArray(props.field.options) || (props.field.options.length <= 1)) {

package/index.d.ts

@@ -134,7 +134,7 @@ export { UForm, UFormModal, UInfo, UInfoModal, UModal, UDescriptions } from './c
 export { VTable, ApiTable, ApiTableModal, STable, TopTable, TopTableModal } from './components/Tables';
 export { STree, DTree, FTree } from './components/Trees';
 export { UploadFile, UploadImage, UploadModal } from './components/Upload';
-export { SList } from './components/Lists/SList';
+export { SList, type SListProps } from './components/Lists/SList';
 export type { UFromProps, UModalProps, UFormField, UFormFieldGroup, LinkResult, UDescriptionsProps, UFormRef, Link, LinkValue } from './components/UForm';
 export type { TableColumn } from './components/Tables/index';
 export type { VTableProps, VTableRef } from './components/Tables/VTable';

package/package.json

@@ -1 +1 @@
-{"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"}
+{"name":"vap1","version":"0.2.2","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/PageUtil.js

@@ -68,7 +68,9 @@ exports.clearURL = (len == 0) ? (val => val) : (url) => {
 /**
  * 判断是否有权限
 */
-const hasRole = (roleCode) => Global_1.CONFIG.PROMISSION.ROLE.has(lodash_1.default.trim(roleCode).toLowerCase());
+const hasRole = (roleCode) => {
+    return Global_1.CONFIG.PROMISSION.ROLE.has(roleCode) || Global_1.CONFIG.PROMISSION.ROLE.has((0, StringUtil_1.trimLower)(roleCode));
+};
 exports.hasRole = hasRole;
 // export const hasRole = (roleCode: string): boolean => true; // 测试中，总返回有权限
 const GLOBAL_APPS = new Map();

package/utils/StringUtil.d.ts

@@ -91,6 +91,7 @@ export declare const searchText: (sentence: string, keyword: string) => MatchPat
  * 拼 className
 */
 export declare const className: (base: string[], classNameProps?: string) => string;
+export declare const replaceAll: (text: string, keyword: string | RegExp, replaceText: string) => string;
 /**
  * 试图转px的值
  * 300px -> 300

package/utils/StringUtil.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getFileType = exports.getFloat = exports.getInteger = exports.getBoolean = exports.getString = exports.copy = exports.px = exports.className = exports.searchText = exports.trimLower = exports.isBoolean = exports.isBTCAddress = exports.uuid = exports.genKey = exports.isId = exports.isId15 = exports.isId18 = exports.REG_ID_15 = exports.REG_ID_18 = exports.isIP = exports.isIP6 = exports.isIP4 = exports.isPhone = exports.isMAC = exports.isURL = exports.isEmail = exports.isTelePhone = exports.isMobilePhone = exports.REG_PORT = exports.REG_URL = exports.REG_IPV6 = exports.REG_IPV4 = exports.REG_TELEPHONE = exports.REG_PHONE = exports.REG_EMAIL = void 0;
+exports.getFileType = exports.getFloat = exports.getInteger = exports.getBoolean = exports.getString = exports.copy = exports.px = exports.replaceAll = exports.className = exports.searchText = exports.trimLower = exports.isBoolean = exports.isBTCAddress = exports.uuid = exports.genKey = exports.isId = exports.isId15 = exports.isId18 = exports.REG_ID_15 = exports.REG_ID_18 = exports.isIP = exports.isIP6 = exports.isIP4 = exports.isPhone = exports.isMAC = exports.isURL = exports.isEmail = exports.isTelePhone = exports.isMobilePhone = exports.REG_PORT = exports.REG_URL = exports.REG_IPV6 = exports.REG_IPV4 = exports.REG_TELEPHONE = exports.REG_PHONE = exports.REG_EMAIL = void 0;
 const lodash_1 = __importDefault(require("lodash"));
 const _Support_1 = require("./_Support");
 const dayjs_1 = __importDefault(require("dayjs"));
@@ -205,6 +205,12 @@ const className = (base, classNameProps) => {
     return base.join(' ');
 };
 exports.className = className;
+const replaceAll = (text, keyword, replaceText) => {
+    let reg = lodash_1.default.isRegExp(keyword) ? new RegExp(keyword, 'g') : new RegExp(keyword, "g");
+    return lodash_1.default.replace(text, reg, replaceText);
+    ;
+};
+exports.replaceAll = replaceAll;
 /**
  * 试图转px的值
  * 300px -> 300