@ibiz-template/runtime 0.0.3-beta.4 → 0.0.3-beta.5

package/src/service/service/widget/md-control-service.ts

@@ -12,12 +12,12 @@ export class MDControlService<
    *
    * @author lxm
    * @date 2022-08-31 17:08:41
-   * @param {IContext} context 上下文
+   * @param {IParams} context 上下文
    * @param {IParams} [params={}] 视图参数
    * @returns {*}  {Promise<IHttpResponse>}
    */
   async fetch(
-    context: IContext,
+    context: IParams,
     params: IParams = {},
   ): Promise<IHttpResponse<ControlVO[]>> {
     let res = await this.exec(this.model.fetchAction, context, params);
@@ -30,12 +30,12 @@ export class MDControlService<
    *
    * @author lxm
    * @date 2022-08-31 17:08:41
-   * @param {IContext} context 上下文
+   * @param {IParams} context 上下文
    * @param {IParams} [params={}] 视图参数
    * @returns {*}  {Promise<IHttpResponse>}
    */
   async get(
-    context: IContext,
+    context: IParams,
     params: IParams = {},
   ): Promise<IHttpResponse<ControlVO>> {
     let res = await this.exec(this.model.getAction, context, undefined, params);
@@ -48,12 +48,12 @@ export class MDControlService<
    *
    * @author lxm
    * @date 2022-08-31 17:08:41
-   * @param {IContext} context 上下文
+   * @param {IParams} context 上下文
    * @param {IParams} [params={}] 视图参数
    * @returns {*}  {Promise<IHttpResponse>}
    */
   async getDraft(
-    context: IContext,
+    context: IParams,
     params: IParams = {},
   ): Promise<IHttpResponse<ControlVO>> {
     let res = await this.exec(
@@ -71,14 +71,11 @@ export class MDControlService<
    *
    * @author lxm
    * @date 2022-09-07 19:09:48
-   * @param {IContext} context 上下文
+   * @param {IParams} context 上下文
    * @param {IParams} [params={}] 视图参数
    * @returns {*}
    */
-  async remove(
-    context: IContext,
-    params: IParams = {},
-  ): Promise<IHttpResponse> {
+  async remove(context: IParams, params: IParams = {}): Promise<IHttpResponse> {
     const res = await this.exec(
       this.model.removeAction,
       context,
@@ -93,12 +90,12 @@ export class MDControlService<
    *
    * @author lxm
    * @date 2022-09-07 19:09:11
-   * @param {IContext} context 上下文
+   * @param {IParams} context 上下文
    * @param {ControlVO} data 数据
    * @returns {*}
    */
   async create(
-    context: IContext,
+    context: IParams,
     data: ControlVO,
   ): Promise<IHttpResponse<ControlVO>> {
     let res = await this.exec(
@@ -115,12 +112,12 @@ export class MDControlService<
    *
    * @author lxm
    * @date 2022-09-07 19:09:11
-   * @param {IContext} context 上下文
+   * @param {IParams} context 上下文
    * @param {ControlVO} data 数据
    * @returns {*}
    */
   async update(
-    context: IContext,
+    context: IParams,
     data: ControlVO,
   ): Promise<IHttpResponse<ControlVO>> {
     let res = await this.exec(
@@ -138,13 +135,13 @@ export class MDControlService<
    * @author lxm
    * @date 2022-11-25 14:11:09
    * @param {IPSDEDataExport} dataExport 导出模型
-   * @param {IContext} context 上下文
+   * @param {IParams} context 上下文
    * @param {IParams} [params={}] 请求参数
    * @returns {*}  {Promise<IHttpResponse>}
    */
   async exportData(
     dataExport: IPSDEDataExport,
-    context: IContext,
+    context: IParams,
     params: IParams = {},
   ): Promise<IHttpResponse<Blob>> {
     return this.entityService.file.exportData(

package/src/service/service/widget/search-form-service.ts

@@ -22,12 +22,12 @@ export class SearchFormService<
    *
    * @author lxm
    * @date 2022-08-31 17:08:41
-   * @param {IContext} context 上下文
+   * @param {IParams} context 上下文
    * @param {IParams} [params={}] 视图参数
    * @returns {*}  {Promise<IHttpResponse>}
    */
   async getDraft(
-    _context: IContext,
+    _context: IParams,
     _params: IParams = {},
   ): Promise<IHttpResponse<ControlVO>> {
     // let res = await this.exec(this.model.getDraftAction, context, params);

package/src/service/service/widget/tree-service.ts

@@ -4,7 +4,7 @@ import {
   TreeNodeRSModel,
   TreeStaticNodeModel,
 } from '@ibiz-template/model';
-import { convertNavData } from '../../../utils';
+import { calcNavParams } from '../../../utils';
 import { ITreeNodeData } from '../../interface/i-tree-node-data/i-tree-node-data';
 import { TreeDataSetNodeData, TreeStaticNodeData } from '../../vo';
 import { MDControlService } from './md-control-service';
@@ -20,10 +20,10 @@ export interface TreeFetchOpts {
   /**
    * 上下文
    *
-   * @type {IContext}
+   * @type {IParams}
    * @memberof TreeFetchOpts
    */
-  context: IContext;
+  context: IParams;
   /**
    * 视图参数
    *
@@ -150,9 +150,15 @@ export class TreeService extends MDControlService<TreeModel> {
     nodeRS: TreeNodeRSModel,
     parentNodeData: ITreeNodeData | undefined,
     opts: TreeFetchOpts,
-  ): { context: IContext; params: IParams } {
+  ): { context: IParams; params: IParams } {
     // 处理父值过滤项
-    const { parentValueLevel, navContexts, navParams, pickupDEFName } = nodeRS;
+    const {
+      parentValueLevel,
+      navContexts,
+      navParams,
+      parentFilter: navFilter,
+      pickupDEFName,
+    } = nodeRS;
 
     const params = { ...opts.params };
 
@@ -163,29 +169,31 @@ export class TreeService extends MDControlService<TreeModel> {
     };
 
     // 计算关系过滤用到的实体数据
-    let data: IData = {};
+    let datum: IDatum = {};
     let parentData: ITreeNodeData | undefined;
+    // 根据父值级别查找父数据
     if (parentNodeData) {
-      // 根据父值级别查找父数据
       parentData = parentNodeData;
       for (let index = 1; index < parentValueLevel; index++) {
         parentData = parentData?.parent;
       }
-      if (parentData?.deData) {
-        data = parentData.deData;
-      }
     }
-
-    // 处理父值关系过滤参数
-    if (parentData && pickupDEFName) {
-      params[`n_${pickupDEFName}_eq`] = parentData.value;
+    let derValue;
+    let deName;
+    if (parentData) {
+      datum = parentData.deData || {};
+      const parentNodeModel = this.model.getNodeById(parentData.nodeId);
+      deName = (parentNodeModel as TreeDataSetNodeModel).appEntity?.deName;
+      derValue = parentData.value;
     }
 
-    // 处理自定义关系过滤参数
-    const tempContext = convertNavData(navContexts, context, params, data);
-    const tempParams = convertNavData(navParams, context, params, data);
-    Object.assign(context, tempContext);
-    Object.assign(params, tempParams);
+    // 导航相关参数处理
+    const { resultContext, resultParams } = calcNavParams(
+      { deName, navFilter, pickupDEFName, navParams, navContexts },
+      { derValue, context, params, datum },
+    );
+    Object.assign(context, resultContext);
+    Object.assign(params, resultParams);
 
     return { context, params };
   }

package/src/service/service/widget/wizard-panel-service.ts

@@ -21,12 +21,12 @@ export class WizardPanelService<
    *
    * @author lxm
    * @date 2022-08-31 17:08:41
-   * @param {IContext} context 上下文
+   * @param {IParams} context 上下文
    * @param {IParams} [params={}] 视图参数
    * @returns {*}  {Promise<IHttpResponse>}
    */
   async initialize(
-    context: IContext,
+    context: IParams,
     data: IData = {},
     params: IParams = {},
   ): Promise<IHttpResponse<IData>> {
@@ -40,12 +40,12 @@ export class WizardPanelService<
    *
    * @author lxm
    * @date 2022-08-31 17:08:41
-   * @param {IContext} context 上下文
+   * @param {IParams} context 上下文
    * @param {IParams} [params={}] 视图参数
    * @returns {*}  {Promise<IHttpResponse>}
    */
   async finish(
-    context: IContext,
+    context: IParams,
     data: IData = {},
     params: IParams = {},
   ): Promise<IHttpResponse<IData>> {

package/src/service/service/work-flow/work-flow.service.ts

@@ -54,10 +54,10 @@ export class WorkFlowService {
    *
    * @author lxm
    * @date 2022-09-29 14:09:45
-   * @param {IContext} context
+   * @param {IParams} context
    * @returns {*}  {Promise<IHttpResponse<IData>>}
    */
-  async getWFStep(context: IContext): Promise<IHttpResponse<IData>> {
+  async getWFStep(context: IParams): Promise<IHttpResponse<IData>> {
     const { processDefinitionKey, taskDefinitionKey } = context;
     return this.app.net.get(
       `${this.getBaseUrl()}/process-definitions/${processDefinitionKey}/usertasks/${taskDefinitionKey}`,
@@ -69,12 +69,12 @@ export class WorkFlowService {
    *
    * @author lxm
    * @date 2022-09-29 14:09:52
-   * @param {IContext} context 路径参数
+   * @param {IParams} context 路径参数
    * @param {IData} data 数据
    * @returns {*}  {Promise<IHttpResponse<IData>>}
    */
   async getWFLink(
-    context: IContext,
+    context: IParams,
     data: IData,
   ): Promise<IHttpResponse<IData[]>> {
     const deKeyValue = context[this.model.deName];
@@ -90,10 +90,10 @@ export class WorkFlowService {
    *
    * @author lxm
    * @date 2022-09-29 14:09:45
-   * @param {IContext} context
+   * @param {IParams} context
    * @returns {*}  {Promise<IHttpResponse<IData>>}
    */
-  async getWFHistory(context: IContext): Promise<IHttpResponse<IData>> {
+  async getWFHistory(context: IParams): Promise<IHttpResponse<IData>> {
     const deKeyValue = context[this.model.deName];
     return this.app.net.get(
       `${this.getBaseUrl()}/${deKeyValue}/process-instances/alls/history`,
@@ -105,10 +105,10 @@ export class WorkFlowService {
    *
    * @author lxm
    * @date 2022-10-27 16:10:13
-   * @param {IContext} context
+   * @param {IParams} context
    * @returns {*}  {Promise<IHttpResponse<IData>>}
    */
-  async getWFProcessDiagram(context: IContext): Promise<IHttpResponse<IData>> {
+  async getWFProcessDiagram(context: IParams): Promise<IHttpResponse<IData>> {
     const deKeyValue = context[this.model.deName];
     return this.app.net.request(
       `${this.getBaseUrl()}/${deKeyValue}/process-instances/alls/processdiagram`,
@@ -136,13 +136,13 @@ export class WorkFlowService {
    *
    * @author lxm
    * @date 2022-09-30 17:09:51
-   * @param {IContext} context 路径参数
+   * @param {IParams} context 路径参数
    * @param {IParams} params 请求参数
    * @param {IData} data 数据
    * @returns {*}  {Promise<IHttpResponse<IData>>}
    */
   async wfStart(
-    context: IContext,
+    context: IParams,
     params: IParams,
     data: IData,
   ): Promise<IHttpResponse<IData>> {
@@ -160,13 +160,13 @@ export class WorkFlowService {
    *
    * @author lxm
    * @date 2022-09-30 17:09:51
-   * @param {IContext} context 路径参数
+   * @param {IParams} context 路径参数
    * @param {IParams} params 请求参数
    * @param {IData} data 数据
    * @returns {*}  {Promise<IHttpResponse<IData>>}
    */
   async wfSubmit(
-    context: IContext,
+    context: IParams,
     params: IParams,
     data: IData,
   ): Promise<IHttpResponse<IData>> {
@@ -186,13 +186,13 @@ export class WorkFlowService {
    *
    * @author lxm
    * @date 2022-09-30 17:09:51
-   * @param {IContext} context 路径参数
+   * @param {IParams} context 路径参数
    * @param {IParams} params 请求参数
    * @param {IData} data 数据
    * @returns {*}  {Promise<IHttpResponse<IData>>}
    */
   async wfWithdraw(
-    context: IContext,
+    context: IParams,
     params: IParams,
     data: IData,
   ): Promise<IHttpResponse<IData>> {
@@ -213,14 +213,14 @@ export class WorkFlowService {
    * @author lxm
    * @date 2022-09-30 17:09:38
    * @param {string} methodName 接口名称
-   * @param {IContext} context 路径参数
+   * @param {IParams} context 路径参数
    * @param {IParams} [params={}] 查询参数
    * @param {IData} [data={}] 主数据数据
    * @returns {*}  {Promise<IHttpResponse<IData>>}
    */
   async exec(
     methodName: string,
-    context: IContext,
+    context: IParams,
     params: IParams = {},
     data: IData = {},
   ): Promise<IHttpResponse<IData>> {

package/src/service/service-util.ts

@@ -68,7 +68,7 @@ export class ServiceUtil {
    * @author chitanda
    * @date 2022-12-23 10:12:24
    * @param {string} entityCodeName 实体标识
-   * @param {IContext} [context] 上下文,用于计算模型所属沙箱环境
+   * @param {IParams} [context] 上下文,用于计算模型所属沙箱环境
    * @return {*}  {Promise<EntityService>}
    */
   async getService(entityCodeName: string): Promise<EntityService> {
@@ -95,9 +95,9 @@ export class ServiceUtil {
    * @description 根据 srfsessionid 作为临时数据域
    * @author chitanda
    * @date 2022-08-18 14:08:48
-   * @param {IContext} context
+   * @param {IParams} context
    */
-  clearTempCache(context: IContext): void {
+  clearTempCache(context: IParams): void {
     this.cache.forEach(service => {
       service.local.clear(context);
     });

package/src/service/utils/app-counter/app-counter.ts

@@ -1,3 +1,4 @@
+import { IBizContext } from '@ibiz-template/core';
 import {
   DefectModelError,
   IPSAppCounter,
@@ -41,7 +42,7 @@ export class AppCounter {
     return this.destroyed;
   }
 
-  protected context: IContext = {};
+  protected context: IParams = IBizContext.create();
 
   protected params: IParams = {};
 
@@ -73,10 +74,10 @@ export class AppCounter {
    *
    * @author chitanda
    * @date 2022-10-26 19:10:24
-   * @param {IContext} [context]
+   * @param {IParams} [context]
    * @param {IParams} [params]
    */
-  async init(context?: IContext, params?: IParams) {
+  async init(context?: IParams, params?: IParams) {
     this.setParams(context, params);
     this.entity = this.model.getPSAppDataEntity()!;
     await this.entity.fill(true);
@@ -96,10 +97,10 @@ export class AppCounter {
    * @author chitanda
    * @date 2022-10-26 19:10:58
    * @protected
-   * @param {IContext} [context]
+   * @param {IParams} [context]
    * @param {IParams} [params]
    */
-  protected setParams(context?: IContext, params?: IParams): void {
+  protected setParams(context?: IParams, params?: IParams): void {
     if (context) {
       this.context = clone(context);
     }
@@ -161,11 +162,11 @@ export class AppCounter {
    *
    * @author chitanda
    * @date 2022-10-26 19:10:46
-   * @param {IContext} [context]
+   * @param {IParams} [context]
    * @param {IParams} [params]
    * @return {*}  {Promise<IData>}
    */
-  refresh(context?: IContext, params?: IParams): Promise<IData> {
+  refresh(context?: IParams, params?: IParams): Promise<IData> {
     this.setParams(context, params);
     return this.load();
   }
@@ -216,6 +217,7 @@ export class AppCounter {
    */
   destroy(): void {
     this.destroyed = true;
+    this.context.destroy();
     this.destroyInterval();
     this.evt.reset();
   }

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

@@ -195,12 +195,12 @@ export class DynamicCodeListCache {
    * @author lxm
    * @date 2022-08-26 14:08:08
    * @protected
-   * @param {IContext} [context={}]
+   * @param {IParams} [context={}]
    * @param {IParams} [params={}]
    * @returns {*}  {Promise<CodeListItem[]>}
    */
   protected async load(
-    context: IContext = {},
+    context: IParams = {},
     params: IParams = {},
   ): Promise<CodeListItem[]> {
     // *预定义加载
@@ -236,12 +236,12 @@ export class DynamicCodeListCache {
    *
    * @author lxm
    * @date 2022-08-26 14:08:44
-   * @param {IContext} [context={}]
+   * @param {IParams} [context={}]
    * @param {IParams} [params={}]
    * @returns {*}  {Promise<IData[]>}
    */
   async get(
-    context: IContext = {},
+    context: IParams = {},
     params: IParams = {},
   ): Promise<CodeListItem[]> {
     // 初始化还未完成时被调用

package/src/service/utils/entity-cache/entity-cache.ts

@@ -29,10 +29,10 @@ export class EntityCache {
    *
    * @author chitanda
    * @date 2022-05-10 17:05:45
-   * @param {IContext} context
+   * @param {IParams} context
    * @param {Entity} entity
    */
-  forceAdd(context: IContext, entity: Entity): void {
+  forceAdd(context: IParams, entity: Entity): void {
     const map = this.getCacheByTag(context);
     const data = map.get(entity.srfkey!);
     if (data) {
@@ -46,10 +46,10 @@ export class EntityCache {
    *
    * @author chitanda
    * @date 2022-05-10 17:05:27
-   * @param {IContext} context
+   * @param {IParams} context
    * @param {Entity} entity
    */
-  forceUpdate(context: IContext, entity: Entity): void {
+  forceUpdate(context: IParams, entity: Entity): void {
     const map = this.getCacheByTag(context);
     map.set(entity.srfkey!, clone(entity));
     ibiz.log.warn('forceUpdate', entity.srfkey, entity);
@@ -60,10 +60,10 @@ export class EntityCache {
    *
    * @author chitanda
    * @date 2022-05-10 17:05:08
-   * @param {IContext} context
+   * @param {IParams} context
    * @param {string} srfKey
    */
-  forceDelete(context: IContext, srfKey: string): void {
+  forceDelete(context: IParams, srfKey: string): void {
     const map = this.getCacheByTag(context);
     map.delete(srfKey);
     ibiz.log.warn('forceDelete', srfKey);
@@ -77,7 +77,7 @@ export class EntityCache {
    * @return {*}  {boolean}
    * @memberof EntityCache
    */
-  add(context: IContext, entity: Entity): Entity | null {
+  add(context: IParams, entity: Entity): Entity | null {
     try {
       isExistSessionId('add', context);
       if (isNil(entity.srfkey) || isEmpty(entity.srfkey)) {
@@ -102,7 +102,7 @@ export class EntityCache {
    * @return {*}  {Entity}
    * @memberof EntityCache
    */
-  get(context: IContext, srfKey: string): Entity | null {
+  get(context: IParams, srfKey: string): Entity | null {
     try {
       isExistSessionId('get', context);
       const map = this.getCacheByTag(context);
@@ -118,12 +118,12 @@ export class EntityCache {
   /**
    * 更新数据
    *
-   * @param {IContext} context
+   * @param {IParams} context
    * @param {Entity} entity
    * @return {*}  {Entity}
    * @memberof EntityCache
    */
-  update(context: IContext, entity: Entity): Entity | null {
+  update(context: IParams, entity: Entity): Entity | null {
     try {
       isExistSessionId('update', context);
       isExistSrfKey('update', entity);
@@ -146,12 +146,12 @@ export class EntityCache {
   /**
    * 删除数据
    *
-   * @param {IContext} context
+   * @param {IParams} context
    * @param {string} srfKey
    * @return {*}  {(Entity | null)}
    * @memberof EntityCache
    */
-  delete(context: IContext, srfKey: string): Entity | null {
+  delete(context: IParams, srfKey: string): Entity | null {
     try {
       isExistSessionId('delete', context);
       const map = this.getCacheByTag(context);
@@ -175,11 +175,11 @@ export class EntityCache {
    *
    * @author chitanda
    * @date 2022-03-23 11:03:52
-   * @param {IContext} context
+   * @param {IParams} context
    * @param {Entity[]} entities
    * @return {*}  {Entity[]}
    */
-  createBatch(context: IContext, entities: Entity[]): Entity[] {
+  createBatch(context: IParams, entities: Entity[]): Entity[] {
     try {
       isExistSessionId('add', context);
       const map = this.getCacheByTag(context);
@@ -206,11 +206,11 @@ export class EntityCache {
    *
    * @author chitanda
    * @date 2022-03-23 10:03:17
-   * @param {IContext} context
+   * @param {IParams} context
    * @param {Entity[]} entities
    * @return {*}  {Entity[]}
    */
-  updateBatch(context: IContext, entities: Entity[]): Entity[] {
+  updateBatch(context: IParams, entities: Entity[]): Entity[] {
     try {
       isExistSessionId('update', context);
       const map = this.getCacheByTag(context);
@@ -242,11 +242,11 @@ export class EntityCache {
    *
    * @author chitanda
    * @date 2022-03-23 10:03:40
-   * @param {IContext} context 上下文
+   * @param {IParams} context 上下文
    * @param {string[]} srfKeys 需要删除的数据主键
    * @return {*}  {string[]} 未能删除的数据主键
    */
-  deleteBatch(context: IContext, srfKeys: string[]): string[] {
+  deleteBatch(context: IParams, srfKeys: string[]): string[] {
     try {
       isExistSessionId('delete', context);
     } catch (err) {
@@ -279,11 +279,11 @@ export class EntityCache {
    *
    * @author chitanda
    * @date 2022-08-17 23:08:06
-   * @param {IContext} context
+   * @param {IParams} context
    * @param {string} srfkey
    * @return {*}  {boolean}
    */
-  checkData(context: IContext, srfkey: string): boolean {
+  checkData(context: IParams, srfkey: string): boolean {
     const list = this.getList(context);
     const i = list.findIndex(item => item.srfkey === srfkey);
     return i !== -1;
@@ -294,10 +294,10 @@ export class EntityCache {
    *
    * @author chitanda
    * @date 2022-08-17 23:08:56
-   * @param {IContext} context
+   * @param {IParams} context
    * @return {*}  {Entity[]}
    */
-  getList(context: IContext): Entity[] {
+  getList(context: IParams): Entity[] {
     try {
       isExistSessionId('getList', context);
       const map = this.getCacheByTag(context);
@@ -341,9 +341,9 @@ export class EntityCache {
    *
    * @author chitanda
    * @date 2022-08-17 23:08:54
-   * @param {IContext} context
+   * @param {IParams} context
    */
-  clear(context: IContext): void {
+  clear(context: IParams): void {
     const tag: string = context.srfsessionid;
     if (this.cacheMap.size > 0) {
       this.cacheMap.delete(tag);
@@ -356,10 +356,10 @@ export class EntityCache {
    * @author chitanda
    * @date 2022-08-17 23:08:47
    * @private
-   * @param {IContext} context
+   * @param {IParams} context
    * @return {*}  {Map<string, Entity>}
    */
-  private getCacheByTag(context: IContext): Map<string, Entity> {
+  private getCacheByTag(context: IParams): Map<string, Entity> {
     const tag: string = context.srfsessionid;
     if (!this.cacheMap.has(tag)) {
       this.cacheMap.set(tag, new Map());

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

@@ -6,12 +6,12 @@ import { ServicePathItem } from '../service-path-util/service-path-util';
  * @author lxm
  * @date 2022-11-25 13:11:53
  * @export
- * @param {IContext} context 上下文对象
+ * @param {IParams} context 上下文对象
  * @param {ServicePathItem[][]} pathItems 计算出的资源关系路径
  * @returns {*}  {string}
  */
 export function calcResPath(
-  context: IContext,
+  context: IParams,
   pathItems: ServicePathItem[][],
 ): string {
   let paths: string[][] = [];

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

@@ -27,12 +27,12 @@ export const excludeViewTypes: string[] = [
  * @author chitanda
  * @date 2023-01-10 14:01:51
  * @export
- * @param {IContext} context
+ * @param {IParams} context
  * @param {ServicePathItem[][]} pathItems
  * @return {*}  {Record<string, unknown>}
  */
 export function calcRouteContext(
-  context: IContext,
+  context: IParams,
   pathItems: ServicePathItem[][],
   appView?: IPSAppView,
 ): Record<string, unknown> {