@ibiz-template/core 0.0.4-beta.5 → 0.1.1

package/src/context/index.ts

@@ -28,9 +28,9 @@ export class IBizContext implements IContext {
    * @author lxm
    * @date 2022-12-08 18:12:16
    * @protected
-   * @type {IDatum}
+   * @type {IData}
    */
-  protected declare _context: IDatum;
+  protected declare _context: IData;
 
   /**
    * 父的上下文源对象
@@ -46,69 +46,78 @@ export class IBizContext implements IContext {
    *
    * @author chitanda
    * @date 2022-07-14 10:07:15
-   * @param {IDatum} [context={}] 自身的上下文
+   * @param {IData} [context={}] 自身的上下文
    * @param {IContext} [parent]
    */
   // eslint-disable-next-line default-param-last
-  private constructor(context: IDatum = {}, parent?: IContext) {
+  private constructor(context: IData = {}, parent?: IContext) {
     Object.defineProperty(this, '_associationContext', {
       enumerable: false,
       value: [],
     });
 
     if (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);
+      this.initWithParent(parent);
     }
+
     // 合并给入上下文
     Object.assign(this, context);
   }
 
+  private initWithParent(parent: IContext): void {
+    // 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 => {
+      if (Object.prototype.hasOwnProperty.call(this, key)) {
+        // !已经定义的不重复定义，会报错
+        return;
+      }
+      properties[key] = {
+        enumerable: true,
+        set(val: unknown): void {
+          if (val == null) {
+            self._context[key] = null;
+          } else {
+            self._context[key] = val;
+          }
+        },
+        get(): IContext {
+          if (self._context[key] !== undefined) {
+            return self._context[key];
+          }
+          return self._parent![key];
+        },
+      };
+    });
+    Object.defineProperties(this, properties);
+  }
+
   /**
    * 返回自身的上下文，独有的和与父有差异的。
    *
    * @author lxm
    * @date 2022-12-08 17:12:26
-   * @returns {*}  {IDatum}
+   * @returns {*}  {IData}
    */
-  getOwnContext(): IDatum {
-    const result: IDatum = {};
+  getOwnContext(): IData {
+    const result: IData = {};
     Object.keys(this).forEach(key => {
       // 父没有的，或者修改了父的上下文
       // 父不存在则返回所有自身的属性
@@ -153,17 +162,52 @@ export class IBizContext implements IContext {
     return newContext;
   }
 
+  /**
+   * 在不改变对象引用的情况下，重置上下文
+   * 等效于重新实例化，但是引用不变
+   * @author lxm
+   * @date 2023-05-24 10:30:40
+   * @param {IData} [context={}]
+   * @param {IContext} [parent]
+   */
+  // eslint-disable-next-line default-param-last
+  reset(context: IData = {}, parent?: IContext): void {
+    // 清空_associationContext
+    this._associationContext.forEach(item => {
+      item.destroy();
+    });
+    // 置空parent相关属性
+    if (this._parent) {
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      this._parent = {} as any;
+      this._context = {};
+    }
+    // 删除自身的属性，define的删不掉，上面置空了就不管了
+    Object.keys(this).forEach(key => {
+      try {
+        delete this[key];
+      } catch (error) {
+        // 删不掉的不管了，上面已经变成uneducated了
+      }
+    });
+    if (parent) {
+      this.initWithParent(parent);
+    }
+    // 合并默认值
+    Object.assign(this, context);
+  }
+
   /**
    * 上下文只有在视图初始化时，调用 create 方法
    *
    * @author chitanda
    * @date 2023-03-13 16:03:32
    * @static
-   * @param {IDatum} [context]
+   * @param {IData} [context]
    * @param {IContext} [parent]
    * @return {*}  {IContext}
    */
-  static create(context?: IDatum, parent?: IContext): IBizContext {
+  static create(context?: IData, parent?: IContext): IBizContext {
     return new IBizContext(context, parent);
   }
 }

package/src/environment/environment.ts

@@ -11,6 +11,7 @@ export const Environment: IEnvironment = {
   baseUrl: '/api',
   appId: '',
   pluginBaseUrl: './plugins',
+  isLocalModel: false,
   remoteModelUrl: '/remotemodel',
   assetsUrl: './assets',
   dcSystem: '',
@@ -22,4 +23,8 @@ export const Environment: IEnvironment = {
   enablePermission: true,
   routePlaceholder: '-',
   enableWfAllHistory: false,
+  isMob: false,
+  isSaaSMode: true,
+  AppTitle: '应用',
+  favicon: './favicon.ico',
 };

package/src/error/model-error/model-error.ts

@@ -17,8 +17,10 @@ export class ModelError extends Error {
    * @param {IModelObject} model 模板未支持的模型
    * @param {string} [msg]
    */
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  constructor(public model: any, msg?: string) {
+  constructor(
+    public model: IData,
+    msg?: string,
+  ) {
     super(`「${model.id}」模型${msg ? `： ${msg}` : ''}`);
   }
 }

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

@@ -18,8 +18,10 @@ export class RuntimeModelError extends Error {
    * @param {IModelObject} model 丢失配置的模型
    * @param {string} [msg] 缺失配置描述
    */
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  constructor(public model: any, msg?: string) {
+  constructor(
+    public model: IData,
+    msg?: string,
+  ) {
     super(`「${model.id}」模型${msg ? `： ${msg}` : ''}`);
   }
 }

package/src/ibizsys.ts

@@ -1,7 +1,9 @@
+import { Logger } from 'loglevel';
 import { CommandController } from './command';
 import { Environment } from './environment/environment';
 import { OrgData } from './interface';
-import { Logger, Net } from './utils';
+import { Net } from './utils';
+import { logger } from './utils/logger/logger';
 
 /**
  * 全局对象
@@ -21,12 +23,13 @@ export class IBizSys {
   env = Environment;
 
   /**
-   * 日志对象
+   * 日志输出工具类
    *
    * @author chitanda
-   * @date 2022-10-25 20:10:22
+   * @date 2023-07-10 18:07:05
+   * @type {Logger}
    */
-  log = Logger;
+  log: Logger = logger;
 
   /**
    * 网络请求工具类(发送默认请求)

package/src/index.ts

@@ -8,5 +8,4 @@ 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,4 +1,3 @@
-import { FactoryCenter } from './factory-center';
 import { IBizSys } from './ibizsys';
 
 /**
@@ -13,5 +12,4 @@ export function install(): void {
     throw new Error('ibiz 已经存在, 无需重复安装');
   }
   window.ibiz = new IBizSys();
-  window.___fc = new FactoryCenter();
 }

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

@@ -92,6 +92,15 @@ export interface IEnvironment {
    */
   casLoginUrl: string;
 
+  /**
+   * 模型是否为本地模型(走静态资源模式)
+   *
+   * @author chitanda
+   * @date 2023-07-06 15:07:19
+   * @type {boolean}
+   */
+  isLocalModel: boolean;
+
   /**
    * 远程模型路径
    *
@@ -170,4 +179,39 @@ export interface IEnvironment {
    * @memberof IEnvironment
    */
   enableWfAllHistory: boolean;
+
+  /**
+   * 应用标题
+   *
+   * @type {string}
+   * @memberof IEnvironment
+   */
+  AppTitle?: string;
+
+  /**
+   * 是否为 SaaS 模式
+   *
+   * @author chitanda
+   * @date 2023-07-11 16:07:23
+   * @type {boolean}
+   */
+  isSaaSMode?: boolean;
+
+  /**
+   * 是否为移动端应用
+   *
+   * @author chitanda
+   * @date 2023-06-20 12:06:15
+   * @type {boolean}
+   */
+  isMob?: boolean;
+
+  /**
+   * 应用图标地址
+   *
+   * @author chitanda
+   * @date 2023-07-17 17:07:23
+   * @type {string}
+   */
+  favicon?: string;
 }

package/src/types.ts

@@ -1,21 +1,11 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import { FactoryCenter } from './factory-center';
 import { IBizSys } from './ibizsys';
 
 declare global {
   const ibiz: IBizSys;
-  const ___fc: FactoryCenter;
 
   interface Window {
     ibiz: IBizSys;
-    /**
-     * 全局工厂中心
-     *
-     * @author lxm
-     * @date 2022-10-17 15:10:43
-     * @type {FactoryCenter}
-     */
-    ___fc: FactoryCenter;
   }
 
   /**
@@ -51,9 +41,9 @@ declare global {
      *
      * @author chitanda
      * @date 2023-03-13 17:03:10
-     * @return {*}  {IDatum}
+     * @return {*}  {IData}
      */
-    getOwnContext(): IDatum;
+    getOwnContext(): IData;
 
     /**
      * 销毁当前上下文
@@ -71,6 +61,16 @@ declare global {
      * @return {*}  {IContext}
      */
     clone(): IContext;
+
+    /**
+     * 在不改变对象引用的情况下，重置上下文
+     * 等效于重新实例化，但是引用不变
+     * @author lxm
+     * @date 2023-05-24 10:30:40
+     * @param {IData} [context={}] 默认值
+     * @param {IContext} [parent] 父上下文
+     */
+    reset(context?: IData, parent?: IContext): void;
   }
 
   /**
@@ -95,17 +95,6 @@ declare global {
     [key: string | symbol]: any;
   }
 
-  /**
-   * 数据
-   *
-   * @author chitanda
-   * @date 2023-03-13 17:03:50
-   * @interface IDatum
-   */
-  interface IDatum {
-    [key: string | symbol]: any;
-  }
-
   /**
    * 任意对象结构
    *

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

@@ -37,7 +37,7 @@ export function onClickOutside(
    * @param event 事件对象
    * @returns
    */
-  const isOutside = (event: MouseEvent) => {
+  const isOutside = (event: MouseEvent): boolean => {
     // 有一个判断是在内部，则不算外部，返回false
     return ![target, ...ignore].some(el => {
       return isEventInside(event, el);
@@ -46,10 +46,10 @@ export function onClickOutside(
 
   /** 暂停，所有监听的回调都不执行，用于增强某些ignore无法实现的场景 */
   let isPaused = false;
-  const pause = () => {
+  const pause = (): void => {
     isPaused = true;
   };
-  const proceed = () => {
+  const proceed = (): void => {
     isPaused = false;
   };
 
@@ -61,7 +61,7 @@ export function onClickOutside(
    * @param event 事件对象
    * @returns
    */
-  const listener = (event: MouseEvent) => {
+  const listener = (event: MouseEvent): void => {
     if (isPaused) return;
     window.clearTimeout(fallback);
 
@@ -94,7 +94,7 @@ export function onClickOutside(
         if (e.button === 0) {
           // 锁死结果避免延时执行时变更
           const path = eventPath(e);
-          e.composedPath = () => path;
+          e.composedPath = (): (EventTarget | null)[] => path;
           fallback = window.setTimeout(() => listener(e), 50);
         }
       },
@@ -105,6 +105,6 @@ export function onClickOutside(
   /**
    * 停止事件监听，移除监听
    */
-  const stop = () => cleanups.forEach(fn => fn());
+  const stop = (): void => cleanups.forEach(fn => fn());
   return { stop, pause, proceed };
 }

package/src/utils/download-file/download-file.ts

@@ -7,7 +7,7 @@
  * @param {string} fileName
  * @returns {*}
  */
-export function calcMimeByFileName(fileName: string) {
+export function calcMimeByFileName(fileName: string): string {
   const ext = fileName.split('.').pop();
   let mime = '';
   switch (ext) {
@@ -87,7 +87,7 @@ export function isImage(fileName: string): boolean {
  * @param {Blob} file 文件流Blob
  * @param {string} fileName 文件名称
  */
-export function downloadFileFromBlob(file: Blob, fileName: string) {
+export function downloadFileFromBlob(file: Blob, fileName: string): void {
   // 获取文件名
   const filetype = calcMimeByFileName(fileName);
   // 用blob对象获取文件流

package/src/utils/event/event.ts

@@ -51,7 +51,7 @@ export function listenJSEvent(
 ): () => void {
   target.addEventListener(eventName, listener, options);
 
-  let cleanup = () => {
+  let cleanup = (): void => {
     target.removeEventListener(eventName, listener, options);
     // cleanup方法只能调用一次
     cleanup = NOOP;

package/src/utils/index.ts

@@ -1,5 +1,4 @@
 export * from './interceptor';
-export { Logger } from './logger/logger';
 export { Namespace } from './namespace/namespace';
 export { IHttpResponse, HttpResponse } from './net/http-response';
 export { Net } from './net/net';
@@ -15,3 +14,4 @@ export * from './upload/select-file';
 export * from './upload/upload-file';
 export * from './sync';
 export * from './style/remote-style';
+export * from './recursive/find-recursive-child';

package/src/utils/interceptor/core-interceptor.ts

@@ -15,21 +15,26 @@ export class CoreInterceptor extends Interceptor {
   protected async onBeforeRequest(
     config: InternalAxiosRequestConfig,
   ): Promise<InternalAxiosRequestConfig> {
-    await super.onBeforeRequest(config);
+    config = await super.onBeforeRequest(config);
 
     const { headers } = config;
 
+    // Set the access token.
     headers.set('Authorization', `Bearer ${getToken()}`);
 
+    // Set the system ID.
+    let systemId = ibiz.env.dcSystem;
     const { orgData } = ibiz;
     if (orgData) {
       if (orgData.systemid) {
-        headers.set('srfsystemid', orgData.systemid);
+        systemId = orgData.systemid;
       }
       if (orgData.orgid) {
         headers.set('srforgid', orgData.orgid);
       }
     }
+    headers.set('srfsystemid', systemId);
+
     return config;
   }
 }

package/src/utils/interceptor/interceptor.ts

@@ -57,7 +57,7 @@ export class Interceptor {
    * @protected
    * @param {*} error
    */
-  protected onRequestError(error: any) {
+  protected onRequestError(error: Error): Promise<never> {
     // 处理请求错误
     return Promise.reject(error);
   }
@@ -85,7 +85,7 @@ export class Interceptor {
    * @protected
    * @param {*} _error
    */
-  protected onResponseError(error: any) {
+  protected onResponseError(error: Error): Promise<never> {
     // 处理响应错误
     return Promise.reject(error);
   }
@@ -115,7 +115,7 @@ export class Interceptor {
    * @date 2022-10-27 17:10:27
    * @param {AxiosInstance} instance
    */
-  eject(instance: AxiosInstance) {
+  eject(instance: AxiosInstance): void {
     if (this.requestTag) {
       instance.interceptors.request.eject(this.requestTag);
     }

package/src/utils/logger/logger.ts

@@ -1,3 +1,10 @@
 import * as Logger from 'loglevel';
+import * as prefix from 'loglevel-plugin-prefix';
 
-export { Logger };
+const logger = Logger.noConflict();
+
+prefix.reg(logger);
+
+prefix.apply(logger);
+
+export { logger };

package/src/utils/namespace/namespace.ts

@@ -64,7 +64,10 @@ export class Namespace {
    * @param {string} block 当前命名空间的根模块,例如组件的名称
    * @param {string} [namespace] 指定命名空间，未指定使用默认值 ibiz
    */
-  constructor(protected block: string, namespace?: string) {
+  constructor(
+    protected block: string,
+    namespace?: string,
+  ) {
     this.namespace = namespace || defaultNamespace;
   }
 

package/src/utils/net/net.ts

@@ -42,6 +42,17 @@ export class Net {
    */
   protected urlReg = /^http[s]?:\/\/[^\s]*/;
 
+  /**
+   * 请求等待队列，防止重复请求。当有完全相同请求参数的请求时，会等待上一个请求完成后把结果返回给当前请求，不会重复请求
+   * key: 由请求的 config 生成的字符串,用于唯一标识请求
+   * value: 当前正在请求的 Promise
+   *
+   * @author chitanda
+   * @date 2023-06-07 14:06:19
+   * @protected
+   */
+  protected waitRequest = new Map<string, Promise<AxiosResponse>>();
+
   /**
    * Creates an instance of Net.
    * @author lxm
@@ -70,7 +81,7 @@ export class Net {
    * @param {string} name 唯一标识
    * @param {Interceptor} interceptor 拦截器
    */
-  addInterceptor(name: string, interceptor: Interceptor) {
+  addInterceptor(name: string, interceptor: Interceptor): void {
     interceptor.use(this.instance);
     this.interceptors.set(name, interceptor);
   }
@@ -82,7 +93,7 @@ export class Net {
    * @date 2022-10-27 17:10:27
    * @param {string} name 唯一标识
    */
-  removeInterceptor(name: string) {
+  removeInterceptor(name: string): void {
     const interceptor = this.interceptors.get(name);
     if (interceptor) {
       interceptor.eject(this.instance);
@@ -121,7 +132,7 @@ export class Net {
    * @param {...AxiosRequestConfig[]} configs
    * @returns {*}
    */
-  protected mergeConfig(...configs: AxiosRequestConfig[]) {
+  protected mergeConfig(...configs: AxiosRequestConfig[]): AxiosRequestConfig {
     const config = this.presetConfig;
     if (configs.length === 0) {
       return config;
@@ -180,10 +191,6 @@ export class Net {
     headers: RawAxiosRequestHeaders = {},
     option: AxiosRequestConfig = {},
   ): Promise<IHttpResponse> {
-    // if (params.srfparentdata) {
-    //   Object.assign(params, params.srfparentdata);
-    //   delete params.srfparentdata;
-    // }
     url = this.attachUrlParam(url, params);
     try {
       const response = await this.request(
@@ -286,12 +293,29 @@ export class Net {
     url: string,
     config: AxiosRequestConfig = {},
   ): Promise<IHttpResponse> {
+    // axios 请求参数配置
+    const cfg = this.mergeConfig({ url }, config);
+    // 当前请求的唯一标识
+    const key = JSON.stringify(cfg);
     try {
-      const response = await this.instance.request(
-        this.mergeConfig({ url }, config),
-      );
+      let requestPromise: Promise<AxiosResponse> | null = null;
+      if (!this.waitRequest.has(key)) {
+        requestPromise = this.instance.request(cfg);
+        this.waitRequest.set(key, requestPromise);
+      } else {
+        requestPromise = this.waitRequest.get(key)!;
+      }
+      const response = await requestPromise;
+      // 当第一个请求完成后就删除等待队列中的请求
+      if (this.waitRequest.has(key)) {
+        this.waitRequest.delete(key);
+      }
       return this.doResponseResult(response);
     } catch (error) {
+      // 请求异常删除等待队列中的请求体
+      if (this.waitRequest.has(key)) {
+        this.waitRequest.delete(key);
+      }
       throw new HttpError(error as AxiosError);
     }
   }
@@ -304,7 +328,7 @@ export class Net {
    * @param {AxiosRequestConfig<IData>} config
    * @return {*}
    */
-  axios(config: AxiosRequestConfig<IData>) {
+  axios(config: AxiosRequestConfig<IData>): Promise<AxiosResponse> {
     return axios(config);
   }