@pisell/core 1.0.1 → 1.0.3

package/lib/locales/index.js

@@ -29,143 +29,130 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/locales/index.ts
 var locales_exports = {};
 __export(locales_exports, {
-  createTextsByLibrary: () => createTextsByLibrary,
-  default: () => locales_default,
-  getCurrentTexts: () => getCurrentTexts,
-  getLibraryByData: () => getLibraryByData,
-  getLocale: () => getLocale,
-  getText: () => getText,
-  isCN: () => isCN,
-  loadLibrary: () => loadLibrary,
-  loadLibraryByItems: () => loadLibraryByItems,
-  loadLibraryByUrl: () => loadLibraryByUrl,
-  setLocale: () => setLocale,
-  translation: () => translation
+  Locales: () => Locales
 });
 module.exports = __toCommonJS(locales_exports);
-var import_config = require("./config");
 var import_lodash = __toESM(require("lodash"));
 var import_utils = require("@pisell/utils");
-var getLocale = () => {
-  return (0, import_config.getConfig)().locale;
-};
-var getCurrentTexts = (locale) => {
-  let config = (0, import_config.getConfig)();
-  return config.library[locale || config.locale].translations;
-};
-var setLocale = (locale, reload = false) => {
-  (0, import_config.setConfig)({ locale });
-  if (reload) {
-    window.location.reload();
-    return;
-  }
-};
-var getText = (id, locale) => {
-  var _a;
-  return ((_a = getCurrentTexts(locale)) == null ? void 0 : _a[id]) || id;
-};
-var isCN = () => {
-  let locale = getLocale();
-  return locale === "zh-CN" || locale === "zh-HK";
-};
-var loadLibraryByUrl = async (urls) => {
-  try {
-    let fetchList = urls.map((item) => {
-      if (typeof item === "string") {
-        return fetch(item);
-      }
-      if (typeof item === "function") {
-        return item();
+var import_en = __toESM(require("./en"));
+var import_zh_CN = __toESM(require("./zh-CN"));
+var import_zh_HK = __toESM(require("./zh-HK"));
+var import_original = __toESM(require("./original"));
+var Locales = class {
+  constructor(app, options) {
+    // 当前语言 本地语言 > 英文语言包
+    this.locale = import_en.default.locale;
+    //  语言包
+    this.library = [import_original.default, import_en.default, import_zh_CN.default, import_zh_HK.default].reduce((pre, cur) => {
+      pre[cur.locale] = cur;
+      return pre;
+    }, {});
+    this.loadLibraryByUrl = async (urls) => {
+      try {
+        let fetchList = urls.map((item) => {
+          if (typeof item === "string") {
+            return fetch(item);
+          }
+          if (typeof item === "function") {
+            return item();
+          }
+          if (typeof item === "object" && item !== null && "locale" in item) {
+            return Promise.resolve(item);
+          }
+          return item;
+        });
+        let res = await Promise.all(fetchList);
+        let library = { ...this.library };
+        for (const item of res) {
+          const _item = item instanceof Response ? await item.json() : item;
+          library = {
+            ...library,
+            [_item.locale]: import_lodash.default.mergeWith(library[_item.locale] || {}, _item)
+          };
+        }
+        this.library = library;
+        return library;
+      } catch (err) {
+        console.log(err);
+        throw err;
       }
-      if (typeof item === "object" && item !== null && "locale" in item) {
-        return Promise.resolve(item);
-      }
-      return item;
-    });
-    let res = await Promise.all(fetchList);
-    let library = { ...(0, import_config.getConfig)().library };
-    for (const item of res) {
-      const _item = item instanceof Response ? await item.json() : item;
+    };
+    this.app = app;
+    this.locale = (options == null ? void 0 : options.locale) || this.app.storage.getStorage("locale") || import_en.default.locale;
+    this.library = (options == null ? void 0 : options.library) || [import_original.default, import_en.default, import_zh_CN.default, import_zh_HK.default].reduce((pre, cur) => {
+      pre[cur.locale] = cur;
+      return pre;
+    }, {});
+  }
+  getLocale() {
+    return this.locale;
+  }
+  getCurrentTexts(locale) {
+    return this.library[locale || this.locale].translations;
+  }
+  setLocale(locale, reload = false) {
+    this.locale = locale;
+    if (reload) {
+      window.location.reload();
+      return;
+    }
+  }
+  getText(id, locale) {
+    var _a;
+    return ((_a = this.getCurrentTexts(locale)) == null ? void 0 : _a[id]) || id;
+  }
+  isCN() {
+    let locale = this.getLocale();
+    return locale === "zh-CN" || locale === "zh-HK";
+  }
+  loadLibraryByItems(libraryList) {
+    let library = { ...this.library };
+    libraryList.forEach((item) => {
       library = {
         ...library,
-        [_item.locale]: import_lodash.default.mergeWith(library[_item.locale] || {}, _item)
+        [item.locale]: import_lodash.default.mergeWith(library[item.locale] || {}, item)
       };
+    });
+    this.library = library;
+  }
+  loadLibrary(urls) {
+    return this.loadLibraryByUrl(urls);
+  }
+  translation(text, locale) {
+    if (!text) {
+      return "";
+    }
+    if ((0, import_utils.isString)(text) || (0, import_utils.isNumber)(text)) {
+      return text;
+    }
+    let primary = locale || this.getLocale();
+    if (typeof text === "string") {
+      return text;
     }
-    (0, import_config.setConfig)({ library });
-    return library;
-  } catch (err) {
-    console.log(err);
-    throw err;
+    return text[primary] || text["original"] || text["en"] || text["zh-CN"] || text["zh-HK"];
   }
-};
-var loadLibraryByItems = (libraryList) => {
-  let library = { ...(0, import_config.getConfig)().library };
-  libraryList.forEach((item) => {
-    library = {
-      ...library,
-      [item.locale]: import_lodash.default.mergeWith(library[item.locale] || {}, item)
-    };
-  });
-  (0, import_config.setConfig)({ library });
-};
-var loadLibrary = async (urls) => {
-  return loadLibraryByUrl(urls);
-};
-var translation = (text, locale) => {
-  if (!text) {
-    return "";
+  getLibraryByData(data) {
+    return data.reduce((pre, next) => {
+      return {
+        ...pre,
+        [next.locale]: next
+      };
+    }, {});
   }
-  if ((0, import_utils.isString)(text) || (0, import_utils.isNumber)(text)) {
-    return text;
+  createTextsByLibrary(id, library) {
+    const _library = library || this.library;
+    return Object.keys(_library).reduce((pre, next) => {
+      var _a;
+      let _pre = { ...pre };
+      let cur = (_a = _library[next].translations) == null ? void 0 : _a[id];
+      if (cur) {
+        _pre[_library[next].locale] = cur;
+      }
+      return _pre;
+    }, {});
   }
-  let primary = locale || getLocale();
-  return text[primary] || text["original"] || text["en"] || text["zh-CN"] || text["zh-HK"];
-};
-var getLibraryByData = (data) => {
-  return data.reduce((pre, next) => {
-    return {
-      ...pre,
-      [next.locale]: next
-    };
-  }, {});
-};
-var createTextsByLibrary = (id, library) => {
-  const _library = library || (0, import_config.getConfig)().library;
-  return Object.keys(_library).reduce((pre, next) => {
-    var _a;
-    let _pre = { ...pre };
-    let cur = (_a = _library[next].translations) == null ? void 0 : _a[id];
-    if (cur) {
-      _pre[_library[next].locale] = cur;
-    }
-    return _pre;
-  }, {});
-};
-var locales_default = {
-  getLocale,
-  getCurrentTexts,
-  setLocale,
-  getText,
-  isCN,
-  getConfig: import_config.getConfig,
-  setConfig: import_config.setConfig,
-  loadLibraryByUrl,
-  translation,
-  loadLibraryByItems,
-  getLibraryByData,
-  createTextsByLibrary
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  createTextsByLibrary,
-  getCurrentTexts,
-  getLibraryByData,
-  getLocale,
-  getText,
-  isCN,
-  loadLibrary,
-  loadLibraryByItems,
-  loadLibraryByUrl,
-  setLocale,
-  translation
+  Locales
 });

package/lib/locales/type.d.ts

@@ -1,5 +1,5 @@
-export declare type Locale = 'original' | 'en' | 'zh-CN' | 'zh-HK' | string;
-export declare type MultiLanguage = {
+export type Locale = 'original' | 'en' | 'zh-CN' | 'zh-HK' | string;
+export type MultiLanguage = {
     [key in Locale]: string;
 };
 export interface LibraryItem {
@@ -16,4 +16,4 @@ export interface LocaleConfig {
         [key in Locale]: LibraryItem;
     };
 }
-export declare type LoadLibraryByUrlParams = (string | Promise<LibraryItem> | (() => Promise<LibraryItem>) | LibraryItem)[];
+export type LoadLibraryByUrlParams = (string | Promise<LibraryItem> | (() => Promise<LibraryItem>) | LibraryItem)[];

package/lib/logger/index.d.ts

@@ -1,5 +1,5 @@
 import App from "../app";
-export declare type LogConsoleType = "info" | "warning" | "error" | "debug";
+export type LogConsoleType = "info" | "warning" | "error" | "debug";
 /**
  * 日志项接口
  */

package/lib/menuManager/hooks.d.ts

@@ -1,8 +1,17 @@
 import React from "react";
 import { MenuItem } from "./index";
 export declare const isHttp: (url: string) => boolean;
+export interface MenuContextType {
+    selectedKeys: string[];
+    openKeys: string[];
+    setOpenKeys: (keys: string[]) => void;
+    handleClick: (key: string) => void;
+    menuItems: MenuItem[];
+    getShowChildren: (children: MenuItem[]) => MenuItem[];
+    setMenuItems: (items: MenuItem[]) => void;
+}
 export declare const MenuProvider: React.FC<{
     children: React.ReactNode;
     menus: MenuItem[];
 }>;
-export declare const useMenu: () => any;
+export declare const useMenu: () => MenuContextType;

package/lib/menuManager/index.d.ts

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

package/lib/models/index.d.ts

@@ -1,7 +1,7 @@
 import hooks from '../hooks';
 import { Provider as StoreProvider } from "react-redux";
-declare const models: (import("./global").GlobalModal | import("./tasks").TasksModal)[];
-declare type ModalsType = (typeof models[number]);
+declare const models: import("./global").GlobalModal[];
+type ModalsType = (typeof models[number]);
 export interface Store {
     getDataByModel: typeof getDataByModel;
     useStore: typeof hooks.useStore;
@@ -10,8 +10,8 @@ export interface Store {
     dispatch: any;
     getState: any;
 }
-export declare type ModelsNames = ModalsType['namespace'];
-export declare type ModelsState = {
+export type ModelsNames = ModalsType['namespace'];
+export type ModelsState = {
     [K in (ModalsType['namespace'])]: Extract<ModalsType, {
         namespace: K;
     }>['state'];
@@ -25,7 +25,7 @@ export declare type ModelsState = {
  * @Author: zhiwei.Wang
  * @Date: 2024-09-03 11:07
  */
-declare const getDataByModel: <T extends "tasks" | "global", D extends keyof ModelsState[T]>(model: string, key?: D | undefined) => D extends undefined ? ModelsState[T] : ModelsState[T][D];
+declare const getDataByModel: <T extends "global", D extends keyof ModelsState[T]>(model: string, key?: D) => D extends undefined ? ModelsState[T] : ModelsState[T][D];
 /**
  * @title: 设置数据到store
  * @description:
@@ -36,7 +36,7 @@ declare const getDataByModel: <T extends "tasks" | "global", D extends keyof Mod
  * @Author: zhiwei.Wang
  * @Date: 2024-09-08 15:17
  */
-declare const setDataByModel: <T extends "tasks" | "global", D extends keyof ModelsState[T]>(model: string, key: any, value: any) => void;
+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;

package/lib/models/index.js

@@ -35,9 +35,8 @@ module.exports = __toCommonJS(models_exports);
 var import_dva_core = require("dva-core");
 var import_hooks = __toESM(require("../hooks"));
 var import_global = __toESM(require("./global"));
-var import_tasks = __toESM(require("./tasks"));
 var import_react_redux = require("react-redux");
-var models = [import_global.default, import_tasks.default];
+var models = [import_global.default];
 var app = (0, import_dva_core.create)();
 models.forEach((item) => app.model(item));
 var getStore = () => app._store;

package/lib/pubsub/index.d.ts

@@ -2,7 +2,7 @@
  * 发布订阅模块
  * 用于组件/服务间的事件通信
  */
-declare type EventCallback = (...args: any[]) => void;
+type EventCallback = (...args: any[]) => void;
 interface EventSubscription {
     unsubscribe: () => void;
 }

package/lib/request/cache.d.ts

@@ -1,5 +1,5 @@
 import { CacheProps } from './type';
-export declare type CacheType = 'memory' | 'storage' | 'indexDB';
+export type CacheType = 'memory' | 'storage' | 'indexDB';
 /**
  * @title: 设置缓存
  * @description:

package/lib/request/config.js

@@ -1,8 +1,6 @@
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -16,14 +14,6 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/request/config.ts
@@ -34,11 +24,11 @@ __export(config_exports, {
 });
 module.exports = __toCommonJS(config_exports);
 var import_constants = require("./constants");
-var import_storage = __toESM(require("../storage"));
+var import_storage = require("../storage");
 var import_lodash = require("lodash");
 var defaultConfig = {
   axiosConfig: import_constants.axiosConfig,
-  storage: import_storage.default,
+  storage: new import_storage.Storage(),
   requestCallbacks: {
     200: (resData) => {
       const { res, props, resolve, reject, err } = resData;

package/lib/request/index.js

@@ -48,7 +48,11 @@ var import_axios = __toESM(require("axios"));
 var import_config = require("./config");
 __reExport(request_exports, require("./type"), module.exports);
 var axiosInstance = import_axios.default.create(import_constants.axiosConfig);
-axiosInstance.interceptors.request.use(import_utils.interceptorsRequest, import_utils.interceptorsRequestError);
+console.log("config1111");
+axiosInstance.interceptors.request.use((config) => {
+  console.log("config11", config);
+  return config;
+}, import_utils.interceptorsRequestError);
 axiosInstance.interceptors.response.use(import_utils.interceptorsResponse, import_utils.interceptorsResponseError);
 var createRequest = (props) => {
   const { data, config, method } = props;

package/lib/request/pisell2Request.d.ts

@@ -1,4 +1,4 @@
-declare type RequestMethod = any;
+type RequestMethod = any;
 declare const pisell2Get: RequestMethod;
 declare const pisell2Post: RequestMethod;
 declare const pisell2Put: RequestMethod;

package/lib/request/type.d.ts

@@ -23,6 +23,7 @@ export interface CacheProps {
     key?: string;
     type?: CacheType;
     updateCache?: boolean;
+    cacheUpdateChange?: (data: any) => void;
 }
 export interface RequestSetting {
     abort?: boolean;

package/lib/request/utils.js

@@ -78,6 +78,7 @@ var interceptorsResponseError = (response) => {
   return (_b = (_a = (0, import_config.getConfig)()).interceptorsResponseError) == null ? void 0 : _b.call(_a, response);
 };
 var requestCallback = (resData) => {
+  var _a;
   const { res, props, resolve, reject, err } = resData;
   try {
     const { config } = props;
@@ -87,6 +88,7 @@ var requestCallback = (resData) => {
       if ((res == null ? void 0 : res.code) === 200) {
         if (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);
         }
       }
       return codeFn(resData);

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): any;
+    renderComponent(item: RouteType, children?: React.ReactNode): string | number | boolean | Iterable<React.ReactNode> | React.JSX.Element | null | undefined;
     getPageByRoute(route: string): ApplicationInterface | undefined;
     getRouterComponent({ fallback }: {
         fallback?: React.ReactNode;
-    }): JSX.Element[];
+    }): React.JSX.Element[];
 }

package/lib/socket/monitor.d.ts

@@ -11,7 +11,7 @@ export interface SocketHistoryItem {
     /** 消息方向（发送/接收） */
     direction: 'in' | 'out';
     /** 消息内容 */
-    message: SocketMessage;
+    message: SocketMessage | Partial<SocketMessage>;
     /** 消息大小（字节） */
     size?: number;
 }

package/lib/socket/types.d.ts

@@ -45,6 +45,7 @@ export interface SocketMessage<T = any> {
     data?: T;
     /** 消息ID */
     id?: string;
+    event?: any;
 }
 /**
  * 心跳配置选项
@@ -75,7 +76,7 @@ export interface ReconnectOptions {
 /**
  * 事件处理函数类型
  */
-export declare type EventHandler = (...args: any[]) => void;
+export type EventHandler = (...args: any[]) => void;
 /**
  * 事件处理函数映射
  */

package/lib/storage/index.d.ts

@@ -1,42 +1,17 @@
-/**
- * @title: 创建storage的key
- * @description:
- * @param {string} key
- * @return {*}
- * @Author: zhiwei.Wang
- * @Date: 2024-09-08 14:52
- */
-export declare const createKey: (key: string) => string;
-/**
- * storage 的增删查, 同时更新 Preferences 内的数据
- * @param key
- * @param value
- */
-export declare const setStorage: (key: string, value: string) => void;
-/**
- * @title: 获取数据 --storage
- * @description:
- * @param {string} key
- * @return {*}
- * @Author: zhiwei.Wang
- * @Date: 2024-09-08 14:53
- */
-export declare const getStorage: (key: string) => string | null;
-/**
- * @title: 删除数据 --storage
- * @description:
- * @param {string} key
- * @return {*}
- * @Author: zhiwei.Wang
- * @Date: 2024-09-08 14:53
- */
-export declare const removeStorage: (key: string) => void;
-declare const _default: {
-    setStorage: (key: string, value: string) => void;
-    getStorage: (key: string) => string | null;
-    removeStorage: (key: string) => void;
-    createKey: (key: string) => string;
-    setConfig: (newConfig: Partial<import("./type").StorageConfig>) => void;
-    getConfig: () => import("./type").StorageConfig;
-};
-export default _default;
+import App from '../app';
+export interface StorageOptions {
+    storageKey?: string;
+    removeStorageAfter?: (key: string) => void;
+    setStorageAfter?: (key: string, value: string) => void;
+}
+export declare class Storage {
+    private storageKey;
+    private app?;
+    private options;
+    constructor(app?: App, options?: StorageOptions);
+    createKey(key: string): string;
+    setStorage(key: string, value: string): void;
+    getStorage(key: string): string | null;
+    removeStorage(key: string): void;
+    clear(): void;
+}

package/lib/storage/index.js

@@ -19,48 +19,45 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/storage/index.ts
 var storage_exports = {};
 __export(storage_exports, {
-  createKey: () => createKey,
-  default: () => storage_default,
-  getStorage: () => getStorage,
-  removeStorage: () => removeStorage,
-  setStorage: () => setStorage
+  Storage: () => Storage
 });
 module.exports = __toCommonJS(storage_exports);
-var import_config = require("./config");
-var getStorageKey = () => {
-  return (0, import_config.getConfig)().STORAGE_KEY;
-};
-var createKey = (key) => {
-  if (key.indexOf(getStorageKey()) !== -1) {
-    return key;
+var Storage = class {
+  constructor(app, options) {
+    this.storageKey = "CapacitorStorage.native_";
+    this.options = {};
+    this.app = app;
+    if (options) {
+      this.options = options;
+    }
+    if (options == null ? void 0 : options.storageKey) {
+      this.storageKey = options.storageKey;
+    }
+  }
+  createKey(key) {
+    if (key.indexOf(this.storageKey) !== -1) {
+      return key;
+    }
+    return this.storageKey + key;
+  }
+  setStorage(key, value) {
+    var _a, _b;
+    localStorage.setItem(this.createKey(key), value);
+    (_b = (_a = this.options) == null ? void 0 : _a.setStorageAfter) == null ? void 0 : _b.call(_a, key, value);
+  }
+  getStorage(key) {
+    return localStorage.getItem(this.createKey(key));
+  }
+  removeStorage(key) {
+    var _a, _b;
+    localStorage.removeItem(this.createKey(key));
+    (_b = (_a = this.options) == null ? void 0 : _a.removeStorageAfter) == null ? void 0 : _b.call(_a, key);
+  }
+  clear() {
+    localStorage.clear();
   }
-  return getStorageKey() + key;
-};
-var setStorage = (key, value) => {
-  var _a, _b;
-  localStorage.setItem(createKey(key), value);
-  (_b = (_a = (0, import_config.getConfig)()).setStorageAfter) == null ? void 0 : _b.call(_a, key, value);
-};
-var getStorage = (key) => {
-  return localStorage.getItem(createKey(key));
-};
-var removeStorage = (key) => {
-  var _a, _b;
-  localStorage.removeItem(createKey(key));
-  (_b = (_a = (0, import_config.getConfig)()).removeStorageAfter) == null ? void 0 : _b.call(_a, key);
-};
-var storage_default = {
-  setStorage,
-  getStorage,
-  removeStorage,
-  createKey,
-  setConfig: import_config.setConfig,
-  getConfig: import_config.getConfig
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  createKey,
-  getStorage,
-  removeStorage,
-  setStorage
+  Storage
 });

package/lib/tasks/index.d.ts

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