@ibiz-template/core 0.0.1-alpha.1 → 0.0.1-alpha.13

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

@@ -1,3 +1,4 @@
+import { DebounceSettings } from 'lodash-es';
 /**
  * 获取认证令牌
  *
@@ -7,4 +8,32 @@
  * @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] 防抖的延迟毫秒数
+ * @param {DebounceSettings} [options] 防抖函数的额外参数
+ * @returns {*}
+ */
+export declare function debounceAndMerge<T extends (...args: any[]) => any>(func: T, mergeFunc: (oldParams: Parameters<T>, newParams: Parameters<T>) => Parameters<T>, wait?: number, options?: DebounceSettings): (...args: Parameters<T>) => any;
 //# 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":"AACA,OAAO,EAAY,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAIvD;;;;;;;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,EACb,OAAO,CAAC,EAAE,gBAAgB,aAaT,WAAW,CAAC,CAAC,SAS/B"}

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,51 @@ 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] 防抖的延迟毫秒数
+ * @param {DebounceSettings} [options] 防抖函数的额外参数
+ * @returns {*}
+ */
+export function debounceAndMerge(func, mergeFunc, wait, options) {
+    // 缓存上一次的函数参数
+    let oldParams;
+    const debounceFunc = debounce((...params) => {
+        // 防抖函数执行的时候清空缓存参数
+        oldParams = undefined;
+        return func(...params);
+    }, wait, options);
+    return (...args) => {
+        // 合并参数，并把参数缓存到oldParams里，用新参数调用防抖函数
+        let newParams = args;
+        if (oldParams) {
+            newParams = mergeFunc(oldParams, newParams);
+        }
+        oldParams = newParams;
+        return debounceFunc(...newParams);
+    };
+}

package/package.json

@@ -1,9 +1,13 @@
 {
   "name": "@ibiz-template/core",
-  "version": "0.0.1-alpha.1",
+  "version": "0.0.1-alpha.13",
   "description": "核心包",
   "main": "out/index.js",
   "types": "out/index.d.ts",
+  "repository": {
+    "type": "git",
+    "url": "https://gitee.com/iBizModeling/ibiz-template.git"
+  },
   "files": [
     "out",
     "src"
@@ -11,23 +15,29 @@
   "scripts": {
     "dev": "tsc --watch",
     "build": "npm run lint && npm run clean && tsc --build",
-    "lint": "eslint src/**/*.ts",
-    "lint:fix": "eslint --fix src/**/*.ts",
+    "lint": "eslint 'src/**/*.ts'",
+    "lint:fix": "eslint --fix 'src/**/*.ts'",
     "clean": "rimraf out",
+    "test": "jest",
     "publish:next": "npm run build && npm publish --access public --tag next",
     "publish:npm": "npm run build && npm publish --access public"
   },
   "author": "chitanda",
   "license": "MIT",
   "dependencies": {
-    "@ibiz-template/command": "^0.0.1-alpha.1",
-    "@ibiz-template/model": "^0.0.1-alpha.1",
     "axios": "^0.27.2",
-    "qs": "^6.11.0",
-    "qx-util": "^0.1.2"
+    "pluralize": "^8.0.0",
+    "qs": "^6.11.0"
   },
   "devDependencies": {
-    "@types/qs": "^6.9.7"
+    "@types/pluralize": "^0.0.29",
+    "@types/qs": "^6.9.7",
+    "lodash-es": "^4.17.21",
+    "qx-util": "^0.4.1"
+  },
+  "peerDependencies": {
+    "lodash-es": "^4.17.21",
+    "qx-util": "^0.4.1"
   },
-  "gitHead": "4ea59555405794d91b25e807a92bbefa080108fb"
+  "gitHead": "e72517e4226353804443c9a0cd7b40aaf0edf846"
 }

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,2 @@
 export { CoreConst } from './core/core';
+export { HttpStatusMessageConst } from './http-status-message/http-status-message';

package/src/context/index.ts

@@ -2,6 +2,9 @@
 /* eslint-disable no-constructor-return */
 /* eslint-disable no-underscore-dangle */
 /* eslint-disable max-classes-per-file */
+
+import { clone } from 'lodash-es';
+
 /**
  * 上下文代理处理
  *
@@ -17,14 +20,14 @@ export class IBizContextProxyHandle implements ProxyHandler<IBizContext> {
   }
 
   get(target: IBizContext, p: string | symbol, _receiver: unknown): unknown {
-    if (target[p]) {
+    if (target[p] !== undefined) {
       return target[p];
     }
-    if (target.context[p]) {
+    if (target.context[p] !== undefined) {
       return target.context[p];
     }
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    if ((target as any)._parent) {
+    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];
     }
@@ -51,14 +54,14 @@ export class IBizContext implements IContext {
    * @protected
    * @type {(IBizContext | null)}
    */
-  protected _parent: IBizContext | null = null;
+  protected _parent: IContext | null = null;
 
   /**
    * 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) {
@@ -80,6 +83,22 @@ export class IBizContext implements IContext {
     return new Proxy(this, new IBizContextProxyHandle());
   }
 
+  /**
+   * 获取所有上下文参数，无多层级默认合并
+   *
+   * @author chitanda
+   * @date 2022-09-28 14:09:20
+   * @return {*}  {IContext}
+   */
+  getContext(): IContext {
+    if (this.parent) {
+      const ctx = this.parent.getContext();
+      Object.assign(ctx, clone(this.context));
+      return ctx;
+    }
+    return clone(this.context);
+  }
+
   /**
    * 销毁上下文，避免内存泄漏
    *

package/src/environment/environment.ts

@@ -4,5 +4,10 @@ import { IEnvironment } from '../interface';
  * 环境变量
  */
 export const Environment: IEnvironment = {
-  baseUrl: '/trainsys__web',
+  baseUrl: '',
+  remoteModelUrl: '/remotemodel',
+  assetsUrl: './assets',
+  dcSystem: '',
+  ExportFile: '/ibizutil/download',
+  UploadFile: '/ibizutil/upload',
 };

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/ibizsys.ts

@@ -1,4 +1,3 @@
-import { commands } from '@ibiz-template/command';
 import { Environment } from './environment/environment';
 import { OrgData } from './interface';
 import { Net } from './utils';
@@ -20,14 +19,6 @@ export class IBizSys {
    */
   env = Environment;
 
-  /**
-   * 指令控制器
-   *
-   * @author chitanda
-   * @date 2022-07-21 17:07:45
-   */
-  commands = commands;
-
   /**
    * 网络请求工具类
    *
@@ -35,7 +26,7 @@ export class IBizSys {
    * @date 2022-07-19 17:07:56
    * @type {Net}
    */
-  net: Net = new Net(this.env.baseUrl);
+  net: Net = new Net();
 
   /**
    * sass 模式下的中心系统标识

package/src/index.ts

@@ -1,10 +1,9 @@
 import './types';
 
-export { commands } from '@ibiz-template/command';
-
 export * from './constant';
 export { IBizContext, IBizContextProxyHandle } from './context';
 export { Environment } from './environment/environment';
+export * from './error';
 export * from './interface';
 export * from './utils';
 export { IBizSys } from './ibizsys';

package/src/install.ts

@@ -9,8 +9,9 @@ import { Interceptor } from './utils';
  * @export
  */
 export function install(): void {
-  if (!window.ibiz) {
-    window.ibiz = new IBizSys();
+  if (window.ibiz) {
+    throw new Error('ibiz 已经存在, 无需重复安装');
   }
+  window.ibiz = new IBizSys();
   new Interceptor();
 }

package/src/interface/i-environment/i-environment.ts

@@ -7,8 +7,15 @@
  * @interface IEnvironment
  */
 export interface IEnvironment {
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  [key: string | symbol]: any;
+  /**
+   * 命名空间
+   *
+   * @author chitanda
+   * @date 2022-09-06 11:09:32
+   * @type {string}
+   */
+  namespace?: string;
+
   /**
    * 请求根路径
    *
@@ -17,4 +24,49 @@ export interface IEnvironment {
    * @type {string}
    */
   baseUrl: string;
+
+  /**
+   * 远程模型路径
+   *
+   * @author chitanda
+   * @date 2022-09-22 18:09:25
+   * @type {string}
+   */
+  remoteModelUrl: string;
+
+  /**
+   * 资源文件根路径
+   *
+   * @author lxm
+   * @date 2022-08-25 14:08:08
+   * @type {string}
+   */
+  assetsUrl: string;
+
+  /**
+   * 中心系统标识
+   *
+   * @author chitanda
+   * @date 2022-08-22 23:08:46
+   * @type {string}
+   */
+  dcSystem: string;
+
+  /**
+   * 文件导出
+   *
+   * @author chitanda
+   * @date 2022-08-22 23:08:46
+   * @type {string}
+   */
+  ExportFile: string;
+
+  /**
+   * 文件上传
+   *
+   * @author chitanda
+   * @date 2022-08-22 23:08:46
+   * @type {string}
+   */
+  UploadFile: string;
 }

package/src/types.ts

@@ -40,4 +40,15 @@ declare global {
   interface IData {
     [key: string | symbol]: any;
   }
+
+  /**
+   * 任意对象结构
+   *
+   * @author chitanda
+   * @date 2022-09-21 15:09:30
+   * @interface IObject
+   */
+  interface IObject {
+    [key: string | symbol]: any;
+  }
 }

package/src/utils/index.ts

@@ -1,3 +1,6 @@
 export { Interceptor } from './interceptor/interceptor';
-export { Net, NetResponse } from './net/net';
-export { getToken } from './util/util';
+export { Namespace } from './namespace/namespace';
+export { IHttpResponse, HttpResponse } from './net/http-response';
+export { Net } from './net/net';
+export { plural, pluralLower } from './plural/plural';
+export * from './util/util';