@ibiz-template/runtime 0.1.13 → 0.1.15

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

@@ -1 +1 @@
-{"version":3,"file":"base.controller.d.ts","sourceRoot":"","sources":["../../../src/controller/common/base.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AAC7B,OAAO,EACL,SAAS,EACT,eAAe,EACf,WAAW,EACX,eAAe,EAChB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAI5D;;;;;;GAMG;AACH,qBAAa,cAAc,CACzB,CAAC,SAAS,YAAY,GAAG,YAAY,EACrC,CAAC,SAAS,gBAAgB,GAAG,gBAAgB,EAC7C,CAAC,SAAS,eAAe,GAAG,eAAe,CAC3C,YAAW,WAAW,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;aA8Bb,KAAK,EAAE,CAAC;aACR,OAAO,EAAE,QAAQ;aACjB,MAAM,EAAE,OAAO;IAC/B,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,GAAG;IA/B7B;;;;;;OAMG;IACH,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,eAAe,CAAC,CAErD;IAED,KAAK,EAAE,CAAC,CAAW;IAEnB;;;;;OAKG;IACH,IAAI,EAAE,MAAM,CAAM;IAElB;;;;;OAKG;gBAEe,KAAK,EAAE,CAAC,EACR,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,EACZ,GAAG,EAAE,GAAG;IAM7B;;;;;;;OAOG;IACH,SAAS,CAAC,SAAS,IAAI,IAAI;IAK3B;;;;;OAKG;IACH,SAAS,CAAC,YAAY,IAAI,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC;IAUtD;;;;;OAKG;IACH,GAAG,EAAE,eAAe,CAAC,CAAC,CAAC,CAErB;IAEF;;;;;OAKG;IACH,YAAY,EAAE,eAAe,CAAgD;IAE7E;;;;;OAKG;IACH,UAAU,EAAE,MAAM,EAAE,CAAM;IAE1B;;;;OAIG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAY9B;;;;OAIG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAiB1C;;;;;OAKG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAO1C;;;;;;OAMG;cACa,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAOxC;;;;;OAKG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAI1C;;;;OAIG;IACG,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAOhC;;;;OAIG;cACa,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAI5C;;;;;;OAMG;IACH,KAAK,CAAC,SAAS,CAAC,EAAE,MAAM,IAAI,GAAG,IAAI;IAKnC;;;;;;;OAOG;IACH,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,UAAQ,GAAG,WAAW,GAAG,SAAS;IAIvE,UAAU,IAAI,eAAe;IAI7B;;;;;OAKG;IACH,mBAAmB,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE,WAAW,KAAK,IAAI,GAAG,IAAI;CAGtE"}
+{"version":3,"file":"base.controller.d.ts","sourceRoot":"","sources":["../../../src/controller/common/base.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AAC7B,OAAO,EACL,SAAS,EACT,eAAe,EACf,WAAW,EACX,eAAe,EAChB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAI5D;;;;;;GAMG;AACH,qBAAa,cAAc,CACzB,CAAC,SAAS,YAAY,GAAG,YAAY,EACrC,CAAC,SAAS,gBAAgB,GAAG,gBAAgB,EAC7C,CAAC,SAAS,eAAe,GAAG,eAAe,CAC3C,YAAW,WAAW,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;aA8Bb,KAAK,EAAE,CAAC;aACR,OAAO,EAAE,QAAQ;aACjB,MAAM,EAAE,OAAO;IAC/B,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,GAAG;IA/B7B;;;;;;OAMG;IACH,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,eAAe,CAAC,CAErD;IAED,KAAK,EAAE,CAAC,CAAW;IAEnB;;;;;OAKG;IACH,IAAI,EAAE,MAAM,CAAM;IAElB;;;;;OAKG;gBAEe,KAAK,EAAE,CAAC,EACR,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,EACZ,GAAG,EAAE,GAAG;IAM7B;;;;;;;OAOG;IACH,SAAS,CAAC,SAAS,IAAI,IAAI;IAM3B;;;;;OAKG;IACH,SAAS,CAAC,YAAY,IAAI,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC;IAUtD;;;;;OAKG;IACH,GAAG,EAAE,eAAe,CAAC,CAAC,CAAC,CAErB;IAEF;;;;;OAKG;IACH,YAAY,EAAE,eAAe,CAAgD;IAE7E;;;;;OAKG;IACH,UAAU,EAAE,MAAM,EAAE,CAAM;IAE1B;;;;OAIG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAY9B;;;;OAIG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAiB1C;;;;;OAKG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAO1C;;;;;;OAMG;cACa,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAOxC;;;;;OAKG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAI1C;;;;OAIG;IACG,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAQhC;;;;OAIG;cACa,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAI5C;;;;;;OAMG;IACH,KAAK,CAAC,SAAS,CAAC,EAAE,MAAM,IAAI,GAAG,IAAI;IAKnC;;;;;;;OAOG;IACH,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,UAAQ,GAAG,WAAW,GAAG,SAAS;IAIvE,UAAU,IAAI,eAAe;IAI7B;;;;;OAKG;IACH,mBAAmB,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE,WAAW,KAAK,IAAI,GAAG,IAAI;CAGtE"}

package/out/controller/common/base.controller.js

@@ -72,6 +72,7 @@ export class BaseController {
     initState() {
         this.state.isCreated = false;
         this.state.isMounted = false;
+        this.state.isDestroyed = false;
     }
     /**
      * 获取事件的基础参数
@@ -166,6 +167,7 @@ export class BaseController {
      */
     async destroyed() {
         await this.onDestroyed();
+        this.state.isDestroyed = true;
         ibiz.log.debug(`${this.constructor.name}:${this.name} onDestroyed`);
         await this._evt.emit('onDestroyed', undefined);
         this.evt.destroy();

package/out/controller/common/editor/editor.controller.d.ts

@@ -86,7 +86,7 @@ export declare class EditorController<T extends IEditor = IEditor> implements IE
      * @Date: 2022-08-25 15:44:14
      */
     handlePublicParams(data: IData, context: IContext, params: IParams): {
-        context: IData;
+        context: IContext;
         params: IParams;
     };
     /**

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

@@ -1 +1 @@
-{"version":3,"file":"editor.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/common/editor/editor.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAA2B,MAAM,kBAAkB,CAAC;AAEpE,OAAO,EACL,0BAA0B,EAC1B,iBAAiB,EAClB,MAAM,+BAA+B,CAAC;AAEvC;;;;;;;GAOG;AACH,qBAAa,gBAAgB,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO,CACvD,YAAW,iBAAiB;IAE5B;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;IAElB;;;;;;OAMG;IACH,QAAQ,CAAC,OAAO,EAAG,QAAQ,CAAC;IAE5B;;;;;;OAMG;IACH,QAAQ,CAAC,MAAM,EAAG,OAAO,CAAC;IAE1B;;;;;OAKG;IACH,QAAQ,CAAC,MAAM,EAAE,0BAA0B,CAAC;IAE5C;;;;;OAKG;IACI,WAAW,SAAM;IAExB;;;;;OAKG;IACI,YAAY,EAAE,KAAK,CAAM;IAEhC;;;;;;OAMG;IACH,IAAI,QAAQ,IAAI,OAAO,CAEtB;IAED;;;;;OAKG;gBACS,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,0BAA0B;IAOxD;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;cAIX,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAYvC;;;;;;OAMG;IACI,kBAAkB,CACvB,IAAI,EAAE,KAAK,EACX,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd;QAAE,OAAO,EAAE,KAAK,CAAC;QAAC,MAAM,EAAE,OAAO,CAAA;KAAE;IActC;;;;;;;OAOG;IACH,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,GAAG,KAAK,EAAE,GAAG,SAAS;IASjD;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;CAGlC"}
+{"version":3,"file":"editor.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/common/editor/editor.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAA2B,MAAM,kBAAkB,CAAC;AAEpE,OAAO,EACL,0BAA0B,EAC1B,iBAAiB,EAClB,MAAM,+BAA+B,CAAC;AAEvC;;;;;;;GAOG;AACH,qBAAa,gBAAgB,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO,CACvD,YAAW,iBAAiB;IAE5B;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;IAElB;;;;;;OAMG;IACH,QAAQ,CAAC,OAAO,EAAG,QAAQ,CAAC;IAE5B;;;;;;OAMG;IACH,QAAQ,CAAC,MAAM,EAAG,OAAO,CAAC;IAE1B;;;;;OAKG;IACH,QAAQ,CAAC,MAAM,EAAE,0BAA0B,CAAC;IAE5C;;;;;OAKG;IACI,WAAW,SAAM;IAExB;;;;;OAKG;IACI,YAAY,EAAE,KAAK,CAAM;IAEhC;;;;;;OAMG;IACH,IAAI,QAAQ,IAAI,OAAO,CAEtB;IAED;;;;;OAKG;gBACS,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,0BAA0B;IAOxD;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;cAIX,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAYvC;;;;;;OAMG;IACI,kBAAkB,CACvB,IAAI,EAAE,KAAK,EACX,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd;QAAE,OAAO,EAAE,QAAQ,CAAC;QAAC,MAAM,EAAE,OAAO,CAAA;KAAE;IAiBzC;;;;;;;OAOG;IACH,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,GAAG,KAAK,EAAE,GAAG,SAAS;IASjD;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;CAGlC"}

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

@@ -79,11 +79,13 @@ export class EditorController {
         if (navigateContexts && data) {
             selfContext = convertNavData(navigateContexts, context, params, data);
         }
+        const _context = Object.assign(context.clone(), selfContext);
         let selfParams = {};
         if (navigateParams && data) {
             selfParams = convertNavData(navigateParams, context, params, data);
         }
-        return { context: selfContext, params: selfParams };
+        const _params = Object.assign(Object.assign({}, params), selfParams);
+        return { context: _context, params: _params };
     }
     /**
      * 字符串转对象、数组对象

package/out/controller/control/caption-bar/caption-bar.controller.js

@@ -21,7 +21,7 @@ export class CaptionBarController extends ControlController {
     async onCreated() {
         await super.onCreated();
         this.view.evt.on('onViewInfoChange', ({ caption: _caption, dataInfo }) => {
-            this.state.caption = `${this.state.caption}${dataInfo ? `-${dataInfo}` : ''}`;
+            this.state.caption = `${this.view.model.caption}${dataInfo ? `-${dataInfo}` : ''}`;
         });
     }
 }

package/out/controller/control/form/form-detail/form-druipart/form-druipart.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"form-druipart.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-druipart/form-druipart.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAGnD,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAE3D,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAE1D;;;;;;;;GAQG;AACH,qBAAa,sBAAuB,SAAQ,oBAAoB,CAAC,eAAe,CAAC;IACvE,KAAK,EAAE,iBAAiB,CAAC;IAEjC,SAAS,CAAC,WAAW,IAAI,iBAAiB;IAI1C;;;;;;OAMG;IACH,UAAU,CAAC,EAAE,QAAQ,CAAC;IAEtB;;;;;;OAMG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IAEpB;;;;;;OAMG;IACH,YAAY,EAAE,MAAM,EAAE,CAAc;IAEpC;;;;;;OAMG;IACH,SAAS,EAAE,MAAM,CAAY;IAE7B;;;;;;OAMG;IACH,SAAS,EAAG,eAAe,CAAC;IAE5B;;;;;OAKG;IACH,SAAS,EAAE,OAAO,CAAS;cAEX,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAmBvC;;;;;;OAMG;IACG,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAShD,eAAe,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAU5D;;;;;;OAMG;IACH,cAAc,IAAI,IAAI;IA+CtB;;;;;;OAMG;IACH,YAAY,CAAC,IAAI,EAAE,eAAe,GAAG,IAAI;CAoB1C"}
+{"version":3,"file":"form-druipart.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-druipart/form-druipart.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAGnD,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAE3D,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAE1D;;;;;;;;GAQG;AACH,qBAAa,sBAAuB,SAAQ,oBAAoB,CAAC,eAAe,CAAC;IACvE,KAAK,EAAE,iBAAiB,CAAC;IAEjC,SAAS,CAAC,WAAW,IAAI,iBAAiB;IAI1C;;;;;;OAMG;IACH,UAAU,CAAC,EAAE,QAAQ,CAAC;IAEtB;;;;;;OAMG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IAEpB;;;;;;OAMG;IACH,YAAY,EAAE,MAAM,EAAE,CAAc;IAEpC;;;;;;OAMG;IACH,SAAS,EAAE,MAAM,CAAY;IAE7B;;;;;;OAMG;IACH,SAAS,EAAG,eAAe,CAAC;IAE5B;;;;;OAKG;IACH,SAAS,EAAE,OAAO,CAAS;cAEX,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAmBvC;;;;;;OAMG;IACG,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAShD,eAAe,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAY5D;;;;;;OAMG;IACH,cAAc,IAAI,IAAI;IA+CtB;;;;;;OAMG;IACH,YAAY,CAAC,IAAI,EAAE,eAAe,GAAG,IAAI;CAoB1C"}

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

@@ -79,8 +79,10 @@ export class FormDRUIPartController extends FormDetailController {
         await super.formStateNotify(state);
         this.isNewData = state === FormNotifyState.DRAFT;
         this.state.showMask = this.isNewData;
-        // 表单数据加载变更后，计算关系界面参数
-        this.calcViewParams();
+        if (state === FormNotifyState.LOAD || state === FormNotifyState.DRAFT) {
+            // 表单数据加载变更后，计算关系界面参数
+            this.calcViewParams();
+        }
     }
     /**
      * 计算视图上下文和视图参数,

package/out/controller/control/grid/grid-column/grid-field-column/grid-field-column.controller.d.ts

@@ -78,7 +78,7 @@ export declare class GridFieldColumnController extends GridColumnController<IDEG
      * @param {MouseEvent} event 鼠标事件
      * @returns {*}  {Promise<void>}
      */
-    triggerAction(_row: GridRowState, _event: MouseEvent): Promise<void>;
+    triggerAction(row: GridRowState, event: MouseEvent): Promise<void>;
     /**
      * 加载代码表数据
      *

package/out/controller/control/grid/grid-column/grid-field-column/grid-field-column.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"grid-field-column.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/grid/grid-column/grid-field-column/grid-field-column.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAIpE,OAAO,EAAE,YAAY,EAAc,MAAM,0BAA0B,CAAC;AAGpE,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAEzD;;;;;GAKG;AACH,qBAAa,yBAA0B,SAAQ,oBAAoB,CAAC,kBAAkB,CAAC;IACrF;;;;;;OAMG;IACH,aAAa,CAAC,EAAE,SAAS,YAAY,EAAE,CAAC;IAExC;;;;;OAKG;IACH,QAAQ,EAAE,YAAY,GAAG,SAAS,CAAa;IAE/C;;;;;;OAMG;IACH,IAAI,YAAY,IAAI,OAAO,CAE1B;IAED;;;;;;;OAOG;IACH,IAAI,SAAS,IAAI,OAAO,CAEvB;IAED;;;;;;OAMG;IACH,SAAS,CAAC,GAAG,EAAE,YAAY,GAAG,OAAO;IAKrC;;;;;OAKG;IACI,kBAAkB,CACvB,IAAI,EAAE,KAAK,EACX,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd;QAAE,OAAO,EAAE,QAAQ,CAAC;QAAC,MAAM,EAAE,OAAO,CAAA;KAAE;IAoBzC;;;;;;;;OAQG;IACG,YAAY,CAAC,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAuCvE;;;;;;;;OAQG;IACG,aAAa,CAAC,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAgB1E;;;;;;OAMG;IACG,YAAY,IAAI,OAAO,CAAC,QAAQ,CAAC,YAAY,EAAE,CAAC,GAAG,SAAS,CAAC;IAqBnE;;;;;;;OAOG;IACH,YAAY,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,MAAM,GAAG,SAAS;IA6DhD;;;;;;OAMG;IACH,WAAW,CAAC,KAAK,GAAE,OAAY,GAAG,MAAM;CAWzC"}
+{"version":3,"file":"grid-field-column.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/grid/grid-column/grid-field-column/grid-field-column.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAIpE,OAAO,EAAE,YAAY,EAAc,MAAM,0BAA0B,CAAC;AAKpE,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAEzD;;;;;GAKG;AACH,qBAAa,yBAA0B,SAAQ,oBAAoB,CAAC,kBAAkB,CAAC;IACrF;;;;;;OAMG;IACH,aAAa,CAAC,EAAE,SAAS,YAAY,EAAE,CAAC;IAExC;;;;;OAKG;IACH,QAAQ,EAAE,YAAY,GAAG,SAAS,CAAa;IAE/C;;;;;;OAMG;IACH,IAAI,YAAY,IAAI,OAAO,CAE1B;IAED;;;;;;;OAOG;IACH,IAAI,SAAS,IAAI,OAAO,CAEvB;IAED;;;;;;OAMG;IACH,SAAS,CAAC,GAAG,EAAE,YAAY,GAAG,OAAO;IAKrC;;;;;OAKG;IACI,kBAAkB,CACvB,IAAI,EAAE,KAAK,EACX,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd;QAAE,OAAO,EAAE,QAAQ,CAAC;QAAC,MAAM,EAAE,OAAO,CAAA;KAAE;IAoBzC;;;;;;;;OAQG;IACG,YAAY,CAAC,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAuCvE;;;;;;;;OAQG;IACG,aAAa,CAAC,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAWxE;;;;;;OAMG;IACG,YAAY,IAAI,OAAO,CAAC,QAAQ,CAAC,YAAY,EAAE,CAAC,GAAG,SAAS,CAAC;IAqBnE;;;;;;;OAOG;IACH,YAAY,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,MAAM,GAAG,SAAS;IA6DhD;;;;;;OAMG;IACH,WAAW,CAAC,KAAK,GAAE,OAAY,GAAG,MAAM;CAiBzC"}

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

@@ -4,7 +4,9 @@ import dayjs from 'dayjs';
 import { clone } from 'ramda';
 import { OpenAppViewCommand } from '../../../../../command';
 import { parseUserParams } from '../../../../../model';
+import { UIActionUtil } from '../../../../../ui-action';
 import { convertNavData, getWFContext } from '../../../../../utils';
+import { ValueExUtil } from '../../../../utils';
 import { GridColumnController } from '../../grid/grid-column.controller';
 /**
  * 表格属性列控制器
@@ -123,20 +125,15 @@ export class GridFieldColumnController extends GridColumnController {
      * @param {MouseEvent} event 鼠标事件
      * @returns {*}  {Promise<void>}
      */
-    async triggerAction(_row, _event) {
-        // if (this.model.viewLogic) {
-        //   await executeViewLogic(
-        //     this.model.viewLogic,
-        //     this.context,
-        //     [row.data],
-        //     this.params,
-        //     {
-        //       event,
-        //       neuron: this.grid.nerve.self,
-        //       view: this.grid.ctx.view,
-        //     },
-        //   );
-        // }
+    async triggerAction(row, event) {
+        const actionId = this.model.deuiactionId;
+        await UIActionUtil.execAndResolved(actionId, {
+            context: this.context,
+            params: this.params,
+            data: [row.data],
+            view: this.grid.view,
+            event,
+        });
     }
     /**
      * 加载代码表数据
@@ -230,6 +227,11 @@ export class GridFieldColumnController extends GridColumnController {
      * @return {*}  {string}
      */
     formatValue(value = '') {
+        // 根据数据类型增强转换显示文本
+        if (this.model.valueType) {
+            return ValueExUtil.toText(this.model, value);
+        }
+        // 根据格式化配置格式化显示
         const strVal = `${value}`;
         if (!this.valueFormat) {
             return strVal;

package/out/controller/control/search-bar/search-bar.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"search-bar.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/search-bar/search-bar.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EACL,eAAe,EACf,eAAe,EACf,oBAAoB,EACrB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAEjD;;;;;;;;GAQG;AACH,qBAAa,mBACX,SAAQ,iBAAiB,CAAC,UAAU,EAAE,eAAe,EAAE,eAAe,CACtE,YAAW,oBAAoB;IAE/B;;;;;OAKG;IACH,WAAW,SAAM;IAEjB,SAAS,CAAC,SAAS,IAAI,IAAI;cAUX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IA6B1C;;;;;;OAMG;IACH,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAI9B;;;;;OAKG;IACH,YAAY,IAAI,IAAI;CAGrB"}
+{"version":3,"file":"search-bar.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/search-bar/search-bar.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EACL,eAAe,EACf,eAAe,EACf,oBAAoB,EACrB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAEjD;;;;;;;;GAQG;AACH,qBAAa,mBACX,SAAQ,iBAAiB,CAAC,UAAU,EAAE,eAAe,EAAE,eAAe,CACtE,YAAW,oBAAoB;IAE/B;;;;;OAKG;IACH,WAAW,SAAM;IAEjB,SAAS,CAAC,SAAS,IAAI,IAAI;cAWX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IA6B1C;;;;;;OAMG;IACH,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAI9B;;;;;OAKG;IACH,YAAY,IAAI,IAAI;CAGrB"}

package/out/controller/control/search-bar/search-bar.controller.js

@@ -22,6 +22,7 @@ export class SearchBarController extends ControlController {
     initState() {
         super.initState();
         this.state.query = '';
+        this.state.selectedGroupItem = null;
         this.state.visible = !!(this.model.enableQuickSearch ||
             this.model.enableGroup ||
             this.model.enableFilter);

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

@@ -1 +1 @@
-{"version":3,"file":"tree.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/tree/tree.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EACL,UAAU,EACV,UAAU,EACV,eAAe,EACf,gBAAgB,EAChB,aAAa,EACd,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C;;;;;;;;GAQG;AACH,qBAAa,cACX,SAAQ,mBAAmB,CAAC,OAAO,EAAE,UAAU,EAAE,UAAU,CAC3D,YAAW,eAAe;IAElB,OAAO,EAAE,WAAW,CAAC;IAE7B;;;;;OAKG;IACH,YAAY,EAAE;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,qBAAqB,CAAA;KAAE,CAAM;IAE1D,SAAS,CAAC,SAAS,IAAI,IAAI;cAOX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAuB1C;;;;;OAKG;IACG,IAAI,CAAC,IAAI,GAAE,gBAAqB,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IAajE;;;;;;OAMG;IACG,SAAS,CAAC,UAAU,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IA0CrE;;;;;;OAMG;IACG,eAAe,CAAC,QAAQ,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAwB7D;;;;;;OAMG;IACG,iBAAiB,CAAC,QAAQ,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAM/D,SAAS,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAK7C,YAAY,CAAC,SAAS,EAAE,KAAK,EAAE,GAAG,IAAI;IAKtC;;;;;;OAMG;IACH,YAAY,CAAC,EAAE,EAAE,MAAM,GAAG,WAAW,GAAG,SAAS;IAIjD;;;;;;;;OAQG;IACG,UAAU,CACd,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,aAAa,EACvB,KAAK,EAAE,UAAU,GAChB,OAAO,CAAC,IAAI,CAAC;IA6BhB;;;;;;OAMG;IACH,SAAS,CAAC,iBAAiB,CAAC,QAAQ,EAAE,aAAa,GAAG;QACpD,IAAI,EAAE,KAAK,EAAE,CAAC;QACd,OAAO,EAAE,QAAQ,CAAC;QAClB,MAAM,EAAE,OAAO,CAAC;KACjB;IAQD;;;;;;;OAOG;IACH,gBAAgB,CAAC,KAAK,EAAE,aAAa,EAAE,GAAG,MAAM,EAAE;IAclD;;;;;;;OAOG;IACG,mBAAmB,CACvB,QAAQ,EAAE,aAAa,GAAG,KAAK,EAC/B,aAAa,UAAQ,GACpB,OAAO,CAAC,IAAI,CAAC;CA+BjB"}
+{"version":3,"file":"tree.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/tree/tree.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EACL,UAAU,EACV,UAAU,EACV,eAAe,EACf,gBAAgB,EAChB,aAAa,EACd,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C;;;;;;;;GAQG;AACH,qBAAa,cACX,SAAQ,mBAAmB,CAAC,OAAO,EAAE,UAAU,EAAE,UAAU,CAC3D,YAAW,eAAe;IAElB,OAAO,EAAE,WAAW,CAAC;IAE7B;;;;;OAKG;IACH,YAAY,EAAE;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,qBAAqB,CAAA;KAAE,CAAM;IAE1D,SAAS,CAAC,SAAS,IAAI,IAAI;cAOX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAuB1C;;;;;OAKG;IACG,IAAI,CAAC,IAAI,GAAE,gBAAqB,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IAajE;;;;;;OAMG;IACG,SAAS,CAAC,UAAU,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IAyCrE;;;;;;OAMG;IACG,eAAe,CAAC,QAAQ,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAwB7D;;;;;;OAMG;IACG,iBAAiB,CAAC,QAAQ,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAM/D,SAAS,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAK7C,YAAY,CAAC,SAAS,EAAE,KAAK,EAAE,GAAG,IAAI;IAKtC;;;;;;OAMG;IACH,YAAY,CAAC,EAAE,EAAE,MAAM,GAAG,WAAW,GAAG,SAAS;IAIjD;;;;;;;;OAQG;IACG,UAAU,CACd,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,aAAa,EACvB,KAAK,EAAE,UAAU,GAChB,OAAO,CAAC,IAAI,CAAC;IA6BhB;;;;;;OAMG;IACH,SAAS,CAAC,iBAAiB,CAAC,QAAQ,EAAE,aAAa,GAAG;QACpD,IAAI,EAAE,KAAK,EAAE,CAAC;QACd,OAAO,EAAE,QAAQ,CAAC;QAClB,MAAM,EAAE,OAAO,CAAC;KACjB;IAQD;;;;;;;OAOG;IACH,gBAAgB,CAAC,KAAK,EAAE,aAAa,EAAE,GAAG,MAAM,EAAE;IAclD;;;;;;;OAOG;IACG,mBAAmB,CACvB,QAAQ,EAAE,aAAa,GAAG,KAAK,EAC/B,aAAa,UAAQ,GACpB,OAAO,CAAC,IAAI,CAAC;CA+BjB"}

package/out/controller/control/tree/tree.controller.js

@@ -91,7 +91,6 @@ export class TreeController extends MDControlController {
         }
         // 有父节点绑定到父节点数据上，无父节点替换rootNodes
         if (parentNode) {
-            // nodes.splice(0, 10);
             parentNode.children = nodes;
         }
         else {

package/out/controller/utils/event/controller-event.d.ts

@@ -30,6 +30,13 @@ export type EventTypeObjec<T> = {
  */
 export declare class ControllerEvent<E extends IComponentEvent = IComponentEvent> {
     protected getBaseArgs: () => Omit<EventBase, 'eventName'>;
+    /**
+     * 是否已经销毁
+     * @author lxm
+     * @date 2023-08-30 02:54:14
+     * @type {boolean}
+     */
+    isDestroyed: boolean;
     /**
      * 事件对象
      *

package/out/controller/utils/event/controller-event.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"controller-event.d.ts","sourceRoot":"","sources":["../../../../src/controller/utils/event/controller-event.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAChE,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAE1C,MAAM,MAAM,WAAW,CAAC,CAAC,IAAI;KAC1B,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG;CACxC,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACxB,CAAC,CAAC,EAAE,MAAM,GAAG,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,CAAC;CACtC,CAAC;AAEF,MAAM,MAAM,cAAc,CAAC,CAAC,IAAI;KAC7B,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS;QAC3B,KAAK,EAAE,OAAO,CAAC;QACf,QAAQ,EAAE,SAAS,GAAG,OAAO,CAAC;KAC/B,GACG,CAAC,GACD,KAAK;CACV,CAAC,MAAM,CAAC,CAAC,CAAC;AAEX,MAAM,MAAM,cAAc,CAAC,CAAC,IAAI;KAC7B,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS;QAC3B,KAAK,EAAE,OAAO,CAAC;QACf,QAAQ,EAAE,SAAS,GAAG,OAAO,CAAC;KAC/B,GACG,CAAC,CAAC,CAAC,CAAC,GACJ,KAAK;CACV,CAAC;AAEF;;;;;;;;;GASG;AACH,qBAAa,eAAe,CAAC,CAAC,SAAS,eAAe,GAAG,eAAe;IA+D1D,SAAS,CAAC,WAAW,EAAE,MAAM,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC;IA9DrE;;;;;OAKG;IACH,SAAS,CAAC,QAAQ,CAAC,GAAG,yBAAgC;IAEtD;;;;;;;;OAQG;IACG,IAAI,CAAC,CAAC,SAAS,cAAc,CAAC,CAAC,CAAC,EACpC,IAAI,EAAE,CAAC,EACP,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,GACrC,OAAO,CAAC,IAAI,CAAC;IAUhB;;;;;;OAMG;IACH,EAAE,CAAC,CAAC,SAAS,cAAc,CAAC,CAAC,CAAC,EAC5B,IAAI,EAAE,CAAC,EACP,EAAE,EAAE,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,GACjE,IAAI;IAIP;;;;;OAKG;IACH,KAAK,CACH,EAAE,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,GAChE,IAAI;IAIP;;;;;OAKG;gBACmB,WAAW,EAAE,MAAM,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC;IAErE;;;;;OAKG;IACH,OAAO,IAAI,IAAI;CAIhB"}
+{"version":3,"file":"controller-event.d.ts","sourceRoot":"","sources":["../../../../src/controller/utils/event/controller-event.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAChE,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAE1C,MAAM,MAAM,WAAW,CAAC,CAAC,IAAI;KAC1B,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG;CACxC,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACxB,CAAC,CAAC,EAAE,MAAM,GAAG,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,CAAC;CACtC,CAAC;AAEF,MAAM,MAAM,cAAc,CAAC,CAAC,IAAI;KAC7B,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS;QAC3B,KAAK,EAAE,OAAO,CAAC;QACf,QAAQ,EAAE,SAAS,GAAG,OAAO,CAAC;KAC/B,GACG,CAAC,GACD,KAAK;CACV,CAAC,MAAM,CAAC,CAAC,CAAC;AAEX,MAAM,MAAM,cAAc,CAAC,CAAC,IAAI;KAC7B,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS;QAC3B,KAAK,EAAE,OAAO,CAAC;QACf,QAAQ,EAAE,SAAS,GAAG,OAAO,CAAC;KAC/B,GACG,CAAC,CAAC,CAAC,CAAC,GACJ,KAAK;CACV,CAAC;AAEF;;;;;;;;;GASG;AACH,qBAAa,eAAe,CAAC,CAAC,SAAS,eAAe,GAAG,eAAe;IAgF1D,SAAS,CAAC,WAAW,EAAE,MAAM,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC;IA/ErE;;;;;OAKG;IACH,WAAW,EAAE,OAAO,CAAS;IAE7B;;;;;OAKG;IACH,SAAS,CAAC,QAAQ,CAAC,GAAG,yBAAgC;IAEtD;;;;;;;;OAQG;IACG,IAAI,CAAC,CAAC,SAAS,cAAc,CAAC,CAAC,CAAC,EACpC,IAAI,EAAE,CAAC,EACP,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,GACrC,OAAO,CAAC,IAAI,CAAC;IAahB;;;;;;OAMG;IACH,EAAE,CAAC,CAAC,SAAS,cAAc,CAAC,CAAC,CAAC,EAC5B,IAAI,EAAE,CAAC,EACP,EAAE,EAAE,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,GACjE,IAAI;IAOP;;;;;OAKG;IACH,KAAK,CACH,EAAE,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,GAChE,IAAI;IAOP;;;;;OAKG;gBACmB,WAAW,EAAE,MAAM,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC;IAErE;;;;;OAKG;IACH,OAAO,IAAI,IAAI;CAKhB"}

package/out/controller/utils/event/controller-event.js

@@ -20,6 +20,9 @@ export class ControllerEvent {
      * @return {*}  {Promise<void>}
      */
     async emit(name, args) {
+        if (this.isDestroyed) {
+            return;
+        }
         // 自动补全其他事件对象参数
         await this.evt.asyncEmit(name, Object.assign(Object.assign(Object.assign({}, this.getBaseArgs()), { eventName: name }), (args || {})));
     }
@@ -31,6 +34,9 @@ export class ControllerEvent {
      * @param  fn 事件回调
      */
     on(name, fn) {
+        if (this.isDestroyed) {
+            return;
+        }
         this.evt.on(name, fn);
     }
     /**
@@ -40,6 +46,9 @@ export class ControllerEvent {
      * @param fn 事件回调
      */
     onAll(fn) {
+        if (this.isDestroyed) {
+            return;
+        }
         this.evt.onAll(fn);
     }
     /**
@@ -50,6 +59,13 @@ export class ControllerEvent {
      */
     constructor(getBaseArgs) {
         this.getBaseArgs = getBaseArgs;
+        /**
+         * 是否已经销毁
+         * @author lxm
+         * @date 2023-08-30 02:54:14
+         * @type {boolean}
+         */
+        this.isDestroyed = false;
         /**
          * 事件对象
          *
@@ -67,5 +83,6 @@ export class ControllerEvent {
     destroy() {
         this.getBaseArgs = undefined;
         this.evt.reset();
+        this.isDestroyed = true;
     }
 }

package/out/controller/utils/index.d.ts

@@ -4,4 +4,5 @@ export * from './button-state';
 export * from './event';
 export * from './util/util';
 export * from './value-rule/value-rule';
+export * from './value-ex/value-ex';
 //# sourceMappingURL=index.d.ts.map

package/out/controller/utils/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/controller/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAC;AAC1B,cAAc,yBAAyB,CAAC;AACxC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,SAAS,CAAC;AACxB,cAAc,aAAa,CAAC;AAC5B,cAAc,yBAAyB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/controller/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAC;AAC1B,cAAc,yBAAyB,CAAC;AACxC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,SAAS,CAAC;AACxB,cAAc,aAAa,CAAC;AAC5B,cAAc,yBAAyB,CAAC;AACxC,cAAc,qBAAqB,CAAC"}

package/out/controller/utils/index.js

@@ -4,3 +4,4 @@ export * from './button-state';
 export * from './event';
 export * from './util/util';
 export * from './value-rule/value-rule';
+export * from './value-ex/value-ex';

package/out/controller/utils/value-ex/value-ex.d.ts

@@ -0,0 +1,47 @@
+export type ValueExOptions = {
+    /**
+     * 值类型
+     */
+    valueType?: string | 'SIMPLE' | 'SIMPLES' | 'OBJECT' | 'OBJECTS';
+    /**
+     * 对象标识属性
+     */
+    objectIdField?: string;
+    /**
+     * 对象名称属性(显示文本)
+     */
+    objectNameField?: string;
+    /**
+     * 对象值属性
+     */
+    objectValueField?: string;
+    /**
+     * 多项值分隔符
+     */
+    valueSeparator?: string;
+    /**
+     * 多项文本分隔符
+     */
+    textSeparator?: string;
+};
+export declare class ValueExUtil {
+    /**
+     * 合并默认值
+     * @author lxm
+     * @date 2023-08-30 02:06:58
+     * @static
+     * @param {ValueExOptions} options
+     * @return {*}  {ValueExOptions}
+     */
+    static mergeDefault(options: ValueExOptions): ValueExOptions;
+    /**
+     * 转成显示用的文本
+     * @author lxm
+     * @date 2023-08-30 01:55:38
+     * @param {ValueExOptions} options
+     * @param {unknown} value
+     * @return {*}  {string}
+     */
+    static toText(options: ValueExOptions, value: unknown): string;
+}
+//# sourceMappingURL=value-ex.d.ts.map

package/out/controller/utils/value-ex/value-ex.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"value-ex.d.ts","sourceRoot":"","sources":["../../../../src/controller/utils/value-ex/value-ex.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,cAAc,GAAG;IAC3B;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,GAAG,QAAQ,GAAG,SAAS,GAAG,QAAQ,GAAG,SAAS,CAAC;IAEjE;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IAEvB;;OAEG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC;IAEzB;;OAEG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAE1B;;OAEG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IAExB;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,qBAAa,WAAW;IACtB;;;;;;;OAOG;IACH,MAAM,CAAC,YAAY,CAAC,OAAO,EAAE,cAAc,GAAG,cAAc;IAO5D;;;;;;;OAOG;IACH,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,cAAc,EAAE,KAAK,EAAE,OAAO,GAAG,MAAM;CAuB/D"}

package/out/controller/utils/value-ex/value-ex.js

@@ -0,0 +1,48 @@
+import { RuntimeError } from '@ibiz-template/core';
+import { isNil, mergeLeft } from 'ramda';
+export class ValueExUtil {
+    /**
+     * 合并默认值
+     * @author lxm
+     * @date 2023-08-30 02:06:58
+     * @static
+     * @param {ValueExOptions} options
+     * @return {*}  {ValueExOptions}
+     */
+    static mergeDefault(options) {
+        return mergeLeft(options, {
+            textSeparator: ',',
+            valueSeparator: ',',
+        });
+    }
+    /**
+     * 转成显示用的文本
+     * @author lxm
+     * @date 2023-08-30 01:55:38
+     * @param {ValueExOptions} options
+     * @param {unknown} value
+     * @return {*}  {string}
+     */
+    static toText(options, value) {
+        if (isNil(value) || value === '') {
+            return '';
+        }
+        const { valueType, objectNameField, textSeparator } = this.mergeDefault(options);
+        if (['OBJECTS', 'OBJECT'].includes(valueType)) {
+            if (!objectNameField) {
+                throw new RuntimeError('缺少objectNameField');
+            }
+            const textKey = objectNameField.toLowerCase();
+            if (valueType === 'OBJECTS') {
+                return value
+                    .map(item => item[textKey] || '---')
+                    .join(textSeparator);
+            }
+            return value[textKey];
+        }
+        if (valueType === 'SIMPLES') {
+            return value.join(textSeparator);
+        }
+        return `${value}`;
+    }
+}

package/out/engine/md-view.engine.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"md-view.engine.d.ts","sourceRoot":"","sources":["../../src/engine/md-view.engine.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAEvD,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EACL,YAAY,EACZ,YAAY,EACZ,oBAAoB,EACpB,qBAAqB,EACrB,kBAAkB,EAClB,oBAAoB,EACpB,gBAAgB,EACjB,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEpD;;;;;;;GAOG;AACH,qBAAa,YAAa,SAAQ,cAAc;IAC9C,UAAkB,IAAI,EAAE,cAAc,CACpC,mBAAmB,EACnB,YAAY,EACZ,YAAY,CACb,CAAC;IAEF;;;;;;OAMG;IACH,IAAI,gBAAgB,IAAI,MAAM,CAE7B;IAED;;;;;OAKG;IACH,SAAS,KAAK,UAAU,IAAI,qBAAqB,CAEhD;IAED;;;;;OAKG;IACH,SAAS,KAAK,SAAS,IAAI,oBAAoB,CAE9C;IAED;;;;;;OAMG;IACH,SAAS,KAAK,YAAY,IAAI,oBAAoB,CAIjD;IAEK,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAM1B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAyD1B,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,KAAK,GAAG,IAAI,GAAG,SAAS,CAAC;IAwCrE,SAAS,CAAC,OAAO,IAAI,KAAK,EAAE;IAI5B;;;;;;;;OAQG;cACa,QAAQ,CAAC,IAAI,EAAE;QAC7B,IAAI,EAAE,KAAK,EAAE,CAAC;QACd,KAAK,CAAC,EAAE,UAAU,CAAC;QACnB,OAAO,CAAC,EAAE,QAAQ,CAAC;QACnB,MAAM,CAAC,EAAE,OAAO,CAAC;KAClB,GAAG,OAAO,CAAC,IAAI,CAAC;IA0BjB;;;;;;;;OAQG;cACa,OAAO,CAAC,IAAI,EAAE;QAC5B,IAAI,EAAE,KAAK,EAAE,CAAC;QACd,KAAK,CAAC,EAAE,UAAU,CAAC;QACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;KACpB,GAAG,OAAO,CAAC,IAAI,CAAC;IA6BjB;;;;;;OAMG;cACa,MAAM,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAI5E;;;;;OAKG;cACa,IAAI,CAAC,IAAI,GAAE,gBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC;IAIhE;;;;;OAKG;cACa,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAIxC;;;;;OAKG;IACH,SAAS,CAAC,eAAe,IAAI,OAAO;IA0BpC;;;;;OAKG;cACa,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAI3C;;;;;;OAMG;cACa,UAAU,CAAC,IAAI,EAAE;QAAE,KAAK,EAAE,UAAU,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAItE;;;;;;OAMG;IACG,IAAI,CAAC,IAAI,EAAE;QAAE,IAAI,EAAE,KAAK,EAAE,CAAC;QAAC,KAAK,CAAC,EAAE,UAAU,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAItE,SAAS,CAAC,qBAAqB,IAAI,OAAO;IAc1C;;;;;OAKG;IACH,SAAS,CAAC,YAAY,IAAI,IAAI;CAS/B"}
+{"version":3,"file":"md-view.engine.d.ts","sourceRoot":"","sources":["../../src/engine/md-view.engine.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAEvD,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EACL,YAAY,EACZ,YAAY,EACZ,oBAAoB,EACpB,qBAAqB,EACrB,kBAAkB,EAClB,oBAAoB,EACpB,gBAAgB,EACjB,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEpD;;;;;;;GAOG;AACH,qBAAa,YAAa,SAAQ,cAAc;IAC9C,UAAkB,IAAI,EAAE,cAAc,CACpC,mBAAmB,EACnB,YAAY,EACZ,YAAY,CACb,CAAC;IAEF;;;;;;OAMG;IACH,IAAI,gBAAgB,IAAI,MAAM,CAE7B;IAED;;;;;OAKG;IACH,SAAS,KAAK,UAAU,IAAI,qBAAqB,CAEhD;IAED;;;;;OAKG;IACH,SAAS,KAAK,SAAS,IAAI,oBAAoB,CAE9C;IAED;;;;;;OAMG;IACH,SAAS,KAAK,YAAY,IAAI,oBAAoB,CAIjD;IAEK,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAM1B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAyD1B,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,KAAK,GAAG,IAAI,GAAG,SAAS,CAAC;IAwCrE,SAAS,CAAC,OAAO,IAAI,KAAK,EAAE;IAI5B;;;;;;;;OAQG;cACa,QAAQ,CAAC,IAAI,EAAE;QAC7B,IAAI,EAAE,KAAK,EAAE,CAAC;QACd,KAAK,CAAC,EAAE,UAAU,CAAC;QACnB,OAAO,CAAC,EAAE,QAAQ,CAAC;QACnB,MAAM,CAAC,EAAE,OAAO,CAAC;KAClB,GAAG,OAAO,CAAC,IAAI,CAAC;IA0BjB;;;;;;;;OAQG;cACa,OAAO,CAAC,IAAI,EAAE;QAC5B,IAAI,EAAE,KAAK,EAAE,CAAC;QACd,KAAK,CAAC,EAAE,UAAU,CAAC;QACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;KACpB,GAAG,OAAO,CAAC,IAAI,CAAC;IA6BjB;;;;;;OAMG;cACa,MAAM,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAI5E;;;;;OAKG;cACa,IAAI,CAAC,IAAI,GAAE,gBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC;IAIhE;;;;;OAKG;cACa,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAIxC;;;;;OAKG;IACH,SAAS,CAAC,eAAe,IAAI,OAAO;IAsCpC;;;;;OAKG;cACa,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAI3C;;;;;;OAMG;cACa,UAAU,CAAC,IAAI,EAAE;QAAE,KAAK,EAAE,UAAU,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAItE;;;;;;OAMG;IACG,IAAI,CAAC,IAAI,EAAE;QAAE,IAAI,EAAE,KAAK,EAAE,CAAC;QAAC,KAAK,CAAC,EAAE,UAAU,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAItE,SAAS,CAAC,qBAAqB,IAAI,OAAO;IAc1C;;;;;OAKG;IACH,SAAS,CAAC,YAAY,IAAI,IAAI;CAS/B"}

package/out/engine/md-view.engine.js

@@ -246,6 +246,7 @@ export class MDViewEngine extends ViewEngineBase {
      * @return {*}  {IParams}
      */
     getSearchParams() {
+        var _a;
         const params = {};
         // 有搜索表单的整合相关参数
         if (this.searchForm) {
@@ -259,11 +260,21 @@ export class MDViewEngine extends ViewEngineBase {
             Object.assign(params, filteredParams);
         }
         // 有搜索栏的整合相关参数
-        if (this.searchBar && this.searchBar.state.query) {
-            const addParams = {
-                query: this.searchBar.state.query,
-            };
-            Object.assign(params, addParams);
+        if (this.searchBar) {
+            // 快速搜索
+            if (this.searchBar.state.query) {
+                const addParams = {
+                    query: this.searchBar.state.query,
+                };
+                Object.assign(params, addParams);
+            }
+            // 快速分组
+            if ((_a = this.searchBar.state.selectedGroupItem) === null || _a === void 0 ? void 0 : _a.data) {
+                // eslint-disable-next-line no-new-func
+                const func = new Function(`return (${this.searchBar.state.selectedGroupItem.data});`);
+                const addParams = func();
+                Object.assign(params, addParams);
+            }
         }
         return params;
     }

package/out/interface/common/i-modal/i-modal.d.ts

@@ -25,6 +25,14 @@ export interface IModal {
      * @type {string}
      */
     mode: ViewMode;
+    /**
+     * 是否忽略关闭检查，用于强制关闭视图
+     *
+     * @author chitanda
+     * @date 2023-08-30 16:08:45
+     * @type {boolean}
+     */
+    ignoreDismissCheck: boolean;
     /**
      * 路由绘制的视图才有，用于表示所在路由层级
      *

package/out/interface/common/i-modal/i-modal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"i-modal.d.ts","sourceRoot":"","sources":["../../../../src/interface/common/i-modal/i-modal.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAC1C,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAE1D,KAAK,UAAU,GAAG;IAChB,aAAa,EAAE,eAAe,CAC5B;KAAE,EACF;QACE,UAAU,EAAE,OAAO,CAAC;KACrB,CACF,CAAC;IACF,aAAa,EAAE,eAAe,CAAC,EAAE,EAAE,UAAU,CAAC,CAAC;CAChD,CAAC;AAEF;;;;;;;GAOG;AACH,MAAM,WAAW,MAAM;IACrB;;;;;;OAMG;IACH,IAAI,EAAE,QAAQ,CAAC;IAEf;;;;;OAKG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;;;;;OAMG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;;;;OAKG;IACH,KAAK,EAAE,UAAU,CAAC;IAElB;;;;;;OAMG;IACH,OAAO,EAAE,CAAC,IAAI,CAAC,EAAE,UAAU,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;CAClD"}
+{"version":3,"file":"i-modal.d.ts","sourceRoot":"","sources":["../../../../src/interface/common/i-modal/i-modal.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAC1C,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAE1D,KAAK,UAAU,GAAG;IAChB,aAAa,EAAE,eAAe,CAC5B;KAAE,EACF;QACE,UAAU,EAAE,OAAO,CAAC;KACrB,CACF,CAAC;IACF,aAAa,EAAE,eAAe,CAAC,EAAE,EAAE,UAAU,CAAC,CAAC;CAChD,CAAC;AAEF;;;;;;;GAOG;AACH,MAAM,WAAW,MAAM;IACrB;;;;;;OAMG;IACH,IAAI,EAAE,QAAQ,CAAC;IAEf;;;;;;OAMG;IACH,kBAAkB,EAAE,OAAO,CAAC;IAE5B;;;;;OAKG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;;;;;OAMG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;;;;OAKG;IACH,KAAK,EAAE,UAAU,CAAC;IAElB;;;;;;OAMG;IACH,OAAO,EAAE,CAAC,IAAI,CAAC,EAAE,UAAU,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;CAClD"}

package/out/interface/controller/state/common/i-controller.state.d.ts

@@ -21,5 +21,13 @@ export interface IControllerState {
      * @type {boolean}
      */
     isMounted: boolean;
+    /**
+     * 控制器是否走完destroy生命周期
+     *
+     * @author lxm
+     * @date 2022-08-18 22:08:23
+     * @type {boolean}
+     */
+    isDestroyed: boolean;
 }
 //# sourceMappingURL=i-controller.state.d.ts.map

package/out/interface/controller/state/common/i-controller.state.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"i-controller.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/state/common/i-controller.state.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,MAAM,WAAW,gBAAgB;IAC/B;;;;;;OAMG;IACH,SAAS,EAAE,OAAO,CAAC;IAEnB;;;;;;OAMG;IACH,SAAS,EAAE,OAAO,CAAC;CACpB"}
+{"version":3,"file":"i-controller.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/state/common/i-controller.state.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,MAAM,WAAW,gBAAgB;IAC/B;;;;;;OAMG;IACH,SAAS,EAAE,OAAO,CAAC;IAEnB;;;;;;OAMG;IACH,SAAS,EAAE,OAAO,CAAC;IAEnB;;;;;;OAMG;IACH,WAAW,EAAE,OAAO,CAAC;CACtB"}

package/out/interface/controller/state/control/i-search-bar.state.d.ts

@@ -1,3 +1,4 @@
+import { ISearchBarGroup } from '@ibiz/model-core';
 import { IControlState } from './i-control.state';
 export interface ISearchBarState extends IControlState {
     /**
@@ -14,5 +15,12 @@ export interface ISearchBarState extends IControlState {
      * @type {boolean}
      */
     visible: boolean;
+    /**
+     * 选中的分组项
+     * @author lxm
+     * @date 2023-08-25 05:32:59
+     * @type {boolean}
+     */
+    selectedGroupItem: ISearchBarGroup | null;
 }
 //# sourceMappingURL=i-search-bar.state.d.ts.map

package/out/interface/controller/state/control/i-search-bar.state.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"i-search-bar.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/state/control/i-search-bar.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAElD,MAAM,WAAW,eAAgB,SAAQ,aAAa;IACpD;;;;;OAKG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;;;;OAKG;IACH,OAAO,EAAE,OAAO,CAAC;CAClB"}
+{"version":3,"file":"i-search-bar.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/state/control/i-search-bar.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAElD,MAAM,WAAW,eAAgB,SAAQ,aAAa;IACpD;;;;;OAKG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;;;;OAKG;IACH,OAAO,EAAE,OAAO,CAAC;IAEjB;;;;;OAKG;IACH,iBAAiB,EAAE,eAAe,GAAG,IAAI,CAAC;CAC3C"}

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;IAYlB,SAAS,CAAC,MAAM,EAAE,cAAc;IAChC,SAAS,CAAC,GAAG,CAAC;IAZhB,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;IAErD,IAAI,WAAW,IAAI,OAAO,CAEzB;gBAGW,MAAM,EAAE,cAAc,EACtB,GAAG,CAAC,6BAAiB;IAUjC;;;;;;;;OAQG;IACG,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;IAwCxD;;;;;;;;OAQG;IACG,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IA+BrE;;;;;;;;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;IAYlB,SAAS,CAAC,MAAM,EAAE,cAAc;IAChC,SAAS,CAAC,GAAG,CAAC;IAZhB,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;IAErD,IAAI,WAAW,IAAI,OAAO,CAEzB;gBAGW,MAAM,EAAE,cAAc,EACtB,GAAG,CAAC,6BAAiB;IAUjC;;;;;;;;OAQG;IACG,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;IA0CxD;;;;;;;;OAQG;IACG,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IA+BrE;;;;;;;;OAQG;cACa,WAAW,CAAC,KAAK,EAAE,oBAAoB,GAAG,OAAO,CAAC,SAAS,CAAC;CAgB7E"}

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

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

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;AAChE,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;IAwDxB,SAAS,CAAC,MAAM,EAAE,cAAc;IAChC,SAAS,CAAC,MAAM,EAAE,YAAY;IAxDhC,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;IACH,SAAS,KAAK,WAAW,IAAI,OAAO,CAEnC;IAED;;;;;;;;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;IAiC7B;;;;;;;;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;CAG/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;IAwDxB,SAAS,CAAC,MAAM,EAAE,cAAc;IAChC,SAAS,CAAC,MAAM,EAAE,YAAY;IAxDhC,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;IACH,SAAS,KAAK,WAAW,IAAI,OAAO,CAEnC;IAED;;;;;;;;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;IAuC7B;;;;;;;;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;CAG/D"}

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

@@ -1,5 +1,6 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
 import { RuntimeModelError } from '@ibiz-template/core';
+import { notNilEmpty } from 'qx-util';
 import { AppDataEntity } from '../../../app-data-entity/app-data-entity';
 import { calcResPath } from '../../../utils';
 import { MethodInput } from './method-input';
@@ -60,16 +61,16 @@ export class Method {
             let res = null;
             switch (requestMethod) {
                 case 'POST':
-                    res = await this.app.net.post(`${path}/${methodName}`, data);
+                    res = await this.app.net.post(`${path}/${methodName}`, notNilEmpty(data) ? data : params);
                     break;
                 case 'GET':
-                    res = await this.app.net.get(`${path}/${methodName}`, params);
+                    res = await this.app.net.get(`${path}/${methodName}`, data);
                     break;
                 case 'PUT':
-                    res = await this.app.net.put(`${path}/${methodName}`, data);
+                    res = await this.app.net.put(`${path}/${methodName}`, notNilEmpty(data) ? data : params);
                     break;
                 case 'DELETE':
-                    res = await this.app.net.delete(`${path}/${methodName}`, params);
+                    res = await this.app.net.delete(`${path}/${methodName}`, data);
                     break;
                 default:
                     if (requestMethod) {

package/out/ui-action/provider/backend-ui-action-provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"backend-ui-action-provider.d.ts","sourceRoot":"","sources":["../../../src/ui-action/provider/backend-ui-action-provider.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAGlD,OAAO,EAAE,cAAc,EAAE,eAAe,EAAc,MAAM,iBAAiB,CAAC;AAC9E,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE;;;;;;;;GAQG;AACH,qBAAa,uBAAwB,SAAQ,oBAAoB;IACzD,UAAU,CACd,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;CAmE5B"}
+{"version":3,"file":"backend-ui-action-provider.d.ts","sourceRoot":"","sources":["../../../src/ui-action/provider/backend-ui-action-provider.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAGlD,OAAO,EAAE,cAAc,EAAE,eAAe,EAAc,MAAM,iBAAiB,CAAC;AAC9E,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE;;;;;;;;GAQG;AACH,qBAAa,uBAAwB,SAAQ,oBAAoB;IACzD,UAAU,CACd,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;CAsE5B"}

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

@@ -22,6 +22,7 @@ export class BackendUIActionProvider extends UIActionProviderBase {
         }
         // 处理参数
         const { resultContext, resultParams, resultData } = await this.handleParams(action, context, data, params);
+        const tempParams = Object.assign({}, resultParams);
         // 如果有打开视图，打开视图，并把返回的数据作为子实体数据
         const frontPSAppView = action.frontAppViewId;
         if (frontPSAppView) {
@@ -41,9 +42,11 @@ export class BackendUIActionProvider extends UIActionProviderBase {
             }
         }
         const app = ibiz.hub.getApp(context === null || context === void 0 ? void 0 : context.srfappid);
-        const _data = resultData.map(item => { var _a; return ((_a = item.getOrigin) === null || _a === void 0 ? void 0 : _a.call(item)) || item || {}; });
+        const _data = resultData
+            .map(item => { var _a; return ((_a = item.getOrigin) === null || _a === void 0 ? void 0 : _a.call(item)) || item || {}; })
+            .map(item => Object.assign(item, tempParams)); // 界面行为视图参数和data合并一起传给后台
         const isMultiData = ['MULTIKEY', 'MULTIDATA'].includes(action.actionTarget);
-        const res = await app.deService.exec(entityName, methodName, resultContext, isMultiData ? _data : _data[0], resultParams);
+        const res = await app.deService.exec(entityName, methodName, resultContext, isMultiData ? _data : _data[0], tempParams);
         // 适配界面行为成功提示信息
         if (res.ok && action.successMsg) {
             ibiz.message.success(action.successMsg);
@@ -51,7 +54,7 @@ export class BackendUIActionProvider extends UIActionProviderBase {
         Object.assign(actionResult, {
             data: isArray(res.data) ? res.data : [res.data],
             nextContext: resultContext,
-            nextParams: resultParams,
+            nextParams: tempParams,
         });
         return actionResult;
     }

package/out/ui-action/uiaction-util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"uiaction-util.d.ts","sourceRoot":"","sources":["../../src/ui-action/uiaction-util.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAI/D;;;;;;;GAOG;AACH,qBAAa,YAAY;IACvB;;;;;;;;;OASG;WACU,IAAI,CACf,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,cAAc,GACrB,OAAO,CAAC,eAAe,CAAC;IAS3B;;;;;;;OAOG;WACU,eAAe,CAC1B,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,cAAc,GACrB,OAAO,CAAC,IAAI,CAAC;CAmBjB"}
+{"version":3,"file":"uiaction-util.d.ts","sourceRoot":"","sources":["../../src/ui-action/uiaction-util.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAI/D;;;;;;;GAOG;AACH,qBAAa,YAAY;IACvB;;;;;;;;;OASG;WACU,IAAI,CACf,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,cAAc,GACrB,OAAO,CAAC,eAAe,CAAC;IAS3B;;;;;;;OAOG;WACU,eAAe,CAC1B,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,cAAc,GACrB,OAAO,CAAC,IAAI,CAAC;CAoBjB"}