@ibiz-template/core 0.0.1-alpha.6 → 0.0.1-beta.130

package/out/utils/util/util.js

@@ -25,10 +25,11 @@ export function getToken() {
  */
 export function isOverlap(arr1, arr2) {
     const newArr = Array.from(new Set([...arr1, ...arr2]));
-    return newArr.length === arr1.length + arr2.length;
+    return newArr.length !== arr1.length + arr2.length;
 }
 /**
- * 防抖并合并每次的参数
+ * 防抖并合并每次的参数，
+ * 最后一次才会执行
  *
  * @author lxm
  * @date 2022-09-20 21:09:53
@@ -40,17 +41,16 @@ export function isOverlap(arr1, arr2) {
  *     newParams: Parameters<T>,
  *   ) => Parameters<T>} mergeFunc 合并的回调函数
  * @param {number} [wait] 防抖的延迟毫秒数
- * @param {DebounceSettings} [options] 防抖函数的额外参数
  * @returns {*}
  */
-export function debounceAndMerge(func, mergeFunc, wait, options) {
+export function debounceAndMerge(func, mergeFunc, wait) {
     // 缓存上一次的函数参数
     let oldParams;
     const debounceFunc = debounce((...params) => {
         // 防抖函数执行的时候清空缓存参数
         oldParams = undefined;
         return func(...params);
-    }, wait, options);
+    }, wait);
     return (...args) => {
         // 合并参数，并把参数缓存到oldParams里，用新参数调用防抖函数
         let newParams = args;
@@ -61,3 +61,57 @@ export function debounceAndMerge(func, mergeFunc, wait, options) {
         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;
+        try {
+            const result = await func(...params);
+            promises.forEach(promise => {
+                promise.resolve(result);
+            });
+            promises = [];
+            return result;
+        }
+        catch (error) {
+            promises.forEach(promise => {
+                promise.reject(error);
+            });
+            promises = [];
+        }
+    }, 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,27 +1,37 @@
 {
   "name": "@ibiz-template/core",
-  "version": "0.0.1-alpha.6",
+  "version": "0.0.1-beta.130",
   "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"
+    "prepublish": "npm run build",
+    "publish:next": "npm publish --access public --tag next",
+    "publish:npm": "npm publish --access public"
   },
   "author": "chitanda",
   "license": "MIT",
   "dependencies": {
-    "axios": "^0.27.2",
+    "axios": "^1.2.1",
+    "loglevel": "^1.8.0",
     "pluralize": "^8.0.0",
     "qs": "^6.11.0"
   },
@@ -29,11 +39,12 @@
     "@types/pluralize": "^0.0.29",
     "@types/qs": "^6.9.7",
     "lodash-es": "^4.17.21",
-    "qx-util": "^0.4.1"
+    "qx-util": "^0.4.8",
+    "ramda": "^0.28.0"
   },
   "peerDependencies": {
     "lodash-es": "^4.17.21",
-    "qx-util": "^0.4.1"
-  },
-  "gitHead": "0af61790674d0f38ffcf2697fc8b2d2324507ce7"
+    "qx-util": "^0.4.8",
+    "ramda": "^0.28.0"
+  }
 }

package/src/constant/core/core.ts

@@ -20,4 +20,14 @@ export class CoreConst {
    * @static
    */
   static readonly TOKEN = 'access_token';
+
+  /**
+   * 访问令牌标识过期时间
+   *
+   * @author lxm
+   * @date 2023-02-13 07:11:33
+   * @static
+   * @memberof CoreConst
+   */
+  static readonly TOKEN_EXPIRES = 'access_token_expires';
 }

package/src/constant/index.ts

@@ -1,2 +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,35 +1,4 @@
-/* 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];
-    }
-  }
-}
+import { clone } from 'ramda';
 
 /**
  * 上下文处理类
@@ -44,50 +13,157 @@ export class IBizContext implements IContext {
   [key: string | symbol]: any;
 
   /**
-   * 父上下文
+   * clone 后引用的上下文实例，需要在实例销毁时，同时销毁
    *
    * @author chitanda
-   * @date 2022-07-14 10:07:06
+   * @date 2023-03-13 16:03:31
    * @protected
-   * @type {(IBizContext | null)}
+   * @type {IBizContext[]}
    */
-  protected _parent: IContext | null = null;
+  protected declare _associationContext: IBizContext[];
+
+  /**
+   * 修改的父上下文
+   *
+   * @author lxm
+   * @date 2022-12-08 18:12:16
+   * @protected
+   * @type {IData}
+   */
+  protected declare _context: IData;
+
+  /**
+   * 父的上下文源对象
+   *
+   * @author lxm
+   * @date 2022-12-08 18:12:31
+   * @type {IContext}
+   */
+  declare _parent?: IContext;
 
   /**
    * Creates an instance of IBizContext.
    *
    * @author chitanda
    * @date 2022-07-14 10:07:15
-   * @param {IContext} [context={}] 自身的上下文
-   * @param {IBizContext} [parent]
+   * @param {IData} [context={}] 自身的上下文
+   * @param {IContext} [parent]
    */
-  constructor(public context: IContext = {}, parent?: IContext) {
+  // eslint-disable-next-line default-param-last
+  private constructor(context: IData = {}, parent?: IContext) {
+    Object.defineProperty(this, '_associationContext', {
+      enumerable: false,
+      value: [],
+    });
+
     if (parent) {
-      this._parent = parent;
+      // eslint-disable-next-line @typescript-eslint/no-this-alias
+      const self = this;
+
+      // 定义私有变量，存放父上下文源对象
+      Object.defineProperty(this, '_parent', {
+        enumerable: false,
+        writable: true,
+        value: parent,
+      });
+
+      // 定义私有变量，用于存储对父已有上下文的修改。
+      Object.defineProperty(this, '_context', {
+        enumerable: false,
+        writable: true,
+        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();
+    // 合并给入上下文
+    Object.assign(this, context);
+  }
+
+  /**
+   * 返回自身的上下文，独有的和与父有差异的。
+   *
+   * @author lxm
+   * @date 2022-12-08 17:12:26
+   * @returns {*}  {IData}
+   */
+  getOwnContext(): IData {
+    const result: IData = {};
+    Object.keys(this).forEach(key => {
+      // 父没有的，或者修改了父的上下文
+      // 父不存在则返回所有自身的属性
+      if (
+        !this._parent ||
+        !Object.prototype.hasOwnProperty.call(this._parent, key) ||
+        Object.prototype.hasOwnProperty.call(this._context, key)
+      ) {
+        result[key] = this[key];
+      }
+    });
+    return result;
   }
 
   /**
-   * 创建代理
+   * 销毁当前上下文对象
    *
    * @author chitanda
-   * @date 2022-07-14 11:07:37
-   * @protected
+   * @date 2023-03-13 15:03:04
+   */
+  destroy(): void {
+    this._parent = undefined;
+    this._context = {};
+    this._associationContext.forEach(item => {
+      item.destroy();
+    });
+  }
+
+  /**
+   * 在非视图中，需要断开视图上下文联系时。只能使用 clone 创建新的局部上下文
+   *
+   * @author chitanda
+   * @date 2023-03-13 16:03:13
    * @return {*}  {IBizContext}
    */
-  protected createProxy(): IBizContext {
-    return new Proxy(this, new IBizContextProxyHandle());
+  clone(): IBizContext {
+    const newContext = new IBizContext(
+      clone(this.getOwnContext()),
+      this._parent,
+    );
+    this._associationContext.push(newContext);
+    return newContext;
   }
 
   /**
-   * 销毁上下文，避免内存泄漏
+   * 上下文只有在视图初始化时，调用 create 方法
    *
    * @author chitanda
-   * @date 2022-07-14 11:07:45
+   * @date 2023-03-13 16:03:32
+   * @static
+   * @param {IData} [context]
+   * @param {IContext} [parent]
+   * @return {*}  {IContext}
    */
-  destroy(): void {
-    this.context = {};
-    this._parent = null;
+  static create(context?: IData, parent?: IContext): IBizContext {
+    return new IBizContext(context, parent);
   }
 }

package/src/environment/environment.ts

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

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

@@ -1,5 +1,4 @@
 import { AxiosError, AxiosResponse } from 'axios';
-import { HttpStatusMessageConst } from '../../constant';
 
 /**
  * 请求异常
@@ -28,9 +27,6 @@ export class HttpError implements Error {
       } else {
         this.message = res.statusText;
       }
-      if (!this.message) {
-        this.message = HttpStatusMessageConst[res.status];
-      }
       if (!this.message) {
         this.message = '网络异常，请稍后重试!';
       }

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,10 +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';

package/src/install.ts

@@ -1,5 +1,6 @@
+import { FactoryCenter } from './factory-center';
 import { IBizSys } from './ibizsys';
-import { Interceptor } from './utils';
+import { CoreInterceptor } from './utils';
 
 /**
  * 初始化全局对象
@@ -13,5 +14,6 @@ export function install(): void {
     throw new Error('ibiz 已经存在, 无需重复安装');
   }
   window.ibiz = new IBizSys();
-  new Interceptor();
+  window.___fc = new FactoryCenter();
+  ibiz.net.addInterceptor('CoreInterceptor', new CoreInterceptor());
 }

package/src/interface/click-outside/click-outside.ts

@@ -0,0 +1,71 @@
+/**
+ * 可选配置参数
+ *
+ * @author lxm
+ * @date 2022-10-28 16:10:48
+ * @export
+ * @interface OnClickOutsideOptions
+ * @extends {ConfigurableWindow}
+ * @template E
+ */
+export interface OnClickOutsideOptions {
+  /**
+   * 指定使用的window,不给就用默认的window
+   * 一般是在iframe或测试环境中使用。
+   *
+   * @author lxm
+   * @date 2022-10-28 17:10:49
+   * @type {Window}
+   */
+  window?: Window;
+  /**
+   * 指定需要忽略的元素，用于排除某些外部的元素
+   *
+   * @author lxm
+   * @date 2022-10-28 17:10:50
+   * @type {HTMLElement[]}
+   */
+  ignore?: HTMLElement[];
+  /**
+   * 是否捕获内部元素。默认为是，内部元素不会触发回调。
+   * @default true
+   */
+  capture?: boolean;
+}
+
+/**
+ * 回调处理函数类型
+ */
+export type OnClickOutsideHandler = (_evt: PointerEvent | MouseEvent) => void;
+
+/**
+ * OnClickOutside返回对象类型
+ *
+ * @author lxm
+ * @date 2022-10-31 11:10:59
+ * @export
+ * @interface OnClickOutsideResult
+ */
+export interface OnClickOutsideResult {
+  /**
+   * 停止监听，并移除相关监听事件
+   *
+   * @author lxm
+   * @date 2022-10-31 11:10:28
+   */
+  stop: () => void;
+  /**
+   * 暂停监听
+   *
+   * @author lxm
+   * @date 2022-10-31 11:10:30
+   */
+  pause: () => void;
+  /**
+   * 继续监听
+   *
+   * @author lxm
+   * @date 2022-10-31 11:10:32
+   */
+  proceed: () => void;
+}