@pisell/core 1.0.21 → 1.0.23

package/es/app/app.d.ts

@@ -35,7 +35,7 @@ declare class App {
     locales: Locales;
     models: {
         getStore: () => import("../models").Store;
-        StoreProvider: typeof import("react-redux").Provider;
+        StoreProvider: any;
         setConfig: (models: any[]) => void;
     };
     request: {

package/es/aws/index.d.ts

@@ -11,6 +11,6 @@ declare class AWS {
     private app;
     private config?;
     constructor(app: App, options?: AWSOptions);
-    upload(params: UploadParams): Promise<import("@aws-sdk/client-s3").PutObjectCommandOutput | undefined>;
+    upload(params: UploadParams): Promise<any>;
 }
 export default AWS;

package/es/history/index.d.ts

@@ -1,14 +1,13 @@
 import type { History as HistoryType } from "history";
-import { useHistory, useLocation, useParams } from "react-router-dom";
 import App from "../app";
 export interface HistoryOptions {
     basename?: string;
 }
 export declare class History {
-    instance: HistoryType<unknown>;
-    useHistory: typeof useHistory;
-    useLocation: typeof useLocation;
-    useParams: typeof useParams;
+    instance: any;
+    useHistory: any;
+    useLocation: any;
+    useParams: any;
     app: App;
     constructor(app: App, options?: HistoryOptions);
     push: HistoryType["push"];

package/es/menuManager/hooks.d.ts

@@ -14,4 +14,4 @@ export declare const MenuProvider: React.FC<{
     children: React.ReactNode;
     menus: MenuItem[];
 }>;
-export declare const useMenu: () => MenuContextType;
+export declare const useMenu: () => any;

package/es/menuManager/index.d.ts

@@ -12,7 +12,7 @@ export declare class MenuManager {
     private menuItems;
     private menuMaps;
     private app;
-    useMenu: () => import("./hooks").MenuContextType;
+    useMenu: () => any;
     MenuProvider: React.FC<{
         children: React.ReactNode;
         menus: MenuItem[];

package/es/models/index.d.ts

@@ -1,5 +1,4 @@
 import hooks from '../hooks';
-import { Provider as StoreProvider } from "react-redux";
 declare const models: import("./global").GlobalModal[];
 declare type ModalsType = (typeof models[number]);
 export interface Store {
@@ -39,7 +38,7 @@ declare const getDataByModel: <T extends "global", D extends keyof ModelsState[T
 declare const setDataByModel: <T extends "global", D extends keyof ModelsState[T]>(model: string, key: any, value: any) => void;
 declare const _default: {
     getStore: () => Store;
-    StoreProvider: typeof StoreProvider;
+    StoreProvider: any;
     setConfig: (models: any[]) => void;
 };
 export default _default;

package/es/pubsub/index.d.ts

@@ -28,6 +28,16 @@ declare class PubSub {
      * @param args 事件参数
      */
     publish(event: string, ...args: any[]): void;
+    /**
+     * @title: 异步发布,  某些事件需要延迟发布
+     * @description:
+     * @param {string} event
+     * @param {number} timeout
+     * @param {array} args
+     * @return {*}
+     * @Author: zhiwei.Wang
+     */
+    publishDelay(event: string, delay?: number, ...args: any[]): void;
     /**
      * 移除某个事件的所有订阅
      * @param event 事件名称

package/es/pubsub/index.js

@@ -77,6 +77,28 @@ var PubSub = /*#__PURE__*/function () {
       });
     }
 
+    /**
+     * @title: 异步发布,  某些事件需要延迟发布
+     * @description: 
+     * @param {string} event
+     * @param {number} timeout
+     * @param {array} args
+     * @return {*}
+     * @Author: zhiwei.Wang
+     */
+  }, {
+    key: "publishDelay",
+    value: function publishDelay(event) {
+      var _this2 = this;
+      var delay = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
+      for (var _len2 = arguments.length, args = new Array(_len2 > 2 ? _len2 - 2 : 0), _key2 = 2; _key2 < _len2; _key2++) {
+        args[_key2 - 2] = arguments[_key2];
+      }
+      setTimeout(function () {
+        _this2.publish.apply(_this2, [event].concat(args));
+      }, delay);
+    }
+
     /**
      * 移除某个事件的所有订阅
      * @param event 事件名称
@@ -129,9 +151,9 @@ var PubSub = /*#__PURE__*/function () {
   }, {
     key: "once",
     value: function once(event, callback) {
-      var _this2 = this;
+      var _this3 = this;
       var wrappedCallback = function wrappedCallback() {
-        _this2.unsubscribe(event, wrappedCallback);
+        _this3.unsubscribe(event, wrappedCallback);
         callback.apply(void 0, arguments);
       };
       return this.subscribe(event, wrappedCallback);

package/es/request/cache.d.ts

@@ -32,7 +32,7 @@ export declare const getCacheData: (url: string, data: any, cache: CacheProps) =
  * @return {*}
  * @Author: zhiwei.Wang
  */
-export declare const setCacheData: (url: string, data: any, res: any, cache: CacheProps) => any | null;
+export declare const setCacheData: (url: string, data: any, res: any, cache?: CacheProps) => any | null;
 /**
  * @title: 缓存函数包装器
  * @description:

package/es/request/cache.js

@@ -124,20 +124,26 @@ var getCache = /*#__PURE__*/function () {
         case 0:
           _getConfig3 = getConfig(), storage = _getConfig3.storage; // 如果 当前时间 - 数据缓存时间 小于 超时时间, 则数据正常.
           if (!(cache.type === 'memory')) {
-            _context2.next = 6;
+            _context2.next = 8;
             break;
           }
-          if (!getIsEffectiveTime(CACHES[key].time)) {
+          if (CACHES[key]) {
             _context2.next = 4;
             break;
           }
-          return _context2.abrupt("return", CACHES[key].data);
+          return _context2.abrupt("return", null);
         case 4:
-          _context2.next = 21;
-          break;
+          if (!getIsEffectiveTime(CACHES[key].time)) {
+            _context2.next = 6;
+            break;
+          }
+          return _context2.abrupt("return", CACHES[key].data);
         case 6:
+          _context2.next = 23;
+          break;
+        case 8:
           if (!(cache.type === 'storage')) {
-            _context2.next = 13;
+            _context2.next = 15;
             break;
           }
           storageDetail = storage.getStorage(key) || "";
@@ -145,35 +151,35 @@ var getCache = /*#__PURE__*/function () {
             storageDetail = JSON.parse(storageDetail);
           }
           if (!getIsEffectiveTime(storageDetail.time)) {
-            _context2.next = 11;
+            _context2.next = 13;
             break;
           }
           return _context2.abrupt("return", (_storageDetail = storageDetail) === null || _storageDetail === void 0 ? void 0 : _storageDetail.data);
-        case 11:
-          _context2.next = 21;
-          break;
         case 13:
+          _context2.next = 23;
+          break;
+        case 15:
           if (!(cache.type === 'indexDB')) {
-            _context2.next = 21;
+            _context2.next = 23;
             break;
           }
           app = getApp();
           if (!app.dbManager) {
-            _context2.next = 21;
+            _context2.next = 23;
             break;
           }
-          _context2.next = 18;
+          _context2.next = 20;
           return app.dbManager.get('requests', key);
-        case 18:
+        case 20:
           indexDBDetail = _context2.sent;
           if (!indexDBDetail) {
-            _context2.next = 21;
+            _context2.next = 23;
             break;
           }
           return _context2.abrupt("return", indexDBDetail === null || indexDBDetail === void 0 ? void 0 : indexDBDetail.data);
-        case 21:
+        case 23:
           return _context2.abrupt("return", null);
-        case 22:
+        case 24:
         case "end":
           return _context2.stop();
       }
@@ -251,7 +257,10 @@ export var getCacheData = /*#__PURE__*/function () {
  * @return {*}
  * @Author: zhiwei.Wang
  */
-export var setCacheData = function setCacheData(url, data, res, cache) {
+export var setCacheData = function setCacheData(url, data, res) {
+  var cache = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {
+    type: 'memory'
+  };
   // 创建缓存key
   var _key = createCacheKey(url, data, cache);
   setCache(_key, res, cache);
@@ -269,37 +278,44 @@ export var setCacheData = function setCacheData(url, data, res, cache) {
  */
 export var cacheFn = /*#__PURE__*/function () {
   var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(props, fn) {
-    var url, data, config, _data, _config$cache;
+    var url, data, config, cache, _data, _config$cache;
     return _regeneratorRuntime().wrap(function _callee4$(_context4) {
       while (1) switch (_context4.prev = _context4.next) {
         case 0:
           url = props.url, data = props.data, config = props.config;
-          if (!(config !== null && config !== void 0 && config.cache)) {
-            _context4.next = 8;
+          if (!(config !== null && config !== void 0 && config.cache || config !== null && config !== void 0 && config.useCache)) {
+            _context4.next = 10;
             break;
           }
-          _context4.next = 4;
-          return getCacheData(url, data, config.cache);
-        case 4:
+          cache = config.cache;
+          if (config.useCache) {
+            cache = {
+              type: 'memory'
+            };
+          }
+          // 获取缓存数据
+          _context4.next = 6;
+          return getCacheData(url, data, cache);
+        case 6:
           _data = _context4.sent;
           if (!_data) {
-            _context4.next = 8;
+            _context4.next = 10;
             break;
           }
           // 如果开启更新缓存执行函数
           if ((_config$cache = config.cache) !== null && _config$cache !== void 0 && _config$cache.updateCache) {
             fn(_objectSpread(_objectSpread({}, props), {}, {
               config: _objectSpread(_objectSpread({}, props.config), {}, {
-                cache: _objectSpread(_objectSpread({}, props.config.cache), {}, {
+                cache: _objectSpread(_objectSpread({}, cache), {}, {
                   updateCache: false
                 })
               })
             }));
           }
           return _context4.abrupt("return", _data);
-        case 8:
+        case 10:
           return _context4.abrupt("return", fn(props));
-        case 9:
+        case 11:
         case "end":
           return _context4.stop();
       }

package/es/request/utils.js

@@ -128,7 +128,7 @@ export var requestCallback = function requestCallback(resData) {
     if (codeFn) {
       if ((res === null || res === void 0 ? void 0 : res.code) === 200) {
         // 需要缓存的进行缓存数据
-        if (config !== null && config !== void 0 && config.cache) {
+        if (config !== null && config !== void 0 && config.useCache || config !== null && config !== void 0 && config.cache) {
           var _config$cacheUpdateCh;
           setCacheData(props.url, props.data, res, config === null || config === void 0 ? void 0 : config.cache);
           config === null || config === void 0 || (_config$cacheUpdateCh = config.cacheUpdateChange) === null || _config$cacheUpdateCh === void 0 || _config$cacheUpdateCh.call(config, res);

package/es/routes/index.d.ts

@@ -20,9 +20,9 @@ export declare class RouterManager {
     get(name: string): RouteType;
     has(name: string): boolean;
     remove(name: string): void;
-    renderComponent(item: RouteType, children?: React.ReactNode): string | number | boolean | JSX.Element | React.ReactFragment | null | undefined;
+    renderComponent(item: RouteType, children?: React.ReactNode): any;
     getPageByRoute(route: string): ApplicationInterface | undefined;
     getRouterComponent({ fallback }: {
         fallback?: React.ReactNode;
-    }): JSX.Element[];
+    }): any[];
 }

package/es/tasks/index.d.ts

@@ -7,7 +7,7 @@ export declare class TasksManager {
     private app;
     private db;
     useTasks: () => {
-        tasks: TasksModule;
+        tasks: any;
     };
     watchTaskCallback: (taskModule: TasksModule) => void;
     private timerIds;

package/es/tasks/useTasks.d.ts

@@ -1,5 +1,4 @@
-import { TasksModule } from './type';
 declare const useTasks: () => {
-    tasks: TasksModule;
+    tasks: any;
 };
 export default useTasks;

package/lib/app/app.d.ts

@@ -35,7 +35,7 @@ declare class App {
     locales: Locales;
     models: {
         getStore: () => import("../models").Store;
-        StoreProvider: typeof import("react-redux").Provider;
+        StoreProvider: any;
         setConfig: (models: any[]) => void;
     };
     request: {

package/lib/aws/index.d.ts

@@ -11,6 +11,6 @@ declare class AWS {
     private app;
     private config?;
     constructor(app: App, options?: AWSOptions);
-    upload(params: UploadParams): Promise<import("@aws-sdk/client-s3").PutObjectCommandOutput | undefined>;
+    upload(params: UploadParams): Promise<any>;
 }
 export default AWS;

package/lib/history/index.d.ts

@@ -1,14 +1,13 @@
 import type { History as HistoryType } from "history";
-import { useHistory, useLocation, useParams } from "react-router-dom";
 import App from "../app";
 export interface HistoryOptions {
     basename?: string;
 }
 export declare class History {
-    instance: HistoryType<unknown>;
-    useHistory: typeof useHistory;
-    useLocation: typeof useLocation;
-    useParams: typeof useParams;
+    instance: any;
+    useHistory: any;
+    useLocation: any;
+    useParams: any;
     app: App;
     constructor(app: App, options?: HistoryOptions);
     push: HistoryType["push"];

package/lib/menuManager/hooks.d.ts

@@ -14,4 +14,4 @@ export declare const MenuProvider: React.FC<{
     children: React.ReactNode;
     menus: MenuItem[];
 }>;
-export declare const useMenu: () => MenuContextType;
+export declare const useMenu: () => any;

package/lib/menuManager/index.d.ts

@@ -12,7 +12,7 @@ export declare class MenuManager {
     private menuItems;
     private menuMaps;
     private app;
-    useMenu: () => import("./hooks").MenuContextType;
+    useMenu: () => any;
     MenuProvider: React.FC<{
         children: React.ReactNode;
         menus: MenuItem[];

package/lib/models/index.d.ts

@@ -1,5 +1,4 @@
 import hooks from '../hooks';
-import { Provider as StoreProvider } from "react-redux";
 declare const models: import("./global").GlobalModal[];
 declare type ModalsType = (typeof models[number]);
 export interface Store {
@@ -39,7 +38,7 @@ declare const getDataByModel: <T extends "global", D extends keyof ModelsState[T
 declare const setDataByModel: <T extends "global", D extends keyof ModelsState[T]>(model: string, key: any, value: any) => void;
 declare const _default: {
     getStore: () => Store;
-    StoreProvider: typeof StoreProvider;
+    StoreProvider: any;
     setConfig: (models: any[]) => void;
 };
 export default _default;

package/lib/pubsub/index.d.ts

@@ -28,6 +28,16 @@ declare class PubSub {
      * @param args 事件参数
      */
     publish(event: string, ...args: any[]): void;
+    /**
+     * @title: 异步发布,  某些事件需要延迟发布
+     * @description:
+     * @param {string} event
+     * @param {number} timeout
+     * @param {array} args
+     * @return {*}
+     * @Author: zhiwei.Wang
+     */
+    publishDelay(event: string, delay?: number, ...args: any[]): void;
     /**
      * 移除某个事件的所有订阅
      * @param event 事件名称

package/lib/pubsub/index.js

@@ -74,6 +74,20 @@ var PubSub = class {
       }
     });
   }
+  /**
+   * @title: 异步发布,  某些事件需要延迟发布
+   * @description: 
+   * @param {string} event
+   * @param {number} timeout
+   * @param {array} args
+   * @return {*}
+   * @Author: zhiwei.Wang
+   */
+  publishDelay(event, delay = 0, ...args) {
+    setTimeout(() => {
+      this.publish(event, ...args);
+    }, delay);
+  }
   /**
    * 移除某个事件的所有订阅
    * @param event 事件名称

package/lib/request/cache.d.ts

@@ -32,7 +32,7 @@ export declare const getCacheData: (url: string, data: any, cache: CacheProps) =
  * @return {*}
  * @Author: zhiwei.Wang
  */
-export declare const setCacheData: (url: string, data: any, res: any, cache: CacheProps) => any | null;
+export declare const setCacheData: (url: string, data: any, res: any, cache?: CacheProps) => any | null;
 /**
  * @title: 缓存函数包装器
  * @description:

package/lib/request/cache.js

@@ -77,6 +77,9 @@ var getIsEffectiveTime = (time) => {
 var getCache = async (key, cache) => {
   const { storage } = (0, import_config.getConfig)();
   if (cache.type === "memory") {
+    if (!CACHES[key]) {
+      return null;
+    }
     if (getIsEffectiveTime(CACHES[key].time)) {
       return CACHES[key].data;
     }
@@ -122,15 +125,23 @@ var getCacheData = async (url, data, cache) => {
   const res = await getCache(_key, cache);
   return res;
 };
-var setCacheData = (url, data, res, cache) => {
+var setCacheData = (url, data, res, cache = {
+  type: "memory"
+}) => {
   let _key = createCacheKey(url, data, cache);
   setCache(_key, res, cache);
 };
 var cacheFn = async (props, fn) => {
   var _a;
   const { url, data, config } = props;
-  if (config == null ? void 0 : config.cache) {
-    let _data = await getCacheData(url, data, config.cache);
+  if ((config == null ? void 0 : config.cache) || (config == null ? void 0 : config.useCache)) {
+    let cache = config.cache;
+    if (config.useCache) {
+      cache = {
+        type: "memory"
+      };
+    }
+    let _data = await getCacheData(url, data, cache);
     if (_data) {
       if ((_a = config.cache) == null ? void 0 : _a.updateCache) {
         fn({
@@ -138,7 +149,7 @@ var cacheFn = async (props, fn) => {
           config: {
             ...props.config,
             cache: {
-              ...props.config.cache,
+              ...cache,
               updateCache: false
             }
           }

package/lib/request/utils.js

@@ -86,7 +86,7 @@ var requestCallback = (resData) => {
     const codeFn = requestCallbacks == null ? void 0 : requestCallbacks[res == null ? void 0 : res.code];
     if (codeFn) {
       if ((res == null ? void 0 : res.code) === 200) {
-        if (config == null ? void 0 : config.cache) {
+        if ((config == null ? void 0 : config.useCache) || (config == null ? void 0 : config.cache)) {
           (0, import_cache.setCacheData)(props.url, props.data, res, config == null ? void 0 : config.cache);
           (_a = config == null ? void 0 : config.cacheUpdateChange) == null ? void 0 : _a.call(config, res);
         }

package/lib/routes/index.d.ts

@@ -20,9 +20,9 @@ export declare class RouterManager {
     get(name: string): RouteType;
     has(name: string): boolean;
     remove(name: string): void;
-    renderComponent(item: RouteType, children?: React.ReactNode): string | number | boolean | JSX.Element | React.ReactFragment | null | undefined;
+    renderComponent(item: RouteType, children?: React.ReactNode): any;
     getPageByRoute(route: string): ApplicationInterface | undefined;
     getRouterComponent({ fallback }: {
         fallback?: React.ReactNode;
-    }): JSX.Element[];
+    }): any[];
 }

package/lib/tasks/index.d.ts

@@ -7,7 +7,7 @@ export declare class TasksManager {
     private app;
     private db;
     useTasks: () => {
-        tasks: TasksModule;
+        tasks: any;
     };
     watchTaskCallback: (taskModule: TasksModule) => void;
     private timerIds;

package/lib/tasks/useTasks.d.ts

@@ -1,5 +1,4 @@
-import { TasksModule } from './type';
 declare const useTasks: () => {
-    tasks: TasksModule;
+    tasks: any;
 };
 export default useTasks;

package/package.json

@@ -1,6 +1,12 @@
 {
   "name": "@pisell/core",
-  "version": "1.0.21",
+  "version": "1.0.23",
+  "scripts": {
+    "build": "father build",
+    "dev": "father dev",
+    "build:types": "tsc --project tsconfig.types.json",
+    "publish:types": "npm run build:types && cd types && cp ../types-package.json package.json && npm publish"
+  },
   "sideEffects": false,
   "main": "./lib/index.js",
   "module": "./es/index.js",
@@ -38,11 +44,5 @@
   ],
   "publishConfig": {
     "access": "public"
-  },
-  "scripts": {
-    "build": "father build",
-    "dev": "father dev",
-    "build:types": "tsc --project tsconfig.types.json",
-    "publish:types": "npm run build:types && cd types && cp ../types-package.json package.json && npm publish"
   }
 }