@ibiz-template/runtime 0.0.3-beta.6 → 0.0.4-beta.2

package/out/service/service-util.js

@@ -1,5 +1,3 @@
-import { AppEntityModel, } from '@ibiz-template/model';
-import { EntityService } from './service';
 /**
  * 应用服务工具类
  *
@@ -13,11 +11,11 @@ export class ServiceUtil {
      * Creates an instance of ServiceUtil.
      *
      * @author chitanda
-     * @date 2022-12-23 10:12:24
-     * @param {ModelService} modelService 应用模型服务
+     * @date 2023-04-18 14:04:01
+     * @param {IApplication} appModel
      */
-    constructor(modelService) {
-        this.modelService = modelService;
+    constructor(appModel) {
+        this.appModel = appModel;
         /**
          * 实体服务缓存
          *
@@ -33,7 +31,7 @@ export class ServiceUtil {
          * @author chitanda
          * @date 2022-08-18 22:08:45
          * @protected
-         * @type {Map<string, IPSAppDataEntity>}
+         * @type {Map<string, IAppDataEntity>}
          */
         this.allEntities = new Map();
     }
@@ -47,13 +45,13 @@ export class ServiceUtil {
      */
     async initAllEntities() {
         if (this.allEntities.size !== 0) {
-            return;
+            // todo
         }
-        const items = this.modelService.app.getAllPSAppDataEntities() || [];
-        items.forEach(item => {
-            const codeName = item.isFill ? item.codeName : item.refM.codeName;
-            this.allEntities.set(codeName, item);
-        });
+        // const items = this.app.getAllPSAppDataEntities() || [];
+        // items.forEach(item => {
+        //   const codeName = item.isFill ? item.codeName : item.refM.codeName;
+        //   this.allEntities.set(codeName, item);
+        // });
     }
     /**
      * 根据实体标识获取实体服务
@@ -65,20 +63,20 @@ export class ServiceUtil {
      * @return {*}  {Promise<EntityService>}
      */
     async getService(entityCodeName) {
-        if (!this.cache.has(entityCodeName)) {
-            await this.initAllEntities();
-            const entity = this.allEntities.get(entityCodeName);
-            if (!entity) {
-                throw new Error(`找不到实体[${entityCodeName}]模型`);
-            }
-            await entity.fill(true);
-            const entityModel = new AppEntityModel(entity);
-            await entityModel.init();
-            const app = ibiz.hub.getApp(this.modelService.app);
-            const paths = app.resourcePathUtil.calcPaths(entityCodeName);
-            const service = await new EntityService(entityModel, paths);
-            this.cache.set(entityCodeName, service);
-        }
+        // if (!this.cache.has(entityCodeName)) {
+        //   await this.initAllEntities();
+        //   const entity = this.allEntities.get(entityCodeName);
+        //   if (!entity) {
+        //     throw new Error(`找不到实体[${entityCodeName}]模型`);
+        //   }
+        //   await entity.fill(true);
+        //   const entityModel = new IAppDataEntity(entity);
+        //   await entityModel.init();
+        //   const app = ibiz.hub.getApp(this.modelService.app);
+        //   const paths = app.resourcePathUtil.calcPaths(entityCodeName);
+        //   const service = await new EntityService(entityModel, paths);
+        //   this.cache.set(entityCodeName, service);
+        // }
         return this.cache.get(entityCodeName);
     }
     /**

package/out/service/utils/app-counter/app-counter.d.ts

@@ -1,4 +1,4 @@
-import { IPSAppCounter, IPSAppDataEntity } from '@ibiz-template/model';
+import { IAppCounter, IAppDataEntity } from '@ibiz/model-core';
 import { QXEvent } from 'qx-util';
 import { Application } from '../../../application';
 import { EntityService } from '../../service';
@@ -11,9 +11,9 @@ import { EntityService } from '../../service';
  * @class AppCounter
  */
 export declare class AppCounter {
-    model: IPSAppCounter;
+    model: IAppCounter;
     protected app: Application;
-    protected entity: IPSAppDataEntity;
+    protected entity: IAppDataEntity;
     protected service: EntityService;
     protected action: string;
     protected intervalTimer: unknown;
@@ -46,9 +46,9 @@ export declare class AppCounter {
      *
      * @author chitanda
      * @date 2022-10-26 20:10:55
-     * @param {IPSAppCounter} model 应用计数器模型
+     * @param {IAppCounter} model 应用计数器模型
      */
-    constructor(model: IPSAppCounter);
+    constructor(model: IAppCounter);
     /**
      * 计数器初始化
      *
@@ -57,7 +57,7 @@ export declare class AppCounter {
      * @param {IParams} [context]
      * @param {IParams} [params]
      */
-    init(context?: IParams, params?: IParams): Promise<void>;
+    init(_context?: IParams, _params?: IParams): Promise<void>;
     /**
      * 设置上下文以及查询参数
      *

package/out/service/utils/app-counter/app-counter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"app-counter.d.ts","sourceRoot":"","sources":["../../../../src/service/utils/app-counter/app-counter.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,aAAa,EACb,gBAAgB,EACjB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAe,OAAO,EAAE,MAAM,SAAS,CAAC;AAE/C,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAE9C;;;;;;;GAOG;AACH,qBAAa,UAAU;IAgDF,KAAK,EAAE,aAAa;IA/CvC,SAAS,CAAC,GAAG,EAAE,WAAW,CAAC;IAE3B,SAAS,CAAC,MAAM,EAAG,gBAAgB,CAAC;IAEpC,SAAS,CAAC,OAAO,EAAG,aAAa,CAAC;IAElC,SAAS,CAAC,MAAM,EAAG,MAAM,CAAC;IAE1B,SAAS,CAAC,aAAa,EAAE,OAAO,CAAC;IAEjC,SAAS,CAAC,SAAS,EAAE,OAAO,CAAS;IAErC;;;;;;;OAOG;IACH,IAAI,WAAW,IAAI,OAAO,CAEzB;IAED,SAAS,CAAC,OAAO,EAAE,OAAO,CAAwB;IAElD,SAAS,CAAC,MAAM,EAAE,OAAO,CAAM;IAE/B,SAAS,CAAC,GAAG,EAAE,OAAO,CAAC;QAAE,MAAM,EAAE,CAAC,IAAI,EAAE,KAAK,KAAK,IAAI,CAAA;KAAE,CAAC,CAAiB;IAE1E;;;;;;;OAOG;IACH,SAAS,CAAC,IAAI,EAAE,KAAK,CAAM;IAE3B;;;;;;OAMG;gBACgB,KAAK,EAAE,aAAa;IAIvC;;;;;;;OAOG;IACG,IAAI,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,OAAO;IAc9C;;;;;;;;OAQG;IACH,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,IAAI;IAS9D;;;;;;OAMG;IACH,SAAS,CAAC,QAAQ,IAAI,IAAI;IAU1B;;;;;;OAMG;IACH,SAAS,CAAC,eAAe,IAAI,IAAI;IAOjC;;;;;;;OAOG;cACa,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;IAStC;;;;;;;;OAQG;IACH,OAAO,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC;IAK5D;;;;;;;OAOG;IACH,QAAQ,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,KAAK,KAAK,IAAI,EAAE,SAAS,GAAE,OAAc,GAAG,IAAI;IAOpE;;;;;;OAMG;IACH,SAAS,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,KAAK,KAAK,IAAI,GAAG,IAAI;IAI1C;;;;;;;OAOG;IACH,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAI/B;;;;;OAKG;IACH,OAAO,IAAI,IAAI;CAMhB"}
+{"version":3,"file":"app-counter.d.ts","sourceRoot":"","sources":["../../../../src/service/utils/app-counter/app-counter.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAC/D,OAAO,EAAe,OAAO,EAAE,MAAM,SAAS,CAAC;AAE/C,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAE9C;;;;;;;GAOG;AACH,qBAAa,UAAU;IAgDF,KAAK,EAAE,WAAW;IA/CrC,SAAS,CAAC,GAAG,EAAG,WAAW,CAAC;IAE5B,SAAS,CAAC,MAAM,EAAG,cAAc,CAAC;IAElC,SAAS,CAAC,OAAO,EAAG,aAAa,CAAC;IAElC,SAAS,CAAC,MAAM,EAAG,MAAM,CAAC;IAE1B,SAAS,CAAC,aAAa,EAAE,OAAO,CAAC;IAEjC,SAAS,CAAC,SAAS,EAAE,OAAO,CAAS;IAErC;;;;;;;OAOG;IACH,IAAI,WAAW,IAAI,OAAO,CAEzB;IAED,SAAS,CAAC,OAAO,EAAE,OAAO,CAAwB;IAElD,SAAS,CAAC,MAAM,EAAE,OAAO,CAAM;IAE/B,SAAS,CAAC,GAAG,EAAE,OAAO,CAAC;QAAE,MAAM,EAAE,CAAC,IAAI,EAAE,KAAK,KAAK,IAAI,CAAA;KAAE,CAAC,CAAiB;IAE1E;;;;;;;OAOG;IACH,SAAS,CAAC,IAAI,EAAE,KAAK,CAAM;IAE3B;;;;;;OAMG;gBACgB,KAAK,EAAE,WAAW;IAErC;;;;;;;OAOG;IACG,IAAI,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,OAAO;IAehD;;;;;;;;OAQG;IACH,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,IAAI;IAS9D;;;;;;OAMG;IACH,SAAS,CAAC,QAAQ,IAAI,IAAI;IAU1B;;;;;;OAMG;IACH,SAAS,CAAC,eAAe,IAAI,IAAI;IAOjC;;;;;;;OAOG;cACa,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;IAStC;;;;;;;;OAQG;IACH,OAAO,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC;IAK5D;;;;;;;OAOG;IACH,QAAQ,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,KAAK,KAAK,IAAI,EAAE,SAAS,GAAE,OAAc,GAAG,IAAI;IAOpE;;;;;;OAMG;IACH,SAAS,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,KAAK,KAAK,IAAI,GAAG,IAAI;IAI1C;;;;;;;OAOG;IACH,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAI/B;;;;;OAKG;IACH,OAAO,IAAI,IAAI;CAMhB"}

package/out/service/utils/app-counter/app-counter.js

@@ -1,5 +1,4 @@
 import { IBizContext } from '@ibiz-template/core';
-import { DefectModelError, } from '@ibiz-template/model';
 import { notNilEmpty, QXEvent } from 'qx-util';
 import { clone } from 'ramda';
 /**
@@ -27,7 +26,7 @@ export class AppCounter {
      *
      * @author chitanda
      * @date 2022-10-26 20:10:55
-     * @param {IPSAppCounter} model 应用计数器模型
+     * @param {IAppCounter} model 应用计数器模型
      */
     constructor(model) {
         this.model = model;
@@ -44,7 +43,6 @@ export class AppCounter {
          * @type {IData}
          */
         this.data = {};
-        this.app = ibiz.hub.getApp(model.getPSModelService().app);
     }
     /**
      * 计数器初始化
@@ -54,18 +52,19 @@ export class AppCounter {
      * @param {IParams} [context]
      * @param {IParams} [params]
      */
-    async init(context, params) {
-        this.setParams(context, params);
-        this.entity = this.model.getPSAppDataEntity();
-        await this.entity.fill(true);
-        this.service = await this.app.es.getService(this.entity.codeName);
-        const action = this.model.getGetPSAppDEAction();
-        if (!action) {
-            throw new DefectModelError(this.model, `未找到获取计数器行为!`);
-        }
-        this.action = action.codeName;
-        this.interval();
-        await this.load();
+    async init(_context, _params) {
+        // todo
+        // this.setParams(context, params);
+        // this.entity = this.model.getPSAppDataEntity()!;
+        // await this.entity.fill(true);
+        // this.service = await this.app.es.getService(this.entity.codeName);
+        // const action = this.model.getGetPSAppDEAction();
+        // if (!action) {
+        //   throw new RuntimeModelError(this.model, `未找到获取计数器行为!`);
+        // }
+        // this.action = action.codeName;
+        // this.interval();
+        // await this.load();
     }
     /**
      * 设置上下文以及查询参数

package/out/service/utils/de-dq-cond/ps-de-dq-cond-engine.js

@@ -13,7 +13,7 @@ import { PSModelSingleCondBase } from './ps-model-single-cond-base';
  * @class PSDEDQCondEngine
  * @extends {PSModelCondEngineBase}
  */
-export class PSDEDQCondEngine extends PSModelCondEngineBase {
+class PSDEDQCondEngine extends PSModelCondEngineBase {
     /**
      * 测试
      *
@@ -118,3 +118,4 @@ PSDEDQCondEngine.PARAMTYPE_DATACONTEXT = 'DATACONTEXT';
  * @memberof PSDEDQCondEngine
  */
 PSDEDQCondEngine.PARAMTYPE_WEBCONTEXT = 'WEBCONTEXT';
+export { PSDEDQCondEngine };

package/out/service/utils/de-dq-cond-util/de-dq-cond-util.d.ts

@@ -1,4 +1,4 @@
-import { IPSAppDEDataSet, IPSDEDQCondition } from '@ibiz-template/model';
+import { IAppDEDataSet, IDEDQCondition } from '@ibiz/model-core';
 import { PSDEDQCondEngine } from '../de-dq-cond/ps-de-dq-cond-engine';
 /**
  * 获取查询条件工具类
@@ -16,19 +16,19 @@ export declare 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>;
     /**
      * 根据数据查询获取查询
      *
      * @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;
     /**
      * 计算查询条件
      *
@@ -36,9 +36,9 @@ export declare 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[];
 }
 //# sourceMappingURL=de-dq-cond-util.d.ts.map

package/out/service/utils/de-dq-cond-util/de-dq-cond-util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"de-dq-cond-util.d.ts","sourceRoot":"","sources":["../../../../src/service/utils/de-dq-cond-util/de-dq-cond-util.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EACf,gBAAgB,EAGjB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AAEtE;;;;;;;GAOG;AACH,qBAAa,YAAY;IACvB;;;;;;;;OAQG;IACH,SAAS,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,eAAe,EAAE,gBAAgB,CAAC,CAChD;IAEhB;;;;;;;;OAQG;IACH,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,eAAe,GAAG,gBAAgB,GAAG,IAAI;IAcjE;;;;;;;;;OASG;IACH,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,EAAE,gBAAgB,EAAE,GAAG,OAAO,EAAE;CAyChE"}
+{"version":3,"file":"de-dq-cond-util.d.ts","sourceRoot":"","sources":["../../../../src/service/utils/de-dq-cond-util/de-dq-cond-util.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,cAAc,EAGf,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AAEtE;;;;;;;GAOG;AACH,qBAAa,YAAY;IACvB;;;;;;;;OAQG;IACH,SAAS,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,aAAa,EAAE,gBAAgB,CAAC,CAC9C;IAEhB;;;;;;;;OAQG;IACH,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,aAAa,GAAG,gBAAgB,GAAG,IAAI;IAc/D;;;;;;;;;OASG;IACH,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,EAAE,cAAc,EAAE,GAAG,OAAO,EAAE;CAyC9D"}

package/out/service/utils/de-dq-cond-util/de-dq-cond-util.js

@@ -7,21 +7,21 @@ import { PSDEDQCondEngine } from '../de-dq-cond/ps-de-dq-cond-engine';
  * @export
  * @class DEDQCondUtil
  */
-export class DEDQCondUtil {
+class DEDQCondUtil {
     /**
      * 根据数据查询获取查询
      *
      * @author chitanda
      * @date 2022-08-25 17:08:04
      * @static
-     * @param {IPSAppDEDataSet} dataSet
+     * @param {IAppDEDataSet} dataSet
      * @return {*}  {PSDEDQCondEngine}
      */
     static getCond(dataSet) {
         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)]);
@@ -37,7 +37,7 @@ export class DEDQCondUtil {
      * @date 2022-08-25 17:08:39
      * @protected
      * @static
-     * @param {IPSDEDQCondition[]} items
+     * @param {IDEDQCondition[]} items
      * @return {*}  {unknown[]}
      */
     static calcCond(items) {
@@ -53,7 +53,7 @@ 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);
@@ -63,15 +63,14 @@ export class DEDQCondUtil {
                 const cond = item;
                 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 {
                     // 无条件值为空字符串
@@ -93,6 +92,7 @@ export class DEDQCondUtil {
  * @date 2022-08-25 17:08:57
  * @protected
  * @static
- * @type {WeakMap<IPSAppDEDataSet, PSDEDQCondEngine>}
+ * @type {WeakMap<IAppDEDataSet, PSDEDQCondEngine>}
  */
 DEDQCondUtil.map = new WeakMap();
+export { DEDQCondUtil };

package/out/service/utils/dynamic-code-list/dynamic-code-list.d.ts

@@ -1,4 +1,4 @@
-import { AppEntityModel, IPSAppCodeList } from '@ibiz-template/model';
+import { IAppDataEntity, IAppCodeList } from '@ibiz/model-core';
 import { Application } from '../../../application';
 import { CodeListItem } from '../../interface';
 /**
@@ -50,17 +50,17 @@ export declare 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;
     /**
      * 代码表请求实体服务的方法名称
      *
@@ -94,7 +94,7 @@ export declare class DynamicCodeListCache {
      * @type {Promise<void>}
      */
     protected initPromise?: Promise<void>;
-    constructor(codeList: IPSAppCodeList);
+    constructor(codeList: IAppCodeList);
     /**
      * 初始化
      *
@@ -111,7 +111,7 @@ export declare class DynamicCodeListCache {
      * @param {IData} data
      * @returns {*}
      */
-    protected convertData(data: IData): Readonly<IData>;
+    protected convertData(_data: IData): Readonly<IData>;
     /**
      * 加载服务获取数据，返回代码项
      *
@@ -122,7 +122,7 @@ export declare class DynamicCodeListCache {
      * @param {IParams} [params={}]
      * @returns {*}  {Promise<CodeListItem[]>}
      */
-    protected load(context?: IParams, params?: IParams): Promise<CodeListItem[]>;
+    protected load(_context?: IParams, params?: IParams): Promise<CodeListItem[]>;
     /**
      * 获取动态的代码项
      *

package/out/service/utils/dynamic-code-list/dynamic-code-list.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dynamic-code-list.d.ts","sourceRoot":"","sources":["../../../../src/service/utils/dynamic-code-list/dynamic-code-list.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EAEd,cAAc,EAEf,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C;;;;;;GAMG;AACH,KAAK,SAAS,GAAG;IACf;;;;;;OAMG;IACH,cAAc,EAAE,MAAM,CAAC;IAEvB;;;;;;OAMG;IACH,KAAK,CAAC,EAAE,YAAY,EAAE,CAAC;IAEvB;;;;;;OAMG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC;CACnC,CAAC;AAEF;;;;;;;GAOG;AACH,qBAAa,oBAAoB;IAC/B,SAAS,CAAC,GAAG,EAAE,WAAW,CAAC;IAE3B;;;;;;;OAOG;IACH,SAAS,CAAC,QAAQ,EAAE,cAAc,CAAC;IAEnC;;;;;;OAMG;IACH,SAAS,CAAC,MAAM,CAAC,EAAE,cAAc,CAAC;IAElC;;;;;;OAMG;IACH,SAAS,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAE9B;;;;;;OAMG;IACH,SAAS,CAAC,KAAK,yBAAgC;IAE/C;;;;;;;OAOG;IACH,SAAS,CAAC,YAAY,EAAE,OAAO,CAAS;IAExC;;;;;;OAMG;IACH,SAAS,CAAC,WAAW,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;gBAE1B,QAAQ,EAAE,cAAc;IAKpC;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAmC3B;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,CAAC,IAAI,EAAE,KAAK;IAwBjC;;;;;;;;;OASG;cACa,IAAI,CAClB,OAAO,GAAE,OAAY,EACrB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,YAAY,EAAE,CAAC;IA6B1B;;;;;;;;OAQG;IACG,GAAG,CACP,OAAO,GAAE,OAAY,EACrB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,YAAY,EAAE,CAAC;CAwC3B"}
+{"version":3,"file":"dynamic-code-list.d.ts","sourceRoot":"","sources":["../../../../src/service/utils/dynamic-code-list/dynamic-code-list.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhE,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C;;;;;;GAMG;AACH,KAAK,SAAS,GAAG;IACf;;;;;;OAMG;IACH,cAAc,EAAE,MAAM,CAAC;IAEvB;;;;;;OAMG;IACH,KAAK,CAAC,EAAE,YAAY,EAAE,CAAC;IAEvB;;;;;;OAMG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC;CACnC,CAAC;AAEF;;;;;;;GAOG;AACH,qBAAa,oBAAoB;IAC/B,SAAS,CAAC,GAAG,EAAG,WAAW,CAAC;IAE5B;;;;;;;OAOG;IACH,SAAS,CAAC,QAAQ,EAAE,YAAY,CAAC;IAEjC;;;;;;OAMG;IACH,SAAS,CAAC,MAAM,CAAC,EAAE,cAAc,CAAC;IAElC;;;;;;OAMG;IACH,SAAS,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAE9B;;;;;;OAMG;IACH,SAAS,CAAC,KAAK,yBAAgC;IAE/C;;;;;;;OAOG;IACH,SAAS,CAAC,YAAY,EAAE,OAAO,CAAS;IAExC;;;;;;OAMG;IACH,SAAS,CAAC,WAAW,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;gBAE1B,QAAQ,EAAE,YAAY;IAIlC;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAmC3B;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,CAAC,KAAK,EAAE,KAAK;IAwBlC;;;;;;;;;OASG;cACa,IAAI,CAClB,QAAQ,GAAE,OAAY,EACtB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,YAAY,EAAE,CAAC;IAiC1B;;;;;;;;OAQG;IACG,GAAG,CACP,OAAO,GAAE,OAAY,EACrB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,YAAY,EAAE,CAAC;CAwC3B"}

package/out/service/utils/dynamic-code-list/dynamic-code-list.js

@@ -1,4 +1,4 @@
-import { AppEntityModel, DefectModelError, UnsupportedModelError, } from '@ibiz-template/model';
+import { ModelError } from '@ibiz-template/core';
 /**
  * 动态代码表缓存对象
  *
@@ -27,7 +27,6 @@ export class DynamicCodeListCache {
          */
         this.isPredefined = false;
         this.codeList = codeList;
-        this.app = ibiz.hub.getApp(codeList.getPSModelService().app);
     }
     /**
      * 初始化
@@ -38,30 +37,29 @@ export class DynamicCodeListCache {
      */
     async init() {
         const fn = async () => {
-            var _a;
             // 预定义类型处理
             const { predefinedType } = this.codeList;
             if (predefinedType) {
                 this.isPredefined = true;
                 if (!['OPERATOR', 'RUNTIME'].includes(predefinedType)) {
-                    throw new UnsupportedModelError(this.codeList, `预定义类型${predefinedType}暂不支持`);
+                    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 = (_a = this.codeList.getPSAppDEDataSet()) === null || _a === void 0 ? void 0 : _a.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;
         };
         this.initPromise = fn();
@@ -75,29 +73,27 @@ export class DynamicCodeListCache {
      * @param {IData} data
      * @returns {*}
      */
-    convertData(data) {
+    convertData(_data) {
         // todo 根据模型转换
         const result = {};
-        // 值属性
-        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);
     }
     /**
@@ -110,9 +106,13 @@ export class DynamicCodeListCache {
      * @param {IParams} [params={}]
      * @returns {*}  {Promise<CodeListItem[]>}
      */
-    async load(context = {}, params = {}) {
+    async load(_context = {}, params = {}) {
         // *预定义加载
         if (this.isPredefined) {
+            // 特殊处理，避免预置代码表加载不全
+            if (!params.size) {
+                params.size = 10000;
+            }
             const res = await this.app.net.get(`/dictionaries/codelist/${this.codeList.codeName}`, params);
             return Object.freeze(res.data.items);
         }
@@ -120,16 +120,18 @@ export class DynamicCodeListCache {
         if (!this.entity || !this.methodName) {
             new Error('动态代码表找不到实体或数据集');
         }
-        const deService = await this.app.es.getService(this.entity.source.codeName);
-        const res = await deService.exec(this.methodName, context, params);
-        let resultItems = [];
-        if (res.data.length) {
-            resultItems = res.data.map((item) => {
-                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 [];
     }
     /**
      * 获取动态的代码项

package/out/service/utils/route-context/route-context.d.ts

@@ -1,4 +1,4 @@
-import { IPSAppView } from '@ibiz-template/model';
+import { IAppView } from '@ibiz/model-core';
 import { ServicePathItem } from '../service-path-util/service-path-util';
 /**
  * 计算资源上下文时，需要排除自身实体codeName的视图（导航类视图和多数据视图）
@@ -17,5 +17,5 @@ export declare const excludeViewTypes: string[];
  * @param {ServicePathItem[][]} pathItems
  * @return {*}  {Record<string, unknown>}
  */
-export declare function calcRouteContext(context: IParams, pathItems: ServicePathItem[][], appView?: IPSAppView): Record<string, unknown>;
+export declare function calcRouteContext(context: IParams, pathItems: ServicePathItem[][], _appView?: IAppView): Record<string, unknown>;
 //# sourceMappingURL=route-context.d.ts.map

package/out/service/utils/route-context/route-context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"route-context.d.ts","sourceRoot":"","sources":["../../../../src/service/utils/route-context/route-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAY,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAC;AAEzE;;;;;GAKG;AACH,eAAO,MAAM,gBAAgB,EAAE,MAAM,EAYpC,CAAC;AAEF;;;;;;;;;GASG;AACH,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,OAAO,EAChB,SAAS,EAAE,eAAe,EAAE,EAAE,EAC9B,OAAO,CAAC,EAAE,UAAU,GACnB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAqCzB"}
+{"version":3,"file":"route-context.d.ts","sourceRoot":"","sources":["../../../../src/service/utils/route-context/route-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAC;AAGzE;;;;;GAKG;AACH,eAAO,MAAM,gBAAgB,EAAE,MAAM,EAYpC,CAAC;AAEF;;;;;;;;;GASG;AACH,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,OAAO,EAChB,SAAS,EAAE,eAAe,EAAE,EAAE,EAC9B,QAAQ,CAAC,EAAE,QAAQ,GAClB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAqCzB"}

package/out/service/utils/route-context/route-context.js

@@ -1,4 +1,4 @@
-import { ViewType } from '@ibiz-template/model';
+import { ViewType } from '../../../constant';
 /**
  * 计算资源上下文时，需要排除自身实体codeName的视图（导航类视图和多数据视图）
  * @return {*}
@@ -28,23 +28,24 @@ export const excludeViewTypes = [
  * @param {ServicePathItem[][]} pathItems
  * @return {*}  {Record<string, unknown>}
  */
-export function calcRouteContext(context, pathItems, appView) {
+export function calcRouteContext(context, pathItems, _appView) {
     let paths = [];
     pathItems.forEach(items => {
-        var _a;
         const values = [];
         for (let i = 0; i < items.length; i++) {
             const arr = [];
             const item = items[i];
-            if (appView &&
-                appView.viewType &&
-                excludeViewTypes.includes(appView.viewType)) {
-                // 排除导航类视图和多数据视图自身
-                const deName = (_a = appView.getPSAppDataEntity()) === null || _a === void 0 ? void 0 : _a.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);