@ibiz-template/runtime 0.5.3-beta.8 → 0.5.3

package/src/controller/utils/jsonschema/entity.ts

@@ -13,7 +13,10 @@ export async function getEntitySchema(
 ): Promise<IData> {
   const app = ibiz.hub.getApp(context.srfappid);
   const entity = await ibiz.hub.getAppDataEntity(entityId, context.srfappid);
-  const url = `/jsonschema/${entity.name}`;
+  let url = `/jsonschema/${entity.name}`;
+  if (entity.dynaSysMode === 0 && ibiz.appData) {
+    url += `?dynamodeltag=${ibiz.appData.dynamodeltag}`;
+  }
   const res = await app.net.get(url);
   return res.data;
 }

package/src/global/global-util/global-util.ts

@@ -8,6 +8,7 @@ import {
   ThemeUtil,
   DefaultErrorHandler,
   ErrorHandlerCenter,
+  ViewStack,
 } from '../../utils';
 
 /**
@@ -74,6 +75,14 @@ export class GlobalUtil {
    */
   readonly error = new ErrorHandlerCenter();
 
+  /**
+   * 视图堆栈
+   *
+   * @author chitanda
+   * @date 2024-01-18 14:01:23
+   */
+  readonly viewStack = new ViewStack();
+
   constructor() {
     this.error.register(new DefaultErrorHandler());
   }

package/src/interface/controller/common/i-icon/i-icon.ts

@@ -1,5 +1,6 @@
 /**
  * 图标类型
+ * @deprecated 已废弃，后面不要用了
  * @author lxm
  * @date 2023-06-09 06:40:32
  * @export

package/src/interface/controller/state/control/i-drbar.state.ts

@@ -104,4 +104,12 @@ export interface IDRBarItemsState {
    * @memberof IDRBarItemsState
    */
   fullPath?: string;
+
+  /**
+   * 计数器标识
+   * @author lxm
+   * @date 2024-01-18 05:41:26
+   * @type {string}
+   */
+  counterId?: string;
 }

package/src/interface/controller/state/control/i-drtab.state.ts

@@ -80,4 +80,12 @@ export interface IDRTabPagesState {
    * @memberof IDRTabPagesState
    */
   fullPath?: string;
+
+  /**
+   * 计数器标识
+   * @author lxm
+   * @date 2024-01-18 05:55:11
+   * @type {string}
+   */
+  counterId?: string;
 }

package/src/interface/service/i-transaction/i-transaction.ts

@@ -0,0 +1,88 @@
+/**
+ * 事务状态
+ *
+ * @author chitanda
+ * @date 2024-01-17 15:01:18
+ * @export
+ * @interface ITransactionState
+ */
+export interface ITransactionState {
+  /**
+   * 是否在事务中
+   *
+   * @author chitanda
+   * @date 2024-01-17 15:01:24
+   * @type {boolean}
+   */
+  isOpen: boolean;
+  /**
+   * 当前事务是否有变更，如果有变更，提交事务时会触发数据更新并且不可以直接关闭事务
+   *
+   * @author chitanda
+   * @date 2024-01-17 15:01:20
+   * @type {boolean}
+   */
+  isChange: boolean;
+}
+
+/**
+ * 本地包数据事务，用于界面域下简单数据事务
+ *
+ * @author chitanda
+ * @date 2024-01-17 15:01:46
+ * @export
+ * @interface ITransaction
+ */
+export interface ITransaction {
+  /**
+   * 事务状态
+   *
+   * @author chitanda
+   * @date 2024-01-17 15:01:46
+   * @type {ITransactionState}
+   */
+  readonly state: ITransactionState;
+
+  /**
+   * 开启事务
+   *
+   * @description 事务开启后，所有的数据操作都会被缓存，直到事务提交或者回滚
+   * @author chitanda
+   * @date 2024-01-17 15:01:46
+   */
+  open(): void;
+
+  /**
+   * 新增变更事务回调，事务提交时会按照添加顺序倒序执行
+   *
+   * @author chitanda
+   * @date 2024-01-17 16:01:25
+   * @param {string} id
+   * @param {() => void} commit
+   */
+  change(id: string, commit: () => void): void;
+
+  /**
+   * 提交事务
+   *
+   * @author chitanda
+   * @date 2024-01-17 15:01:05
+   */
+  commit(): void;
+
+  /**
+   * 回滚事务
+   *
+   * @description 回滚事务会清空所有变更，不会触发数据更新
+   * @date 2024-01-17 15:01:05
+   */
+  rollback(): void;
+
+  /**
+   * 关闭事务
+   *
+   * @author chitanda
+   * @date 2024-01-17 15:01:02
+   */
+  close(): void;
+}

package/src/interface/service/index.ts

@@ -1,3 +1,7 @@
 export type { CodeListItem } from './code-list-item/code-list-item';
 export type { IDataEntity } from './i-data-entity/i-data-entity';
+export type {
+  ITransaction,
+  ITransactionState,
+} from './i-transaction/i-transaction';
 export type * from './service';

package/src/interface/service/service/i-app-de.service.ts

@@ -1,5 +1,5 @@
 import { IHttpResponse, IPortalAsyncAction } from '@ibiz-template/core';
-import { IAppDEMethodDTO } from '@ibiz/model-core';
+import { IAppDEMethodDTO, IAppDataEntity } from '@ibiz/model-core';
 import { DECache } from '../../../service/utils';
 import { IFileService } from './i-file.service';
 import { IWorkFlowService } from './i-wf.service';
@@ -62,6 +62,15 @@ export interface IAppDEService {
    */
   readonly file: IFileService;
 
+  /**
+   * 当前实体服务对应的实体模型
+   *
+   * @author chitanda
+   * @date 2024-01-17 17:01:16
+   * @type {IAppDataEntity}
+   */
+  readonly model: IAppDataEntity;
+
   /**
    * 执行实体服务方法
    *

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/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/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/de.service.ts

@@ -8,6 +8,7 @@ import {
   IPortalAsyncAction,
   ModelError,
   RuntimeError,
+  RuntimeModelError,
 } from '@ibiz-template/core';
 import { DECache, calcResPath } from '../../utils';
 import { WorkFlowService } from '../work-flow/work-flow.service';
@@ -94,7 +95,7 @@ export class DEService implements IAppDEService {
    */
   constructor(
     protected srfSessionId: string,
-    protected model: IAppDataEntity,
+    public readonly model: IAppDataEntity,
   ) {
     this.local = new DECache(model);
     this.configCache = new ConfigService(
@@ -126,6 +127,10 @@ export class DEService implements IAppDEService {
     }
     const model = findModelChild(this.model.appDEMethods!, id) as IAppDEMethod;
 
+    if (!model) {
+      throw new RuntimeModelError(this.model, `未找到服务方法: ${id}`);
+    }
+
     // 获取适配器
     const provider = await getDEMethodProvider(model);
     if (!provider) {