@ibiz-template/runtime 0.4.16 → 0.4.17-dev.1

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

@@ -203,7 +203,7 @@ export class DynamicCodeListCache {
    * @returns {*}  {Promise<CodeListItem[]>}
    */
   protected async load(
-    context: IParams = {},
+    context: IContext,
     params: IParams = {},
   ): Promise<CodeListItem[]> {
     const app = ibiz.hub.getApp(context.srfappid);
@@ -317,10 +317,7 @@ export class DynamicCodeListCache {
    * @param {IParams} [params={}]
    * @returns {*}  {Promise<IData[]>}
    */
-  async get(
-    context: IParams = {},
-    params: IParams = {},
-  ): Promise<CodeListItem[]> {
+  async get(context: IContext, params: IParams = {}): Promise<CodeListItem[]> {
     // 初始化还未完成时被调用
     if (this.initPromise) {
       await this.initPromise;

package/src/service/utils/res-path/res-path.ts

@@ -12,12 +12,12 @@ const reg = /\$\{(.*?)\}/g;
  * @author lxm
  * @date 2023-07-12 07:02:52
  * @export
- * @param {IParams} context
+ * @param {IContext} context
  * @param {IAppDataEntity} entity
  * @return {*}  {({ path: string; keys: string[] } | undefined)}
  */
 export function getMatchResPath(
-  context: IParams,
+  context: IContext,
   entity: IAppDataEntity,
 ): { path: string; keys: string[] } | undefined {
   const pathItems = entity.requestPaths || [];
@@ -61,11 +61,11 @@ export function getMatchResPath(
  * @author lxm
  * @date 2022-11-25 13:11:53
  * @export
- * @param {IParams} context 上下文对象
+ * @param {IContext} context 上下文对象
  * @param {ServicePathItem[][]} pathItems 计算出的资源关系路径
  * @return {*}  {string}
  */
-export function calcResPath(context: IParams, entity: IAppDataEntity): string {
+export function calcResPath(context: IContext, entity: IAppDataEntity): string {
   const item = getMatchResPath(context, entity);
   if (item) {
     if (item.keys.length > 0) {

package/src/service/utils/search-filter/search-filter.ts

@@ -14,7 +14,7 @@ export class SearchFilter {
    * @date 2022-08-17 22:08:24
    * @type {IParams}
    */
-  readonly context: IParams;
+  readonly context: IContext;
 
   /**
    * 父关系实体
@@ -88,7 +88,7 @@ export class SearchFilter {
    * @param {*} [data]
    * @memberof SearchFilter
    */
-  constructor(context: IParams, data?: IData) {
+  constructor(context: IContext, data?: IData) {
     this.context = context;
     if (data) {
       if (!isNil(data.page) && !isEmpty(data.page)) {

package/src/service/utils/service-exist-util/service-exist-util.ts

@@ -25,10 +25,10 @@ export function isExistSrfKey(funcName: string, entity: IDataEntity): boolean {
  *
  * @export
  * @param {string} funcName 执行方法名称
- * @param {IParams} context 上下文
+ * @param {IContext} context 上下文
  * @return {*}  {boolean}
  */
-export function isExistSessionId(funcName: string, context: IParams): boolean {
+export function isExistSessionId(funcName: string, context: IContext): boolean {
   const { srfsessionid } = context;
   if (!isNil(srfsessionid) && !isEmpty(srfsessionid)) {
     return true;

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

@@ -1,4 +1,6 @@
+/* eslint-disable no-constructor-return */
 import { IDETreeDataSetNode, IDETreeNodeDataItem } from '@ibiz/model-core';
+import { updateKeyDefine } from '@ibiz-template/core';
 import { IIcon, ITreeNodeData } from '../../../interface';
 import { calcDeCodeNameById } from '../../../model';
 import { ScriptFactory } from '../../../utils';
@@ -70,6 +72,57 @@ export class TreeDataSetNodeData extends TreeNodeData implements ITreeNodeData {
     if (model.leafFlagAppDEFieldId) {
       this.leaf = fieldValueToBoolean(data[model.leafFlagAppDEFieldId]);
     }
+
+    /** 数据项映射 */
+    const dataItemkeyMap = new Map<string | symbol, string | symbol>();
+    const dataItemDefaults: IData = {};
+    model.detreeNodeDataItems?.forEach(dataItem => {
+      const uiKey = dataItem.id!.toLowerCase();
+      // 后台实体属性
+      const deFieldKey = dataItem.appDEFieldId!.toLowerCase();
+      dataItemkeyMap.set(uiKey, deFieldKey);
+      if (dataItem.defaultValue) {
+        dataItemDefaults[uiKey] = dataItem.defaultValue;
+      }
+    });
+
+    return new Proxy<TreeDataSetNodeData>(this, {
+      set(target, p, value): boolean {
+        if (Object.prototype.hasOwnProperty.call(target.deData, p)) {
+          target.deData[p] = value;
+        } else if (dataItemkeyMap.has(p)) {
+          target.deData[dataItemkeyMap.get(p)!] = value;
+        } else {
+          target[p] = value;
+        }
+        return true;
+      },
+
+      get(target, p, _receiver): unknown {
+        if (target[p] !== undefined) {
+          return target[p];
+        }
+        if (dataItemkeyMap.has(p)) {
+          return target.deData[dataItemkeyMap.get(p)!] || dataItemDefaults[p];
+        }
+        if (target.deData[p] !== undefined) {
+          return target.deData[p];
+        }
+      },
+
+      ownKeys(target): ArrayLike<string | symbol> {
+        // 整合所有并排除重复
+        const allKeys = [
+          ...new Set([
+            ...Object.keys(target),
+            ...dataItemkeyMap.keys(),
+            ...Object.keys(target.deData),
+          ]),
+        ];
+        updateKeyDefine(target, allKeys);
+        return allKeys;
+      },
+    });
   }
 
   protected calcIcon(model: IDETreeDataSetNode): IIcon | undefined {

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

@@ -12,6 +12,8 @@ import { IIcon, ITreeNodeData } from '../../../interface';
 export abstract class TreeNodeData implements ITreeNodeData {
   _uuid: string = createUUID();
 
+  _nodeType: string;
+
   id!: string;
 
   value?: string | undefined;
@@ -40,6 +42,9 @@ export abstract class TreeNodeData implements ITreeNodeData {
 
   textHtml?: string;
 
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  [key: string | symbol]: any;
+
   constructor(
     model: IDETreeNode,
     parentNodeData: ITreeNodeData | undefined,
@@ -47,6 +52,7 @@ export abstract class TreeNodeData implements ITreeNodeData {
   ) {
     this.leaf = opts.leaf === true;
     this.parent = parentNodeData;
+    this._nodeType = model.treeNodeType!;
 
     // 所有节点都要继承父的上下文，如果父存在则复制父的资源上下文，否则返回空对象。
     if (this.parent) {

package/src/types.ts

@@ -18,6 +18,7 @@ import {
 } from './interface';
 import { LogicSchedulerCenter } from './logic-scheduler';
 import { RegisterCenter } from './register/register-center';
+import { UIDomainManager } from './utils';
 
 declare module '@ibiz-template/core' {
   interface IBizSys {
@@ -186,6 +187,15 @@ declare module '@ibiz-template/core' {
      * @memberof IBizSys
      */
     platform: IPlatformProvider;
+
+    /**
+     * UI域管理器
+     *
+     * @author chitanda
+     * @date 2023-12-22 15:12:41
+     * @type {UIDomainManager}
+     */
+    uiDomainManager: UIDomainManager;
   }
 
   interface IEnvironment {

package/src/ui-logic/ui-logic-param/ui-logic-param.ts

@@ -32,7 +32,7 @@ export class UILogicParam {
     const m = this.model;
     const { parameters } = ctx;
     const { context, params, data } = parameters;
-    const app = ibiz.hub.getApp(context.srfappid);
+    const app = ibiz.hub.getApp(m.appId);
 
     // 特殊变量的特殊处理
     if (m.codeName === 'layoutPanel') {

package/src/utils/index.ts

@@ -13,5 +13,7 @@ export * from './value-rule/value-rule';
 export * from './script/index';
 export { TextUtil } from './text-util/text-util';
 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 { handleAllSettled } from './promise/promise';

package/src/utils/nav-params/calc-nav-params.ts

@@ -15,7 +15,7 @@ import { convertNavData } from './nav-params';
  *   })} model
  * @param {{
  *     derValue?: string; 关系父实体的主键值
- *     context: IParams; 上下文
+ *     context: IContext; 上下文
  *     params: IParams; 视图参数
  *     data: IData; 关系父的数据
  *   }} originParams
@@ -37,7 +37,7 @@ export function calcNavParams(
      * 关系父主键值
      */
     derValue?: string;
-    context: IParams;
+    context: IContext;
     params: IParams;
     data: IData;
   },

package/src/utils/open-redirect-view/open-redirect-view.ts

@@ -143,7 +143,7 @@ export async function openDERedirectView(
   // 实体重定向视图获取数据行为
   const actionId = appView.getDataAppDEActionId;
   const app = ibiz.hub.getApp(appView.appId);
-  const service = await app.deService.getService(entityId);
+  const service = await app.deService.getService(context, entityId);
   ibiz.loading.showRedirect();
   try {
     // 获取数据，未配置行为时，默认走 Get 行为

package/src/utils/ui-domain/ui-domain.ts

@@ -0,0 +1,52 @@
+import { createUUID } from 'qx-util';
+
+/**
+ * 界面域
+ *
+ * @author chitanda
+ * @date 2023-12-22 15:12:07
+ * @export
+ * @class UIDomain
+ */
+export class UIDomain {
+  /**
+   * 唯一域标识
+   *
+   * @author chitanda
+   * @date 2023-12-22 15:12:12
+   * @type {string}
+   */
+  readonly id: string;
+
+  /**
+   * Creates an instance of UIDomain.
+   *
+   * @author chitanda
+   * @date 2023-12-22 16:12:03
+   * @param {string} appId
+   * @param {string} [id]
+   */
+  constructor(id?: string) {
+    if (id) {
+      this.id = id;
+    } else {
+      this.id = createUUID();
+    }
+  }
+
+  /**
+   * 界面域销毁
+   *
+   * @author chitanda
+   * @date 2023-12-22 15:12:49
+   */
+  destroy(): void {
+    const apps = ibiz.hub.getAllApps();
+    apps.forEach(app => {
+      app.deService.reset({
+        srfappid: app.appId,
+        srfsessionid: this.id,
+      });
+    });
+  }
+}

package/src/utils/ui-domain-manager/ui-domain-manager.ts

@@ -0,0 +1,64 @@
+import { UIDomain } from '../ui-domain/ui-domain';
+
+/**
+ * 界面域管理器
+ *
+ * @author chitanda
+ * @date 2023-12-22 15:12:10
+ * @export
+ * @class UIDomainManager
+ */
+export class UIDomainManager {
+  /**
+   * 界面域实例缓存
+   *
+   * @author chitanda
+   * @date 2023-12-22 15:12:53
+   * @protected
+   * @type {Map<string, UIDomain>}
+   */
+  protected domainMap: Map<string, UIDomain> = new Map();
+
+  /**
+   * 创建域
+   *
+   * @author chitanda
+   * @date 2023-12-22 16:12:44
+   * @param {string} [id] 可选，不传则自动生成
+   * @return {*}  {UIDomain}
+   */
+  create(id?: string): UIDomain {
+    const domain = new UIDomain(id);
+    this.domainMap.set(domain.id, domain);
+    return domain;
+  }
+
+  /**
+   * 获取域
+   *
+   * @author chitanda
+   * @date 2023-12-22 15:12:17
+   * @param {string} id
+   * @return {*}  {UIDomain}
+   */
+  get(id: string): UIDomain {
+    if (this.domainMap.has(id)) {
+      return this.domainMap.get(id)!;
+    }
+    throw new Error(`无效的界面域标识[${id}]`);
+  }
+
+  /**
+   * 销毁域
+   *
+   * @author chitanda
+   * @date 2023-12-22 15:12:03
+   * @param {string} id
+   */
+  destroy(id: string): void {
+    if (this.domainMap.has(id)) {
+      this.domainMap.get(id)!.destroy();
+      this.domainMap.delete(id);
+    }
+  }
+}

package/out/service/service/entity/util/util.d.ts

@@ -1,13 +0,0 @@
-import { IAppDEMethod } from '@ibiz/model-core';
-/**
- * 是否为本地模式
- *
- * @description 行为类型: 内置方法、数据集类型: 数据查询，才是本地模式
- * @author chitanda
- * @date 2023-09-06 16:09:06
- * @export
- * @param {IAppDEMethod} method
- * @return {*}  {boolean}
- */
-export declare function isLocalMode(method: IAppDEMethod): boolean;
-//# sourceMappingURL=util.d.ts.map

package/out/service/service/entity/util/util.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/util/util.ts"],"names":[],"mappings":"AAAA,OAAO,EAA+B,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAE7E;;;;;;;;;GASG;AACH,wBAAgB,WAAW,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAKzD"}

package/out/service/service/entity/util/util.js

@@ -1,14 +0,0 @@
-/**
- * 是否为本地模式
- *
- * @description 行为类型: 内置方法、数据集类型: 数据查询，才是本地模式
- * @author chitanda
- * @date 2023-09-06 16:09:06
- * @export
- * @param {IAppDEMethod} method
- * @return {*}  {boolean}
- */
-export function isLocalMode(method) {
-    return (method.actionType === 'BUILTIN' ||
-        method.dataSetType === 'DATAQUERY');
-}

package/src/service/service/entity/util/util.ts

@@ -1,18 +0,0 @@
-import { IAppDEAction, IAppDEDataSet, IAppDEMethod } from '@ibiz/model-core';
-
-/**
- * 是否为本地模式
- *
- * @description 行为类型: 内置方法、数据集类型: 数据查询，才是本地模式
- * @author chitanda
- * @date 2023-09-06 16:09:06
- * @export
- * @param {IAppDEMethod} method
- * @return {*}  {boolean}
- */
-export function isLocalMode(method: IAppDEMethod): boolean {
-  return (
-    (method as IAppDEAction).actionType === 'BUILTIN' ||
-    (method as IAppDEDataSet).dataSetType === 'DATAQUERY'
-  );
-}