@ibiz-template/runtime 0.0.3-beta.5 → 0.0.4-beta.1

package/src/service/utils/de-dq-cond-util/de-dq-cond-util.ts

@@ -1,9 +1,9 @@
 import {
-  IPSAppDEDataSet,
-  IPSDEDQCondition,
-  IPSDEDQFieldCondition,
-  IPSDEDQGroupCondition,
-} from '@ibiz-template/model';
+  IAppDEDataSet,
+  IDEDQCondition,
+  IDEDQFieldCondition,
+  IDEDQGroupCondition,
+} from '@ibiz/model-core';
 import { PSDEDQCondEngine } from '../de-dq-cond/ps-de-dq-cond-engine';
 
 /**
@@ -22,9 +22,9 @@ export class DEDQCondUtil {
    * @date 2022-08-25 17:08:57
    * @protected
    * @static
-   * @type {WeakMap<IPSAppDEDataSet, PSDEDQCondEngine>}
+   * @type {WeakMap<IAppDEDataSet, PSDEDQCondEngine>}
    */
-  protected static map: WeakMap<IPSAppDEDataSet, PSDEDQCondEngine> =
+  protected static map: WeakMap<IAppDEDataSet, PSDEDQCondEngine> =
     new WeakMap();
 
   /**
@@ -33,14 +33,14 @@ export class DEDQCondUtil {
    * @author chitanda
    * @date 2022-08-25 17:08:04
    * @static
-   * @param {IPSAppDEDataSet} dataSet
+   * @param {IAppDEDataSet} dataSet
    * @return {*}  {PSDEDQCondEngine}
    */
-  static getCond(dataSet: IPSAppDEDataSet): PSDEDQCondEngine | null {
+  static getCond(dataSet: IAppDEDataSet): PSDEDQCondEngine | null {
     if (this.map.has(dataSet)) {
       return this.map.get(dataSet)!;
     }
-    const groups = dataSet.getPSDEDQGroupConditions();
+    const groups = dataSet.dedqgroupConditions;
     if (groups) {
       const cond = new PSDEDQCondEngine();
       cond.parse(['OR', this.calcCond(groups)]);
@@ -57,15 +57,15 @@ export class DEDQCondUtil {
    * @date 2022-08-25 17:08:39
    * @protected
    * @static
-   * @param {IPSDEDQCondition[]} items
+   * @param {IDEDQCondition[]} items
    * @return {*}  {unknown[]}
    */
-  protected static calcCond(items: IPSDEDQCondition[]): unknown[] {
+  protected static calcCond(items: IDEDQCondition[]): unknown[] {
     const arr: unknown[] = [];
     items.forEach(item => {
       const condArr: unknown[] = [];
       if (item.condType === 'GROUP') {
-        const cond = item as IPSDEDQGroupCondition;
+        const cond = item as IDEDQGroupCondition;
         // 是否取反
         if (cond.notMode) {
           condArr.push('!');
@@ -73,23 +73,23 @@ export class DEDQCondUtil {
         // 分组模式 AND、OR
         condArr.push(item.condOp);
         // 填充子条件
-        const children = cond.getPSDEDQConditions();
+        const children = cond.dedqconditions;
         if (children) {
           const child = this.calcCond(children);
           condArr.push(child);
         }
       } else if (item.condType === 'SINGLE') {
-        const cond = item as IPSDEDQFieldCondition;
+        const cond = item as IDEDQFieldCondition;
         condArr.push(cond.fieldName);
         if (cond.condValue) {
-          if (cond.getPSVARTypeId()) {
-            condArr.push({
-              type: cond.getPSVARTypeId(),
-              value: cond.getPSVARTypeId(),
-            });
-          } else {
-            condArr.push(cond.condValue);
-          }
+          // if (cond.getPSVARTypeId()) {
+          //   condArr.push({
+          //     type: cond.getPSVARTypeId(),
+          //     value: cond.getPSVARTypeId(),
+          //   });
+          // } else {
+          //   condArr.push(cond.condValue);
+          // }
         } else {
           // 无条件值为空字符串
           condArr.push('');

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

@@ -1,9 +1,5 @@
-import {
-  AppEntityModel,
-  DefectModelError,
-  IPSAppCodeList,
-  UnsupportedModelError,
-} from '@ibiz-template/model';
+import { IAppDataEntity, IAppCodeList } from '@ibiz/model-core';
+import { ModelError } from '@ibiz-template/core';
 import { Application } from '../../../application';
 import { CodeListItem } from '../../interface';
 
@@ -52,7 +48,7 @@ type CacheData = {
  * @class DynamicCodeListCache
  */
 export class DynamicCodeListCache {
-  protected app: Application;
+  protected app!: Application;
 
   /**
    * 代码表对象
@@ -60,18 +56,18 @@ export class DynamicCodeListCache {
    * @author lxm
    * @date 2022-08-26 14:08:11
    * @protected
-   * @type {IPSAppCodeList}
+   * @type {IAppCodeList}
    */
-  protected codeList: IPSAppCodeList;
+  protected codeList: IAppCodeList;
 
   /**
    * 动态代码表对应实体模型
    *
    * @author lxm
    * @date 2022-08-26 14:08:16
-   * @type {AppEntityModel}
+   * @type {IAppDataEntity}
    */
-  protected entity?: AppEntityModel;
+  protected entity?: IAppDataEntity;
 
   /**
    * 代码表请求实体服务的方法名称
@@ -110,9 +106,8 @@ export class DynamicCodeListCache {
    */
   protected initPromise?: Promise<void>;
 
-  constructor(codeList: IPSAppCodeList) {
+  constructor(codeList: IAppCodeList) {
     this.codeList = codeList;
-    this.app = ibiz.hub.getApp(codeList.getPSModelService().app);
   }
 
   /**
@@ -129,27 +124,27 @@ export class DynamicCodeListCache {
       if (predefinedType) {
         this.isPredefined = true;
         if (!['OPERATOR', 'RUNTIME'].includes(predefinedType)) {
-          throw new UnsupportedModelError(
+          throw new ModelError(
             this.codeList,
             `预定义类型${predefinedType}暂不支持`,
           );
         }
         return;
       }
-      // *非预定的需要准备实体模型和方法
-      const appDataEntity = this.codeList.getPSAppDataEntity();
-      if (!appDataEntity) {
-        throw new DefectModelError(this.codeList, '未配置应用实体');
-      }
-      await appDataEntity.fill(true);
-      const methodName = this.codeList.getPSAppDEDataSet()?.codeName;
-      if (!methodName) {
-        throw new DefectModelError(this.codeList, '未配置数据集');
-      }
-      const entityModel = new AppEntityModel(appDataEntity);
-      await entityModel.init();
-      this.entity = entityModel;
-      this.methodName = methodName;
+      // // *非预定的需要准备实体模型和方法
+      // const appDataEntity = this.codeList.getPSAppDataEntity();
+      // if (!appDataEntity) {
+      //   throw new RuntimeModelError(this.codeList, '未配置应用实体');
+      // }
+      // await appDataEntity.fill(true);
+      // const methodName = this.codeList.getPSAppDEDataSet()?.codeName;
+      // if (!methodName) {
+      //   throw new RuntimeModelError(this.codeList, '未配置数据集');
+      // }
+      // const entityModel = new IAppDataEntity(appDataEntity);
+      // await entityModel.init();
+      // this.entity = entityModel;
+      // this.methodName = methodName;
       this.initPromise = undefined;
     };
 
@@ -165,27 +160,27 @@ export class DynamicCodeListCache {
    * @param {IData} data
    * @returns {*}
    */
-  protected convertData(data: IData) {
+  protected convertData(_data: IData) {
     // todo 根据模型转换
     const result: IData = {};
-    // 值属性
-    if (this.codeList.getValuePSAppDEField()) {
-      const valueKey = this.codeList
-        .getValuePSAppDEField()!
-        .codeName.toLowerCase();
-      result.id = data[valueKey];
-      result.value = data[valueKey];
-    } else {
-      result.id = data[this.entity!.keyName];
-      result.value = data[this.entity!.keyName];
-    }
-    // 文本属性
-    if (this.codeList.getTextPSAppDEField()) {
-      result.text =
-        data[this.codeList.getTextPSAppDEField()!.codeName.toLowerCase()];
-    } else {
-      result.text = data[this.entity!.textName];
-    }
+    // // 值属性
+    // if (this.codeList.getValuePSAppDEField()) {
+    //   const valueKey = this.codeList
+    //     .getValuePSAppDEField()!
+    //     .codeName.toLowerCase();
+    //   result.id = data[valueKey];
+    //   result.value = data[valueKey];
+    // } else {
+    //   result.id = data[this.entity!.keyName];
+    //   result.value = data[this.entity!.keyName];
+    // }
+    // // 文本属性
+    // if (this.codeList.getTextPSAppDEField()) {
+    //   result.text =
+    //     data[this.codeList.getTextPSAppDEField()!.codeName.toLowerCase()];
+    // } else {
+    //   result.text = data[this.entity!.textName];
+    // }
     return Object.freeze(result);
   }
 
@@ -200,11 +195,15 @@ export class DynamicCodeListCache {
    * @returns {*}  {Promise<CodeListItem[]>}
    */
   protected async load(
-    context: IParams = {},
+    _context: IParams = {},
     params: IParams = {},
   ): Promise<CodeListItem[]> {
     // *预定义加载
     if (this.isPredefined) {
+      // 特殊处理，避免预置代码表加载不全
+      if (!params.size) {
+        params.size = 10000;
+      }
       const res = await this.app.net.get(
         `/dictionaries/codelist/${this.codeList.codeName}`,
         params,
@@ -217,18 +216,18 @@ export class DynamicCodeListCache {
       new Error('动态代码表找不到实体或数据集');
     }
 
-    const deService = await this.app.es.getService(
-      this.entity!.source.codeName,
-    );
-    const res = await deService.exec(this.methodName!, context, params);
-    let resultItems: CodeListItem[] = [];
-    if (res.data.length) {
-      resultItems = res.data.map((item: IData) => {
-        return this.convertData(item);
-      });
-      // todo 动态树形代码表
-    }
-    return resultItems;
+    // const deService = await this.app.es.getService(
+    //   this.entity!.source.codeName,
+    // );
+    // const res = await deService.exec(this.methodName!, context, params);
+    // let resultItems: CodeListItem[] = [];
+    // if (res.data.length) {
+    //   resultItems = res.data.map((item: IData) => {
+    //     return this.convertData(item);
+    //   });
+    // todo 动态树形代码表
+    // }
+    return [];
   }
 
   /**
@@ -272,7 +271,7 @@ export class DynamicCodeListCache {
         ? ibiz.config.defaultCodeListCacheTimeout
         : this.codeList.cacheTimeout;
     const cacheData: CacheData = {
-      expirationTime: new Date().getTime() + waitTime,
+      expirationTime: new Date().getTime() + waitTime!,
       promise,
     };
     this.cache.set(key, cacheData);

package/src/service/utils/route-context/route-context.ts

@@ -1,5 +1,6 @@
-import { IPSAppView, ViewType } from '@ibiz-template/model';
+import { IAppView } from '@ibiz/model-core';
 import { ServicePathItem } from '../service-path-util/service-path-util';
+import { ViewType } from '../../../constant';
 
 /**
  * 计算资源上下文时，需要排除自身实体codeName的视图（导航类视图和多数据视图）
@@ -34,7 +35,7 @@ export const excludeViewTypes: string[] = [
 export function calcRouteContext(
   context: IParams,
   pathItems: ServicePathItem[][],
-  appView?: IPSAppView,
+  _appView?: IAppView,
 ): Record<string, unknown> {
   let paths: string[][][] = [];
   pathItems.forEach(items => {
@@ -42,17 +43,17 @@ export function calcRouteContext(
     for (let i = 0; i < items.length; i++) {
       const arr: string[] = [];
       const item = items[i];
-      if (
-        appView &&
-        appView.viewType &&
-        excludeViewTypes.includes(appView.viewType)
-      ) {
-        // 排除导航类视图和多数据视图自身
-        const deName = appView.getPSAppDataEntity()?.codeName.toLowerCase();
-        if (deName === item.name) {
-          return;
-        }
-      }
+      // if (
+      //   appView &&
+      //   appView.viewType &&
+      //   excludeViewTypes.includes(appView.viewType)
+      // ) {
+      //   // 排除导航类视图和多数据视图自身
+      //   const deName = appView.getPSAppDataEntity()?.codeName.toLowerCase();
+      //   if (deName === item.name) {
+      //     return;
+      //   }
+      // }
       const val = context[item.name];
       if (val) {
         arr.push(item.name);

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

@@ -1,10 +1,11 @@
 import { pluralLower } from '@ibiz-template/core';
-import { IPSAppDERS, ModelService } from '@ibiz-template/model';
+import { IAppDERS } from '@ibiz/model-core';
+import { Application } from '../../../application';
 
 /**
  * 获取服务拼接递归对象
  */
-export type ServicePathDeep = [IPSAppDERS, ServicePathDeep[]];
+export type ServicePathDeep = [IAppDERS, ServicePathDeep[]];
 
 /**
  * 服务路径项
@@ -45,7 +46,7 @@ export type ServicePathItem = {
  * @class ServicePathUtil
  */
 export class ServicePathUtil {
-  protected allDERss: IPSAppDERS[] = [];
+  protected allDERss: IAppDERS[] = [];
 
   /**
    * 应用实体关系
@@ -53,9 +54,9 @@ export class ServicePathUtil {
    * @author chitanda
    * @date 2022-08-22 22:08:18
    * @protected
-   * @type {Map<string, IPSAppDERS[]>} <应用实体, 应用实体父关系>
+   * @type {Map<string, IAppDERS[]>} <应用实体, 应用实体父关系>
    */
-  protected entityRsMap: Map<string, IPSAppDERS[]> = new Map();
+  protected entityRsMap: Map<string, IAppDERS[]> = new Map();
 
   /**
    * 实体资源路径
@@ -67,14 +68,7 @@ export class ServicePathUtil {
    */
   protected entityRsPathMap: Map<string, ServicePathItem[][]> = new Map();
 
-  /**
-   * Creates an instance of ServicePathUtil.
-   *
-   * @author chitanda
-   * @date 2023-01-10 16:01:18
-   * @param {ModelService} modelService 当前应用所归属的模型服务
-   */
-  constructor(protected modelService: ModelService) {}
+  constructor(protected app: Application) {}
 
   /**
    * 初始化工具参数
@@ -88,11 +82,9 @@ export class ServicePathUtil {
     if (this.allDERss.length > 0) {
       return;
     }
-    const { app } = this.modelService;
-    const allPSAppEntities = app.getAllPSAppDataEntities() || [];
-    this.allDERss = app.getAllPSAppDERSs() || [];
-    allPSAppEntities.forEach(entity => {
-      const codeName = entity.isFill ? entity.codeName : entity.refM.codeName;
+    const list = this.app.appDataEntityList || [];
+    this.allDERss = this.app.appDERSs;
+    list.forEach(codeName => {
       const items = this.allDERss.filter(item => {
         if (item.minorDECodeName === codeName) {
           return item;
@@ -146,11 +138,11 @@ export class ServicePathUtil {
    * @author chitanda
    * @date 2022-08-22 22:08:32
    * @protected
-   * @param {IPSAppDERS[]} deRss
+   * @param {IAppDERS[]} deRss
    * @return {*}  {ServicePathDeep[]}
    */
   protected calcDeepPath(
-    deRss: IPSAppDERS[],
+    deRss: IAppDERS[],
     num: number = 0,
   ): ServicePathDeep[] {
     if (num > 10) {
@@ -159,7 +151,7 @@ export class ServicePathUtil {
     num += 1;
     const arr: ServicePathDeep[] = [];
     deRss.forEach(rs => {
-      const items = this.entityRsMap.get(rs.majorDECodeName) || [];
+      const items = this.entityRsMap.get(rs.majorDECodeName!) || [];
       arr.push([rs, this.calcDeepPath(items, num)]);
     });
     return arr;
@@ -183,7 +175,11 @@ export class ServicePathUtil {
     items.forEach(item => {
       const [rs, children] = item;
       if (children.length > 0) {
-        this.deepFillPath(deName, [...pathNames, rs.majorDECodeName], children);
+        this.deepFillPath(
+          deName,
+          [...pathNames, rs.majorDECodeName!],
+          children,
+        );
       } else {
         if (!this.entityRsPathMap.has(deName)) {
           this.entityRsPathMap.set(deName, []);
@@ -200,9 +196,9 @@ export class ServicePathUtil {
               };
             }),
             {
-              deName: rs.majorDECodeName,
-              name: rs.majorDECodeName.toLowerCase(),
-              plural: pluralLower(rs.majorDECodeName),
+              deName: rs.majorDECodeName!,
+              name: rs.majorDECodeName!.toLowerCase(),
+              plural: pluralLower(rs.majorDECodeName!),
             },
           ].reverse(),
         );

package/src/service/vo/index.ts

@@ -1,2 +1,3 @@
 export * from './control.vo';
 export * from './tree-node-data';
+export * from './ui-map-field';

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

@@ -1,4 +1,4 @@
-import { TreeDataSetNodeModel, TreeNodeRSModel } from '@ibiz-template/model';
+import { IDETreeDataSetNode, IDETreeNodeRS } from '@ibiz/model-core';
 import { ITreeNodeData } from '../../interface';
 import { TreeNodeData } from './tree-node-data';
 
@@ -20,9 +20,9 @@ export class TreeDataSetNodeData extends TreeNodeData implements ITreeNodeData {
   deData: IData;
 
   constructor(
-    model: TreeDataSetNodeModel,
+    model: IDETreeDataSetNode,
     opts: { hasQuery: boolean; data: IData },
-    nodeRS?: TreeNodeRSModel,
+    nodeRS?: IDETreeNodeRS,
     parentNodeData?: ITreeNodeData,
   ) {
     super(model, opts, nodeRS, parentNodeData);
@@ -31,14 +31,14 @@ export class TreeDataSetNodeData extends TreeNodeData implements ITreeNodeData {
     this.text = data.srfmajortext;
     this.value = data.srfkey;
     this.id = parentNodeData
-      ? `${parentNodeData.id}:${model.nodeId}${data.srfkey}`
-      : model.nodeId + data.srfkey;
+      ? `${parentNodeData.id}:${model.id}${data.srfkey}`
+      : model.id + data.srfkey;
     // id小写
     this.id = this.id.toLowerCase();
 
     // 实体节点额外添加上自己的实体上下文
-    Object.assign(this.context, {
-      [model.appEntity.deName]: data.srfkey,
-    });
+    // Object.assign(this.context, {
+    //   [model.appDataEntityId]: data.srfkey,
+    // });
   }
 }

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

@@ -1,4 +1,4 @@
-import { TreeNodeModel, TreeNodeRSModel } from '@ibiz-template/model';
+import { IDETreeNode, IDETreeNodeRS } from '@ibiz/model-core';
 import { ITreeNodeData } from '../../interface';
 
 /**
@@ -23,7 +23,7 @@ export abstract class TreeNodeData {
    * @type {boolean}
    * @memberof TreeNodeData
    */
-  leaf: boolean;
+  leaf: boolean = false;
 
   /**
    * 资源路径相关上下文参数
@@ -43,9 +43,9 @@ export abstract class TreeNodeData {
   parent?: ITreeNodeData;
 
   constructor(
-    model: TreeNodeModel,
+    model: IDETreeNode,
     opts: { hasQuery: boolean },
-    _nodeRS?: TreeNodeRSModel,
+    _nodeRS?: IDETreeNodeRS,
     parentNodeData?: ITreeNodeData,
   ) {
     this.parent = parentNodeData;
@@ -57,8 +57,7 @@ export abstract class TreeNodeData {
       this.context = {};
     }
 
-    this.nodeId = model.nodeId;
-    this.leaf =
-      model.tree.getChildNodes(model.nodeId, opts.hasQuery).length === 0;
+    this.nodeId = model.id!;
+    // this.leaf = model.tree.getChildNodes(model.id, opts.hasQuery).length === 0;
   }
 }

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

@@ -1,4 +1,4 @@
-import { TreeNodeRSModel, TreeStaticNodeModel } from '@ibiz-template/model';
+import { IDETreeNodeRS, IDETreeStaticNode } from '@ibiz/model-core';
 import { ITreeNodeData } from '../../interface';
 import { TreeNodeData } from './tree-node-data';
 
@@ -20,24 +20,22 @@ export class TreeStaticNodeData extends TreeNodeData implements ITreeNodeData {
   deData?: IData;
 
   constructor(
-    model: TreeStaticNodeModel,
+    model: IDETreeStaticNode,
     opts: { hasQuery: boolean },
-    nodeRS?: TreeNodeRSModel,
+    nodeRS?: IDETreeNodeRS,
     parentNodeData?: ITreeNodeData,
   ) {
     super(model, opts, nodeRS, parentNodeData);
-    this.id = parentNodeData
-      ? `${parentNodeData.id}:${model.nodeId}`
-      : model.nodeId;
+    this.id = parentNodeData ? `${parentNodeData.id}:${model.id}` : model.id!;
     // id小写
     this.id = this.id.toLowerCase();
-    this.text = model.text;
+    this.text = model.text!;
 
     // 静态节点数据去对应级别的父节点数据
     if (parentNodeData && nodeRS) {
       // 根据父值级别查找父数据
       let parent: ITreeNodeData | undefined = parentNodeData;
-      for (let index = 1; index < nodeRS.parentValueLevel; index++) {
+      for (let index = 1; index < nodeRS.parentValueLevel!; index++) {
         parent = parent?.parent;
       }
       if (parent?.deData) {

package/src/types.ts

@@ -8,9 +8,8 @@ import {
   IOverlayController,
   IGlobalConfig,
 } from './interface';
-import { GlobalModel } from './model';
 import { RegisterCenter } from './register/register-center';
-import { RuntimeHub } from './runtime-hub';
+import { AppHub } from './app-hub';
 import { AuthService } from './service';
 
 declare module '@ibiz-template/core' {
@@ -29,18 +28,9 @@ declare module '@ibiz-template/core' {
      *
      * @author chitanda
      * @date 2022-12-21 14:12:34
-     * @type {RuntimeHub}
+     * @type {AppHub}
      */
-    hub: RuntimeHub;
-
-    /**
-     * 全局模型对象
-     *
-     * @author chitanda
-     * @date 2022-12-20 17:12:23
-     * @type {GlobalModel}
-     */
-    model: GlobalModel;
+    hub: AppHub;
 
     /**
      * 简洁确认框

package/src/utils/app-de-ui-action-util/app-de-ui-action-util.ts

@@ -1,5 +1,4 @@
-import { IBizContext } from '@ibiz-template/core';
-import { IPSAppDEUIAction } from '@ibiz-template/model';
+import { IAppDEUIAction } from '@ibiz/model-core';
 import { IUIActionResult } from '../../interface';
 
 /**
@@ -17,22 +16,22 @@ export class AppDEUIActionUtil {
    * @author chitanda
    * @date 2022-08-29 15:08:47
    * @static
-   * @param {IPSAppDEUIAction} action
-   * @param {IBizContext} context
+   * @param {IAppDEUIAction} action
+   * @param {IContext} context
    * @param {(IData | null)} data
    * @param {IParams} [params]
    * @param {IData} [opts]
    * @return {*}  {Promise<IUIActionResult>}
    */
   static async exec(
-    action: IPSAppDEUIAction,
-    context: IBizContext,
-    data: IData[] | null,
+    action: IAppDEUIAction,
+    context: IContext,
+    data: IDatum[] | null,
     params: IParams,
     opts?: IData,
   ): Promise<IUIActionResult> {
     const provider = await ibiz.register.uiAction.get(action);
     const handler = await provider.getHandler();
-    return handler.exec(action, context, data, params, opts);
+    return handler.exec(action, context, data || [], params, opts);
   }
 }