@ibiz-template/runtime 0.1.6 → 0.1.7

package/out/service/dto/method.dto.js

@@ -1,6 +1,3 @@
-/* eslint-disable no-await-in-loop */
-import { clone } from 'ramda';
-import { isNilOrEmpty } from 'qx-util';
 import { ModelError } from '@ibiz-template/core';
 import { AppDataEntity } from '../app-data-entity/app-data-entity';
 import { findModelChild } from '../../model';
@@ -40,21 +37,11 @@ export class MethodDto {
     async get(context, data) {
         const params = {};
         // 拷贝数据
-        const copyData = clone(data);
         for (let i = 0; i < this.fields.length; i++) {
             const field = this.fields[i];
             const key = field.codeName.toLowerCase();
             switch (field.type) {
                 case 'SIMPLE': {
-                    const val = copyData[key];
-                    if (isNilOrEmpty(val)) {
-                        params[key] = null;
-                    }
-                    else {
-                        params[key] = val;
-                    }
-                    // 取值后删除
-                    delete copyData[key];
                     break;
                 }
                 case 'DTOS': {
@@ -75,8 +62,7 @@ export class MethodDto {
             }
         }
         // 合并剩余参数
-        Object.assign(params, copyData);
-        return params;
+        return Object.assign(Object.assign({}, data), params);
     }
     /**
      * 设置本地 DTO 存储

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

@@ -1 +1 @@
-{"version":3,"file":"code-list.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/code-list/code-list.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACzE,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAEnD;;;;;;;GAOG;AACH,qBAAa,eAAe;IAoBd,SAAS,CAAC,QAAQ,EAAE,YAAY;IAnB5C;;;;;OAKG;IACH,SAAS,CAAC,YAAY,4BAAmC;IAEzD;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,YAAY,EAAE,GAAG,oBAAoB,CAAC,CAChE;gBAEU,QAAQ,EAAE,YAAY;IAE5C;;;;;;;OAOG;IACH,SAAS,CAAC,SAAS,CAAC,QAAQ,EAAE,YAAY,GAAG,YAAY,EAAE;IAc3D;;;;;;;;OAQG;IACH,WAAW,CAAC,QAAQ,EAAE,YAAY,GAAG,IAAI;IAMzC;;;;;;;;OAQG;IACH,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS;IAIlD;;;;;;;;;OASG;IACH,SAAS,CAAC,iBAAiB,CACzB,SAAS,EAAE,SAAS,EAAE,EACtB,aAAa,EAAE,OAAO,GACrB,QAAQ,CAAC,YAAY,CAAC,EAAE;IAmB3B;;;;;;;;OAQG;cACa,kBAAkB,CAChC,QAAQ,EAAE,YAAY,EACtB,OAAO,GAAE,OAAY,EACrB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,YAAY,EAAE,CAAC;IAa1B;;;;;;;;;OASG;IACG,GAAG,CACP,GAAG,EAAE,MAAM,EACX,OAAO,CAAC,EAAE,OAAO,EACjB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,SAAS,YAAY,EAAE,CAAC;CAcpC"}
+{"version":3,"file":"code-list.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/code-list/code-list.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACzE,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAEnD;;;;;;;GAOG;AACH,qBAAa,eAAe;IAoBd,SAAS,CAAC,QAAQ,EAAE,YAAY;IAnB5C;;;;;OAKG;IACH,SAAS,CAAC,YAAY,4BAAmC;IAEzD;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,YAAY,EAAE,GAAG,oBAAoB,CAAC,CAChE;gBAEU,QAAQ,EAAE,YAAY;IAE5C;;;;;;;OAOG;IACH,SAAS,CAAC,SAAS,CAAC,QAAQ,EAAE,YAAY,GAAG,YAAY,EAAE;IAc3D;;;;;;;;OAQG;IACH,WAAW,CAAC,QAAQ,EAAE,YAAY,GAAG,IAAI;IAMzC;;;;;;;;OAQG;IACH,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS;IAIlD;;;;;;;;;OASG;IACH,SAAS,CAAC,iBAAiB,CACzB,SAAS,EAAE,SAAS,EAAE,EACtB,aAAa,EAAE,OAAO,GACrB,QAAQ,CAAC,YAAY,CAAC,EAAE;IA0B3B;;;;;;;;OAQG;cACa,kBAAkB,CAChC,QAAQ,EAAE,YAAY,EACtB,OAAO,GAAE,OAAY,EACrB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,YAAY,EAAE,CAAC;IAa1B;;;;;;;;;OASG;IACG,GAAG,CACP,GAAG,EAAE,MAAM,EACX,OAAO,CAAC,EAAE,OAAO,EACjB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,SAAS,YAAY,EAAE,CAAC;CAcpC"}

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

@@ -89,8 +89,12 @@ export class CodeListService {
         return codeItems.map(codeItem => {
             var _a;
             // todo代码项其他属性，表单数据
+            let text = codeItem.text;
+            if (codeItem.textLanguageRes) {
+                text = ibiz.i18n.t(codeItem.textLanguageRes.lanResTag, codeItem.textLanguageRes.defaultContent);
+            }
             const _codeItem = {
-                text: codeItem.text,
+                text,
                 value: isValueNumber ? Number(codeItem.value) : codeItem.value,
                 color: codeItem.color,
                 id: codeItem.codeName,

package/out/types.d.ts

@@ -1,6 +1,7 @@
+import { I18n } from '@ibiz-template/core/src/interface';
 import { EngineFactory } from './engine';
 import { GlobalUtil } from './global';
-import { IMessageUtil, INotificationUtil, IOpenViewUtil, IModalUtil, ILoadingUtil, IPluginFactory, IOverlayController, IGlobalConfig, IAppHubService } from './interface';
+import { IMessageUtil, INotificationUtil, IOpenViewUtil, IModalUtil, IConfirmUtil, ILoadingUtil, IPluginFactory, IOverlayController, IGlobalConfig, IAppHubService } from './interface';
 import { LogicSchedulerCenter } from './logic-scheduler';
 import { RegisterCenter } from './register/register-center';
 import { AuthService } from './service';
@@ -31,6 +32,15 @@ declare module '@ibiz-template/core' {
          * @type {IModalUtil}
          */
         modal: IModalUtil;
+        /**
+         * 确认框
+         *
+         * @description 需要用户确认收到提示消息时使用此工具
+         * @author chitanda
+         * @date 2022-08-17 16:08:10
+         * @type {IConfirmUtil}
+         */
+        confirm: IConfirmUtil;
         /**
          * 消息通知
          *
@@ -113,6 +123,14 @@ declare module '@ibiz-template/core' {
          * @type {GlobalUtil}
          */
         util: GlobalUtil;
+        /**
+         * 多语言
+         *
+         * @author chitanda
+         * @date 2023-08-11 16:08:15
+         * @type {I18n}
+         */
+        i18n: I18n;
         /**
          * 逻辑调度中心
          * @author lxm

package/out/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AACtC,OAAO,EACL,YAAY,EACZ,iBAAiB,EACjB,aAAa,EACb,UAAU,EACV,YAAY,EACZ,cAAc,EACd,kBAAkB,EAClB,aAAa,EACb,cAAc,EACf,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAExC,OAAO,QAAQ,qBAAqB,CAAC;IACnC,UAAU,OAAO;QACf;;;;;;WAMG;QACH,OAAO,EAAE,YAAY,CAAC;QAEtB;;;;;;WAMG;QACH,GAAG,EAAE,cAAc,CAAC;QAEpB;;;;;;;WAOG;QACH,KAAK,EAAE,UAAU,CAAC;QAElB;;;;;;;WAOG;QACH,OAAO,EAAE,YAAY,CAAC;QAEtB;;;;;;;WAOG;QACH,YAAY,EAAE,iBAAiB,CAAC;QAEhC;;;;;;;WAOG;QACH,QAAQ,EAAE,aAAa,CAAC;QAExB;;;;;;WAMG;QACH,OAAO,EAAE,kBAAkB,CAAC;QAE5B;;;;;;WAMG;QACH,MAAM,EAAE,cAAc,CAAC;QAEvB;;;;;;WAMG;QACH,QAAQ,EAAE,cAAc,CAAC;QAEzB;;;;;;WAMG;QACH,MAAM,EAAE,aAAa,CAAC;QAEtB;;;;;;WAMG;QACH,IAAI,EAAE,WAAW,CAAC;QAElB;;;;;WAKG;QACH,MAAM,EAAE,aAAa,CAAC;QAEtB;;;;;;WAMG;QACH,IAAI,EAAE,UAAU,CAAC;QAEjB;;;;;WAKG;QACH,SAAS,EAAE,oBAAoB,CAAC;KACjC;CACF"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,mCAAmC,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AACtC,OAAO,EACL,YAAY,EACZ,iBAAiB,EACjB,aAAa,EACb,UAAU,EACV,YAAY,EACZ,YAAY,EACZ,cAAc,EACd,kBAAkB,EAClB,aAAa,EACb,cAAc,EACf,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAExC,OAAO,QAAQ,qBAAqB,CAAC;IACnC,UAAU,OAAO;QACf;;;;;;WAMG;QACH,OAAO,EAAE,YAAY,CAAC;QAEtB;;;;;;WAMG;QACH,GAAG,EAAE,cAAc,CAAC;QAEpB;;;;;;;WAOG;QACH,KAAK,EAAE,UAAU,CAAC;QAElB;;;;;;;WAOG;QACH,OAAO,EAAE,YAAY,CAAC;QAEtB;;;;;;;WAOG;QACH,OAAO,EAAE,YAAY,CAAC;QAEtB;;;;;;;WAOG;QACH,YAAY,EAAE,iBAAiB,CAAC;QAEhC;;;;;;;WAOG;QACH,QAAQ,EAAE,aAAa,CAAC;QAExB;;;;;;WAMG;QACH,OAAO,EAAE,kBAAkB,CAAC;QAE5B;;;;;;WAMG;QACH,MAAM,EAAE,cAAc,CAAC;QAEvB;;;;;;WAMG;QACH,QAAQ,EAAE,cAAc,CAAC;QAEzB;;;;;;WAMG;QACH,MAAM,EAAE,aAAa,CAAC;QAEtB;;;;;;WAMG;QACH,IAAI,EAAE,WAAW,CAAC;QAElB;;;;;WAKG;QACH,MAAM,EAAE,aAAa,CAAC;QAEtB;;;;;;WAMG;QACH,IAAI,EAAE,UAAU,CAAC;QAEjB;;;;;;WAMG;QACH,IAAI,EAAE,IAAI,CAAC;QAEX;;;;;WAKG;QACH,SAAS,EAAE,oBAAoB,CAAC;KACjC;CACF"}

package/out/ui-logic/ui-logic-node/bind-param-node/bind-param-node.d.ts

@@ -0,0 +1,17 @@
+import { IDEUIBindParamLogic } from '@ibiz/model-core';
+import { UILogicContext } from '../../ui-logic-context';
+import { UILogicNode } from '../ui-logic-node';
+/**
+ * 绑定参数
+ *
+ * @author lxm
+ * @date 2023-02-09 21:02:20
+ * @export
+ * @class BindParamNode
+ * @extends {UILogicNode}
+ */
+export declare class BindParamNode extends UILogicNode {
+    model: IDEUIBindParamLogic;
+    exec(ctx: UILogicContext): Promise<void>;
+}
+//# sourceMappingURL=bind-param-node.d.ts.map

package/out/ui-logic/ui-logic-node/bind-param-node/bind-param-node.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"bind-param-node.d.ts","sourceRoot":"","sources":["../../../../src/ui-logic/ui-logic-node/bind-param-node/bind-param-node.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAExD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C;;;;;;;;GAQG;AACH,qBAAa,aAAc,SAAQ,WAAW;IACpC,KAAK,EAAE,mBAAmB,CAAC;IAE7B,IAAI,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;CAW/C"}

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

@@ -0,0 +1,22 @@
+import { RuntimeModelError } from '@ibiz-template/core';
+import { handleSrcVal } from '../../utils';
+import { UILogicNode } from '../ui-logic-node';
+/**
+ * 绑定参数
+ *
+ * @author lxm
+ * @date 2023-02-09 21:02:20
+ * @export
+ * @class BindParamNode
+ * @extends {UILogicNode}
+ */
+export class BindParamNode extends UILogicNode {
+    async exec(ctx) {
+        const { dstDEUILogicParamId, srcDEUILogicParamId } = this.model;
+        if (!dstDEUILogicParamId || !srcDEUILogicParamId) {
+            throw new RuntimeModelError(this.model, '缺少目标参数对象或者源参数对象配置');
+        }
+        const srcVal = handleSrcVal(ctx, this.model);
+        ctx.params[dstDEUILogicParamId] = srcVal;
+    }
+}

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

@@ -5,4 +5,5 @@ export { EndNode } from './end-node/end-node';
 export { PrepareJSParamNode } from './prepare-js-param-node/prepare-js-param-node';
 export { UILogicNode } from './ui-logic-node';
 export { ViewCtrlInvokeNode } from './view-ctrl-invoke-node/view-ctrl-invoke-node';
+export { BindParamNode } from './bind-param-node/bind-param-node';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/ui-logic/ui-logic-node/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AACvE,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,+CAA+C,CAAC;AACnF,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,+CAA+C,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/ui-logic/ui-logic-node/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AACvE,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,+CAA+C,CAAC;AACnF,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,+CAA+C,CAAC;AACnF,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC"}

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

@@ -5,3 +5,4 @@ export { EndNode } from './end-node/end-node';
 export { PrepareJSParamNode } from './prepare-js-param-node/prepare-js-param-node';
 export { UILogicNode } from './ui-logic-node';
 export { ViewCtrlInvokeNode } from './view-ctrl-invoke-node/view-ctrl-invoke-node';
+export { BindParamNode } from './bind-param-node/bind-param-node';

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

@@ -1 +1 @@
-{"version":3,"file":"ui-logic-param.d.ts","sourceRoot":"","sources":["../../../src/ui-logic/ui-logic-param/ui-logic-param.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD;;;;;;;GAOG;AACH,qBAAa,YAAY;IAQJ,KAAK,EAAE,eAAe;IAPzC;;;;;;OAMG;gBACgB,KAAK,EAAE,eAAe;IAEzC;;;;;;OAMG;IACH,IAAI,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;IA6D/B;;;;;OAKG;IACH,KAAK,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;CAWjC"}
+{"version":3,"file":"ui-logic-param.d.ts","sourceRoot":"","sources":["../../../src/ui-logic/ui-logic-param/ui-logic-param.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD;;;;;;;GAOG;AACH,qBAAa,YAAY;IAQJ,KAAK,EAAE,eAAe;IAPzC;;;;;;OAMG;gBACgB,KAAK,EAAE,eAAe;IAEzC;;;;;;OAMG;IACH,IAAI,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;IAgE/B;;;;;OAKG;IACH,KAAK,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;CAWjC"}

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

@@ -1,4 +1,4 @@
-import { ModelError, RuntimeError } from '@ibiz-template/core';
+import { ModelError, RuntimeModelError } from '@ibiz-template/core';
 /**
  * 界面逻辑参数
  *
@@ -48,7 +48,7 @@ export class UILogicParam {
                 ctx.params[tag] = control;
             }
             else {
-                throw new RuntimeError(`没找到${m.codeName}指定部件对象`);
+                throw new RuntimeModelError(this.model, `视图逻辑初始化参数，未找到${m.codeName}指定部件对象`);
             }
         }
         else if (m.activeViewParam) {

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":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC9C,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,UAAU;IA1BvC;;;;;;;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,UAAU;IA0DvC;;;;;;;;;;OAUG;IACH,SAAS,CAAC,eAAe,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;IASpD;;;;;;;;;OASG;IACG,IAAI,CAAC,UAAU,EAAE,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC;IAmBxD;;;;;;;;;;;;;OAaG;cACa,QAAQ,CACtB,IAAI,EAAE,WAAW,EACjB,GAAG,EAAE,cAAc,GAClB,OAAO,CAAC,IAAI,CAAC;CAiBjB"}
+{"version":3,"file":"ui-logic.d.ts","sourceRoot":"","sources":["../../src/ui-logic/ui-logic.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAOL,WAAW,EAEZ,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D;;;;;;;GAOG;AACH,qBAAa,OAAO;IA2BN,SAAS,CAAC,KAAK,EAAE,UAAU;IA1BvC;;;;;;;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,UAAU;IA4DvC;;;;;;;;;;OAUG;IACH,SAAS,CAAC,eAAe,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;IASpD;;;;;;;;;OASG;IACG,IAAI,CAAC,UAAU,EAAE,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC;IAmBxD;;;;;;;;;;;;;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,7 +1,7 @@
 /* eslint-disable no-await-in-loop */
 import { ModelError, RuntimeModelError } from '@ibiz-template/core';
 import { UILogicContext } from './ui-logic-context';
-import { DEActionNode, DEUIActionNode, EndNode, PrepareJSParamNode, StartNode, ViewCtrlInvokeNode, } from './ui-logic-node';
+import { BindParamNode, DEActionNode, DEUIActionNode, EndNode, PrepareJSParamNode, StartNode, ViewCtrlInvokeNode, } from './ui-logic-node';
 import { UILogicParam } from './ui-logic-param/ui-logic-param';
 /**
  * 界面逻辑
@@ -61,12 +61,14 @@ export class UILogic {
                 case 'PREPAREJSPARAM': // 准备参数
                     logicNode = new PrepareJSParamNode(node);
                     break;
-                case 'RESETPARAM': // 重置参数
-                case 'COPYPARAM': // 拷贝参数
                 case 'BINDPARAM': // 绑定参数
+                    logicNode = new BindParamNode(node);
+                    break;
                 case 'VIEWCTRLINVOKE': // 视图部件调用
                     logicNode = new ViewCtrlInvokeNode(node);
                     break;
+                case 'RESETPARAM': // 重置参数
+                case 'COPYPARAM': // 拷贝参数
                 case 'VIEWCTRLFIREEVENT': // 视图部件事件触发
                 case 'APPENDPARAM': // 附加到数组参数
                 case 'SORTPARAM': // 排序数组参数

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

@@ -1 +1 @@
-{"version":3,"file":"handle-src-val.d.ts","sourceRoot":"","sources":["../../../src/ui-logic/utils/handle-src-val.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD,KAAK,YAAY,GAAG;IAClB;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B,CAAC;AAEF;;;;;;;;GAQG;AACH,wBAAgB,YAAY,CAC1B,GAAG,EAAE,cAAc,EACnB,YAAY,EAAE,YAAY,GACzB,OAAO,CA+CT"}
+{"version":3,"file":"handle-src-val.d.ts","sourceRoot":"","sources":["../../../src/ui-logic/utils/handle-src-val.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD,KAAK,YAAY,GAAG;IAClB;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B,CAAC;AAEF;;;;;;;;GAQG;AACH,wBAAgB,YAAY,CAC1B,GAAG,EAAE,cAAc,EACnB,YAAY,EAAE,YAAY,GACzB,OAAO,CA4CT"}

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

@@ -10,11 +10,9 @@ import { clone } from 'ramda';
  * @return {*}
  */
 export function handleSrcVal(ctx, srcValParams) {
-    const { srcDEUILogicParamId, srcValueType, srcFieldName, srcValue } = srcValParams;
+    const { srcDEUILogicParamId, srcFieldName, srcValue } = srcValParams;
     // 没有源值类型就是逻辑参数
-    if (!srcValParams.srcValueType) {
-        srcValParams.srcValueType = 'SRCDLPARAM';
-    }
+    const srcValueType = srcValParams.srcValueType || 'SRCDLPARAM';
     let value;
     switch (srcValueType) {
         // 源逻辑参数

package/out/utils/open-redirect-view/open-redirect-view.d.ts

@@ -1,5 +1,5 @@
 import { IAppDERedirectView, IAppDataEntity, IAppRedirectView } from '@ibiz/model-core';
-import { IModalData } from '../../interface';
+import { IModalData, IOpenViewOptions } from '../../interface';
 /**
  * 打开重定向视图
  *
@@ -12,7 +12,7 @@ import { IModalData } from '../../interface';
  * @param {IData} [data={}]
  * @return {*}  {Promise<IModalData>}
  */
-export declare function openRedirectView(appView: IAppRedirectView, context: IContext, params?: IParams, data?: IData[]): Promise<IModalData>;
+export declare function openRedirectView(appView: IAppRedirectView, context: IContext, params?: IParams, opts?: IOpenViewOptions): Promise<IModalData>;
 /**
  * 本地打开工作流重定向视图
  *
@@ -24,7 +24,7 @@ export declare function openRedirectView(appView: IAppRedirectView, context: ICo
  * @param {IContext} context
  * @param {string} linkUrl
  */
-export declare function toLocalOpenWFRedirectView(context: IContext, linkUrl: string): Promise<void>;
+export declare function toLocalOpenWFRedirectView(context: IContext, linkUrl: string, opts?: IOpenViewOptions): Promise<void>;
 /**
  * 打开实体重定向视图
  *
@@ -37,7 +37,7 @@ export declare function toLocalOpenWFRedirectView(context: IContext, linkUrl: st
  * @param {IData[]} [data=[]]
  * @return {*}  {Promise<IModalData>}
  */
-export declare function openDERedirectView(appView: IAppDERedirectView, context: IContext, params?: IParams, data?: IData[]): Promise<IModalData>;
+export declare function openDERedirectView(appView: IAppDERedirectView, context: IContext, params?: IParams, opts?: IOpenViewOptions): Promise<IModalData>;
 /**
  * 计算重定向标识
  *

package/out/utils/open-redirect-view/open-redirect-view.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"open-redirect-view.d.ts","sourceRoot":"","sources":["../../../src/utils/open-redirect-view/open-redirect-view.ts"],"names":[],"mappings":"AACA,OAAO,EACL,kBAAkB,EAClB,cAAc,EACd,gBAAgB,EACjB,MAAM,kBAAkB,CAAC;AAI1B,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAK7C;;;;;;;;;;;GAWG;AACH,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,gBAAgB,EACzB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,EACpB,IAAI,GAAE,KAAK,EAAO,GACjB,OAAO,CAAC,UAAU,CAAC,CAOrB;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,yBAAyB,CAC7C,OAAO,EAAE,QAAQ,EACjB,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,IAAI,CAAC,CAmDf;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,kBAAkB,EAC3B,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,EACpB,IAAI,GAAE,KAAK,EAAO,GACjB,OAAO,CAAC,UAAU,CAAC,CAyGrB;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,WAAW,CAC/B,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,kBAAkB,EAC1B,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,MAAM,CAAC,CA0CjB"}
+{"version":3,"file":"open-redirect-view.d.ts","sourceRoot":"","sources":["../../../src/utils/open-redirect-view/open-redirect-view.ts"],"names":[],"mappings":"AACA,OAAO,EACL,kBAAkB,EAClB,cAAc,EACd,gBAAgB,EACjB,MAAM,kBAAkB,CAAC;AAI1B,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAK/D;;;;;;;;;;;GAWG;AACH,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,gBAAgB,EACzB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,EACpB,IAAI,GAAE,gBAAqB,GAC1B,OAAO,CAAC,UAAU,CAAC,CAOrB;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,yBAAyB,CAC7C,OAAO,EAAE,QAAQ,EACjB,OAAO,EAAE,MAAM,EACf,IAAI,GAAE,gBAAqB,GAC1B,OAAO,CAAC,IAAI,CAAC,CAoDf;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,kBAAkB,EAC3B,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,EACpB,IAAI,GAAE,gBAAqB,GAC1B,OAAO,CAAC,UAAU,CAAC,CAyGrB;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,WAAW,CAC/B,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,kBAAkB,EAC1B,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,MAAM,CAAC,CA0CjB"}

package/out/utils/open-redirect-view/open-redirect-view.js

@@ -16,8 +16,8 @@ import { calcDeCodeNameById, findFieldById } from '../../model';
  * @param {IData} [data={}]
  * @return {*}  {Promise<IModalData>}
  */
-export async function openRedirectView(appView, context, params = {}, data = []) {
-    return openDERedirectView(appView, context, params, data);
+export async function openRedirectView(appView, context, params = {}, opts = {}) {
+    return openDERedirectView(appView, context, params, opts);
 }
 /**
  * 本地打开工作流重定向视图
@@ -30,7 +30,7 @@ export async function openRedirectView(appView, context, params = {}, data = [])
  * @param {IContext} context
  * @param {string} linkUrl
  */
-export async function toLocalOpenWFRedirectView(context, linkUrl) {
+export async function toLocalOpenWFRedirectView(context, linkUrl, opts = {}) {
     const i = linkUrl.lastIndexOf('?');
     const queryStr = decodeURIComponent(linkUrl.substring(i + 1, linkUrl.length));
     const params = qs.parse(queryStr, { delimiter: ';' });
@@ -65,7 +65,7 @@ export async function toLocalOpenWFRedirectView(context, linkUrl) {
         context.srfprocessinstanceid = params.srfprocessinstanceid;
         delete params.srfprocessinstanceid;
     }
-    await ibiz.commands.execute(OpenAppViewCommand.TAG, deRdView.id, context, params);
+    await ibiz.commands.execute(OpenAppViewCommand.TAG, deRdView.id, context, params, opts);
 }
 /**
  * 打开实体重定向视图
@@ -79,7 +79,8 @@ export async function toLocalOpenWFRedirectView(context, linkUrl) {
  * @param {IData[]} [data=[]]
  * @return {*}  {Promise<IModalData>}
  */
-export async function openDERedirectView(appView, context, params = {}, data = []) {
+export async function openDERedirectView(appView, context, params = {}, opts = {}) {
+    var _a;
     // 计算重定向视图上下文参数转换
     const navContext = appView.appViewNavContexts || [];
     const navContextData = convertNavData(navContext, context, params);
@@ -91,7 +92,7 @@ export async function openDERedirectView(appView, context, params = {}, data = [
     // 重定向视图对应应用实体
     const entityId = appView.appDataEntityId;
     const key = calcDeCodeNameById(entityId);
-    let curData = data[0] || {};
+    let curData = ((_a = opts.data) === null || _a === void 0 ? void 0 : _a[0]) || {};
     // 将数据主键转换到上下文当中
     context[key] = curData[key] || context[key] || params[key];
     // 实体重定向视图获取数据行为
@@ -125,7 +126,7 @@ export async function openDERedirectView(appView, context, params = {}, data = [
                     });
                 }
                 if (linkUrl.startsWith('appredirectview?')) {
-                    await toLocalOpenWFRedirectView(context, linkUrl);
+                    await toLocalOpenWFRedirectView(context, linkUrl, opts);
                     return { ok: true, data: [] };
                 }
                 return { ok: false, data: [] };
@@ -151,7 +152,7 @@ export async function openDERedirectView(appView, context, params = {}, data = [
     if (refView) {
         const viewId = refView.refAppViewId;
         if (viewId) {
-            const result = await ibiz.commands.execute(OpenAppViewCommand.TAG, viewId, context, params, { data: [curData] });
+            const result = await ibiz.commands.execute(OpenAppViewCommand.TAG, viewId, context, params, Object.assign(Object.assign({}, opts), { data: [curData] }));
             if (result) {
                 return result;
             }
@@ -219,7 +220,7 @@ export async function calcDERdTag(entity, rdView, params, data) {
         }
     }
     if (notNilEmpty(typeValue)) {
-        rdTag = `${defView}:${typeValue.toUpperCase()}`;
+        rdTag = `${defView}:${typeValue.toString().toUpperCase()}`;
     }
     else {
         rdTag = `${defView}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -29,7 +29,7 @@
   "author": "chitanda",
   "license": "MIT",
   "devDependencies": {
-    "@ibiz-template/core": "^0.1.6",
+    "@ibiz-template/core": "^0.1.7",
     "@ibiz/model-core": "^0.0.14",
     "@types/path-browserify": "^1.0.0",
     "@types/qs": "^6.9.7",
@@ -53,5 +53,5 @@
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
-  "gitHead": "b140871c2a8700d063b3a6380f0eef5c02768822"
+  "gitHead": "5e283e6c4cfad7a27402a60f96d4f628bf1dbb1a"
 }

package/src/command/app/open-app-view/open-app-view.ts

@@ -1,6 +1,6 @@
 import { ModelError, RuntimeError } from '@ibiz-template/core';
 import { IAppRedirectView } from '@ibiz/model-core';
-import { IModalData, IViewConfig } from '../../../interface';
+import { IModalData, IOpenViewOptions, IViewConfig } from '../../../interface';
 import { calcDeCodeNameById } from '../../../model';
 import { openRedirectView } from '../../../utils';
 
@@ -34,7 +34,7 @@ export class OpenAppViewCommand {
     appViewId: string,
     context: IContext,
     params: IParams = {},
-    opts: IData = {},
+    opts: IOpenViewOptions = {},
   ): Promise<IModalData | void> {
     const appView = await ibiz.hub.config.view.get(appViewId!);
     if (!appView) {
@@ -54,7 +54,7 @@ export class OpenAppViewCommand {
         fullViewModel as IAppRedirectView,
         context,
         params,
-        opts.data,
+        opts,
       );
     }
     const { openMode = 'INDEXVIEWTAB' } = appView;
@@ -72,7 +72,7 @@ export class OpenAppViewCommand {
       case 'POPUPAPP':
         throw new ModelError(appView, '未支持的视图打开模式: POPUPAPP');
       case 'POPOVER':
-        return this.openPopover(appView, opts.event, context, params);
+        return this.openPopover(appView, opts.event!, context, params);
       case 'DRAWER_LEFT':
       case 'DRAWER_RIGHT':
       case 'DRAWER_TOP':
@@ -135,10 +135,13 @@ export class OpenAppViewCommand {
    */
   protected async openPopover(
     appView: IViewConfig,
-    event: MouseEvent,
+    event: MouseEvent | undefined,
     context: IContext,
     params: IParams = {},
   ): Promise<IModalData> {
+    if (!event) {
+      throw new RuntimeError('气泡打开缺少event');
+    }
     return ibiz.openView.popover(appView, event, context, params);
   }
 

package/src/controller/common/base.controller.ts

@@ -200,7 +200,7 @@ export class BaseController<
   async destroyed(): Promise<void> {
     await this.onDestroyed();
     ibiz.log.debug(`${this.constructor.name}:${this.name} onDestroyed`);
-    this._evt.emit('onDestroyed', undefined);
+    await this._evt.emit('onDestroyed', undefined);
     this.evt.destroy();
   }
 

package/src/controller/common/control/md-control.controller.ts

@@ -189,7 +189,7 @@ export class MDControlController<
     if (!data?.length) {
       throw new RuntimeError('未选中数据');
     }
-    const del = await ibiz.modal.confirm({
+    const del = await ibiz.confirm.error({
       title: '数据删除',
       desc: '确认删除数据？',
     });

package/src/controller/common/view/view.controller.ts

@@ -252,9 +252,12 @@ export class ViewController<
       this.scheduler.defaultParamsCb = (): IUILogicParams => {
         return this.getEventArgs();
       };
-      this.evt.onAll((_eventName, event) => {
-        this.scheduler!.triggerViewEvent(event);
-      });
+      if (this.scheduler.hasViewEventTrigger) {
+        // 监听视图事件触发视图事件触发器
+        this.evt.onAll((_eventName, event) => {
+          this.scheduler!.triggerViewEvent(event);
+        });
+      }
     }
 
     // 执行视图引擎的doCreated
@@ -380,5 +383,15 @@ export class ViewController<
         this.mountCounter.attend(this.layoutPanel!.model.name!);
       });
     }
+
+    if (this.scheduler?.hasControlEventTrigger) {
+      // 监听部件事件触发部件事件触发器
+      panel.evt.on('onControlEvent', event => {
+        this.scheduler!.triggerControlEvent(
+          event.triggerControlName,
+          event.triggerEvent,
+        );
+      });
+    }
   }
 }

package/src/controller/ctx/ctx.ts

@@ -48,7 +48,7 @@ export class CTX<V extends IViewController = IViewController> {
    * @date 2023-04-26 07:54:46
    * @protected
    */
-  readonly evt = new QXEvent<CTXEvent>();
+  readonly evt = new QXEvent<CTXEvent>(3000);
 
   /**
    * 当前视图控制器集合（包含自身视图控制器，部件控制器，和下一层级的视图的控制器）

package/src/interface/common/i-open-view-options/i-open-view-options.ts

@@ -0,0 +1,40 @@
+/**
+ * 打开视图额外参数
+ * @author lxm
+ * @date 2023-08-14 11:46:55
+ * @export
+ * @interface IOpenViewOptions
+ */
+export interface IOpenViewOptions {
+  /**
+   * 打开方式
+   * @author lxm
+   * @date 2023-08-14 01:40:27
+   * @type {string}
+   */
+  openMode?: string;
+
+  /**
+   * 不等待路由打开
+   * @author lxm
+   * @date 2023-07-28 02:23:13
+   * @type {boolean}
+   */
+  noWaitRoute?: boolean;
+
+  /**
+   * 数据集合
+   * @author lxm
+   * @date 2023-08-14 01:40:14
+   * @type {IData[]}
+   */
+  data?: IData[];
+
+  /**
+   * 原生js事件
+   * @author lxm
+   * @date 2023-08-14 04:22:06
+   * @type {MouseEvent}
+   */
+  event?: MouseEvent;
+}

package/src/interface/common/index.ts

@@ -28,3 +28,4 @@ export type {
   IAppViewConfigService,
   IViewConfig,
 } from './i-app-view-config-service/i-app-view-config-service';
+export type { IOpenViewOptions } from './i-open-view-options/i-open-view-options';

package/src/interface/logic-scheduler/i-scheduler-logic.ts

@@ -88,21 +88,24 @@ export interface ISchedulerLogic {
   /**
    * 事件名称
    * @type {string}
-   * 来源  getEventNames
    */
   eventNames?: string;
 
   /**
    * 事件参数
    * @type {string}
-   * 来源  getEventArg
    */
   eventArg?: string;
 
   /**
    * 事件参数2
    * @type {string}
-   * 来源  getEventArg2
    */
   eventArg2?: string;
+
+  /**
+   * 部件名称
+   * @type {string}
+   */
+  ctrlName?: string;
 }

package/src/interface/logic-scheduler/i-trigger-match-params.ts

@@ -22,4 +22,10 @@ export interface ITriggerMatchParams {
    * 来源  getEventNames
    */
   eventName?: string;
+
+  /**
+   * 部件名称
+   * @type {string}
+   */
+  ctrlName?: string;
 }