vap1 0.8.4 → 0.8.6

package/hooks/useApiGlobal.d.ts

@@ -8,4 +8,6 @@ export type ApiGlobalOption = ApiOption & {
     */
     namespace?: string;
 };
-export declare const useApiGlobal: (options: string | ApiGlobalOption) => ApiListState;
+type UseAppGlobal = (option: string | ApiGlobalOption) => ApiListState;
+export declare const useApiGlobal: UseAppGlobal;
+export {};

package/hooks/useApiGlobal.js

@@ -33,10 +33,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.useApiGlobal = void 0;
 var lodash_1 = __importDefault(require("lodash"));
 var react_1 = require("react");
+// import { clearURL } from '../utils/PageUtil'
 var _list_1 = require("./_list");
 var useGlobal_1 = require("./useGlobal");
 var useApiBase_1 = require("./useApiBase");
-var toKey = function (pathname, hash) {
+var useApi_1 = require("./useApi");
+var toKey = function () {
+    var pathname = location.pathname, hash = location.hash;
     var root = lodash_1.default.trim(pathname).toLowerCase();
     if (root.endsWith('/'))
         root = root.substring(0, root.length - 1);
@@ -45,7 +48,7 @@ var toKey = function (pathname, hash) {
     root = root.replace('/', '-');
     return root + hash;
 };
-var useApiGlobal = function (options) {
+exports.useApiGlobal = (lodash_1.default.has(window, '__MICRO_APP_BASE_ROUTE__') && window['__MICRO_APP_BASE_ROUTE__']) ? useApi_1.useApi : function (options) {
     var config = lodash_1.default.isString(options) ? { api: options } : options;
     var BASE = __assign(__assign({}, _list_1.DEFAULT_STATE), { effect: null });
     BASE.rowKey = config.rowKey || 'id';
@@ -57,10 +60,8 @@ 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');
 };
-exports.useApiGlobal = useApiGlobal;

package/package.json

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