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

package/out/ui-logic/ui-logic-param/ui-logic-param.js

@@ -1,4 +1,4 @@
-import { UnsupportedModelError } from '@ibiz-template/model';
+import { ModelError, RuntimeModelError } from '@ibiz-template/core';
 /**
  * 界面逻辑参数
  *
@@ -13,7 +13,7 @@ export class UILogicParam {
      *
      * @author chitanda
      * @date 2023-02-08 16:02:22
-     * @param {UILogicParamModel} model
+     * @param {IAppDEUILogicParam} model
      */
     constructor(model) {
         this.model = model;
@@ -24,22 +24,31 @@ export class UILogicParam {
      * @author chitanda
      * @date 2023-02-08 20:02:33
      * @param {UILogicContext} ctx
-     * @param {IBizContext} context
-     * @param {IData} data
-     * @param {IParams} [opt]
      */
-    calc(ctx, context, data, _params, opt) {
-        const { source: m, codeName: tag } = this.model;
-        const app = ibiz.hub.getApp(this.model.modelService.app);
+    calc(ctx) {
+        const m = this.model;
+        const tag = this.model.codeName;
+        const { context, viewParams, data, opt } = ctx;
         if (m.default) {
             ctx.params[tag] = data && data.length > 0 ? data[0] : {};
         }
         else if (m.activeContainerParam) {
             ctx.params[tag] = opt === null || opt === void 0 ? void 0 : opt.container;
         }
-        else if (m.activeCtrlParam || m.ctrlParam) {
+        else if (m.ctrlParam) {
+            // 指定部件
+            if (!m.paramTag) {
+                throw new RuntimeModelError(m, '指定部件对象需要配置参数标记');
+            }
+            // 部件模型名称会被小写
+            const control = opt === null || opt === void 0 ? void 0 : opt.ctx.getControl(m.paramTag.toLowerCase());
+            if (control) {
+                ctx.params[tag] = control;
+            }
+        }
+        else if (m.activeCtrlParam) {
             // 当前部件
-            ctx.params[tag] = opt === null || opt === void 0 ? void 0 : opt.control;
+            ctx.params[tag] = opt === null || opt === void 0 ? void 0 : opt.neuron;
         }
         else if (m.activeViewParam) {
             // 当前视图
@@ -51,44 +60,64 @@ export class UILogicParam {
         }
         else if (m.applicationParam) {
             // 当前应用
-            ctx.params[tag] = app;
+            // ctx.params[tag] = app;
         }
         else if (m.entityListParam) {
             // 数据对象列表
             ctx.params[tag] = [];
         }
         else if (m.entityPageParam) {
-            throw new UnsupportedModelError(m, `未支持的逻辑参数类型: 分页查询结果`);
+            throw new ModelError(m, `未支持的逻辑参数类型: 分页查询结果`);
         }
         else if (m.entityParam) {
             // 数据对象变量
-            ctx.params[tag] = [];
+            ctx.params[tag] = {};
         }
         else if (m.lastReturnParam) {
-            throw new UnsupportedModelError(m, `未支持的逻辑参数类型: 上次调用返回`);
+            throw new ModelError(m, `未支持的逻辑参数类型: 上次调用返回`);
         }
         else if (m.navContextParam) {
             // 应用上下文
             ctx.params[tag] = context;
         }
         else if (m.navViewParamParam) {
-            throw new UnsupportedModelError(m, `未支持的逻辑参数类型: 视图路由参数`);
+            throw new ModelError(m, `未支持的逻辑参数类型: 视图路由参数`);
         }
         else if (m.routeViewSessionParam) {
-            throw new UnsupportedModelError(m, `未支持的逻辑参数类型: 路由视图会话`);
+            throw new ModelError(m, `未支持的逻辑参数类型: 路由视图会话`);
         }
         else if (m.simpleListParam) {
             // 简单数据列表
             ctx.params[tag] = [];
         }
         else if (m.simpleParam) {
-            throw new UnsupportedModelError(m, `未支持的逻辑参数类型: 简单数据`);
+            // 简单数据
+            ctx.params[tag] = {};
         }
         else if (m.viewNavDataParam) {
-            throw new UnsupportedModelError(m, `未支持的逻辑参数类型: 视图导航数据`);
+            // 视图导航数据
+            ctx.params[tag] = viewParams;
         }
         else if (m.viewSessionParam) {
-            throw new UnsupportedModelError(m, `未支持的逻辑参数类型: 当前视图会话`);
+            throw new ModelError(m, `未支持的逻辑参数类型: 当前视图会话`);
+        }
+    }
+    /**
+     * 重新建立变量
+     * @author lxm
+     * @date 2023-03-24 09:20:42
+     * @param {DELogicContext} ctx
+     */
+    renew(_ctx) {
+        const m = this.model;
+        if (m.entityListParam || m.simpleListParam || m.entityPageParam) {
+            // ctx.params[tag!] = [];
+        }
+        else if (m.simpleParam || m.entityParam) {
+            // ctx.params[tag!] = {};
+        }
+        else {
+            throw new ModelError(m, `未支持的逻辑参数类型重新建立变量`);
         }
     }
 }

package/out/ui-logic/ui-logic.d.ts

@@ -1,5 +1,4 @@
-import { IBizContext } from '@ibiz-template/core';
-import { UILogicModel } from '@ibiz-template/model';
+import { IAppDEUILogic } from '@ibiz/model-core';
 import { UILogicContext } from './ui-logic-context';
 import { UILogicNode } from './ui-logic-node';
 import { UILogicParam } from './ui-logic-param/ui-logic-param';
@@ -12,7 +11,7 @@ import { UILogicParam } from './ui-logic-param/ui-logic-param';
  * @class UILogic
  */
 export declare class UILogic {
-    protected model: UILogicModel;
+    protected model: IAppDEUILogic;
     /**
      * 所有节点实例
      *
@@ -35,9 +34,9 @@ export declare class UILogic {
      * Creates an instance of UILogic.
      * @author chitanda
      * @date 2023-02-08 17:02:26
-     * @param {UILogicModel} model
+     * @param {IAppDEUILogic} model
      */
-    constructor(model: UILogicModel);
+    constructor(model: IAppDEUILogic);
     /**
      * 初始化逻辑参数
      *
@@ -45,22 +44,22 @@ export declare class UILogic {
      * @date 2023-02-08 21:02:58
      * @protected
      * @param {UILogicContext} ctx
-     * @param {IBizContext} context
+     * @param {IContext} context
      * @param {IData} data
      * @param {IParams} [opt]
      */
-    protected initLogicParams(ctx: UILogicContext, context: IBizContext, data: IDatum[] | null, params: IParams, opt?: IParams): void;
+    protected initLogicParams(ctx: UILogicContext): void;
     /**
      * 执行视图逻辑
      *
      * @author chitanda
      * @date 2023-02-08 21:02:09
-     * @param {IBizContext} context
+     * @param {IContext} context
      * @param {IData} data
      * @param {IParams} [opt]
      * @return {*}  {Promise<IData>}
      */
-    exec(context: IBizContext, data: IDatum[] | null, params: IParams, opt?: IParams): Promise<unknown>;
+    exec(context: IContext, data: IDatum[] | null, params: IParams, opt?: IParams): Promise<unknown>;
     /**
      * 开始根据连线递归执行逻辑
      *
@@ -69,12 +68,12 @@ export declare class UILogic {
      * @protected
      * @param {UILogicNode} node
      * @param {UILogicContext} ctx
-     * @param {IBizContext} context
+     * @param {IContext} context
      * @param {(IDatum[] | null)} data
      * @param {IParams} params
      * @param {IParams} [opt]
      * @return {*}  {(Promise<IData | null>)}
      */
-    protected deepExec(node: UILogicNode, ctx: UILogicContext, context: IBizContext, data: IDatum[] | null, params: IParams, opt?: IParams): Promise<void>;
+    protected deepExec(node: UILogicNode, ctx: UILogicContext): Promise<void>;
 }
 //# sourceMappingURL=ui-logic.d.ts.map

package/out/ui-logic/ui-logic.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ui-logic.d.ts","sourceRoot":"","sources":["../../src/ui-logic/ui-logic.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAyB,MAAM,sBAAsB,CAAC;AAC3E,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAML,WAAW,EACZ,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D;;;;;;;GAOG;AACH,qBAAa,OAAO;IA2BN,SAAS,CAAC,KAAK,EAAE,YAAY;IA1BzC;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAa;IAEtD;;;;;;;OAOG;IACH,SAAS,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAa;IAExD;;;;;OAKG;gBACmB,KAAK,EAAE,YAAY;IA2DzC;;;;;;;;;;OAUG;IACH,SAAS,CAAC,eAAe,CACvB,GAAG,EAAE,cAAc,EACnB,OAAO,EAAE,WAAW,EACpB,IAAI,EAAE,MAAM,EAAE,GAAG,IAAI,EACrB,MAAM,EAAE,OAAO,EACf,GAAG,CAAC,EAAE,OAAO,GACZ,IAAI;IASP;;;;;;;;;OASG;IACG,IAAI,CACR,OAAO,EAAE,WAAW,EACpB,IAAI,EAAE,MAAM,EAAE,GAAG,IAAI,EACrB,MAAM,EAAE,OAAO,EACf,GAAG,CAAC,EAAE,OAAO,GACZ,OAAO,CAAC,OAAO,CAAC;IAkBnB;;;;;;;;;;;;;OAaG;cACa,QAAQ,CACtB,IAAI,EAAE,WAAW,EACjB,GAAG,EAAE,cAAc,EACnB,OAAO,EAAE,WAAW,EACpB,IAAI,EAAE,MAAM,EAAE,GAAG,IAAI,EACrB,MAAM,EAAE,OAAO,EACf,GAAG,CAAC,EAAE,OAAO,GACZ,OAAO,CAAC,IAAI,CAAC;CAiBjB"}
+{"version":3,"file":"ui-logic.d.ts","sourceRoot":"","sources":["../../src/ui-logic/ui-logic.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAML,WAAW,EAEZ,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D;;;;;;;GAOG;AACH,qBAAa,OAAO;IA2BN,SAAS,CAAC,KAAK,EAAE,aAAa;IA1B1C;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAa;IAEtD;;;;;;;OAOG;IACH,SAAS,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAa;IAExD;;;;;OAKG;gBACmB,KAAK,EAAE,aAAa;IA0D1C;;;;;;;;;;OAUG;IACH,SAAS,CAAC,eAAe,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;IASpD;;;;;;;;;OASG;IACG,IAAI,CACR,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,MAAM,EAAE,GAAG,IAAI,EACrB,MAAM,EAAE,OAAO,EACf,GAAG,CAAC,EAAE,OAAO,GACZ,OAAO,CAAC,OAAO,CAAC;IAqBnB;;;;;;;;;;;;;OAaG;cACa,QAAQ,CACtB,IAAI,EAAE,WAAW,EACjB,GAAG,EAAE,cAAc,GAClB,OAAO,CAAC,IAAI,CAAC;CAiBjB"}

package/out/ui-logic/ui-logic.js

@@ -1,6 +1,6 @@
-import { UnsupportedModelError } from '@ibiz-template/model';
+import { ModelError } from '@ibiz-template/core';
 import { UILogicContext } from './ui-logic-context';
-import { DEActionNode, DEUIActionNode, EndNode, PrepareJSParamNode, StartNode, } from './ui-logic-node';
+import { DEActionNode, DEUIActionNode, EndNode, PrepareJSParamNode, StartNode, ViewCtrlInvokeNode, } from './ui-logic-node';
 import { UILogicParam } from './ui-logic-param/ui-logic-param';
 /**
  * 界面逻辑
@@ -15,9 +15,10 @@ export class UILogic {
      * Creates an instance of UILogic.
      * @author chitanda
      * @date 2023-02-08 17:02:26
-     * @param {UILogicModel} model
+     * @param {IAppDEUILogic} model
      */
     constructor(model) {
+        var _a, _b;
         this.model = model;
         /**
          * 所有节点实例
@@ -37,8 +38,8 @@ export class UILogic {
          * @type {Map<string, UILogicParam>}
          */
         this.params = new Map();
-        model.nodes.forEach(node => {
-            const { logicNodeType } = node.source;
+        (_a = model.deuilogicNodes) === null || _a === void 0 ? void 0 : _a.forEach(node => {
+            const { logicNodeType } = node;
             let logicNode;
             switch (logicNodeType) {
                 case 'BEGIN': // 开始
@@ -60,6 +61,8 @@ export class UILogic {
                 case 'COPYPARAM': // 拷贝参数
                 case 'BINDPARAM': // 绑定参数
                 case 'VIEWCTRLINVOKE': // 视图部件调用
+                    logicNode = new ViewCtrlInvokeNode(node);
+                    break;
                 case 'VIEWCTRLFIREEVENT': // 视图部件事件触发
                 case 'APPENDPARAM': // 附加到数组参数
                 case 'SORTPARAM': // 排序数组参数
@@ -71,22 +74,22 @@ export class UILogic {
                 case 'THROWEXCEPTION': // 抛出异常
                 case 'DEBUGPARAM': // 调试逻辑参数
                 default:
-                    throw new UnsupportedModelError(node.source, `未支持的逻辑节点类型: ${logicNodeType}`);
+                    throw new ModelError(node, `未支持的逻辑节点类型: ${logicNodeType}`);
             }
-            this.nodes.set(node.codeName, logicNode);
+            this.nodes.set(node.id, logicNode);
         });
-        model.params.forEach(param => {
+        (_b = model.deuilogicParams) === null || _b === void 0 ? void 0 : _b.forEach(param => {
             this.params.set(param.codeName, new UILogicParam(param));
         });
         // 将已经实例化的逻辑节点挂载到逻辑连接上
         this.nodes.forEach(node => {
             node.links.forEach(link => {
-                const { srcNode, dstNode } = link.model;
-                if (this.nodes.has(srcNode.codeName)) {
-                    link.srcNode = this.nodes.get(srcNode.codeName);
+                const { srcDEUILogicNodeId, dstDEUILogicNodeId } = link.model;
+                if (this.nodes.has(srcDEUILogicNodeId)) {
+                    link.srcNode = this.nodes.get(srcDEUILogicNodeId);
                 }
-                if (this.nodes.has(dstNode.codeName)) {
-                    link.dstNode = this.nodes.get(dstNode.codeName);
+                if (this.nodes.has(dstDEUILogicNodeId)) {
+                    link.dstNode = this.nodes.get(dstDEUILogicNodeId);
                 }
             });
         });
@@ -98,16 +101,16 @@ export class UILogic {
      * @date 2023-02-08 21:02:58
      * @protected
      * @param {UILogicContext} ctx
-     * @param {IBizContext} context
+     * @param {IContext} context
      * @param {IData} data
      * @param {IParams} [opt]
      */
-    initLogicParams(ctx, context, data, params, opt) {
+    initLogicParams(ctx) {
         this.params.forEach(param => {
-            if (param.model.source.default) {
+            if (param.model.default) {
                 ctx.defaultParamName = param.model.name;
             }
-            param.calc(ctx, context, data, params, opt);
+            param.calc(ctx);
         });
     }
     /**
@@ -115,20 +118,21 @@ export class UILogic {
      *
      * @author chitanda
      * @date 2023-02-08 21:02:09
-     * @param {IBizContext} context
+     * @param {IContext} context
      * @param {IData} data
      * @param {IParams} [opt]
      * @return {*}  {Promise<IData>}
      */
     async exec(context, data, params, opt) {
-        const ctx = new UILogicContext();
-        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);
-            await this.deepExec(start, ctx, context, data, params, opt);
+        const ctx = new UILogicContext(this.params, context, data, params, opt);
+        this.initLogicParams(ctx);
+        if (this.model.startDEUILogicNodeId &&
+            this.nodes.has(this.model.startDEUILogicNodeId)) {
+            const start = this.nodes.get(this.model.startDEUILogicNodeId);
+            await this.deepExec(start, ctx);
         }
         else {
-            throw new UnsupportedModelError(this.model.source, `未设置起始节点`);
+            throw new ModelError(this.model, `未设置起始节点`);
         }
         if (ctx.isEndNode) {
             return ctx.result;
@@ -146,24 +150,24 @@ export class UILogic {
      * @protected
      * @param {UILogicNode} node
      * @param {UILogicContext} ctx
-     * @param {IBizContext} context
+     * @param {IContext} context
      * @param {(IDatum[] | null)} data
      * @param {IParams} params
      * @param {IParams} [opt]
      * @return {*}  {(Promise<IData | null>)}
      */
-    async deepExec(node, ctx, context, data, params, opt) {
+    async deepExec(node, ctx) {
         // 执行逻辑节点
-        await node.exec(ctx, context, data, params, opt);
+        await node.exec(ctx);
         const { links } = node;
         // 遍历所有节点连接，递归执行下级连接节点
         for (let index = 0; index < links.length; index++) {
             const link = links[index];
-            const bol = await link.exec(ctx, context, data, params, opt);
+            const bol = await link.exec(ctx);
             if (bol && link.dstNode) {
-                await this.deepExec(link.dstNode, ctx, context, data, params, opt);
+                await this.deepExec(link.dstNode, ctx);
                 // 平行输出: 在满足连接条件并逻辑执行完毕后若是非平行输出则执行完成
-                if (node.model.parallel === false) {
+                if (!node.model.parallelOutput) {
                     break;
                 }
             }

package/out/ui-logic/utils/handle-src-params.d.ts

@@ -0,0 +1,12 @@
+import { IDEUILogicNodeParam } from '@ibiz/model-core';
+import { UILogicContext } from '../ui-logic-context';
+/**
+ * 解析模型并获取源参数或其中的某个属性
+ * @author lxm
+ * @date 2023-03-24 09:41:10
+ * @export
+ * @param {IDELogicNodeParam} nodeParam
+ * @param {DELogicContext} ctx
+ */
+export declare function handleSrcParams(nodeParam: IDEUILogicNodeParam, ctx: UILogicContext): unknown;
+//# sourceMappingURL=handle-src-params.d.ts.map

package/out/ui-logic/utils/handle-src-params.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"handle-src-params.d.ts","sourceRoot":"","sources":["../../../src/ui-logic/utils/handle-src-params.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAGvD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAC7B,SAAS,EAAE,mBAAmB,EAC9B,GAAG,EAAE,cAAc,WA8CpB"}

package/out/ui-logic/utils/handle-src-params.js

@@ -0,0 +1,55 @@
+import { clone } from 'ramda';
+import { ModelError } from '@ibiz-template/core';
+/**
+ * 解析模型并获取源参数或其中的某个属性
+ * @author lxm
+ * @date 2023-03-24 09:41:10
+ * @export
+ * @param {IDELogicNodeParam} nodeParam
+ * @param {DELogicContext} ctx
+ */
+export function handleSrcParams(nodeParam, ctx) {
+    const { srcValueType, srcFieldName, srcValue } = nodeParam;
+    let value;
+    switch (srcValueType) {
+        // 源逻辑参数
+        case 'SRCDLPARAM':
+            {
+                // todo
+                // const srcParam = nodeParam.getSrcPSDEUILogicParam()!;
+                const srcParam = {};
+                const srcField = srcFieldName === null || srcFieldName === void 0 ? void 0 : srcFieldName.toLowerCase();
+                value = srcField
+                    ? ctx.params[srcParam.codeName][srcField]
+                    : ctx.params[srcParam.codeName];
+            }
+            break;
+        // 空值类型
+        case 'NULLVALUE':
+            value = null;
+            break;
+        // 无值类型
+        case 'NONEVALUE':
+            value = undefined;
+            break;
+        // 直接值
+        case 'SRCVALUE':
+            value = srcValue;
+            break;
+        // // 视图参数
+        // case 'VIEWPARAM':
+        //   value = ctx.viewParams[srcFieldName.toLowerCase()];
+        //   break;
+        // // 应用上下文
+        // case 'APPDATA':
+        //   value = ctx.context[srcFieldName.toLowerCase()];
+        //   break;
+        // 当前环境参数
+        case 'ENVPARAM':
+            value = clone(ibiz.env);
+            break;
+        default:
+            throw new ModelError(nodeParam, `暂未支持源值类型${srcValueType}`);
+    }
+    return value;
+}

package/out/utils/app-de-ui-action-util/app-de-ui-action-util.d.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';
 /**
  * 应用实体界面行为
@@ -16,13 +15,13 @@ export declare 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 exec(action: IPSAppDEUIAction, context: IBizContext, data: IDatum[] | null, params: IParams, opts?: IData): Promise<IUIActionResult>;
+    static exec(action: IAppDEUIAction, context: IContext, data: IDatum[] | null, params: IParams, opts?: IData): Promise<IUIActionResult>;
 }
 //# sourceMappingURL=app-de-ui-action-util.d.ts.map

package/out/utils/app-de-ui-action-util/app-de-ui-action-util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"app-de-ui-action-util.d.ts","sourceRoot":"","sources":["../../../src/utils/app-de-ui-action-util/app-de-ui-action-util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAElD;;;;;;;GAOG;AACH,qBAAa,iBAAiB;IAC5B;;;;;;;;;;;;OAYG;WACU,IAAI,CACf,MAAM,EAAE,gBAAgB,EACxB,OAAO,EAAE,WAAW,EACpB,IAAI,EAAE,MAAM,EAAE,GAAG,IAAI,EACrB,MAAM,EAAE,OAAO,EACf,IAAI,CAAC,EAAE,KAAK,GACX,OAAO,CAAC,eAAe,CAAC;CAK5B"}
+{"version":3,"file":"app-de-ui-action-util.d.ts","sourceRoot":"","sources":["../../../src/utils/app-de-ui-action-util/app-de-ui-action-util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAElD;;;;;;;GAOG;AACH,qBAAa,iBAAiB;IAC5B;;;;;;;;;;;;OAYG;WACU,IAAI,CACf,MAAM,EAAE,cAAc,EACtB,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,MAAM,EAAE,GAAG,IAAI,EACrB,MAAM,EAAE,OAAO,EACf,IAAI,CAAC,EAAE,KAAK,GACX,OAAO,CAAC,eAAe,CAAC;CAK5B"}

package/out/utils/app-de-ui-action-util/app-de-ui-action-util.js

@@ -13,8 +13,8 @@ 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]

package/out/utils/app-de-ui-action-util/handler/backend-ui-action-handler.d.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';
 import { UIActionHandler } from './ui-action-handler';
 /**
@@ -12,6 +11,17 @@ import { UIActionHandler } from './ui-action-handler';
  * @extends {UIActionHandler}
  */
 export declare class BackendUIActionHandler extends UIActionHandler {
-    execAction(action: IPSAppDEUIAction, context: IBizContext, data: IDatum[], params: IParams, _opts?: IData | undefined): Promise<IUIActionResult>;
+    /**
+     * 打开实体行为前选择视图
+     * @author lxm
+     * @date 2023-03-27 11:21:01
+     * @param {IAppDEUIAction} action
+     * @param {IContext} context
+     * @param {IParams} params
+     * @param {(IData | undefined)} [opts]
+     * @return {*}
+     */
+    openSelectView(action: IAppDEUIAction, context: IContext, params: IParams, opts?: IData | undefined): Promise<void>;
+    execAction(action: IAppDEUIAction, context: IContext, data: IDatum[], params: IParams, opts?: IData | undefined): Promise<IUIActionResult>;
 }
 //# sourceMappingURL=backend-ui-action-handler.d.ts.map

package/out/utils/app-de-ui-action-util/handler/backend-ui-action-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"backend-ui-action-handler.d.ts","sourceRoot":"","sources":["../../../../src/utils/app-de-ui-action-util/handler/backend-ui-action-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAoB,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAE1E,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD;;;;;;;;GAQG;AACH,qBAAa,sBAAuB,SAAQ,eAAe;IACnD,UAAU,CACd,MAAM,EAAE,gBAAgB,EACxB,OAAO,EAAE,WAAW,EACpB,IAAI,EAAE,MAAM,EAAE,EACd,MAAM,EAAE,OAAO,EACf,KAAK,CAAC,EAAE,KAAK,GAAG,SAAS,GACxB,OAAO,CAAC,eAAe,CAAC;CAsC5B"}
+{"version":3,"file":"backend-ui-action-handler.d.ts","sourceRoot":"","sources":["../../../../src/utils/app-de-ui-action-util/handler/backend-ui-action-handler.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD;;;;;;;;GAQG;AACH,qBAAa,sBAAuB,SAAQ,eAAe;IACzD;;;;;;;;;OASG;IACG,cAAc,CAClB,MAAM,EAAE,cAAc,EACtB,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,EACf,IAAI,CAAC,EAAE,KAAK,GAAG,SAAS;IAgBpB,UAAU,CACd,MAAM,EAAE,cAAc,EACtB,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,MAAM,EAAE,EACd,MAAM,EAAE,OAAO,EACf,IAAI,CAAC,EAAE,KAAK,GAAG,SAAS,GACvB,OAAO,CAAC,eAAe,CAAC;CAoE5B"}

package/out/utils/app-de-ui-action-util/handler/backend-ui-action-handler.js

@@ -1,5 +1,3 @@
-import { DefectModelError } from '@ibiz-template/model';
-import { isArray } from 'lodash-es';
 import { UIActionHandler } from './ui-action-handler';
 /**
  * 后台调用界面行为处理器
@@ -11,30 +9,92 @@ import { UIActionHandler } from './ui-action-handler';
  * @extends {UIActionHandler}
  */
 export class BackendUIActionHandler extends UIActionHandler {
-    async execAction(action, context, data, params, _opts) {
-        var _a, _b, _c, _d;
-        const entityName = (_a = action.getPSAppDataEntity()) === null || _a === void 0 ? void 0 : _a.codeName;
-        const methodName = (_b = action.getPSAppDEMethod()) === null || _b === void 0 ? void 0 : _b.codeName;
-        if (!entityName || !methodName) {
-            throw new DefectModelError(action, '未配置实体或实体行为');
-        }
-        // 处理参数
-        const { resultContext, resultParams, resultData } = await this.handleParams(action, context, data, params);
-        const tempParams = Object.assign(Object.assign({}, params), resultParams);
-        const app = ibiz.hub.getApp(action.getPSModelService().app);
-        const deService = await app.es.getService(entityName);
-        const _data = resultData.length > 0
-            ? ((_d = (_c = resultData[0]).getRequestData) === null || _d === void 0 ? void 0 : _d.call(_c)) || resultData[0]
-            : {};
-        const res = await deService.exec(methodName, resultContext, _data, tempParams);
-        // 适配界面行为成功提示信息
-        if (res.ok && action.successMsg) {
-            ibiz.message.success(action.successMsg);
-        }
-        return {
-            data: isArray(res.data) ? res.data : [res.data],
-            nextContext: resultContext,
-            nextParams: tempParams,
-        };
+    /**
+     * 打开实体行为前选择视图
+     * @author lxm
+     * @date 2023-03-27 11:21:01
+     * @param {IAppDEUIAction} action
+     * @param {IContext} context
+     * @param {IParams} params
+     * @param {(IData | undefined)} [opts]
+     * @return {*}
+     */
+    async openSelectView(action, context, params, opts) {
+        // const frontPSAppView = action.getFrontPSAppView();
+        // if (!frontPSAppView) {
+        //   return;
+        // }
+        // await frontPSAppView.fill(true);
+        // return ibiz.commands.execute(
+        //   OpenAppViewCommand.TAG,
+        //   frontPSAppView,
+        //   context,
+        //   params,
+        //   opts,
+        // );
+    }
+    async execAction(action, context, data, params, opts) {
+        const actionResult = {};
+        // const entityName = action.getPSAppDataEntity()?.codeName;
+        // const methodName = action.getPSAppDEMethod()?.codeName;
+        // if (!entityName || !methodName) {
+        //   throw new RuntimeModelError(action, '未配置实体或实体行为');
+        // }
+        // // 处理参数
+        // const { resultContext, resultParams, resultData } = await this.handleParams(
+        //   action,
+        //   context,
+        //   data,
+        //   params,
+        // );
+        // const tempParams = { ...params, ...resultParams };
+        // // 如果有打开视图，打开视图，并把返回的数据作为子实体数据
+        // const frontPSAppView = action.getFrontPSAppView();
+        // if (frontPSAppView) {
+        //   await frontPSAppView.fill(true);
+        //   const res: IModalData | undefined = await ibiz.commands.execute(
+        //     OpenAppViewCommand.TAG,
+        //     frontPSAppView,
+        //     resultContext,
+        //     resultParams,
+        //     opts,
+        //   );
+        //   if (!res?.ok) {
+        //     actionResult.cancel = true;
+        //     return actionResult;
+        //   }
+        //   if (res?.ok && res.data) {
+        //     // 空数据补充一个数据
+        //     if (resultData.length === 0) {
+        //       resultData.push({});
+        //     }
+        //     resultData.forEach(item => {
+        //       item.srfactionparam = res.data;
+        //     });
+        //   }
+        // }
+        // todo
+        // const app = ibiz.hub.getApp(action.getPSModelService().app);
+        // const deService = await app.es.getService(entityName);
+        // const _data =
+        //   resultData.length > 0
+        //     ? resultData[0].getRequestData?.() || resultData[0]
+        //     : {};
+        // const res = await deService.exec(
+        //   methodName,
+        //   resultContext,
+        //   _data,
+        //   tempParams,
+        // );
+        // // 适配界面行为成功提示信息
+        // if (res.ok && action.successMsg) {
+        //   ibiz.message.success(action.successMsg);
+        // }
+        // Object.assign(actionResult, {
+        //   data: isArray(res.data) ? res.data : [res.data],
+        //   nextContext: resultContext,
+        //   nextParams: tempParams,
+        // });
+        return actionResult;
     }
 }

package/out/utils/app-de-ui-action-util/handler/common-sys-ui-action-handler.d.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';
 import { UIActionHandler } from './ui-action-handler';
 /**
@@ -12,6 +11,6 @@ import { UIActionHandler } from './ui-action-handler';
  * @extends {UIActionHandler}
  */
 export declare class CommonSysUIActionHandler extends UIActionHandler {
-    execAction(action: IPSAppDEUIAction, context: IBizContext, data: IDatum[] | null, params: IParams, opts?: IData | undefined): Promise<IUIActionResult>;
+    execAction(action: IAppDEUIAction, context: IContext, data: IDatum[] | null, params: IParams, opts?: IData | undefined): Promise<IUIActionResult>;
 }
 //# sourceMappingURL=common-sys-ui-action-handler.d.ts.map

package/out/utils/app-de-ui-action-util/handler/common-sys-ui-action-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"common-sys-ui-action-handler.d.ts","sourceRoot":"","sources":["../../../../src/utils/app-de-ui-action-util/handler/common-sys-ui-action-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD;;;;;;;;GAQG;AACH,qBAAa,wBAAyB,SAAQ,eAAe;IACrD,UAAU,CACd,MAAM,EAAE,gBAAgB,EACxB,OAAO,EAAE,WAAW,EACpB,IAAI,EAAE,MAAM,EAAE,GAAG,IAAI,EACrB,MAAM,EAAE,OAAO,EACf,IAAI,CAAC,EAAE,KAAK,GAAG,SAAS,GACvB,OAAO,CAAC,eAAe,CAAC;CAuG5B"}
+{"version":3,"file":"common-sys-ui-action-handler.d.ts","sourceRoot":"","sources":["../../../../src/utils/app-de-ui-action-util/handler/common-sys-ui-action-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD;;;;;;;;GAQG;AACH,qBAAa,wBAAyB,SAAQ,eAAe;IACrD,UAAU,CACd,MAAM,EAAE,cAAc,EACtB,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,MAAM,EAAE,GAAG,IAAI,EACrB,MAAM,EAAE,OAAO,EACf,IAAI,CAAC,EAAE,KAAK,GAAG,SAAS,GACvB,OAAO,CAAC,eAAe,CAAC;CAuG5B"}