vap1 0.8.3 → 0.8.5

package/cems/admin/utils.d.ts

@@ -31,7 +31,7 @@ export type GetApiDataXMLHttpRequest = (_url: any, _type: "POST" | 'GET', _param
  * @param _isEncodeURIComponent 一般用于GET请求，是否用 encodeURIComponent 对参数进行编码（注：decodeURIComponent解码），即：中文、特殊字符会被转码，例如：“对” 会被转成 %E5%AF%B9，get请求传中文在后台接收时容易变成乱码
  * @returns 当为同步请求时，返回查询到的所有数据
  */
-export type GetApiData = (_url: any, _type: "POST" | 'GET', _param?: any, _requestType?: "RequestParam" | "RequestBody", _isAsync?: any, _callBackFun?: any, _headerList?: any, _isEncodeURIComponent?: any) => void;
+export type GetApiData = (_url: any, _type: "POST" | 'GET', _param?: any, _requestType?: "RequestParam" | "RequestBody", _isAsync?: any, _callBackFun?: any, _headerList?: any, _isEncodeURIComponent?: any) => any;
 /**
  * 获取指定长度的16进制随机数据，
  * @param len 指定长度，不传默认返回32位

package/hooks/useApiGlobal.js

@@ -33,10 +33,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.useApiGlobal = void 0;
 var lodash_1 = __importDefault(require("lodash"));
 var react_1 = require("react");
+var PageUtil_1 = require("../utils/PageUtil");
 var _list_1 = require("./_list");
 var useGlobal_1 = require("./useGlobal");
 var useApiBase_1 = require("./useApiBase");
-var toKey = function (pathname, hash) {
+var toKey = function () {
+    var pathname = location.pathname, hash = location.hash;
+    if (lodash_1.default.has(window, '__MICRO_APP_BASE_ROUTE__')) {
+        return (0, PageUtil_1.clearURL)(pathname);
+    }
     var root = lodash_1.default.trim(pathname).toLowerCase();
     if (root.endsWith('/'))
         root = root.substring(0, root.length - 1);
@@ -57,8 +62,7 @@ var useApiGlobal = function (options) {
     var namespace = (0, react_1.useMemo)(function () {
         if (config.namespace)
             return config.namespace;
-        var pathname = location.pathname, hash = location.hash;
-        return toKey(pathname, hash);
+        return toKey();
     }, []);
     var _a = __read((0, useGlobal_1.useGlobal)(namespace, BASE), 2), state = _a[0], doLoad = _a[1];
     return (0, useApiBase_1.useApiBase)(config, state, doLoad, 'api-global');

package/package.json

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