@ibiz-template/runtime 0.5.3-beta.9 → 0.5.4

package/src/interface/util/i-view-stack/i-view-stack.ts

@@ -0,0 +1,53 @@
+import { IViewController } from '../../controller';
+
+/**
+ * 视图堆栈
+ *
+ * @author chitanda
+ * @date 2024-01-18 10:01:16
+ * @export
+ * @interface IViewStack
+ */
+export interface IViewStack {
+  /**
+   * 添加视图堆栈信息
+   *
+   * @author chitanda
+   * @date 2024-01-18 10:01:29
+   * @param {string} id
+   * @param {IViewController} view
+   */
+  add(id: string, view: IViewController): void;
+  /**
+   * 删除视图堆栈信息
+   *
+   * @author chitanda
+   * @date 2024-01-18 10:01:41
+   * @param {string} id
+   */
+  remove(id: string): void;
+  /**
+   * 视图激活
+   *
+   * @author chitanda
+   * @date 2024-01-18 10:01:11
+   * @param {string} id
+   */
+  active(id: string): void;
+  /**
+   * 视图休眠
+   *
+   * @author chitanda
+   * @date 2024-01-18 10:01:18
+   * @param {string} id
+   */
+  deactivate(id: string): void;
+  /**
+   * 当前激活视图清单
+   *
+   * @author chitanda
+   * @date 2024-01-18 14:01:50
+   * @return {*}  {IViewController[]}
+   */
+  getActives(): IViewController[];
+}

package/src/interface/util/index.ts

@@ -15,3 +15,4 @@ export type { IOverlayController } from './i-overlay-controller/i-overlay-contro
 export type { IOverlayPopoverContainer } from './i-overlay-popover-container/i-overlay-popover-container';
 export type { IScriptFunctionOpts } from './script/i-script-function';
 export type { IExcelUtil } from './i-excel-util/i-excel-util';
+export type { IViewStack } from './i-view-stack/i-view-stack';

package/src/plugin/remote-plugin-item/remote-plugin-item.ts

@@ -15,6 +15,14 @@ export interface ISystemImportMap {
    * @type {string}
    */
   baseUrl?: string;
+  /**
+   * package.json 清单
+   *
+   * @author chitanda
+   * @date 2024-01-11 20:01:57
+   * @type {{ [key: string]: string }}
+   */
+  packages: { [key: string]: string };
   /**
    * 脚本
    *

package/src/register/helper/async-action-register.ts

@@ -36,7 +36,9 @@ function getProvider(key: string): IAsyncActionProvider | undefined {
 export function getAsyncActionProvider(
   actiontype: string,
 ): IAsyncActionProvider {
-  const provider: IAsyncActionProvider | undefined = getProvider(actiontype);
+  const provider: IAsyncActionProvider | undefined = getProvider(
+    actiontype || 'DEFAULT',
+  );
 
   // 找异步操作类型
   if (!provider) {

package/src/service/de-service-util.ts

@@ -135,6 +135,49 @@ export class DEServiceUtil {
     });
   }
 
+  /**
+   * 清理指定实体的临时数据缓存，并根据关系清理掉子实体的临时数据缓存
+   *
+   * @author chitanda
+   * @date 2024-01-19 14:01:32
+   * @param {IContext} context
+   * @param {string} entityID
+   * @param {string[]} [clearEntities=[]] 已经清理过的实体忽略，避免关系循环引用导致死循环
+   * @return {*}  {void}
+   */
+  clearTempCacheByRs(
+    context: IContext,
+    entityID: string,
+    clearEntities: string[] = [],
+  ): void {
+    if (clearEntities.includes(entityID) === true) {
+      return;
+    }
+    clearEntities.push(entityID);
+    const sandboxId = context.srfsessionid;
+    if (!this.cache.has(sandboxId)) {
+      return;
+    }
+    // 清理当前实体的临时数据缓存
+    const map = this.cache.get(sandboxId)!;
+    const service = map.get(entityID);
+    if (service) {
+      service.local.clear();
+    }
+    // 根据关系清理掉子实体的临时数据缓存
+    const uiDomain = ibiz.uiDomainManager.get(context.srfsessionid);
+    if (uiDomain) {
+      const configs = uiDomain.getDERConfigByMajor(entityID);
+      configs.forEach(config => {
+        this.clearTempCacheByRs(
+          context,
+          config.minorAppDataEntityId!,
+          clearEntities,
+        );
+      });
+    }
+  }
+
   /**
    * 执行服务方法
    * @author lxm

package/src/service/dto/method.dto.ts

@@ -193,12 +193,6 @@ export class MethodDto {
    * @return {*}  {Promise<IDataEntity[]>}
    */
   async sets(context: IContext, data: IData[]): Promise<IDataEntity[]> {
-    const uiDomain = ibiz.uiDomainManager.get(context.srfsessionid);
-    if (uiDomain && uiDomain.state.rsInit !== true) {
-      await this.calcRs(context);
-      uiDomain.calcParentRs();
-      uiDomain.state.rsInit = true;
-    }
     return Promise.all(
       data.map(async datum => {
         const all = this.fields
@@ -247,12 +241,11 @@ export class MethodDto {
    *
    * @author chitanda
    * @date 2023-12-26 16:12:13
-   * @protected
    * @param {IContext} context
    * @param {number} [depth=0] 递归层级，避免进入死循环。最大递归层级为 10
    * @return {*}  {Promise<void>}
    */
-  protected async calcRs(context: IContext, depth: number = 0): Promise<void> {
+  async calcRs(context: IContext, depth: number = 0): Promise<void> {
     if (depth > 10) {
       return;
     }

package/src/service/mqtt/mqtt.service.ts

@@ -1,6 +1,6 @@
 import { IPortalMessage } from '@ibiz-template/core';
 import { MqttClient, IClientOptions } from 'mqtt';
-import { QXEvent, createUUID, isNilOrEmpty } from 'qx-util';
+import { QXEvent, createUUID } from 'qx-util';
 
 /**
  * mqtt 连接服务
@@ -63,9 +63,6 @@ export class MqttService {
     protected token: string,
     protected appId: string,
   ) {
-    if (isNilOrEmpty(mqttTopic) || isNilOrEmpty(token)) {
-      throw new Error('mqttTopic or token is empty');
-    }
     this.options.username = mqttTopic;
     this.options.password = token;
   }

package/src/service/service/auth/v7-auth.service.ts

@@ -1,7 +1,6 @@
 import { CoreConst, HttpError } from '@ibiz-template/core';
 import { clearCookie, getCookie, setCookie } from 'qx-util';
-import { IAuthService } from '../../../interface';
-import { IAuthInfo } from '../../../interface/service/service/i-auth.service';
+import { IAuthService, IAuthInfo } from '../../../interface';
 
 /**
  * 认证服务
@@ -30,9 +29,13 @@ export class V7AuthService implements IAuthService {
       const token = getCookie(CoreConst.TOKEN)!;
       const expirein = getCookie(CoreConst.TOKEN_EXPIRES)!;
       const remember = getCookie(CoreConst.TOKEN_REMEMBER)!;
+      const refreshToken = getCookie(CoreConst.REFRESH_TOKEN)!;
       setCookie(CoreConst.TOKEN, token, 0, true);
       setCookie(CoreConst.TOKEN_EXPIRES, expirein, 0, true);
       setCookie(CoreConst.TOKEN_REMEMBER, remember, 0, true);
+      if (refreshToken) {
+        setCookie(CoreConst.REFRESH_TOKEN, refreshToken, 0, true);
+      }
     }
     return result;
   }
@@ -51,18 +54,22 @@ export class V7AuthService implements IAuthService {
       });
       const { data } = res;
       if (data && data.token) {
+        const cacheDays = remember ? 7 : 0;
         if (remember) {
-          setCookie(CoreConst.TOKEN_REMEMBER, '1', 7, true);
+          setCookie(CoreConst.TOKEN_REMEMBER, '1', cacheDays, true);
         }
-        setCookie(CoreConst.TOKEN, data.token, remember ? 7 : 0, true);
+        setCookie(CoreConst.TOKEN, data.token, cacheDays, true);
         const expiredDate =
           new Date().getTime() + (data.expirein || 7199) * 1000;
-        setCookie(
-          CoreConst.TOKEN_EXPIRES,
-          `${expiredDate}`,
-          remember ? 7 : 0,
-          true,
-        );
+        setCookie(CoreConst.TOKEN_EXPIRES, `${expiredDate}`, cacheDays, true);
+        if (data.refresh_token) {
+          setCookie(
+            CoreConst.REFRESH_TOKEN,
+            data.refresh_token,
+            cacheDays,
+            true,
+          );
+        }
         clearCookie(CoreConst.IS_ANONYMOUS);
       }
       return true;
@@ -81,6 +88,7 @@ export class V7AuthService implements IAuthService {
       clearCookie(CoreConst.TOKEN);
       clearCookie(CoreConst.TOKEN_EXPIRES);
       clearCookie(CoreConst.TOKEN_REMEMBER);
+      clearCookie(CoreConst.REFRESH_TOKEN);
       clearCookie(CoreConst.IS_ANONYMOUS);
       ibiz.appData = undefined;
       ibiz.orgData = undefined;
@@ -102,24 +110,34 @@ export class V7AuthService implements IAuthService {
 
     const token = getCookie(CoreConst.TOKEN);
     const expirein = getCookie(CoreConst.TOKEN_EXPIRES);
-    const remember = getCookie(CoreConst.TOKEN_REMEMBER);
     if (token && expirein) {
       // 计算到过期时间所需的延时毫秒数，预留提前量
       let wait = Number(expirein) - new Date().getTime();
       const early = 5 * 60 * 1000;
       wait = wait > early ? wait - early : 0;
       setTimeout(async () => {
-        const res = await ibiz.net.get(`/uaa/refreshtoken2`);
+        const remember = getCookie(CoreConst.TOKEN_REMEMBER);
+        const refreshToken = getCookie(CoreConst.REFRESH_TOKEN);
+        const cacheDay = remember ? 7 : 0;
+        let res;
+        if (refreshToken != null && refreshToken !== '') {
+          res = await ibiz.net.get(`/uaa/refresh_token/${refreshToken}`);
+        } else {
+          res = await ibiz.net.get(`/uaa/refreshtoken2`);
+        }
         if (res.ok) {
-          setCookie(CoreConst.TOKEN, res.data.token, remember ? 7 : 0, true);
+          setCookie(CoreConst.TOKEN, res.data.token, cacheDay, true);
           const expiredDate =
             new Date().getTime() + (res.data.expirein || 7199) * 1000;
-          setCookie(
-            CoreConst.TOKEN_EXPIRES,
-            `${expiredDate}`,
-            remember ? 7 : 0,
-            true,
-          );
+          setCookie(CoreConst.TOKEN_EXPIRES, `${expiredDate}`, cacheDay, true);
+          if (res.data.refresh_token) {
+            setCookie(
+              CoreConst.REFRESH_TOKEN,
+              res.data.refresh_token,
+              cacheDay,
+              true,
+            );
+          }
         }
         // 下一次延时做准备
         this.extendLogin();

package/src/service/service/entity/method/method-renturn.ts

@@ -58,11 +58,20 @@ export class MethodReturn {
   async handle(context: IContext, data: IData): Promise<IDataEntity> {
     if (this.dto) {
       const app = ibiz.hub.getApp(this.entity.appId);
-      // 设置之前清理掉当前界面域下的数据缓存
-      app.deService.clearTempCache({
-        srfappid: app.appId,
-        srfsessionid: context.srfsessionid,
-      });
+      const uiDomain = ibiz.uiDomainManager.get(context.srfsessionid);
+      if (uiDomain && uiDomain.state.rsInit !== true) {
+        await this.dto.calcRs(context);
+        uiDomain.calcParentRs();
+        uiDomain.state.rsInit = true;
+      }
+      // 设置之前，根据关系清理掉当前界面域下的数据缓存
+      app.deService.clearTempCacheByRs(
+        {
+          srfappid: app.appId,
+          srfsessionid: context.srfsessionid,
+        },
+        this.entity.id!,
+      );
       const items = await this.dto.sets(context, [data]);
       return items[0];
     }

package/src/service/utils/dynamic-code-list/dynamic-code-list.ts

@@ -133,6 +133,7 @@ export class DynamicCodeListCache {
    */
   protected convertData(data: IData): CodeListItem {
     const result = {} as CodeListItem;
+
     const {
       valueAppDEFieldId,
       textAppDEFieldId,
@@ -142,6 +143,8 @@ export class DynamicCodeListCache {
       iconPathXAppDEFieldId,
       disableAppDEFieldId,
       dataAppDEFieldId,
+      clsAppDEFieldId,
+      colorAppDEFieldId,
     } = this.codeList;
     // 值属性
     const value = valueAppDEFieldId ? data[valueAppDEFieldId] : data.srfkey;
@@ -177,6 +180,14 @@ export class DynamicCodeListCache {
     if (disableAppDEFieldId) {
       result.disableSelect = fieldValueToBoolean(data[disableAppDEFieldId]);
     }
+    // 样式表属性
+    if (clsAppDEFieldId) {
+      result.textCls = data[clsAppDEFieldId];
+    }
+    // 颜色值属性
+    if (colorAppDEFieldId) {
+      result.color = data[colorAppDEFieldId];
+    }
     // 数据属性
     if (dataAppDEFieldId && data[dataAppDEFieldId]) {
       try {
@@ -237,9 +248,14 @@ export class DynamicCodeListCache {
     }
 
     // *预定义加载
-    if (this.isPredefined) {
+    if (this.isPredefined && this.codeList.codeName) {
+      const index = this.codeList.codeName.indexOf('__');
+      const tag =
+        index !== -1
+          ? this.codeList.codeName.substring(index + 2)
+          : this.codeList.codeName;
       const res = await app.net.get(
-        `/dictionaries/codelist/${this.codeList.codeName}`,
+        `/dictionaries/codelist/${tag}`,
         tempParams,
       );
       return Object.freeze(res.data.items);

package/src/service/vo/tree-node-data/tree-node-data.ts

@@ -86,6 +86,9 @@ export abstract class TreeNodeData implements ITreeNodeData {
       if (sysImage.imagePath) {
         icon.imagePath = sysImage.imagePath;
       }
+      if (sysImage.rawContent) {
+        icon.htmlStr = sysImage.rawContent;
+      }
     }
     return Object.values(icon).length > 0 ? icon : undefined;
   }

package/src/utils/index.ts

@@ -18,4 +18,5 @@ export { ThemeUtil } from './theme-util/theme-util';
 export { UIDomain } from './ui-domain/ui-domain';
 export { UIDomainManager } from './ui-domain-manager/ui-domain-manager';
 export { RawValueUtil } from './raw-value-util/raw-value-util';
+export { ViewStack } from './view-stack/view-stack';
 export { handleAllSettled } from './promise/promise';

package/src/utils/view-stack/view-stack.ts

@@ -0,0 +1,64 @@
+import { IAppView } from '@ibiz/model-core';
+import {
+  IViewController,
+  IViewEvent,
+  IViewStack,
+  IViewState,
+} from '../../interface';
+
+/**
+ * 视图堆栈
+ *
+ * @author chitanda
+ * @date 2024-01-18 10:01:47
+ * @export
+ * @class ViewStack
+ */
+export class ViewStack implements IViewStack {
+  private stackMap: Map<string, IViewController> = new Map();
+
+  private stack: IViewController[] = [];
+
+  private activeStack: IViewController[] = [];
+
+  add(
+    id: string,
+    view: IViewController<IAppView, IViewState, IViewEvent>,
+  ): void {
+    this.stack.push(view);
+    this.stackMap.set(id, view);
+    this.recalculateActiveStack();
+  }
+
+  remove(id: string): void {
+    const view = this.stackMap.get(id);
+    if (view) {
+      this.stack.splice(this.stack.indexOf(view), 1);
+      this.stackMap.delete(id);
+      this.recalculateActiveStack();
+    }
+  }
+
+  getActives(): IViewController[] {
+    return this.activeStack;
+  }
+
+  active(_id: string): void {
+    this.recalculateActiveStack();
+  }
+
+  deactivate(_id: string): void {
+    this.recalculateActiveStack();
+  }
+
+  /**
+   * 重新计算激活视图堆栈
+   *
+   * @author chitanda
+   * @date 2024-01-18 14:01:23
+   * @protected
+   */
+  protected recalculateActiveStack(): void {
+    this.activeStack = this.stack.filter(item => item.isActive === true);
+  }
+}