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

package/src/controller/view/grid-exp-view.ts

@@ -32,9 +32,9 @@ export class GridExpViewController extends MDViewController<GridExpViewModel> {
    *
    * @author chitanda
    * @date 2022-12-28 16:12:23
-   * @return {*}  {Promise<IData[]>}
+   * @return {*}  {Promise<IDatum[]>}
    */
-  async load(): Promise<IData[]> {
+  async load(): Promise<IDatum[]> {
     const { grid } = this.nerve;
     return grid.call.load();
   }
@@ -93,7 +93,10 @@ export class GridExpViewController extends MDViewController<GridExpViewModel> {
 
       // 路由模式下跳转视图，变更路由
       if (this.context.isRouter) {
-        Object.assign(tempContext, { toRouteLevel: this.modal.level! + 1 });
+        Object.assign(tempContext, {
+          toRouteLevel: this.modal.level! + 1,
+          currentSrfNav: data.srfkey,
+        });
         ibiz.openView.root(grid.navView.source, tempContext, tempParams);
       } else {
         this.state.navItem.context = tempContext;

package/src/controller/view/grid-view.ts

@@ -37,7 +37,7 @@ export class GridViewController extends MDViewController<GridViewModel> {
    * @date 2022-08-30 19:08:59
    * @returns {*}  {Promise<void>}
    */
-  async load(): Promise<IData[]> {
+  async load(): Promise<IDatum[]> {
     const { grid } = this.nerve;
     return grid.call.load();
   }

package/src/controller/view/kanban-view.ts

@@ -35,7 +35,7 @@ export class KanbanViewController extends MDViewController<KanbanViewModel> {
    * @date 2022-08-30 19:08:59
    * @returns {*}  {Promise<void>}
    */
-  async load(): Promise<IData[]> {
+  async load(): Promise<IDatum[]> {
     const { kanban } = this.nerve;
     return kanban.call.load();
   }

package/src/controller/view/list-exp-view.ts

@@ -32,9 +32,9 @@ export class ListExpViewController extends MDViewController<ListExpViewModel> {
    *
    * @author chitanda
    * @date 2022-12-28 16:12:23
-   * @return {*}  {Promise<IData[]>}
+   * @return {*}  {Promise<IDatum[]>}
    */
-  async load(): Promise<IData[]> {
+  async load(): Promise<IDatum[]> {
     const { list } = this.nerve;
     return list.call.load();
   }
@@ -80,7 +80,10 @@ export class ListExpViewController extends MDViewController<ListExpViewModel> {
 
       // 路由模式下跳转视图，变更路由
       if (this.context.isRouter) {
-        Object.assign(tempContext, { toRouteLevel: this.modal.level! + 1 });
+        Object.assign(tempContext, {
+          toRouteLevel: this.modal.level! + 1,
+          currentSrfNav: data.srfkey,
+        });
         ibiz.openView.root(list.navView.source, tempContext, tempParams);
       } else {
         this.state.navItem.context = tempContext;

package/src/controller/view/list-view.ts

@@ -35,7 +35,7 @@ export class ListViewController extends MDViewController<ListViewModel> {
    * @date 2022-08-30 19:08:59
    * @returns {*}  {Promise<void>}
    */
-  async load(): Promise<IData[]> {
+  async load(): Promise<IDatum[]> {
     const { list } = this.nerve;
     return list.call.load();
   }

package/src/controller/view/md-view.ts

@@ -59,7 +59,7 @@ export class MDViewController<
    * @author lxm
    * @date 2022-08-31 11:08:10
    */
-  async load(): Promise<IData[]> {
+  async load(): Promise<IDatum[]> {
     // 具体部件调用各自的数据部件加载
     return [];
   }
@@ -148,9 +148,9 @@ export class MDViewController<
    *
    * @author lxm
    * @date 2022-08-28 18:08:50
-   * @param {IData[]} data 选中的数据集合
+   * @param {IDatum[]} data 选中的数据集合
    */
-  onSelectionChange(data: IData[]) {
+  onSelectionChange(data: IDatum[]) {
     this.state.selectedData = data;
     if (this.state.toolbarState) {
       this.state.toolbarState.update(data[0]?.getOrigin());
@@ -190,13 +190,13 @@ export class MDViewController<
    *
    * @author lxm
    * @date 2022-11-15 18:11:26
-   * @param {IData[]} data 保存的数据
+   * @param {IDatum[]} data 保存的数据
    * @param {boolean} isCreate 是否是创建
    * @param {string} controlName 部件名称
    * @returns {*}  {Promise<void>}
    */
   async onAfterSave(
-    data: IData[],
+    data: IDatum[],
     isCreate: boolean,
     controlName: string,
   ): Promise<void> {
@@ -212,11 +212,11 @@ export class MDViewController<
    *
    * @author lxm
    * @date 2022-11-15 18:11:07
-   * @param {IData[]} data 删除的数据
+   * @param {IDatum[]} data 删除的数据
    * @param {string} controlName 部件名称
    * @returns {*}  {Promise<void>}
    */
-  async onAfterRemove(data: IData[], controlName: string): Promise<void> {
+  async onAfterRemove(data: IDatum[], controlName: string): Promise<void> {
     this.nerve.self.evt.asyncEmit('viewDataChange', {
       type: 'REMOVE',
       data,

package/src/controller/view/mpickup-view.ts

@@ -33,9 +33,9 @@ export class MPickupViewController extends PickupViewController<MPickupViewModel
    *
    * @author lxm
    * @date 2022-09-12 01:09:06
-   * @param {IData[]} data
+   * @param {IDatum[]} data
    */
-  onSelectionChange(data: IData[]) {
+  onSelectionChange(data: IDatum[]) {
     this.state.embedSelection = data;
   }
 
@@ -57,9 +57,9 @@ export class MPickupViewController extends PickupViewController<MPickupViewModel
    *
    * @author lxm
    * @date 2022-09-12 19:09:27
-   * @param {IData[]} data
+   * @param {IDatum[]} data
    */
-  addSelections(data: IData[]) {
+  addSelections(data: IDatum[]) {
     if (data.length > 0) {
       // 去重，过滤已经选中的数据
       const addData = data.filter(item => {
@@ -76,9 +76,9 @@ export class MPickupViewController extends PickupViewController<MPickupViewModel
    *
    * @author lxm
    * @date 2022-09-12 19:09:19
-   * @param {IData[]} data
+   * @param {IDatum[]} data
    */
-  removeSelections(data: IData[]) {
+  removeSelections(data: IDatum[]) {
     if (data.length > 0) {
       data.forEach(item => {
         const findIndex = this.state.selfSelection.findIndex(selection => {

package/src/controller/view/pickup-grid-view.ts

@@ -22,9 +22,9 @@ export class PickupGridViewController extends GridViewController {
    *
    * @author lxm
    * @date 2022-08-28 18:08:50
-   * @param {IData[]} data 选中的数据集合
+   * @param {IDatum[]} data 选中的数据集合
    */
-  onSelectionChange(data: IData[]) {
+  onSelectionChange(data: IDatum[]) {
     super.onSelectionChange(data);
     this.nerve.self.evt.asyncEmit('selectionChange', this.state.selectedData);
   }
@@ -34,9 +34,9 @@ export class PickupGridViewController extends GridViewController {
    *
    * @author lxm
    * @date 2022-09-12 19:09:12
-   * @returns {*}  {Promise<IData[]>}
+   * @returns {*}  {Promise<IDatum[]>}
    */
-  async selectAll(): Promise<IData[]> {
+  async selectAll(): Promise<IDatum[]> {
     return this.nerve.grid.call.selectAll();
   }
 }

package/src/controller/view/pickup-view.ts

@@ -39,9 +39,9 @@ export class PickupViewController<
    *
    * @author lxm
    * @date 2022-09-12 01:09:06
-   * @param {IData[]} data
+   * @param {IDatum[]} data
    */
-  onSelectionChange(data: IData[]) {
+  onSelectionChange(data: IDatum[]) {
     this.nerve.self.evt.asyncEmit('closeView', { ok: true, data });
   }
 }

package/src/controller/view/tree-exp-view.ts

@@ -41,7 +41,7 @@ export class TreeExpViewController<
    * @author lxm
    * @date 2022-08-31 11:08:10
    */
-  async load(): Promise<IData[]> {
+  async load(): Promise<IDatum[]> {
     // 调用数部件加载
     const { tree } = this.nerve;
     return tree.call.load();

package/src/controller/view/view.ts

@@ -201,6 +201,13 @@ export class ViewController<T extends ViewModel = ViewModel> {
     this.handleViewParams();
 
     this.initToolbarState();
+
+    // 初始化视图布局面板适配器
+    const { useDefaultLayout, viewLayoutPanel } = this.model;
+    if (!useDefaultLayout) {
+      const provider = await ibiz.register.control.get(viewLayoutPanel!);
+      this.providers.viewLayoutPanel = provider;
+    }
   }
 
   /**
@@ -240,11 +247,10 @@ export class ViewController<T extends ViewModel = ViewModel> {
    * @protected
    */
   protected handleViewParams(): void {
-    // 识别上下文的srfkey并转成实体名称，然后删除srfkey
+    // 识别上下文的srfkey并转成实体名称，然后置空srfkey
     if (this.context.srfkey && this.model.appEntity) {
       this.context[this.model.appEntity.deName] = this.context.srfkey;
-      this.context.srfkey = undefined; // 避免delete不掉，先置空
-      delete this.context.srfkey;
+      this.context.srfkey = undefined;
     }
 
     // 路由打开的设置srfsessionid
@@ -298,9 +304,9 @@ export class ViewController<T extends ViewModel = ViewModel> {
    *
    * @author lxm
    * @date 2022-08-28 17:08:56
-   * @returns {*}  {IData[]}
+   * @returns {*}  {IDatum[]}
    */
-  getData(): IData[] {
+  getData(): IDatum[] {
     return [];
   }
 
@@ -384,12 +390,12 @@ export class ViewController<T extends ViewModel = ViewModel> {
    * @author lxm
    * @date 2022-09-08 10:09:38
    * @param {IPSAppViewLogic} appViewLogic 视图逻辑
-   * @param {IData} data 数据
+   * @param {IDatum[]} data 数据
    * @param {MouseEvent} event 原生事件
    */
   async executeViewLogic(
     appViewLogic: IPSAppViewLogic,
-    data: IData[],
+    data: IDatum[],
     event?: MouseEvent,
   ): Promise<void> {
     const result = await executeViewLogic(

package/src/de-logic/de-logic-context.ts

@@ -1,3 +1,5 @@
+import { DELogicParam } from './de-logic-param/de-logic-param';
+
 /**
  * 实体逻辑执行上下文
  *
@@ -7,6 +9,14 @@
  * @class DELogicContext
  */
 export class DELogicContext {
+  /**
+   * Creates an instance of DELogicContext.
+   * @author lxm
+   * @date 2023-03-17 05:55:18
+   * @param {Map<string, DELogicParam>} deLogicParams 实体逻辑参数集合
+   */
+  constructor(public deLogicParams: Map<string, DELogicParam>) {}
+
   /**
    * 实体逻辑参数
    *
@@ -25,4 +35,22 @@ export class DELogicContext {
    * @type {unknown}
    */
   result: unknown = null;
+
+  /**
+   * 是否存在结束节点
+   *
+   * @author lxm
+   * @date 2023-03-16 12:08:58
+   * @type {boolean}
+   */
+  isEndNode: boolean = false;
+
+  /**
+   * 默认参数节点
+   *
+   * @author lxm
+   * @date 2023-03-16 12:11:14
+   * @type {string}
+   */
+  defaultParamName: string = 'Default';
 }

package/src/de-logic/de-logic-node/end-node/end-node.ts

@@ -19,9 +19,9 @@ export class EndNode extends DELogicNode {
     _params: IParams,
     _opt?: IParams | undefined,
   ): Promise<void> {
+    ctx.isEndNode = true;
     const source = this.model.source as IPSDEEndLogic;
     const { returnType, rawValue } = source;
-
     // eslint-disable-next-line default-case
     switch (returnType) {
       case 'NONEVALUE': // 无值（NONE）

package/src/de-logic/de-logic-node/prepare-param-node/prepare-param-node.ts

@@ -1,3 +1,7 @@
+import {
+  IPSDELogicNodeParam,
+  UnsupportedModelError,
+} from '@ibiz-template/model';
 import { DELogicContext } from '../../de-logic-context';
 import { DELogicNode } from '../de-logic-node';
 
@@ -11,13 +15,131 @@ import { DELogicNode } from '../de-logic-node';
  * @extends {DELogicNode}
  */
 export class PrepareParamNode extends DELogicNode {
-  exec(
-    _ctx: DELogicContext,
-    _context: IParams,
-    _data: IData | null,
-    _params: IParams,
-    _opt?: IParams | undefined,
+  async exec(
+    ctx: DELogicContext,
+    context: IParams,
+    data: IData | null,
+    params: IParams,
+    opt?: IParams | undefined,
   ): Promise<void> {
-    throw new Error('Method not implemented.');
+    const nodeParams = this.model.source.getPSDELogicNodeParams();
+    if (nodeParams?.length) {
+      await Promise.all(
+        nodeParams.map(nodeParam => {
+          switch (nodeParam.paramAction) {
+            // 设置变量
+            case 'SETPARAMVALUE':
+              return this.doSetParamValue(nodeParam, ctx, params);
+            // 重置变量
+            case 'RESETPARAM':
+              return this.doResetParam(
+                nodeParam,
+                ctx,
+                context,
+                data,
+                params,
+                opt,
+              );
+            // // 拷贝变量
+            // case 'COPYPARAM':
+            //   break;
+            // // 绑定参数
+            // case 'BINDPARAM':
+            //   break;
+            // // 重新建立变量
+            // case 'RENEWPARAM':
+            //   break;
+            // // 附加到数组变量
+            // case 'APPENDPARAM':
+            //   break;
+            // // 排序数组变量
+            // case 'SORTPARAM':
+            //   break;
+            default:
+              throw new UnsupportedModelError(
+                nodeParam,
+                `暂未支持逻辑处理参数操作${nodeParam.paramAction}`,
+              );
+          }
+        }),
+      );
+    }
+  }
+
+  /**
+   * 设置变量
+   * @author lxm
+   * @date 2023-03-17 03:34:02
+   * @protected
+   * @param {IPSDELogicNodeParam} nodeParam
+   * @param {DELogicContext} ctx
+   * @param {IParams} params
+   */
+  protected doSetParamValue(
+    nodeParam: IPSDELogicNodeParam,
+    ctx: DELogicContext,
+    params: IParams,
+  ) {
+    const { srcValueType, dstFieldName, srcFieldName, srcValue } = nodeParam;
+    // 目标参数
+    const dstParam = nodeParam.getDstPSDELogicParam()!;
+    const dstField = dstFieldName.toLowerCase();
+    // 源参数
+    let value: unknown;
+    switch (srcValueType) {
+      // 源逻辑参数
+      case 'SRCDLPARAM':
+        {
+          const srcParam = nodeParam.getSrcPSDELogicParam()!;
+          const srcField = srcFieldName.toLowerCase();
+          value = srcField
+            ? ctx.params[srcParam.codeName]
+            : ctx.params[srcParam.codeName][srcField];
+        }
+        break;
+      // 空值类型
+      case 'NULLVALUE':
+        value = null;
+        break;
+      // 无值类型
+      case 'NONEVALUE':
+        value = undefined;
+        break;
+      // 直接值
+      case 'SRCVALUE':
+        value = srcValue;
+        break;
+      // 视图参数
+      case 'VIEWPARAM':
+        value = params[srcFieldName.toLowerCase()];
+        break;
+
+      default:
+        throw new UnsupportedModelError(
+          nodeParam,
+          `暂未支持源值类型${srcValueType}`,
+        );
+    }
+    ctx.params[dstParam.codeName][dstField] = value;
+  }
+
+  /**
+   * 重置变量
+   * @author lxm
+   * @date 2023-03-17 06:05:20
+   * @protected
+   */
+  protected doResetParam(
+    nodeParam: IPSDELogicNodeParam,
+    ctx: DELogicContext,
+    context: IParams,
+    data: IData | null,
+    params: IParams,
+    opt?: IParams | undefined,
+  ) {
+    const dstParam = nodeParam.getDstPSDELogicParam()!;
+    ctx.deLogicParams
+      .get(dstParam.codeName)!
+      .calc(ctx, context, data, params, opt);
   }
 }

package/src/de-logic/de-logic.ts

@@ -118,6 +118,9 @@ export class DELogic {
     opt?: IParams,
   ): void {
     this.params.forEach(param => {
+      if (param.model.source.default) {
+        ctx.defaultParamName = param.model.name;
+      }
       param.calc(ctx, context, data, params, opt);
     });
   }
@@ -138,7 +141,7 @@ export class DELogic {
     params: IParams,
     opt?: IParams,
   ): Promise<unknown> {
-    const ctx = new DELogicContext();
+    const ctx = new DELogicContext(this.params);
     this.initLogicParams(ctx, context, data, params, opt);
     if (this.model.startNode && this.nodes.has(this.model.startNode.codeName)) {
       const start = this.nodes.get(this.model.startNode.codeName)!;
@@ -146,7 +149,13 @@ export class DELogic {
     } else {
       throw new UnsupportedModelError(this.model.source, `未设置起始节点`);
     }
-    return ctx.result || ctx.params.default || null;
+    if (ctx.isEndNode) {
+      return ctx.result;
+    }
+    if (ctx.params[ctx.defaultParamName]) {
+      return ctx.params[ctx.defaultParamName];
+    }
+    return null;
   }
 
   /**

package/src/de-logic/index.ts

@@ -1,11 +1,11 @@
 import { HttpError, HttpResponse } from '@ibiz-template/core';
-import { IPSDELogic, DELogicModel } from '@ibiz-template/model';
+import { IPSAppDELogic, DELogicModel } from '@ibiz-template/model';
 import { DELogic } from './de-logic';
 
 /**
  * 实体处理逻辑实例缓存
  */
-const deLogicMap: WeakMap<IPSDELogic, DELogic> = new Map();
+const deLogicMap: WeakMap<IPSAppDELogic, DELogic> = new Map();
 
 /**
  * 执行实体处理逻辑
@@ -13,7 +13,7 @@ const deLogicMap: WeakMap<IPSDELogic, DELogic> = new Map();
  * @author lxm
  * @date 2023-02-09 11:02:23
  * @export
- * @param {IPSDELogic} deDELogic
+ * @param {IPSAppDELogic} deDELogic
  * @param {IParams} context
  * @param {(IData | null)} data
  * @param {IParams} params
@@ -21,20 +21,42 @@ const deLogicMap: WeakMap<IPSDELogic, DELogic> = new Map();
  * @return {*}  {Promise<HttpResponse<IData>>}
  */
 export async function execDELogic(
-  deDELogic: IPSDELogic,
+  deDELogic: IPSAppDELogic,
   context: IParams,
   data: IData | null,
   params: IParams,
   opt?: IParams,
-): Promise<HttpResponse<IData>> {
+): Promise<unknown> {
   if (!deLogicMap.has(deDELogic)) {
     const deLogicModel = new DELogicModel(deDELogic);
     await deLogicModel.init();
     deLogicMap.set(deDELogic, new DELogic(deLogicModel));
   }
   const deLogic = deLogicMap.get(deDELogic)!;
+  return deLogic.exec(context, data, params, opt);
+}
+
+/**
+ * 执行实体方法的实体逻辑并返回对应的response
+ * @author lxm
+ * @date 2023-03-16 12:44:43
+ * @export
+ * @param {IPSAppDELogic} deDELogic
+ * @param {IParams} context
+ * @param {(IData | null)} data
+ * @param {IParams} params
+ * @param {IParams} [opt]
+ * @return {*}  {Promise<HttpResponse<IData>>}
+ */
+export async function execDELogicResponse(
+  deDELogic: IPSAppDELogic,
+  context: IParams,
+  data: IData | null,
+  params: IParams,
+  opt?: IParams,
+): Promise<HttpResponse<IData>> {
   try {
-    const result = await deLogic.exec(context, data, params, opt);
+    const result = await execDELogic(deDELogic, context, data, params, opt);
     return new HttpResponse(result);
   } catch (err) {
     if (err instanceof HttpError) {

package/src/index.ts

@@ -11,3 +11,4 @@ export * from './register';
 export * from './service';
 export * from './utils';
 export * from './view-logic';
+export { Application } from './application';

package/src/interface/i-modal/i-modal.ts

@@ -31,7 +31,7 @@ export interface IModal {
    *
    * @author chitanda
    * @date 2022-08-17 18:08:58
-   * @param {(IData | IData[])} data
+   * @param {(IDatum | IDatum[])} data
    */
-  dismiss?: (data?: IData | IData[]) => void;
+  dismiss?: (data?: IDatum | IDatum[]) => void;
 }

package/src/interface/i-modal-data/i-modal-data.ts

@@ -20,9 +20,9 @@ export interface IModalData {
    *
    * @author chitanda
    * @date 2022-08-17 18:08:20
-   * @type {IData[]}
+   * @type {IDatum[]}
    */
-  data?: IData[];
+  data?: IDatum[];
   /**
    * 额外参数
    *

package/src/interface/i-ui-action-handler/i-ui-action-handler.ts

@@ -18,7 +18,7 @@ export interface IUIActionHandler {
    * @date 2022-10-25 14:10:15
    * @param {IPSAppDEUIAction} action 界面行为模型
    * @param {IBizContext} context 上下文
-   * @param {(IData[] | null)} data 数据集合
+   * @param {(IDatum[])} data 数据集合
    * @param {IParams} params 视图参数
    * @param {IData} [opts] 额外参数
    * @returns {*}  {Promise<IUIActionResult>}
@@ -26,7 +26,7 @@ export interface IUIActionHandler {
   exec(
     action: IPSAppDEUIAction,
     context: IBizContext,
-    data: IData[] | null,
+    data: IDatum[],
     params: IParams,
     opts?: IData,
   ): Promise<IUIActionResult>;

package/src/interface/i-ui-action-result/i-ui-action-result.ts

@@ -1,3 +1,5 @@
+import { IBizContext } from '@ibiz-template/core';
+
 /**
  * 界面行为执行返回值
  *
@@ -40,7 +42,25 @@ export interface IUIActionResult {
    *
    * @author chitanda
    * @date 2022-08-17 18:08:20
-   * @type {IData[]}
+   * @type {IDatum[]}
+   */
+  data?: IDatum[];
+
+  /**
+   * 后续逻辑使用的上下文
+   * @author lxm
+   * @date 2023-03-15 07:26:38
+   * @type {IBizContext}
+   * @memberof IUIActionResult
+   */
+  nextContext?: IBizContext;
+
+  /**
+   * 后续逻辑使用的视图参数
+   * @author lxm
+   * @date 2023-03-15 07:26:38
+   * @type {IParams}
+   * @memberof IUIActionResult
    */
-  data?: IData[];
+  nextParams?: IParams;
 }