@ibiz-template/core 0.0.1-alpha.4 → 0.0.1-alpha.40

package/out/utils/url-helper/url-helper.d.ts

@@ -0,0 +1,51 @@
+/**
+ * 路径解析助手
+ *
+ * @author lxm
+ * @date 2022-10-11 14:10:12
+ * @export
+ * @class UrlHelper
+ */
+export declare class UrlHelper {
+    /**
+     * 路由路径前面的基础路径
+     * 如：http://172.16.103.120:30061/portalwebapp/#/index/appportalview?params=123
+     * 返回：http://172.16.103.120:30061/portalwebapp/#
+     *
+     * @author lxm
+     * @date 2022-10-11 20:10:29
+     * @returns {*}
+     */
+    static get routeBase(): string;
+    /**
+     * 应用的的基础路径
+     * 如：http://172.16.103.120:30061/portalwebapp/#/index/appportalview?params=123
+     * 返回：http://172.16.103.120:30061/portalwebapp
+     *
+     * @author lxm
+     * @date 2022-10-11 20:10:29
+     * @returns {*}
+     */
+    static get appBase(): string;
+    /**
+     * #开始到末尾，即路由地址
+     * 如：http://172.16.103.120:30061/portalwebapp/#/index/appportalview?params=123
+     * 返回：/index/appportalview?params=123
+     *
+     * @author lxm
+     * @date 2022-10-11 16:10:40
+     * @returns {*}
+     */
+    static get routePath(): string;
+    /**
+     * 当前地址的全路径，包含域名和参数
+     * 如：http://172.16.103.120:30061/portalwebapp/#/index/appportalview?params=123
+     *
+     * @author lxm
+     * @date 2022-10-11 21:10:39
+     * @readonly
+     * @static
+     */
+    static get fullPath(): string;
+}
+//# sourceMappingURL=url-helper.d.ts.map

package/out/utils/url-helper/url-helper.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"url-helper.d.ts","sourceRoot":"","sources":["../../../src/utils/url-helper/url-helper.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,qBAAa,SAAS;IACpB;;;;;;;;OAQG;IACH,MAAM,KAAK,SAAS,WAEnB;IAED;;;;;;;;OAQG;IACH,MAAM,KAAK,OAAO,WAGjB;IAED;;;;;;;;OAQG;IACH,MAAM,KAAK,SAAS,WAEnB;IAED;;;;;;;;OAQG;IACH,MAAM,KAAK,QAAQ,WAElB;CACF"}

package/out/utils/url-helper/url-helper.js

@@ -0,0 +1,59 @@
+/**
+ * 路径解析助手
+ *
+ * @author lxm
+ * @date 2022-10-11 14:10:12
+ * @export
+ * @class UrlHelper
+ */
+export class UrlHelper {
+    /**
+     * 路由路径前面的基础路径
+     * 如：http://172.16.103.120:30061/portalwebapp/#/index/appportalview?params=123
+     * 返回：http://172.16.103.120:30061/portalwebapp/#
+     *
+     * @author lxm
+     * @date 2022-10-11 20:10:29
+     * @returns {*}
+     */
+    static get routeBase() {
+        return `${this.appBase}/#`;
+    }
+    /**
+     * 应用的的基础路径
+     * 如：http://172.16.103.120:30061/portalwebapp/#/index/appportalview?params=123
+     * 返回：http://172.16.103.120:30061/portalwebapp
+     *
+     * @author lxm
+     * @date 2022-10-11 20:10:29
+     * @returns {*}
+     */
+    static get appBase() {
+        const { origin, pathname } = window.location;
+        return `${origin}${pathname}`.replace(/\/$/, '');
+    }
+    /**
+     * #开始到末尾，即路由地址
+     * 如：http://172.16.103.120:30061/portalwebapp/#/index/appportalview?params=123
+     * 返回：/index/appportalview?params=123
+     *
+     * @author lxm
+     * @date 2022-10-11 16:10:40
+     * @returns {*}
+     */
+    static get routePath() {
+        return window.location.hash.replace('#', '');
+    }
+    /**
+     * 当前地址的全路径，包含域名和参数
+     * 如：http://172.16.103.120:30061/portalwebapp/#/index/appportalview?params=123
+     *
+     * @author lxm
+     * @date 2022-10-11 21:10:39
+     * @readonly
+     * @static
+     */
+    static get fullPath() {
+        return window.location.href;
+    }
+}

package/out/utils/util/util.d.ts

@@ -7,4 +7,49 @@
  * @return {*}  {(string | null)}
  */
 export declare function getToken(): string | null;
+/**
+ * 判断两个数组是否有相同的元素
+ *
+ * @author lxm
+ * @date 2022-09-20 19:09:29
+ * @export
+ * @param {any[]} arr1
+ * @param {any[]} arr2
+ * @returns {*}  {boolean}
+ */
+export declare function isOverlap(arr1: any[], arr2: any[]): boolean;
+/**
+ * 防抖并合并每次的参数，
+ * 最后一次才会执行
+ *
+ * @author lxm
+ * @date 2022-09-20 21:09:53
+ * @export
+ * @template T
+ * @param {T} func 要防抖的函数
+ * @param {(
+ *     oldParams: Parameters<T>,
+ *     newParams: Parameters<T>,
+ *   ) => Parameters<T>} mergeFunc 合并的回调函数
+ * @param {number} [wait] 防抖的延迟毫秒数
+ * @returns {*}
+ */
+export declare function debounceAndMerge<T extends (...args: any[]) => any>(func: T, mergeFunc: (oldParams: Parameters<T>, newParams: Parameters<T>) => Parameters<T>, wait?: number): (...args: Parameters<T>) => any;
+/**
+ * 防抖并合并每次的参数，最后一次才会执行
+ * 绑定方法为异步方法，给每次调用返回最终执行那次的结果
+ *
+ * @author lxm
+ * @date 2022-09-20 21:09:53
+ * @export
+ * @template T
+ * @param {T} func 要防抖的函数
+ * @param {(
+ *     oldParams: Parameters<T>,
+ *     newParams: Parameters<T>,
+ *   ) => Parameters<T>} mergeFunc 合并的回调函数
+ * @param {number} [wait] 防抖的延迟毫秒数
+ * @returns {*}
+ */
+export declare function debounceAndAsyncMerge<T extends (...args: any[]) => Promise<any>>(func: T, mergeFunc: (oldParams: Parameters<T>, newParams: Parameters<T>) => Parameters<T>, wait?: number): T;
 //# sourceMappingURL=util.d.ts.map

package/out/utils/util/util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../src/utils/util/util.ts"],"names":[],"mappings":"AAGA;;;;;;;GAOG;AACH,wBAAgB,QAAQ,IAAI,MAAM,GAAG,IAAI,CAExC"}
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../src/utils/util/util.ts"],"names":[],"mappings":"AAKA;;;;;;;GAOG;AACH,wBAAgB,QAAQ,IAAI,MAAM,GAAG,IAAI,CAExC;AAED;;;;;;;;;GASG;AACH,wBAAgB,SAAS,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,OAAO,CAG3D;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,gBAAgB,CAAC,CAAC,SAAS,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,EAChE,IAAI,EAAE,CAAC,EACP,SAAS,EAAE,CACT,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC,EACxB,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC,KACrB,UAAU,CAAC,CAAC,CAAC,EAClB,IAAI,CAAC,EAAE,MAAM,aASI,WAAW,CAAC,CAAC,SAS/B;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,qBAAqB,CACnC,CAAC,SAAS,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC,GAAG,CAAC,EAE1C,IAAI,EAAE,CAAC,EACP,SAAS,EAAE,CACT,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC,EACxB,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC,KACrB,UAAU,CAAC,CAAC,CAAC,EAClB,IAAI,CAAC,EAAE,MAAM,GACZ,CAAC,CA6BH"}

package/out/utils/util/util.js

@@ -1,3 +1,5 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+import { debounce } from 'lodash-es';
 import { getCookie } from 'qx-util';
 import { CoreConst } from '../../constant';
 /**
@@ -11,3 +13,97 @@ import { CoreConst } from '../../constant';
 export function getToken() {
     return getCookie(CoreConst.TOKEN);
 }
+/**
+ * 判断两个数组是否有相同的元素
+ *
+ * @author lxm
+ * @date 2022-09-20 19:09:29
+ * @export
+ * @param {any[]} arr1
+ * @param {any[]} arr2
+ * @returns {*}  {boolean}
+ */
+export function isOverlap(arr1, arr2) {
+    const newArr = Array.from(new Set([...arr1, ...arr2]));
+    return newArr.length !== arr1.length + arr2.length;
+}
+/**
+ * 防抖并合并每次的参数，
+ * 最后一次才会执行
+ *
+ * @author lxm
+ * @date 2022-09-20 21:09:53
+ * @export
+ * @template T
+ * @param {T} func 要防抖的函数
+ * @param {(
+ *     oldParams: Parameters<T>,
+ *     newParams: Parameters<T>,
+ *   ) => Parameters<T>} mergeFunc 合并的回调函数
+ * @param {number} [wait] 防抖的延迟毫秒数
+ * @returns {*}
+ */
+export function debounceAndMerge(func, mergeFunc, wait) {
+    // 缓存上一次的函数参数
+    let oldParams;
+    const debounceFunc = debounce((...params) => {
+        // 防抖函数执行的时候清空缓存参数
+        oldParams = undefined;
+        return func(...params);
+    }, wait);
+    return (...args) => {
+        // 合并参数，并把参数缓存到oldParams里，用新参数调用防抖函数
+        let newParams = args;
+        if (oldParams) {
+            newParams = mergeFunc(oldParams, newParams);
+        }
+        oldParams = newParams;
+        return debounceFunc(...newParams);
+    };
+}
+/**
+ * 防抖并合并每次的参数，最后一次才会执行
+ * 绑定方法为异步方法，给每次调用返回最终执行那次的结果
+ *
+ * @author lxm
+ * @date 2022-09-20 21:09:53
+ * @export
+ * @template T
+ * @param {T} func 要防抖的函数
+ * @param {(
+ *     oldParams: Parameters<T>,
+ *     newParams: Parameters<T>,
+ *   ) => Parameters<T>} mergeFunc 合并的回调函数
+ * @param {number} [wait] 防抖的延迟毫秒数
+ * @returns {*}
+ */
+export function debounceAndAsyncMerge(func, mergeFunc, wait) {
+    // 缓存上一次的函数参数
+    let oldParams;
+    let promises = [];
+    const debounceFunc = debounce(async (...params) => {
+        // 防抖函数执行的时候清空缓存参数
+        oldParams = undefined;
+        const result = await func(...params);
+        promises.forEach(promise => {
+            promise.resolve(result);
+        });
+        promises = [];
+        return result;
+    }, wait);
+    const fun = async (...args) => {
+        // 合并参数，并把参数缓存到oldParams里，用新参数调用防抖函数
+        let newParams = args;
+        if (oldParams) {
+            newParams = mergeFunc(oldParams, newParams);
+        }
+        oldParams = newParams;
+        // 执行防抖函数
+        debounceFunc(...newParams);
+        return new Promise((resolve, reject) => {
+            // 阻塞当前调用，当防抖函数被执行后返回
+            promises.push({ resolve, reject });
+        });
+    };
+    return fun;
+}

package/package.json

@@ -1,19 +1,27 @@
 {
   "name": "@ibiz-template/core",
-  "version": "0.0.1-alpha.4",
+  "version": "0.0.1-alpha.40",
   "description": "核心包",
+  "type": "module",
   "main": "out/index.js",
   "types": "out/index.d.ts",
+  "system": "./dist/system/index.system.js",
+  "repository": {
+    "type": "git",
+    "url": "https://gitee.com/iBizModeling/ibiz-template.git"
+  },
   "files": [
+    "dist",
     "out",
     "src"
   ],
   "scripts": {
     "dev": "tsc --watch",
-    "build": "npm run lint && npm run clean && tsc --build",
+    "build": "npm run lint && npm run clean && npm run build:rollup && tsc --build",
+    "build:rollup": "rollup -c",
     "lint": "eslint 'src/**/*.ts'",
     "lint:fix": "eslint --fix 'src/**/*.ts'",
-    "clean": "rimraf out",
+    "clean": "rimraf out dist",
     "test": "jest",
     "publish:next": "npm run build && npm publish --access public --tag next",
     "publish:npm": "npm run build && npm publish --access public"
@@ -21,17 +29,20 @@
   "author": "chitanda",
   "license": "MIT",
   "dependencies": {
-    "axios": "^0.27.2",
+    "axios": "^1.1.3",
+    "loglevel": "^1.8.0",
     "pluralize": "^8.0.0",
     "qs": "^6.11.0"
   },
   "devDependencies": {
     "@types/pluralize": "^0.0.29",
     "@types/qs": "^6.9.7",
-    "qx-util": "^0.4.0"
+    "lodash-es": "^4.17.21",
+    "qx-util": "^0.4.4"
   },
   "peerDependencies": {
-    "qx-util": "^0.4.0"
+    "lodash-es": "^4.17.21",
+    "qx-util": "^0.4.4"
   },
-  "gitHead": "e21190e748f8e9ccdcda19ce09bc21c8e0ad7e87"
+  "gitHead": "be7fae93941fcce8a2c0fa9f4158e9525bcdb55d"
 }

package/src/constant/http-status-message/http-status-message.ts

@@ -0,0 +1,20 @@
+/**
+ * 请求状态码文本
+ */
+export const HttpStatusMessageConst: Record<number, string> = {
+  200: '服务器成功返回请求的数据。',
+  201: '新建或修改数据成功。',
+  202: '一个请求已经进入后台排队（异步任务）。',
+  204: '删除数据成功。',
+  400: '发出的请求有错误，服务器没有进行新建或修改数据的操作。',
+  401: '用户没有权限（令牌、用户名、密码错误）。',
+  403: '用户得到授权，但是访问是被禁止的。',
+  404: '发出的请求针对的是不存在的记录，服务器没有进行操作。',
+  406: '请求的格式不可得。',
+  410: '请求的资源被永久删除，且不会再得到的。',
+  422: '当创建一个对象时，发生一个验证错误。',
+  500: '服务器发生错误，请检查服务器。',
+  502: '网关错误。',
+  503: '服务不可用，服务器暂时过载或维护。',
+  504: '网关超时。',
+};

package/src/constant/index.ts

@@ -1 +1,5 @@
 export { CoreConst } from './core/core';
+export * from './util/util';
+export { HttpStatusMessageConst } from './http-status-message/http-status-message';
+export { LoginMode } from './login-mode/login-mode';
+export { MenuPermissionMode } from './menu-permission-mode/menu-permission-mode';

package/src/constant/login-mode/login-mode.ts

@@ -0,0 +1,23 @@
+/* eslint-disable no-shadow */
+/**
+ * 登录模式
+ *
+ * @author lxm
+ * @date 2022-10-12 14:10:56
+ * @export
+ * @enum {number}
+ */
+export enum LoginMode {
+  /**
+   * 默认标准登录
+   */
+  DEFAULT = 'DEFAULT',
+  /**
+   * 自定义登录
+   */
+  CUSTOM = 'CUSTOM',
+  /**
+   * 中央认证登录
+   */
+  CAS = 'CAS',
+}

package/src/constant/menu-permission-mode/menu-permission-mode.ts

@@ -0,0 +1,23 @@
+/* eslint-disable no-shadow */
+/**
+ * 菜单权限校验模式
+ *
+ * @author lxm
+ * @date 2022-10-12 14:10:56
+ * @export
+ * @enum {number}
+ */
+export enum MenuPermissionMode {
+  /**
+   * 混合模式（默认）
+   */
+  MIXIN = 'MIXIN',
+  /**
+   * 统一资源模式
+   */
+  RESOURCE = 'RESOURCE',
+  /**
+   * RT模式
+   */
+  RT = 'RT',
+}

package/src/constant/util/util.ts

@@ -0,0 +1,5 @@
+/* eslint-disable @typescript-eslint/no-empty-function */
+/**
+ * 无操作函数
+ */
+export const NOOP = () => {};

package/src/context/index.ts

@@ -1,36 +1,3 @@
-/* eslint-disable no-param-reassign */
-/* eslint-disable no-constructor-return */
-/* eslint-disable no-underscore-dangle */
-/* eslint-disable max-classes-per-file */
-/**
- * 上下文代理处理
- *
- * @author chitanda
- * @date 2022-07-14 10:07:45
- * @class IBizContextProxyHandle
- * @implements {ProxyHandler<IBizContext>}
- */
-export class IBizContextProxyHandle implements ProxyHandler<IBizContext> {
-  set(target: IBizContext, p: string | symbol, value: unknown): boolean {
-    target.context[p] = value;
-    return true;
-  }
-
-  get(target: IBizContext, p: string | symbol, _receiver: unknown): unknown {
-    if (target[p] !== undefined) {
-      return target[p];
-    }
-    if (target.context[p] !== undefined) {
-      return target.context[p];
-    }
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    if ((target as any)._parent && (target as any)._parent[p] !== undefined) {
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      return (target as any)._parent[p];
-    }
-  }
-}
-
 /**
  * 上下文处理类
  *
@@ -43,51 +10,50 @@ export class IBizContext implements IContext {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   [key: string | symbol]: any;
 
-  /**
-   * 父上下文
-   *
-   * @author chitanda
-   * @date 2022-07-14 10:07:06
-   * @protected
-   * @type {(IBizContext | null)}
-   */
-  protected _parent: IBizContext | null = null;
+  protected _context!: IContext;
 
   /**
    * Creates an instance of IBizContext.
    *
    * @author chitanda
    * @date 2022-07-14 10:07:15
-   * @param {IContext} [context={}]
+   * @param {IContext} [context={}] 自身的上下文
    * @param {IBizContext} [parent]
    */
-  constructor(public context: IContext = {}, parent?: IBizContext) {
+  // eslint-disable-next-line default-param-last
+  constructor(context: IContext = {}, parent?: IBizContext) {
     if (parent) {
-      this._parent = parent;
+      // eslint-disable-next-line @typescript-eslint/no-this-alias
+      const self = this;
+      // 定义私有变量，用于存储父已有上下文，方便覆盖
+      Object.defineProperty(this, '_context', {
+        enumerable: false,
+        value: {},
+      });
+      // 监控父上下文参数，自身不存在时从父取
+      const properties: { [key: string]: PropertyDescriptor } = {};
+      const keys = Object.keys(parent);
+      keys.forEach(key => {
+        properties[key] = {
+          enumerable: true,
+          set(val: unknown) {
+            if (val == null) {
+              self._context[key] = null;
+            } else {
+              self._context[key] = val;
+            }
+          },
+          get() {
+            if (self._context[key] !== undefined) {
+              return self._context[key];
+            }
+            return parent[key];
+          },
+        };
+      });
+      Object.defineProperties(this, properties);
     }
-    return this.createProxy();
-  }
-
-  /**
-   * 创建代理
-   *
-   * @author chitanda
-   * @date 2022-07-14 11:07:37
-   * @protected
-   * @return {*}  {IBizContext}
-   */
-  protected createProxy(): IBizContext {
-    return new Proxy(this, new IBizContextProxyHandle());
-  }
-
-  /**
-   * 销毁上下文，避免内存泄漏
-   *
-   * @author chitanda
-   * @date 2022-07-14 11:07:45
-   */
-  destroy(): void {
-    this.context = {};
-    this._parent = null;
+    // 合并给入上下文
+    Object.assign(this, context);
   }
 }

package/src/environment/environment.ts

@@ -1,12 +1,22 @@
+import { LoginMode, MenuPermissionMode } from '../constant';
 import { IEnvironment } from '../interface';
 
 /**
  * 环境变量
  */
 export const Environment: IEnvironment = {
+  dev: false,
+  logLevel: 'ERROR',
+  jsCdn: 'https://cdn.jsdelivr.net',
   baseUrl: '',
-  assetsUrl: './assets/',
+  pluginBaseUrl: './plugins',
+  remoteModelUrl: '/remotemodel',
+  assetsUrl: './assets',
   dcSystem: '',
   ExportFile: '/ibizutil/download',
   UploadFile: '/ibizutil/upload',
+  casLoginUrl: '',
+  loginMode: LoginMode.DEFAULT,
+  menuPermissionMode: MenuPermissionMode.MIXIN,
+  enablePermission: true,
 };

package/src/error/http-error/http-error.ts

@@ -0,0 +1,43 @@
+import { AxiosError, AxiosResponse } from 'axios';
+import { HttpStatusMessageConst } from '../../constant';
+
+/**
+ * 请求异常
+ *
+ * @author chitanda
+ * @date 2022-09-18 17:09:10
+ * @export
+ * @class HttpError
+ * @implements {Error}
+ */
+export class HttpError implements Error {
+  name: string = 'HttpError';
+
+  message: string;
+
+  status: number;
+
+  response?: AxiosResponse;
+
+  constructor(err: AxiosError) {
+    const res = err.response;
+    this.response = err.response;
+    if (res) {
+      if (res.data) {
+        this.message = (res.data as IData).message;
+      } else {
+        this.message = res.statusText;
+      }
+      if (!this.message) {
+        this.message = HttpStatusMessageConst[res.status];
+      }
+      if (!this.message) {
+        this.message = '网络异常，请稍后重试!';
+      }
+      this.status = res.status;
+    } else {
+      this.message = err.message;
+      this.status = 500;
+    }
+  }
+}

package/src/error/index.ts

@@ -0,0 +1,2 @@
+export { HttpError } from './http-error/http-error';
+export { RuntimeError } from './runtime-error/runtime-error';

package/src/error/runtime-error/runtime-error.ts

@@ -0,0 +1,14 @@
+/**
+ * 运行时异常
+ *
+ * @author lxm
+ * @date 2022-09-21 18:09:09
+ * @export
+ * @class RuntimeError
+ * @implements {Error}
+ */
+export class RuntimeError implements Error {
+  name: string = 'Runtime Error';
+
+  constructor(public message: string) {}
+}

package/src/factory-center.ts

@@ -0,0 +1,9 @@
+/**
+ * 工厂类挂载中心，挂载各种解耦用创建工厂
+ *
+ * @author lxm
+ * @date 2022-10-17 15:10:04
+ * @export
+ * @class FactoryCenter
+ */
+export class FactoryCenter {}

package/src/ibizsys.ts

@@ -1,6 +1,6 @@
 import { Environment } from './environment/environment';
 import { OrgData } from './interface';
-import { Net } from './utils';
+import { Logger, Net } from './utils';
 
 /**
  * 全局对象
@@ -19,6 +19,14 @@ export class IBizSys {
    */
   env = Environment;
 
+  /**
+   * 日志对象
+   *
+   * @author chitanda
+   * @date 2022-10-25 20:10:22
+   */
+  log = Logger;
+
   /**
    * 网络请求工具类
    *

package/src/index.ts

@@ -1,9 +1,11 @@
 import './types';
 
 export * from './constant';
-export { IBizContext, IBizContextProxyHandle } from './context';
+export { IBizContext } from './context';
 export { Environment } from './environment/environment';
+export * from './error';
 export * from './interface';
 export * from './utils';
 export { IBizSys } from './ibizsys';
+export { FactoryCenter } from './factory-center';
 export { install } from './install';