vap1 0.6.4 → 0.6.6

package/cems/policy/DForm.d.ts

@@ -104,6 +104,13 @@ export type DRootProps = {
      * 子组件
      */
     children?: ReactNode;
+    /**
+     * 国际化
+     * @param key
+     * @param param
+     * @returns
+     */
+    txtLang?: (key: string, ...param: any[]) => string;
 };
 /**
  *

package/components/Box/Box.js

@@ -149,7 +149,7 @@ exports.Box = (0, react_1.forwardRef)(function (props, ref) {
         }
     }, [state === null || state === void 0 ? void 0 : state.height]);
     var resize = (0, react_1.useCallback)(function () {
-        if (mode == 'common' || app == null) {
+        if (mode == 'common') {
             if (state === null)
                 setState({});
             return;

package/components/Tables/ApiTable.d.ts

@@ -11,7 +11,6 @@ export declare const ApiTable: React.ForwardRefExoticComponent<import("./index")
     rowKey?: string;
     select?: true | "DEFAULT" | "QUERY";
     selectDisabled?: (record: any) => boolean;
-    actionBar?: Array<import("./Components/ActionBar").TableActionButton[]> | React.ReactNode;
+    actionBar?: Array<import("./Components/ActionBar").TableActionButton> | React.ReactNode;
     autoLoad?: false;
-    fixHeader?: boolean;
 } & Pick<ApiOption, "api" | "tipField" | "tipDisabled" | "aop"> & React.RefAttributes<ApiModel>>;

package/components/Tables/ApiTableModal.d.ts

@@ -11,9 +11,8 @@ export declare const ApiTableModal: React.ForwardRefExoticComponent<import(".").
     rowKey?: string;
     select?: true | "DEFAULT" | "QUERY";
     selectDisabled?: (record: any) => boolean;
-    actionBar?: Array<import("./Components/ActionBar").TableActionButton[]> | React.ReactNode;
+    actionBar?: Array<import("./Components/ActionBar").TableActionButton> | React.ReactNode;
     autoLoad?: false;
-    fixHeader?: boolean;
 } & Pick<import("../../hooks/useApiBase").ApiOption, "api" | "tipField" | "tipDisabled" | "aop"> & Omit<import("antd/es/modal").ModalProps, "visible" | "onCancel" | "onOk"> & {
     open?: boolean;
     onOk?: (data?: import("../..").PlainObject) => void;

package/components/Tables/VTable.d.ts

@@ -35,9 +35,8 @@ export declare const VTable: React.ForwardRefExoticComponent<import("./index").T
     rowKey?: string;
     select?: true | "DEFAULT" | "QUERY";
     selectDisabled?: (record: any) => boolean;
-    actionBar?: Array<TableActionButton[]> | React.ReactNode;
+    actionBar?: Array<TableActionButton> | React.ReactNode;
     autoLoad?: false;
-    fixHeader?: boolean;
 } & {
     /**
      * 列表模型，可以使用系统提供的 useApi/useArray 等，也可自行实现列表模型

package/components/Tables/index.d.ts

@@ -54,19 +54,11 @@ export type BaseTableProps = TableDefine & Pick<BoxProps, 'mode' | 'selectBar' |
     /**
        * 表格操作区域
       */
-    actionBar?: Array<TableActionButton[]> | ReactNode;
+    actionBar?: Array<TableActionButton> | ReactNode;
     /**
     * 是否自动查询，默认为TRUE
    */
     autoLoad?: false;
-    /**
-     * @experimental
-     * 说明： 1.5 版本才有此属性
-     * 2.0版本会自动锁定表头
-     * 1.5版本有问题： http://192.168.119.213:9999/vap2/why-not/#%E4%B8%BA%E4%BB%80%E4%B9%881-5%E7%89%88%E6%9C%AC%E7%9A%84vtable%E4%B8%8D%E6%94%AF%E6%8C%81%E9%94%81%E5%AE%9A%E8%A1%A8%E5%A4%B4
-     * 传此参数后，会试验性的计算，可能会有BUG
-    */
-    fixHeader?: boolean;
 };
 import type { ApiTableProps } from './ApiTable';
 export type ApiTable = ForwardRefExoticComponent<ApiTableProps & RefAttributes<ApiModel>> & TableDefined;

package/hooks/index.d.ts

@@ -13,4 +13,5 @@ export { useOpenState } from './useOpenState';
 export { useFirstMountState } from './useFirstMountState';
 export { useToggle } from './useToggle';
 export { useUpdate } from './useUpdate';
+export { usePreference } from './usePreference';
 export { useSyncExternalStore } from './useSyncExternalStore';

package/hooks/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.useSyncExternalStore = exports.useUpdate = exports.useToggle = exports.useFirstMountState = exports.useOpenState = exports.useAjaxAction = exports.useAjaxQuery = exports.useEffectFunction = exports.useModals = exports.useGlobal = exports.useDoLoad = exports.useSetState = exports.useArray = exports.useApiGlobal = exports.useApi = exports.useApp = void 0;
+exports.useSyncExternalStore = exports.usePreference = exports.useUpdate = exports.useToggle = exports.useFirstMountState = exports.useOpenState = exports.useAjaxAction = exports.useAjaxQuery = exports.useEffectFunction = exports.useModals = exports.useGlobal = exports.useDoLoad = exports.useSetState = exports.useArray = exports.useApiGlobal = exports.useApi = exports.useApp = void 0;
 // export type { GlobalApp } from './useApp';
 var useApp_1 = require("./useApp");
 Object.defineProperty(exports, "useApp", { enumerable: true, get: function () { return useApp_1.useApp; } });
@@ -46,6 +46,8 @@ Object.defineProperty(exports, "useToggle", { enumerable: true, get: function ()
 var useUpdate_1 = require("./useUpdate");
 Object.defineProperty(exports, "useUpdate", { enumerable: true, get: function () { return useUpdate_1.useUpdate; } });
 // export { useUpdateEffect } from './useUpdateEffect';
+var usePreference_1 = require("./usePreference");
+Object.defineProperty(exports, "usePreference", { enumerable: true, get: function () { return usePreference_1.usePreference; } });
 var useSyncExternalStore_1 = require("./useSyncExternalStore");
 Object.defineProperty(exports, "useSyncExternalStore", { enumerable: true, get: function () { return useSyncExternalStore_1.useSyncExternalStore; } });
 // 说明： 主要从以下两个库中提取常用hooks 集成至VAP

package/hooks/usePreference.d.ts

@@ -0,0 +1,9 @@
+type UsePreferenceConfig = {
+    module: string;
+    key: string;
+    defaultValue?: string;
+    allowValue?: Array<string>;
+};
+type UsePreferenceResult = [boolean, string, (val: string) => void];
+export declare const usePreference: (config: UsePreferenceConfig) => UsePreferenceResult;
+export {};

package/hooks/usePreference.js

@@ -0,0 +1,101 @@
+"use strict";
+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 __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+var __read = (this && this.__read) || function (o, n) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator];
+    if (!m) return o;
+    var i = m.call(o), r, ar = [], e;
+    try {
+        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+    }
+    catch (error) { e = { error: error }; }
+    finally {
+        try {
+            if (r && !r.done && (m = i["return"])) m.call(i);
+        }
+        finally { if (e) throw e.error; }
+    }
+    return ar;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.usePreference = void 0;
+var lodash_1 = __importDefault(require("lodash"));
+var react_1 = require("react");
+var useApp_1 = require("./useApp");
+var usePreference = function (config) {
+    var _a = (0, useApp_1.useApp)().user, getConfig = _a.getConfig, setConfig = _a.setConfig;
+    var _b = __read((0, react_1.useState)(null), 2), value = _b[0], setValue = _b[1];
+    var allowValue = (0, react_1.useCallback)(function (value) {
+        if (lodash_1.default.isArray(config.allowValue) && config.allowValue.length > 0) {
+            return lodash_1.default.includes(config.allowValue, value);
+        }
+        return true;
+    }, []);
+    var set = (0, react_1.useCallback)(function (value) { return __awaiter(void 0, void 0, void 0, function () {
+        var isOk;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    if (!allowValue(value))
+                        return [2 /*return*/];
+                    return [4 /*yield*/, setConfig(config.module, config.key, value)];
+                case 1:
+                    isOk = _a.sent();
+                    if (isOk) {
+                        setValue(value);
+                    }
+                    return [2 /*return*/];
+            }
+        });
+    }); }, []);
+    (0, react_1.useEffect)(function () {
+        getConfig(config.module, config.key).then(function (result) {
+            var value = result || config.defaultValue || '';
+            if (allowValue(value)) {
+                setValue(value);
+            }
+            else {
+                setValue(config.defaultValue || '');
+            }
+        });
+    }, []);
+    return [value === null, value === null ? config.defaultValue : value, set];
+};
+exports.usePreference = usePreference;

package/package.json

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

package/utils/CustomApp.d.ts

@@ -39,10 +39,10 @@ export type Menu = {
      *
      * 1 ：菜单组
      * 2 : 链接
-     * 3 : 权限码
-     * 4 : 小组件
+     * 3 : 权限码 - 无效
+     * 4 : 小组件 -无效
     */
-    type: 1 | 2 | 3 | 4;
+    type: 1 | 2;
     /**
      * 图标
     */
@@ -72,12 +72,21 @@ export type Menu = {
      * type = 1 时存在
      * 其它 type 也可存在，但只能放置权限码
     */
-    children?: Menu[];
+    children?: Array<Menu>;
 };
 type CustomAppMenu = {
+    /**
+     * none: (默认)无菜单模式
+     *      一般情况下，注册一个 '/' 路由即可
+     * list: 自定义菜单模式
+     *      使用 list 模式时，必须指定 list , 为已经整理好结构的 Menu 结构
+     * parent: 向上找一个菜单
+     *      使用 parent 模式时，必须指定 parent
+     *      使用资源里面的菜单
+    */
     mode?: 'none' | 'list' | 'parent';
     parent?: string;
-    list?: Menu[];
+    list?: Array<Menu>;
 };
 export type CustomAppTheme = {
     /**

package/utils/index.d.ts

@@ -11,7 +11,6 @@ export * as i18n from './i18n';
 export * as GLOBAL from './Global';
 export * as Renders from './Renders';
 export * as Const from './Const';
-export * as BitModeUtil from './ModeUtil';
 export { default as VAP } from './VAP';
 /**
  * 路由信息

package/utils/index.js

@@ -61,7 +61,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.renderRoot = exports.VAP = exports.BitModeUtil = exports.Const = exports.Renders = exports.GLOBAL = exports.i18n = exports.Ajax = exports.Format = exports.TipUtil = exports.CacheUtil = exports.EventUtil = exports.ArrayUtil = exports.PageUtil = exports.TreeUtil = exports.StringUtil = void 0;
+exports.renderRoot = exports.VAP = exports.Const = exports.Renders = exports.GLOBAL = exports.i18n = exports.Ajax = exports.Format = exports.TipUtil = exports.CacheUtil = exports.EventUtil = exports.ArrayUtil = exports.PageUtil = exports.TreeUtil = exports.StringUtil = void 0;
 exports.registerRoute = registerRoute;
 var lodash_1 = __importDefault(require("lodash"));
 // 全局 UTILS 定义
@@ -78,7 +78,6 @@ exports.i18n = __importStar(require("./i18n"));
 exports.GLOBAL = __importStar(require("./Global"));
 exports.Renders = __importStar(require("./Renders"));
 exports.Const = __importStar(require("./Const"));
-exports.BitModeUtil = __importStar(require("./ModeUtil"));
 // export * as logger from './Logger';
 var VAP_1 = require("./VAP");
 Object.defineProperty(exports, "VAP", { enumerable: true, get: function () { return __importDefault(VAP_1).default; } });

package/utils/py.js

@@ -89,7 +89,7 @@ var matchKeywordByIndex = function (key, index) {
         /**
          * 4. 如果原文本已经遍历完成 ,不管关键字有没有完成 ,都直接中段
         */
-        if (textCursor >= (textLen - 1))
+        if (textCursor >= textLen)
             break;
         keywordCursor++;
     }