@ibiz-template/runtime 0.1.23 → 0.1.24

package/out/command/app/app-func/app-func.js

@@ -33,8 +33,8 @@ export class AppFuncCommand {
         // 导航参数转换
         const { navigateContexts, navigateParams, appFuncType } = appFunc;
         const _context = context.clone();
-        Object.assign(_context, convertNavData(navigateContexts, context, params));
-        const _params = convertNavData(navigateParams, context, params);
+        Object.assign(_context, convertNavData(navigateContexts, params, context));
+        const _params = convertNavData(navigateParams, params, context);
         switch (appFuncType) {
             case 'APPVIEW':
                 return this.openAppView(appFunc, _context, _params, opts);

package/out/controller/common/control/control.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"control.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/common/control/control.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAG7E,OAAO,EAAE,cAAc,EAAE,MAAM,IAAI,CAAC;AACpC,OAAO,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAChC,OAAO,EACL,SAAS,EACT,kBAAkB,EAClB,aAAa,EACb,aAAa,EACb,eAAe,EACf,0BAA0B,EAC3B,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EACL,gBAAgB,EAChB,kBAAkB,EAEnB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AAIjE;;;;;;;GAOG;AACH,qBAAa,iBAAiB,CAC1B,CAAC,SAAS,QAAQ,GAAG,QAAQ,EAC7B,CAAC,SAAS,aAAa,GAAG,aAAa,EACvC,CAAC,SAAS,aAAa,GAAG,aAAa,CAEzC,SAAQ,cAAc,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAC9B,YAAW,kBAAkB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAEtC,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,aAAa,CAAC,CAEnD;IAED,IAAI,IAAI,IAAI,eAAe,CAE1B;IAED;;;;;OAKG;IACH,SAAS,CAAC,EAAE,qBAAqB,CAAC;IAElC;;;;;OAKG;IACH,YAAY,CAAC,EAAE,gBAAgB,CAAC;IAEhC,WAAW,CAAC,EAAE,0BAA0B,CAAC;IAEzC;;;;;OAKG;IACH,SAAS,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,gBAAgB,CAAA;KAAE,CAAM;IAEpD;;;;;;;;OAQG;gBACS,KAAK,EAAE,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG;IAWlE;;;;;OAKG;IACH,SAAS,CAAC,aAAa,IAAI,IAAI;IAI/B;;;;;OAKG;IACH,SAAS,CAAC,YAAY,IAAI,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC;IAStD,SAAS,CAAC,SAAS,IAAI,IAAI;cAKX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;cAc1B,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAO5C;;;;;OAKG;IACH,cAAc,IAAI,MAAM;IAIxB;;;;;OAKG;IACH,OAAO,IAAI,KAAK,EAAE,GAAG,IAAI;IAIzB;;;;;;OAMG;IACG,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAKnC;;;;;;OAMG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAKjC;;;;;;;OAOG;IACH,SAAS,CAAC,oBAAoB,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG;QACzD,OAAO,EAAE,QAAQ,CAAC;QAClB,MAAM,EAAE,OAAO,CAAC;QAChB,IAAI,EAAE,KAAK,EAAE,CAAC;KACf;IAOD;;;;;OAKG;IACH,cAAc,CAAC,KAAK,EAAE,0BAA0B,GAAG,IAAI;IAWvD;;;;;;OAMG;IACH,SAAS,CAAC,oBAAoB,CAAC,MAAM,GAAE,aAAa,EAAO,GAAG,IAAI;IAUlE;;;;;;;OAOG;IACH,kBAAkB,CAChB,GAAG,EAAE,MAAM,EACX,IAAI,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,CAAC;QAAC,KAAK,CAAC,EAAE,KAAK,CAAA;KAAE,GACjE,IAAI;CAoDR"}
+{"version":3,"file":"control.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/common/control/control.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAG7E,OAAO,EAAE,cAAc,EAAE,MAAM,IAAI,CAAC;AACpC,OAAO,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAChC,OAAO,EACL,SAAS,EACT,kBAAkB,EAClB,aAAa,EACb,aAAa,EACb,eAAe,EACf,0BAA0B,EAC3B,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EACL,gBAAgB,EAChB,kBAAkB,EAEnB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AAIjE;;;;;;;GAOG;AACH,qBAAa,iBAAiB,CAC1B,CAAC,SAAS,QAAQ,GAAG,QAAQ,EAC7B,CAAC,SAAS,aAAa,GAAG,aAAa,EACvC,CAAC,SAAS,aAAa,GAAG,aAAa,CAEzC,SAAQ,cAAc,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAC9B,YAAW,kBAAkB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAEtC,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,aAAa,CAAC,CAEnD;IAED,IAAI,IAAI,IAAI,eAAe,CAE1B;IAED;;;;;OAKG;IACH,SAAS,CAAC,EAAE,qBAAqB,CAAC;IAElC;;;;;OAKG;IACH,YAAY,CAAC,EAAE,gBAAgB,CAAC;IAEhC,WAAW,CAAC,EAAE,0BAA0B,CAAC;IAEzC;;;;;OAKG;IACH,SAAS,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,gBAAgB,CAAA;KAAE,CAAM;IAEpD;;;;;;;;OAQG;gBACS,KAAK,EAAE,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG;IAWlE;;;;;OAKG;IACH,SAAS,CAAC,aAAa,IAAI,IAAI;IAI/B;;;;;OAKG;IACH,SAAS,CAAC,YAAY,IAAI,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC;IAStD,SAAS,CAAC,SAAS,IAAI,IAAI;cAKX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;cAc1B,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAO5C;;;;;OAKG;IACH,cAAc,IAAI,MAAM;IAIxB;;;;;OAKG;IACH,OAAO,IAAI,KAAK,EAAE,GAAG,IAAI;IAIzB;;;;;;OAMG;IACG,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAKnC;;;;;;OAMG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAKjC;;;;;;;OAOG;IACH,SAAS,CAAC,oBAAoB,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG;QACzD,OAAO,EAAE,QAAQ,CAAC;QAClB,MAAM,EAAE,OAAO,CAAC;QAChB,IAAI,EAAE,KAAK,EAAE,CAAC;KACf;IAOD;;;;;OAKG;IACH,cAAc,CAAC,KAAK,EAAE,0BAA0B,GAAG,IAAI;IAWvD;;;;;;OAMG;IACH,SAAS,CAAC,oBAAoB,CAAC,MAAM,GAAE,aAAa,EAAO,GAAG,IAAI;IAUlE;;;;;;;OAOG;IACH,kBAAkB,CAChB,GAAG,EAAE,MAAM,EACX,IAAI,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,CAAC;QAAC,KAAK,CAAC,EAAE,KAAK,CAAA;KAAE,GACjE,IAAI;CAqDR"}

package/out/controller/common/control/control.controller.js

@@ -217,6 +217,7 @@ export class ControlController extends BaseController {
             return;
         }
         if (opts === null || opts === void 0 ? void 0 : opts.error) {
+            ibiz.log.error(opts.error);
             // 报错时抛错误
             throw new NoticeError(message, duration);
         }

package/out/controller/common/control/md-control.controller.d.ts

@@ -1,4 +1,4 @@
-import { IMDControl } from '@ibiz/model-core';
+import { IAppDataEntity, IMDControl } from '@ibiz/model-core';
 import { IMDControlController, IMDControlEvent, IMDControlState, MDCtrlLoadParams, MDCtrlRemoveParams } from '../../../interface';
 import { MDControlService } from '../../../service';
 import { ControllerEvent } from '../../utils';
@@ -31,7 +31,26 @@ export declare class MDControlController<T extends IMDControl = IMDControl, S ex
      * @protected
      */
     protected fieldIdNameMap: Map<string, string>;
+    /**
+     * 当前多数据部件对应的应用实体对象
+     *
+     * @author chitanda
+     * @date 2023-09-13 17:09:32
+     * @protected
+     * @type {IAppDataEntity}
+     */
+    protected dataEntity: IAppDataEntity;
     protected onCreated(): Promise<void>;
+    protected onDestroyed(): Promise<void>;
+    /**
+     * 当数据放生变更时，若为当前应用实体数据。则多数据部件进行刷新
+     *
+     * @author chitanda
+     * @date 2023-09-13 17:09:04
+     * @protected
+     * @param {IData} msg
+     */
+    protected onDataChange(msg: IData): void;
     /**
      * 设置排序
      * 无参数时设置的是默认排序。

package/out/controller/common/control/md-control.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"md-control.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/common/control/md-control.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EACL,oBAAoB,EACpB,eAAe,EACf,eAAe,EACf,gBAAgB,EAChB,kBAAkB,EACnB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,gBAAgB,EAAS,MAAM,kBAAkB,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAEzD;;;;;;;;;GASG;AACH,qBAAa,mBAAmB,CAC5B,CAAC,SAAS,UAAU,GAAG,UAAU,EACjC,CAAC,SAAS,eAAe,GAAG,eAAe,EAC3C,CAAC,SAAS,eAAe,GAAG,eAAe,CAE7C,SAAQ,iBAAiB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CACjC,YAAW,oBAAoB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAExC;;;;;;OAMG;IACH,OAAO,EAAG,gBAAgB,CAAC;IAE3B,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,eAAe,CAAC,CAErD;IAED,SAAS,CAAC,SAAS,IAAI,IAAI;IAgB3B;;;;;OAKG;IACH,SAAS,CAAC,cAAc,sBAA6B;cAErC,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAe1C;;;;;;;;OAQG;IACH,OAAO,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,IAAI;IAMnD;;;;;;OAMG;IACG,cAAc,CAAC,WAAW,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IA6B7D;;;;;OAKG;IACG,IAAI,CAAC,IAAI,GAAE,gBAAqB,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAgDzD;;;;;;;;OAQG;IACG,SAAS,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAIzE;;;;OAIG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAI9B;;;;;;OAMG;IACG,MAAM,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IAiEtD;;;;;;OAMG;IACH,WAAW,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAU9B;;;;;;OAMG;IACH,OAAO,IAAI,KAAK,EAAE;IAIlB,SAAS,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAMrC,YAAY,CAAC,SAAS,EAAE,KAAK,EAAE,GAAG,IAAI;IAWtC;;;;;;OAMG;IACG,UAAU,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAmB5C;;;;;;OAMG;IACG,YAAY,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAM9C;;;;;;OAMG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAwBjC;;;;;;OAMG;IACG,UAAU,CAAC,KAAK,EAAE;QAAE,KAAK,EAAE,UAAU,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAkC9D"}
+{"version":3,"file":"md-control.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/common/control/md-control.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EACL,oBAAoB,EACpB,eAAe,EACf,eAAe,EACf,gBAAgB,EAChB,kBAAkB,EACnB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,gBAAgB,EAAS,MAAM,kBAAkB,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAEzD;;;;;;;;;GASG;AACH,qBAAa,mBAAmB,CAC5B,CAAC,SAAS,UAAU,GAAG,UAAU,EACjC,CAAC,SAAS,eAAe,GAAG,eAAe,EAC3C,CAAC,SAAS,eAAe,GAAG,eAAe,CAE7C,SAAQ,iBAAiB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CACjC,YAAW,oBAAoB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAExC;;;;;;OAMG;IACH,OAAO,EAAG,gBAAgB,CAAC;IAE3B,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,eAAe,CAAC,CAErD;IAED,SAAS,CAAC,SAAS,IAAI,IAAI;IAgB3B;;;;;OAKG;IACH,SAAS,CAAC,cAAc,sBAA6B;IAErD;;;;;;;OAOG;IACH,SAAS,CAAC,UAAU,EAAG,cAAc,CAAC;cAEtB,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAiB1C,SAAS,CAAC,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAKtC;;;;;;;OAOG;IACH,SAAS,CAAC,YAAY,CAAC,GAAG,EAAE,KAAK,GAAG,IAAI;IAMxC;;;;;;;;OAQG;IACH,OAAO,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,IAAI;IAMnD;;;;;;OAMG;IACG,cAAc,CAAC,WAAW,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IA6B7D;;;;;OAKG;IACG,IAAI,CAAC,IAAI,GAAE,gBAAqB,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAgDzD;;;;;;;;OAQG;IACG,SAAS,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAIzE;;;;OAIG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAI9B;;;;;;OAMG;IACG,MAAM,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IAiEtD;;;;;;OAMG;IACH,WAAW,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAU9B;;;;;;OAMG;IACH,OAAO,IAAI,KAAK,EAAE;IAIlB,SAAS,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAMrC,YAAY,CAAC,SAAS,EAAE,KAAK,EAAE,GAAG,IAAI;IAWtC;;;;;;OAMG;IACG,UAAU,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAmB5C;;;;;;OAMG;IACG,YAAY,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAM9C;;;;;;OAMG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAwBjC;;;;;;OAMG;IACG,UAAU,CAAC,KAAK,EAAE;QAAE,KAAK,EAAE,UAAU,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAkC9D"}

package/out/controller/common/control/md-control.controller.js

@@ -46,13 +46,32 @@ export class MDControlController extends ControlController {
         var _a;
         await super.onCreated();
         // 初始化实体属性id和name的映射
-        const dataEntity = await ibiz.hub.getAppDataEntity(this.model.appDataEntityId);
-        (_a = dataEntity.appDEFields) === null || _a === void 0 ? void 0 : _a.forEach(field => {
+        this.dataEntity = await ibiz.hub.getAppDataEntity(this.model.appDataEntityId);
+        (_a = this.dataEntity.appDEFields) === null || _a === void 0 ? void 0 : _a.forEach(field => {
             this.fieldIdNameMap.set(field.id, field.name);
         });
+        this.onDataChange = this.onDataChange.bind(this);
+        ibiz.mc.command.change.on(this.onDataChange);
         // 设置默认排序
         this.setSort();
     }
+    onDestroyed() {
+        ibiz.mc.command.change.off(this.onDataChange);
+        return super.onDestroyed();
+    }
+    /**
+     * 当数据放生变更时，若为当前应用实体数据。则多数据部件进行刷新
+     *
+     * @author chitanda
+     * @date 2023-09-13 17:09:04
+     * @protected
+     * @param {IData} msg
+     */
+    onDataChange(msg) {
+        if (msg.data && msg.data.srfdecodename === this.dataEntity.codeName) {
+            this.refresh();
+        }
+    }
     /**
      * 设置排序
      * 无参数时设置的是默认排序。

package/out/controller/common/editor/editor.controller.js

@@ -103,12 +103,12 @@ export class EditorController {
             .model;
         let selfContext = {};
         if (navigateContexts && data) {
-            selfContext = convertNavData(navigateContexts, context, params, data);
+            selfContext = convertNavData(navigateContexts, data, params, context);
         }
         const _context = Object.assign(context.clone(), selfContext);
         let selfParams = {};
         if (navigateParams && data) {
-            selfParams = convertNavData(navigateParams, context, params, data);
+            selfParams = convertNavData(navigateParams, data, params, context);
         }
         const _params = Object.assign(Object.assign({}, params), selfParams);
         return { context: _context, params: _params };

package/out/controller/common/view/view.controller.js

@@ -242,14 +242,14 @@ export class ViewController extends BaseController {
         const navContexts = this.model.appViewNavContexts;
         let context = {};
         if (notNilEmpty(navContexts)) {
-            context = convertNavData(navContexts, this.context, this.params);
+            context = convertNavData(navContexts, this.params, this.context);
         }
         Object.assign(this.context, context);
         // 处理自定义视图参数
         const navParams = this.model.appViewNavParams;
         let params = {};
         if (notNilEmpty(navParams)) {
-            params = convertNavData(navParams, this.context, this.params);
+            params = convertNavData(navParams, this.params, this.context);
         }
         Object.assign(this.params, params);
         if (this.state.isMounted) {

package/out/controller/control/form/edit-form/edit-form.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"edit-form.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/form/edit-form/edit-form.controller.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,OAAO,EACL,cAAc,EACd,cAAc,EACd,mBAAmB,EACpB,MAAM,uBAAuB,CAAC;AAK/B,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AACzC,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD;;;;;;;;GAQG;AACH,qBAAa,kBACX,SAAQ,cAAc,CAAC,WAAW,EAAE,cAAc,EAAE,cAAc,CAClE,YAAW,mBAAmB;IAE9B;;;;;OAKG;IACH,OAAO,EAAG,eAAe,CAAC;IAE1B;;;;;;;OAOG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAY1C;;;;;OAKG;IACG,SAAS,IAAI,OAAO,CAAC,KAAK,CAAC;IAiCjC;;;;;OAKG;IACG,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;IAqC5B;;;;;OAKG;IACG,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;IAyC5B;;;;;;OAMG;IACG,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC;IAuChC;;;;;;OAMG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAc7B;;;;;;;OAOG;IACG,cAAc,CAAC,gBAAgB,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA+C7D;;;;;;;OAOG;IACG,OAAO,CAAC,WAAW,GAAE,OAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IA0BvD;;;;;;;OAOG;IACG,QAAQ,CAAC,WAAW,GAAE,OAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IA0BlD,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAKtD;;;;;OAKG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;CAUhC"}
+{"version":3,"file":"edit-form.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/form/edit-form/edit-form.controller.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,OAAO,EACL,cAAc,EACd,cAAc,EACd,mBAAmB,EACpB,MAAM,uBAAuB,CAAC;AAK/B,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AACzC,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD;;;;;;;;GAQG;AACH,qBAAa,kBACX,SAAQ,cAAc,CAAC,WAAW,EAAE,cAAc,EAAE,cAAc,CAClE,YAAW,mBAAmB;IAE9B;;;;;OAKG;IACH,OAAO,EAAG,eAAe,CAAC;IAE1B;;;;;;;OAOG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAY1C;;;;;OAKG;IACG,SAAS,IAAI,OAAO,CAAC,KAAK,CAAC;IAiCjC;;;;;OAKG;IACG,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;IAqC5B;;;;;OAKG;IACG,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;IA+C5B;;;;;;OAMG;IACG,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC;IA2ChC;;;;;;OAMG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAc7B;;;;;;;OAOG;IACG,cAAc,CAAC,gBAAgB,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA+C7D;;;;;;;OAOG;IACG,OAAO,CAAC,WAAW,GAAE,OAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IA0BvD;;;;;;;OAOG;IACG,QAAQ,CAAC,WAAW,GAAE,OAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IA0BlD,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAKtD;;;;;OAKG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;CAUhC"}

package/out/controller/control/form/edit-form/edit-form.controller.js

@@ -152,6 +152,9 @@ export class EditFormController extends FormController {
         this.actionNotification(`${isCreate ? 'CREATE' : 'UPDATE'}SUCCESS`, {
             default: `${this.data.srfmajortext || ''}保存成功`,
         });
+        if (this.view.modal.mode === 'ROUTE') {
+            ibiz.mc.command.send(this.data.$origin, isCreate ? 'OBJECTCREATED' : 'OBJECTUPDATED');
+        }
         return this.data;
     }
     /**
@@ -197,6 +200,9 @@ export class EditFormController extends FormController {
         this.state.modified = false;
         await this.evt.emit('onRemoveSuccess', undefined);
         this.actionNotification('REMOVESUCCESS');
+        if (this.view.modal.mode === 'ROUTE') {
+            ibiz.mc.command.send(this.data.$origin, 'OBJECTREMOVED');
+        }
         return ok;
     }
     /**
@@ -235,7 +241,7 @@ export class EditFormController extends FormController {
             throw new RuntimeError(`没找到${formItemUpdateId}表单项更新`);
         }
         const { appDEMethodId, defiupdateDetails, customCode, scriptCode } = formItemUpdate;
-        const updateItems = defiupdateDetails.map(item => item.id);
+        const updateItems = defiupdateDetails === null || defiupdateDetails === void 0 ? void 0 : defiupdateDetails.map(item => item.id);
         let updateData; // 要修改的数据
         if (customCode && scriptCode) {
             // 脚本模式获取修改数据

package/out/controller/control/form/form-detail/form-druipart/form-druipart.controller.js

@@ -100,10 +100,10 @@ export class FormDRUIPartController extends FormDetailController {
         let newContext = this.form.context.clone();
         const navContexts = this.model.navigateContexts;
         if (notNilEmpty(navContexts)) {
-            newContext = Object.assign(newContext, convertNavData(navContexts, this.form.context, this.form.params, this.form.data));
+            newContext = Object.assign(newContext, convertNavData(navContexts, this.form.data, this.form.params, this.form.context));
         }
         // 处理导航视图参数
-        const newParams = convertNavData(this.model.navigateParams, this.form.params, this.form.context, this.form.data);
+        const newParams = convertNavData(this.model.navigateParams, this.form.data, this.form.params, this.form.context);
         if (!this.state.viewComponentKey) {
             // 第一次直接修改然后render
             this.state.viewComponentKey = createUUID();

package/out/controller/control/grid/grid-column/grid-field-column/grid-field-column.controller.js

@@ -72,12 +72,12 @@ export class GridFieldColumnController extends GridColumnController {
         const { navigateContexts, navigateParams } = parseUserParams(userParam);
         let selfContext = {};
         if (navigateContexts && data) {
-            selfContext = convertNavData(navigateContexts, context, params, data);
+            selfContext = convertNavData(navigateContexts, data, params, context);
         }
         const _context = Object.assign(context.clone(), selfContext);
         let selfParams = {};
         if (navigateParams && data) {
-            selfParams = convertNavData(navigateParams, context, params, data);
+            selfParams = convertNavData(navigateParams, data, params, context);
         }
         const _params = Object.assign(Object.assign({}, params), selfParams);
         return { context: _context, params: _params };

package/out/controller/control/pickup-view-panel/pickup-view-panel.controller.js

@@ -33,10 +33,10 @@ export class PickupViewPanelController extends ControlController {
         const context = this.context.clone();
         const params = Object.assign({}, this.params);
         if (navigateContexts) {
-            Object.assign(context, convertNavData(navigateContexts, this.context, this.params));
+            Object.assign(context, convertNavData(navigateContexts, this.params, this.context));
         }
         if (navigateParams) {
-            Object.assign(params, convertNavData(navigateParams, this.context, this.params));
+            Object.assign(params, convertNavData(navigateParams, this.params, this.context));
         }
         this.state.context = context;
         this.state.params = params;

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

@@ -1,4 +1,5 @@
 import { IAppDELogic } from '@ibiz/model-core';
+import { ScriptFunction } from '../utils';
 import { DELogicContext } from './de-logic-context';
 import { DELogicNode } from './de-logic-node';
 import { DELogicParam } from './de-logic-param/de-logic-param';
@@ -30,6 +31,14 @@ export declare class DELogic {
      * @type {Map<string, DELogicParam>}
      */
     protected params: Map<string, DELogicParam>;
+    /**
+     * 脚本函数
+     * @author lxm
+     * @date 2023-09-13 04:25:27
+     * @protected
+     * @type {ScriptFunction}
+     */
+    protected scriptFn?: ScriptFunction;
     /**
      * Creates an instance of DELogic.
      * @author lxm

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

@@ -1 +1 @@
-{"version":3,"file":"de-logic.d.ts","sourceRoot":"","sources":["../../src/de-logic/de-logic.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAML,WAAW,EAOZ,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D;;;;;;;GAOG;AACH,qBAAa,OAAO;IA2BN,SAAS,CAAC,KAAK,EAAE,WAAW;IA1BxC;;;;;;;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,WAAW;IA+DxC;;;;;;;;;;OAUG;IACH,SAAS,CAAC,eAAe,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;IASpD;;;;;;;;;OASG;IACG,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAmB5E;;;;;;;;;OASG;cACa,QAAQ,CACtB,IAAI,EAAE,WAAW,EACjB,GAAG,EAAE,cAAc,GAClB,OAAO,CAAC,IAAI,CAAC;CAiBjB"}
+{"version":3,"file":"de-logic.d.ts","sourceRoot":"","sources":["../../src/de-logic/de-logic.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAiB,cAAc,EAAE,MAAM,UAAU,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAML,WAAW,EAOZ,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D;;;;;;;GAOG;AACH,qBAAa,OAAO;IAoCN,SAAS,CAAC,KAAK,EAAE,WAAW;IAnCxC;;;;;;;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;;;;;;OAMG;IACH,SAAS,CAAC,QAAQ,CAAC,EAAE,cAAc,CAAC;IAEpC;;;;;OAKG;gBACmB,KAAK,EAAE,WAAW;IA0ExC;;;;;;;;;;OAUG;IACH,SAAS,CAAC,eAAe,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;IASpD;;;;;;;;;OASG;IACG,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAsB5E;;;;;;;;;OASG;cACa,QAAQ,CACtB,IAAI,EAAE,WAAW,EACjB,GAAG,EAAE,cAAc,GAClB,OAAO,CAAC,IAAI,CAAC;CAiBjB"}

package/out/de-logic/de-logic.js

@@ -1,5 +1,6 @@
 /* eslint-disable no-await-in-loop */
 import { ModelError, RuntimeModelError } from '@ibiz-template/core';
+import { ScriptFactory } from '../utils';
 import { DELogicContext } from './de-logic-context';
 import { AppendParamNode, BindParamNode, CopyParamNode, DataSetNode, DEActionNode, EndNode, PrepareParamNode, RenewParamNode, ResetParamNode, SortParamNode, StartNode, } from './de-logic-node';
 import { ThrowExceptionNode } from './de-logic-node/throw-exception-node/throw-exception-node';
@@ -40,6 +41,16 @@ export class DELogic {
          * @type {Map<string, DELogicParam>}
          */
         this.params = new Map();
+        // 脚本代码模式
+        if (model.customCode) {
+            if (!model.scriptCode) {
+                throw new RuntimeModelError(model, '脚本代码模式没有配置脚本代码');
+            }
+            this.scriptFn = ScriptFactory.createScriptFn([], model.scriptCode, {
+                isAsync: true,
+            });
+            return;
+        }
         if (!((_a = model.delogicNodes) === null || _a === void 0 ? void 0 : _a.length)) {
             throw new RuntimeModelError(model, '实体逻辑没有配置逻辑节点');
         }
@@ -131,6 +142,9 @@ export class DELogic {
      * @return {*}  {Promise<IData>}
      */
     async exec(context, data, params) {
+        if (this.scriptFn) {
+            return this.scriptFn.exec({ context, data, params });
+        }
         const ctx = new DELogicContext(this.params, context, data, params);
         this.initLogicParams(ctx);
         const { startDELogicNodeId } = this.model;

package/out/logic-scheduler/executor/app-ui-logic-executor.js

@@ -72,12 +72,12 @@ export class AppUILogicExecutor extends LogicExecutor {
         // 处理导航参数
         // 处理上下文导航参数
         const navContexts = openViewRef.navigateContexts || [];
-        const tempContext = Object.assign(context, convertNavData(navContexts, context, params, data[0]));
+        const tempContext = Object.assign(context, convertNavData(navContexts, data[0], params, context));
         // 处理导航视图参数
         let tempParams = {};
         const navParams = openViewRef.navigateParams;
         if (notNilEmpty(navParams)) {
-            tempParams = convertNavData(navParams, params, context, data[0]);
+            tempParams = convertNavData(navParams, data[0], params, context);
         }
         // 打开视图
         return ibiz.commands.execute(OpenAppViewCommand.TAG, openView, tempContext, tempParams, rest);
@@ -127,12 +127,12 @@ export class AppUILogicExecutor extends LogicExecutor {
         const _data = (data === null || data === void 0 ? void 0 : data[0]) || {};
         const navContexts = newViewRef.navigateContexts;
         if (notNilEmpty(navContexts)) {
-            tempContext = convertNavData(navContexts, context, params, _data);
+            tempContext = convertNavData(navContexts, _data, params, context);
         }
         tempContext = Object.assign(context, tempContext);
         const navParams = newViewRef.navigateParams;
         if (notNilEmpty(navParams)) {
-            tempParams = convertNavData(navParams, params, context, _data);
+            tempParams = convertNavData(navParams, _data, params, context);
         }
         // 拷贝数据处理
         if (context.srfcopymode) {

package/out/service/dto/method.dto.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"method.dto.d.ts","sourceRoot":"","sources":["../../../src/service/dto/method.dto.ts"],"names":[],"mappings":"AACA,OAAO,EACL,cAAc,EACd,eAAe,EACf,oBAAoB,EACrB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AAGnE;;;;;;;GAOG;AACH,qBAAa,SAAS;IAQlB,SAAS,CAAC,MAAM,EAAE,cAAc;IAChC,SAAS,CAAC,WAAW,CAAC;IACtB,SAAS,CAAC,GAAG,CAAC;IAThB,SAAS,CAAC,GAAG,CAAC,EAAE,WAAW,CAAC;IAE5B,SAAS,CAAC,MAAM,EAAG,oBAAoB,EAAE,CAAC;IAE1C,SAAS,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAa;gBAGzC,MAAM,EAAE,cAAc,EACtB,WAAW,CAAC,qBAAS,EACrB,GAAG,CAAC,6BAAiB;IAUjC;;;;;;;;OAQG;IACG,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;IA6CxD;;;;;;;;OAQG;IACG,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IAiCrE;;;;;;;;OAQG;cACa,WAAW,CAAC,KAAK,EAAE,oBAAoB,GAAG,OAAO,CAAC,SAAS,CAAC;CAgB7E"}
+{"version":3,"file":"method.dto.d.ts","sourceRoot":"","sources":["../../../src/service/dto/method.dto.ts"],"names":[],"mappings":"AACA,OAAO,EACL,cAAc,EACd,eAAe,EACf,oBAAoB,EACrB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AAGnE;;;;;;;GAOG;AACH,qBAAa,SAAS;IAQlB,SAAS,CAAC,MAAM,EAAE,cAAc;IAChC,SAAS,CAAC,WAAW,CAAC;IACtB,SAAS,CAAC,GAAG,CAAC;IAThB,SAAS,CAAC,GAAG,CAAC,EAAE,WAAW,CAAC;IAE5B,SAAS,CAAC,MAAM,EAAG,oBAAoB,EAAE,CAAC;IAE1C,SAAS,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAa;gBAGzC,MAAM,EAAE,cAAc,EACtB,WAAW,CAAC,qBAAS,EACrB,GAAG,CAAC,6BAAiB;IAUjC;;;;;;;;OAQG;IACG,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;IA2CxD;;;;;;;;OAQG;IACG,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IAmCrE;;;;;;;;OAQG;cACa,WAAW,CAAC,KAAK,EAAE,oBAAoB,GAAG,OAAO,CAAC,SAAS,CAAC;CAgB7E"}

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

@@ -58,9 +58,7 @@ export class MethodDto {
                         for (let j = 0; j < items.length; j++) {
                             arr.push(await dto.get(context, items[j]));
                         }
-                        if (arr.length > 0) {
-                            params[key] = arr;
-                        }
+                        params[key] = arr;
                     }
                     break;
                 }
@@ -99,6 +97,9 @@ export class MethodDto {
                 if (items) {
                     await dto.sets(context, items);
                 }
+                else {
+                    await dto.sets(context, []);
+                }
             });
             for (let i = 0; i < all.length; i++) {
                 await all[i];

package/out/service/service/entity/method/method.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"method.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/method.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAqB,MAAM,qBAAqB,CAAC;AACtE,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhE,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAGtD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEnE;;;;;;;GAOG;AACH,8BAAsB,MAAM;IA2CxB,SAAS,CAAC,MAAM,EAAE,cAAc;IAChC,SAAS,CAAC,MAAM,EAAE,YAAY;IA3ChC,SAAS,CAAC,GAAG,EAAG,WAAW,CAAC;IAE5B;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAG,WAAW,CAAC;IAE9B;;;;;;;OAOG;IACH,SAAS,CAAC,MAAM,EAAG,YAAY,CAAC;IAEhC;;;;;;;OAOG;IACH,SAAS,CAAC,OAAO,CAAC,EAAE,aAAa,CAAC;IAElC;;;;;;;;OAQG;gBAES,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,YAAY;IAOhC;;;;;;;;;OASG;IACH,QAAQ,CAAC,IAAI,CACX,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,KAAK,EACb,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,YAAY,CAAC;IAExB;;;;;;;;;;;OAWG;cACa,OAAO,CACrB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,EACX,MAAM,EAAE,OAAO,GAEd,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;IAyC7B;;;;;;;;OAQG;IACH,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM;IAM5C;;;;;;;OAOG;cACa,UAAU,IAAI,OAAO,CAAC,aAAa,CAAC;IAOpD;;;;;;;;OAQG;IACH,SAAS,CAAC,YAAY,CAAC,IAAI,EAAE,KAAK,GAAG,WAAW,GAAG,WAAW;CAM/D"}
+{"version":3,"file":"method.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/method.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAqB,MAAM,qBAAqB,CAAC;AACtE,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhE,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAGtD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEnE;;;;;;;GAOG;AACH,8BAAsB,MAAM;IA2CxB,SAAS,CAAC,MAAM,EAAE,cAAc;IAChC,SAAS,CAAC,MAAM,EAAE,YAAY;IA3ChC,SAAS,CAAC,GAAG,EAAG,WAAW,CAAC;IAE5B;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAG,WAAW,CAAC;IAE9B;;;;;;;OAOG;IACH,SAAS,CAAC,MAAM,EAAG,YAAY,CAAC;IAEhC;;;;;;;OAOG;IACH,SAAS,CAAC,OAAO,CAAC,EAAE,aAAa,CAAC;IAElC;;;;;;;;OAQG;gBAES,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,YAAY;IAOhC;;;;;;;;;OASG;IACH,QAAQ,CAAC,IAAI,CACX,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,KAAK,EACb,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,YAAY,CAAC;IAExB;;;;;;;;;;;OAWG;cACa,OAAO,CACrB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,EACX,MAAM,EAAE,OAAO,GAEd,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;IAwC7B;;;;;;;;OAQG;IACH,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM;IAM5C;;;;;;;OAOG;cACa,UAAU,IAAI,OAAO,CAAC,aAAa,CAAC;IAOpD;;;;;;;;OAQG;IACH,SAAS,CAAC,YAAY,CAAC,IAAI,EAAE,KAAK,GAAG,WAAW,GAAG,WAAW;CAM/D"}

package/out/service/service/entity/method/method.js

@@ -56,7 +56,6 @@ export class Method {
                     break;
                 case 'PUT': {
                     res = await this.app.net.put(`${path}/${methodName}`, notNilEmpty(data) ? data : params);
-                    const entity = this.createEntity(data);
                     break;
                 }
                 case 'DELETE':

package/out/service/vo/control.vo.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"control.vo.d.ts","sourceRoot":"","sources":["../../../src/service/vo/control.vo.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C;;;;;;;GAOG;AACH,qBAAa,SAAS;IAEpB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,GAAG,CAAC;IAE5B;;;;;;;OAOG;IACK,OAAO,EAAE,KAAK,CAAC;IAEvB;;;;;;;OAOG;IACK,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAE5C;;;;;;OAMG;IACH,IAAI,KAAK,IAAI,KAAK,CAKjB;IAED;;;;;;OAMG;IACH,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED;;;;;;OAMG;IACH,IAAI,YAAY,IAAI,MAAM,CAEzB;IAED;;;;;;OAMG;IACH,IAAI,OAAO,IAAI,MAAM,CAEpB;IAED;;;;;;OAMG;IACH,IAAI,aAAa,IAAI,MAAM,CAE1B;IAED;;;;;;OAMG;IACH,IAAI,UAAU,IAAI,MAAM,CAEvB;IAED;;;;;;OAMG;IACH,IAAI,YAAY,IAAI,MAAM,CAEzB;IAED;;;;;;OAMG;gBAED,OAAO,GAAE,KAAU,EACnB,UAAU,GAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAa;IAiCjD;;;;;;;;;;;OAWG;IACH,OAAO,CAAC,YAAY;IA6CpB;;;;;;OAMG;IACH,SAAS,IAAI,KAAK;IAIlB;;;;;;OAMG;IACH,SAAS,CAAC,IAAI,EAAE,KAAK,GAAG,SAAS,GAAG,IAAI;IAIxC;;;;;;OAMG;IACH,KAAK,IAAI,SAAS;CAQnB"}
+{"version":3,"file":"control.vo.d.ts","sourceRoot":"","sources":["../../../src/service/vo/control.vo.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C;;;;;;;GAOG;AACH,qBAAa,SAAS;IAEpB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,GAAG,CAAC;IAE5B;;;;;;;OAOG;IACK,OAAO,EAAE,KAAK,CAAC;IAEvB;;;;;;;OAOG;IACK,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAE5C;;;;;;OAMG;IACH,IAAI,KAAK,IAAI,KAAK,CAKjB;IAED;;;;;;OAMG;IACH,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED;;;;;;OAMG;IACH,IAAI,YAAY,IAAI,MAAM,CAEzB;IAED;;;;;;OAMG;IACH,IAAI,OAAO,IAAI,MAAM,CAEpB;IAED;;;;;;OAMG;IACH,IAAI,aAAa,IAAI,MAAM,CAE1B;IAED;;;;;;OAMG;IACH,IAAI,UAAU,IAAI,MAAM,CAEvB;IAED;;;;;;OAMG;IACH,IAAI,YAAY,IAAI,MAAM,CAEzB;IAED;;;;;;OAMG;gBAED,OAAO,GAAE,KAAU,EACnB,UAAU,GAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAa;IAiCjD;;;;;;;;;;;OAWG;IACH,OAAO,CAAC,YAAY;IA8CpB;;;;;;OAMG;IACH,SAAS,IAAI,KAAK;IAIlB;;;;;;OAMG;IACH,SAAS,CAAC,IAAI,EAAE,KAAK,GAAG,SAAS,GAAG,IAAI;IAIxC;;;;;;OAMG;IACH,KAAK,IAAI,SAAS;CAQnB"}

package/out/service/vo/control.vo.js

@@ -148,7 +148,7 @@ export class ControlVO {
                 },
                 set(val) {
                     // 非空且强制转数值时，转换值的类型
-                    let val2 = forceNumber && !isNil(val) ? Number(val) : val;
+                    let val2 = forceNumber && !isNil(val) && val !== '' ? Number(val) : val;
                     if (Number.isNaN(val2)) {
                         val2 = val; // NaN时还原值
                         ibiz.log.error(`${val}不能转换成数字`);

package/out/ui-action/provider/ui-action-provider-base.js

@@ -185,11 +185,11 @@ export class UIActionProviderBase {
         const isMultiData = ['MULTIKEY', 'MULTIDATA'].includes(action.actionTarget) &&
             data.length > 0;
         // 处理自定义导航上下文
-        const tempContext = convertNavData(navContexts, context, params, isMultiData ? formatMultiData(navContexts, data) : data[0] || {});
+        const tempContext = convertNavData(navContexts, isMultiData ? formatMultiData(navContexts, data) : data[0] || {}, params, context);
         Object.assign(resultContext, tempContext);
         // 处理自定义导航视图参数
         const navParams = action.navigateParams;
-        const resultParams = convertNavData(navParams, resultContext, params, isMultiData ? formatMultiData(navParams, data) : data[0] || {});
+        const resultParams = convertNavData(navParams, isMultiData ? formatMultiData(navParams, data) : data[0] || {}, params, resultContext);
         return { resultContext, resultData, resultParams };
     }
 }

package/out/utils/nav-params/calc-nav-params.js

@@ -37,8 +37,8 @@ export function calcNavParams(model, originParams) {
         }
     }
     // 自定义导航视图参数和上下文
-    const tempContext = convertNavData(navContexts, context, params, data);
-    const tempParams = convertNavData(navParams, context, params, data);
+    const tempContext = convertNavData(navContexts, data, params, context);
+    const tempParams = convertNavData(navParams, data, params, context);
     Object.assign(resultContext, tempContext);
     Object.assign(resultParams, tempParams);
     return {

package/out/utils/nav-params/nav-params.d.ts

@@ -1,4 +1,13 @@
 import { INavigateParam } from '@ibiz/model-core';
+/**
+ * 把对象格式的导航参数转换成数组格式的导航参数
+ * @author lxm
+ * @date 2023-07-10 03:33:14
+ * @export
+ * @param {IData} navParams
+ * @return {*}  {IPSNavigateParam[]}
+ */
+export declare function convertObjectToNavParams(navParams: IData): INavigateParam[];
 /**
  * 转换导航数据(如导航上下文，导航视图参数)
  * - 把%xxx%,转换成origins元素里对应叫xxx的值
@@ -9,10 +18,10 @@ import { INavigateParam } from '@ibiz/model-core';
  * @author lxm
  * @date 2022-08-22 11:08:18
  * @export
- * @param {INavigateParam[]} naviDatas 导航参数
+ * @param {INavigateParam[]} navParams 导航参数
  * @param {...IData[]} origins 转换数据来源集合
  */
-export declare function convertNavData(naviDatas: INavigateParam[] | IData | undefined | null, ...origins: IData[]): IData;
+export declare function convertNavData(navParams: INavigateParam[] | IData | undefined | null, ...origins: IData[]): IData;
 /**
  * 通过模型中的导航数组 转换导航数据(如导航上下文，导航视图参数)
  * - 把%xxx%,转换成origins元素里对应叫xxx的值
@@ -27,29 +36,6 @@ export declare function convertNavData(naviDatas: INavigateParam[] | IData | und
  * @param {...IData[]} origins 转换数据来源集合
  */
 export declare function convertNavDataByArray(naviDatas: INavigateParam[], ...origins: IData[]): IData;
-/**
- * 通过对象 转换导航数据(如导航上下文，导航视图参数)
- * - 把%xxx%,转换成origins元素里对应叫xxx的值
- * - 按顺序查找origins的元素，且只要有xxx的属性就算找到，不管值是否为空。
- * - naviData里{a:%xxx%}，origins里找不到xxx则返回值里不存在a属性
- * - naviData里非%xxx%形式的，都当成直接值原样返回，包括空值。
- *
- * @author lxm
- * @date 2022-08-22 11:08:18
- * @export
- * @param {IData} naviData
- * @param {...IData[]} origins
- */
-export declare function convertNavDataByObject(naviData: IData, ...origins: IData[]): IData;
-/**
- * 把对象格式的导航参数转换成数组格式的导航参数
- * @author lxm
- * @date 2023-07-10 03:33:14
- * @export
- * @param {IData} naviData
- * @return {*}  {IPSNavigateParam[]}
- */
-export declare function convertObjectToNavParams(naviData: IData): INavigateParam[];
 /**
  * 根据导航参数把多条数据转换成单条数据，用；分隔
  * @author lxm

package/out/utils/nav-params/nav-params.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nav-params.d.ts","sourceRoot":"","sources":["../../../src/utils/nav-params/nav-params.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAIlD;;;;;;;;;;;;GAYG;AACH,wBAAgB,cAAc,CAC5B,SAAS,EAAE,cAAc,EAAE,GAAG,KAAK,GAAG,SAAS,GAAG,IAAI,EACtD,GAAG,OAAO,EAAE,KAAK,EAAE,GAClB,KAAK,CAaP;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,qBAAqB,CACnC,SAAS,EAAE,cAAc,EAAE,EAC3B,GAAG,OAAO,EAAE,KAAK,EAAE,GAClB,KAAK,CAwBP;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,sBAAsB,CACpC,QAAQ,EAAE,KAAK,EACf,GAAG,OAAO,EAAE,KAAK,EAAE,GAClB,KAAK,CAoBP;AAED;;;;;;;GAOG;AACH,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,KAAK,GAAG,cAAc,EAAE,CAmB1E;AAED;;;;;;;;GAQG;AACH,wBAAgB,eAAe,CAC7B,SAAS,EAAE,cAAc,EAAE,GAAG,KAAK,GAAG,SAAS,GAAG,IAAI,EACtD,OAAO,EAAE,KAAK,EAAE,GACf,KAAK,CAsBP"}
+{"version":3,"file":"nav-params.d.ts","sourceRoot":"","sources":["../../../src/utils/nav-params/nav-params.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAIlD;;;;;;;GAOG;AACH,wBAAgB,wBAAwB,CAAC,SAAS,EAAE,KAAK,GAAG,cAAc,EAAE,CAmB3E;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,cAAc,CAC5B,SAAS,EAAE,cAAc,EAAE,GAAG,KAAK,GAAG,SAAS,GAAG,IAAI,EACtD,GAAG,OAAO,EAAE,KAAK,EAAE,GAClB,KAAK,CAYP;AA8BD;;;;;;;;;;;;GAYG;AACH,wBAAgB,qBAAqB,CACnC,SAAS,EAAE,cAAc,EAAE,EAC3B,GAAG,OAAO,EAAE,KAAK,EAAE,GAClB,KAAK,CA8BP;AAED;;;;;;;;GAQG;AACH,wBAAgB,eAAe,CAC7B,SAAS,EAAE,cAAc,EAAE,GAAG,KAAK,GAAG,SAAS,GAAG,IAAI,EACtD,OAAO,EAAE,KAAK,EAAE,GACf,KAAK,CAsBP"}