vap1 0.4.2 → 0.4.3

package/components/Box/Box.js

@@ -150,7 +150,7 @@ exports.Box = (0, react_1.forwardRef)(function (props, ref) {
         setState({ height: Math.floor(total) });
         document.body.classList.remove('v-resizing');
     };
-    (0, react_1.useEffect)(function () { setTimeout(resize, 2); }, [app === null || app === void 0 ? void 0 : app.theme.contentHeight]);
+    (0, react_1.useEffect)(function () { setTimeout(resize, 120); }, [app === null || app === void 0 ? void 0 : app.theme.contentHeight]); // 1.5 版本：延时 120ms
     (0, react_1.useImperativeHandle)(ref, function () { return ({ resize: resize }); }, []);
     (0, react_1.useLayoutEffect)(function () {
         setTimeout(resize, 5);

package/components/Trees/COTree/COTreeUtil.js

@@ -62,12 +62,12 @@ var loop = function (root, FIELDS, treeData, checkedKeys, FULL_CHECKED, HALF_CHE
                 // node.className = 'co-tree-select-all';
                 // node.icon = <Icon type="check-circle" />;
                 // node.title = <span>{item[FIELDS.titleField]}{TIP && <small>(含下级)</small>}</span>
+                node.isLeaf = true;
                 node.title = react_1.default.createElement("span", { className: 'co-tree-select-all' },
                     react_1.default.createElement(Icon_1.Icon, { type: "check-circle" }),
                     " ",
                     react_1.default.createElement("span", null, item[FIELDS.titleField]),
                     TIP && react_1.default.createElement("small", null, "(\u542B\u4E0B\u7EA7)"));
-                node.isLeaf = true;
                 checkedKeys.checked.push(item[FIELDS.keyField]);
             }
             else if (HALF_CHECKED.has(item[FIELDS.keyField])) {

package/hooks/useApp.d.ts

@@ -99,7 +99,7 @@ export interface GlobalMenu {
      * 方法 - 菜单跳转
      * @param menu 参数支持
      * 1. 一个路径：如 /admin/#/user
-     * 2. 一个菜单: 如 { root:'/admin', route:'/user' }
+     * 2. 一个菜单: 如 { root:'/admin/', route:'/user' }
      * 3. 一个地址: 如 https://www.qq.com ,（弹出新的TAB面面）
      * 4. 菜单ID :  如 "1" , 将会通过 id 获取具体菜单（打开特殊 sign 菜单用此项）
      *

package/package.json

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

package/utils/Renders/ApiGetRender.js

@@ -100,21 +100,21 @@ var _define_1 = require("./_define");
 var Const_1 = require("../Const");
 var API_CACHES = new Map();
 var loadApi = function (option) { return __awaiter(void 0, void 0, void 0, function () {
-    var KEY, cache, result, arr;
+    var CACHE_KEY, cache, result, arr;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
+                CACHE_KEY = option.cacheKey || option.api;
                 if (option.cache !== false)
-                    index_1.Ajax.SESSION(option.api);
-                KEY = option.api;
-                if (!API_CACHES.has(KEY)) {
-                    API_CACHES.set(KEY, {
+                    index_1.Ajax.SESSION(CACHE_KEY);
+                if (!API_CACHES.has(CACHE_KEY)) {
+                    API_CACHES.set(CACHE_KEY, {
                         fetcher: index_1.Ajax.GET(option.api),
                         loaded: false,
                         map: new Map()
                     });
                 }
-                cache = API_CACHES.get(KEY);
+                cache = API_CACHES.get(CACHE_KEY);
                 if (cache.loaded)
                     return [2 /*return*/, false];
                 return [4 /*yield*/, cache.fetcher];
@@ -131,6 +131,7 @@ var loadApi = function (option) { return __awaiter(void 0, void 0, void 0, funct
 }); };
 exports.loadApi = loadApi;
 var _ApiGetRender = function (props) {
+    var CACHE_KEY = props.cacheKey || props.api;
     var update = (0, hooks_1.useUpdate)();
     (0, react_1.useEffect)(function () {
         (function () { return __awaiter(void 0, void 0, void 0, function () {
@@ -146,7 +147,7 @@ var _ApiGetRender = function (props) {
                 }
             });
         }); })();
-        var KEY = "_API_GET_EVENT_" + props.api.split('/').join('_');
+        var KEY = "_API_GET_EVENT_" + CACHE_KEY.split('/').join('_');
         index_1.EventUtil.on(KEY, function () { return __awaiter(void 0, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
@@ -160,7 +161,7 @@ var _ApiGetRender = function (props) {
         }); });
         return function () { return index_1.EventUtil.off(KEY); };
     }, []);
-    var cache = API_CACHES.get(props.api);
+    var cache = API_CACHES.get(CACHE_KEY);
     if (props.value === null || props.value === '' || cache == null || cache.map == null || cache.map.size == 0) {
         return props.default || Const_1.NONE;
     }
@@ -187,7 +188,8 @@ var _ApiGetRender = function (props) {
  * 从一个 GET API 中取出对应的值，并渲染到页面上
 */
 var ApiGetRender = function (options) {
-    var fn = function (txt) { return react_1.default.createElement(_ApiGetRender, __assign({ key: options.api + txt }, options, { value: txt })); };
+    var CACHE_KEY = options.cacheKey || options.api;
+    var fn = function (txt) { return react_1.default.createElement(_ApiGetRender, __assign({ key: CACHE_KEY + txt }, options, { value: txt })); };
     fn.useOption = function (config) {
         var _a = __read((0, react_1.useState)([]), 2), state = _a[0], setState = _a[1];
         (0, react_1.useEffect)(function () {
@@ -198,7 +200,7 @@ var ApiGetRender = function (options) {
                         case 0: return [4 /*yield*/, (0, exports.loadApi)(options)];
                         case 1:
                             _a.sent();
-                            cache = API_CACHES.get(options.api);
+                            cache = API_CACHES.get(CACHE_KEY);
                             return [4 /*yield*/, cache.fetcher];
                         case 2:
                             result = _a.sent();
@@ -241,7 +243,7 @@ var ApiGetRender = function (options) {
                     }
                 });
             }); };
-            var KEY = "_API_GET_EVENT_" + options.api.split('/').join('_');
+            var KEY = "_API_GET_EVENT_" + CACHE_KEY.split('/').join('_');
             index_1.EventUtil.on(KEY, fetchOptions);
             fetchOptions();
             return function () { return index_1.EventUtil.off(KEY); };
@@ -249,28 +251,31 @@ var ApiGetRender = function (options) {
         return state;
     };
     fn.getText = function (val, def) {
-        if (API_CACHES.has(options.api) && API_CACHES.get(options.api).loaded) {
-            return API_CACHES.get(options.api).map.get(val) || (def || val);
+        if (API_CACHES.has(CACHE_KEY)) {
+            var CACHE_MAPPER = API_CACHES.get(CACHE_KEY);
+            if (CACHE_MAPPER.loaded) {
+                return CACHE_MAPPER.map.get(val) || (def === undefined ? val : def);
+            }
         }
         var resp = (0, XHR_1.GETSYNC)(options.api);
         var map = new Map();
         var arr = (0, _define_1.getList)(resp);
         arr.map(function (item) { return map.set(item[options.valueField] + '', item[options.nameField]); });
-        API_CACHES.set(options.api, {
+        API_CACHES.set(CACHE_KEY, {
             fetcher: index_1.Ajax.GET(options.api),
             loaded: true,
             map: map,
         });
-        return map.get(val) || (def || val);
+        return map.get(val) || (def === undefined ? val : def);
     };
     fn.reflush = function () {
-        index_1.Ajax.CLEAR(options.api);
-        API_CACHES.set(options.api, {
+        index_1.Ajax.CLEAR(CACHE_KEY);
+        API_CACHES.set(CACHE_KEY, {
             fetcher: index_1.Ajax.GET(options.api),
             loaded: false,
             map: new Map()
         });
-        var KEY = "_API_GET_EVENT_" + options.api.split('/').join('_');
+        var KEY = "_API_GET_EVENT_" + CACHE_KEY.split('/').join('_');
         index_1.EventUtil.call(KEY);
     };
     return fn;

package/utils/Renders/ApiPostRender.js

@@ -207,7 +207,7 @@ var ApiPostRender = function (options) {
             result = getLabel(options, resp, key);
         }
         if (result == false)
-            return def || '';
+            return def === undefined ? '' : def;
         return result;
     };
     return fn;

package/utils/Renders/ListRender.js

@@ -37,7 +37,7 @@ var ListRender = function (options) {
                 MAP.set(lodash_1.default.trim(item[valueField]), (0, i18n_1.txt)(item['ik']));
             }
             else {
-                MAP.set(lodash_1.default.trim(item[valueField]), item[labelField] + '');
+                MAP.set(lodash_1.default.trim(item[valueField]), item[labelField]);
             }
         }
     });

package/utils/Renders/_define.d.ts

@@ -13,8 +13,18 @@ export type BaseRenderOptions = {
 };
 export type ApiRenderOptions = BaseRenderOptions & {
     api: string;
+    /**
+     * 用于展示 Label 的字段
+    */
     nameField: string;
+    /**
+     * 用于映射值的字段
+    */
     valueField: string;
+    /**
+     * 默认缓存为 api 地址，若不想以 api 做为KEY，可以指定（用于两个相同的APIRender时）
+    */
+    cacheKey?: string;
     render?: (info: BaseOption) => React.ReactNode;
 };
 export declare const getValue: (txt: string, options: BaseRenderOptions) => string | React.ReactNode;