@ibiz-template/runtime 0.5.7-alpha.8 → 0.6.0-alpha.0

package/out/application.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"application.d.ts","sourceRoot":"","sources":["../src/application.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAY,MAAM,qBAAqB,CAAC;AACpD,OAAO,EACL,cAAc,EACd,QAAQ,EACR,YAAY,EACZ,SAAS,EACT,UAAU,EACX,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,gBAAgB,EAChB,eAAe,EACf,aAAa,EACb,aAAa,EACb,WAAW,EACZ,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE1C;;;;;;;;GAQG;AACH,qBAAa,WAAY,YAAW,WAAW;aAkFjB,KAAK,EAAE,YAAY;IAjF/C;;;;;;;OAOG;IACH,IAAI,KAAK,IAAI,MAAM,CAElB;IAED;;;;;;OAMG;IACH,QAAQ,CAAC,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAa;IAE5D;;;;;;OAMG;IACH,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC;IAElB;;;;;;OAMG;IACH,QAAQ,CAAC,WAAW,EAAE,aAAa,CAAC;IAEpC;;;;;OAKG;IACH,QAAQ,CAAC,SAAS,EAAE,aAAa,CAAC;IAElC;;;;;;OAMG;IACH,QAAQ,CAAC,QAAQ,EAAE,eAAe,CAAC;IAEnC;;;;;;OAMG;IACH,QAAQ,CAAC,SAAS,EAAE,gBAAgB,CAAC;IAErC;;;;;;OAMG;IACH,IAAI,CAAC,EAAE,WAAW,CAAC;IAEnB;;;;;;OAMG;gBACyB,KAAK,EAAE,YAAY;IAc/C;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAM3B;;;;;;;OAOG;cACa,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC;IAWlD;;;;;;;OAOG;IACH,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,QAAQ,GAAG,IAAI;IAMvC;;;;;;;OAOG;IACG,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC;IAqBxE;;;;;;;OAOG;IACG,SAAS,CACb,EAAE,EAAE,MAAM,EACV,eAAe,CAAC,EAAE,MAAM,GACvB,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;IAajC;;;;;;;OAOG;IACG,YAAY,CAChB,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC;IAUlC;;;;;OAKG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;CAyBhC"}
+{"version":3,"file":"application.d.ts","sourceRoot":"","sources":["../src/application.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAY,MAAM,qBAAqB,CAAC;AACpD,OAAO,EACL,cAAc,EACd,QAAQ,EACR,YAAY,EACZ,SAAS,EACT,UAAU,EACX,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,gBAAgB,EAChB,eAAe,EACf,aAAa,EACb,aAAa,EACb,WAAW,EACZ,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE1C;;;;;;;;GAQG;AACH,qBAAa,WAAY,YAAW,WAAW;aAkFjB,KAAK,EAAE,YAAY;IAjF/C;;;;;;;OAOG;IACH,IAAI,KAAK,IAAI,MAAM,CAElB;IAED;;;;;;OAMG;IACH,QAAQ,CAAC,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAa;IAE5D;;;;;;OAMG;IACH,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC;IAElB;;;;;;OAMG;IACH,QAAQ,CAAC,WAAW,EAAE,aAAa,CAAC;IAEpC;;;;;OAKG;IACH,QAAQ,CAAC,SAAS,EAAE,aAAa,CAAC;IAElC;;;;;;OAMG;IACH,QAAQ,CAAC,QAAQ,EAAE,eAAe,CAAC;IAEnC;;;;;;OAMG;IACH,QAAQ,CAAC,SAAS,EAAE,gBAAgB,CAAC;IAErC;;;;;;OAMG;IACH,IAAI,CAAC,EAAE,WAAW,CAAC;IAEnB;;;;;;OAMG;gBACyB,KAAK,EAAE,YAAY;IAc/C;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAM3B;;;;;;;OAOG;cACa,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC;IAWlD;;;;;;;OAOG;IACH,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,QAAQ,GAAG,IAAI;IAMvC;;;;;;;OAOG;IACG,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC;IAqBxE;;;;;;;OAOG;IACG,SAAS,CACb,EAAE,EAAE,MAAM,EACV,eAAe,CAAC,EAAE,MAAM,GACvB,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;IAajC;;;;;;;OAOG;IACG,YAAY,CAChB,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC;IAUlC;;;;;OAKG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;CAuBhC"}

package/out/application.js

@@ -163,7 +163,6 @@ export class Application {
             ibiz.auth.isAnonymous !== true) {
             this.mqtt = new MqttService(ibiz.appData.mqtttopic, getToken(), this.model.appId);
             this.mqtt.evt.on('message', message => {
-                console.log('message', message);
                 ibiz.mc.command.next(message);
             });
             await this.mqtt.connect();

package/out/command/app/open-app-view/open-app-view.d.ts

@@ -68,7 +68,7 @@ export declare class OpenAppViewCommand {
      * @param {IParams} [params={}]
      * @return {*}  {Promise<IModalData>}
      */
-    protected openPopover(appView: IViewConfig, event: MouseEvent | undefined, context: IContext, params?: IParams): Promise<IModalData>;
+    protected openPopover(appView: IViewConfig, context: IContext, params?: IParams, opts?: IOpenViewOptions): Promise<IModalData>;
     /**
      * 抽屉模式打开
      *

package/out/command/app/open-app-view/open-app-view.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"open-app-view.d.ts","sourceRoot":"","sources":["../../../../src/command/app/open-app-view/open-app-view.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAK/E;;;;;;;GAOG;AACH,qBAAa,kBAAkB;IAC7B,MAAM,CAAC,QAAQ,CAAC,GAAG,wBAAwB;;IAM3C;;;;;;;;;;OAUG;IACG,IAAI,CACR,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,QAAQ,EAClB,MAAM,GAAE,OAAY,EACpB,IAAI,GAAE,gBAAqB,GAC1B,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC;IAuE7B;;;;;;;;;OASG;IACH,SAAS,CAAC,gBAAgB,CACxB,OAAO,EAAE,WAAW,EACpB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,UAAU,CAAC;IAItB;;;;;;;;;;OAUG;IACH,SAAS,CAAC,uBAAuB,CAC/B,OAAO,EAAE,WAAW,EACpB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,UAAU,CAAC;IAItB;;;;;;;;;;OAUG;cACa,SAAS,CACvB,OAAO,EAAE,WAAW,EACpB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,UAAU,CAAC;IAItB;;;;;;;;;;OAUG;cACa,WAAW,CACzB,OAAO,EAAE,WAAW,EACpB,KAAK,EAAE,UAAU,GAAG,SAAS,EAC7B,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,UAAU,CAAC;IAOtB;;;;;;;;;;OAUG;cACa,UAAU,CACxB,OAAO,EAAE,WAAW,EACpB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,UAAU,CAAC;IAItB;;;;;;;;;;OAUG;cACa,cAAc,CAC5B,OAAO,EAAE,WAAW,EACpB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,UAAU,CAAC;CAGvB"}
+{"version":3,"file":"open-app-view.d.ts","sourceRoot":"","sources":["../../../../src/command/app/open-app-view/open-app-view.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAK/E;;;;;;;GAOG;AACH,qBAAa,kBAAkB;IAC7B,MAAM,CAAC,QAAQ,CAAC,GAAG,wBAAwB;;IAM3C;;;;;;;;;;OAUG;IACG,IAAI,CACR,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,QAAQ,EAClB,MAAM,GAAE,OAAY,EACpB,IAAI,GAAE,gBAAqB,GAC1B,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC;IAuE7B;;;;;;;;;OASG;IACH,SAAS,CAAC,gBAAgB,CACxB,OAAO,EAAE,WAAW,EACpB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,UAAU,CAAC;IAItB;;;;;;;;;;OAUG;IACH,SAAS,CAAC,uBAAuB,CAC/B,OAAO,EAAE,WAAW,EACpB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,UAAU,CAAC;IAItB;;;;;;;;;;OAUG;cACa,SAAS,CACvB,OAAO,EAAE,WAAW,EACpB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,UAAU,CAAC;IAItB;;;;;;;;;;OAUG;cACa,WAAW,CACzB,OAAO,EAAE,WAAW,EACpB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,EACpB,IAAI,GAAE,gBAAqB,GAC1B,OAAO,CAAC,UAAU,CAAC;IAUtB;;;;;;;;;;OAUG;cACa,UAAU,CACxB,OAAO,EAAE,WAAW,EACpB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,UAAU,CAAC;IAItB;;;;;;;;;;OAUG;cACa,cAAc,CAC5B,OAAO,EAAE,WAAW,EACpB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,UAAU,CAAC;CAGvB"}

package/out/command/app/open-app-view/open-app-view.js

@@ -75,7 +75,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, context, params, opts);
             case 'DRAWER_LEFT':
             case 'DRAWER_RIGHT':
             case 'DRAWER_TOP':
@@ -139,11 +139,12 @@ export class OpenAppViewCommand {
      * @param {IParams} [params={}]
      * @return {*}  {Promise<IModalData>}
      */
-    async openPopover(appView, event, context, params = {}) {
+    async openPopover(appView, context, params = {}, opts = {}) {
+        const { event, modalOption } = opts;
         if (!event) {
             throw new RuntimeError('气泡打开缺少event');
         }
-        return ibiz.openView.popover(appView.id, event, context, params);
+        return ibiz.openView.popover(appView.id, event, context, params, Object.assign({}, modalOption));
     }
     /**
      * 抽屉模式打开

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

@@ -1 +1 @@
-{"version":3,"file":"grid.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/grid/grid/grid.controller.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"grid.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/grid/grid/grid.controller.ts"],"names":[],"mappings":"AAUA,OAAO,EACL,OAAO,EAEP,aAAa,EACb,aAAa,EACd,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,yBAAyB,EAAE,MAAM,+DAA+D,CAAC;AAC1G,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EACL,6BAA6B,EAC7B,sBAAsB,EACvB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,UAAU,EACV,UAAU,EACV,eAAe,EACf,mBAAmB,EACnB,YAAY,EACZ,gBAAgB,EAChB,aAAa,EACb,aAAa,EACb,YAAY,EACZ,gBAAgB,EAEjB,MAAM,uBAAuB,CAAC;AAG/B,OAAO,EAAE,SAAS,EAAS,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EACL,eAAe,EAKhB,MAAM,gBAAgB,CAAC;AAIxB;;;;;;;;GAQG;AACH,qBAAa,cAAc,CACvB,CAAC,SAAS,OAAO,GAAG,OAAO,EAC3B,CAAC,SAAS,UAAU,GAAG,UAAU,EACjC,CAAC,SAAS,UAAU,GAAG,UAAU,CAEnC,SAAQ,mBAAmB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CACnC,YAAW,eAAe,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAEnC;;;;;;OAMG;IACK,OAAO,EAAE,WAAW,CAAC;IAE7B,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,UAAU,CAAC,CAEhD;IAED;;;;;OAKG;IACH,iBAAiB,EAAE,OAAO,CAAS;IAEnC;;;;;OAKG;IACH,kBAAkB,EAAE,OAAO,CAAS;IAEpC;;;;;OAKG;IACH,eAAe,EAAE,OAAO,CAAS;IAEjC;;;;;;OAMG;IACH,OAAO,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,oBAAoB,CAAA;KAAE,CAAM;IAEtD;;;;;;OAMG;IACH,YAAY,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,yBAAyB,CAAA;KAAE,CAAM;IAEhE;;;;;;OAMG;IACH,SAAS,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,sBAAsB,CAAA;KAAE,CAAM;IAE1D;;;;;;OAMG;IACH,WAAW,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,6BAA6B,CAAA;KAAE,CAAM;IAEnE;;;;;;OAMG;IACH,SAAS,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,mBAAmB,CAAA;KAAE,CAAM;IAEvD;;;;;OAKG;IACH,gBAAgB,CAAC,EAAE,yBAAyB,CAAC;IAE7C;;;;;OAKG;IACH,QAAQ,EAAE,MAAM,CAAQ;IAExB;;;;;OAKG;IACH,UAAU,EAAE,aAAa,GAAG,SAAS,CAAC;IAEtC;;;;;OAKG;IACH,gBAAgB,EAAE,aAAa,EAAE,GAAG,SAAS,CAAC;IAE9C;;;;;OAKG;IACH,IAAI,kBAAkB,IAAI,QAAQ,CAAC,YAAY,EAAE,CAAC,GAAG,SAAS,CAE7D;IAED;;;;;;OAMG;IACH,IAAI,SAAS,IAAI,OAAO,CAEvB;IAED;;;;;;OAMG;IACH,IAAI,YAAY,IAAI,OAAO,CAE1B;IAED;;;;;;OAMG;IACH,IAAI,YAAY,IAAI,MAAM,GAAG,UAAU,CAEtC;IAED,SAAS,CAAC,SAAS,IAAI,IAAI;IAW3B;;;;;;;OAOG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAuB1C;;;;;OAKG;IACG,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC;IAkCzC;;;;;;OAMG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAiDpC,SAAS,CACb,IAAI,EAAE,gBAAgB,EACtB,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC,SAAS,EAAE,CAAC;IAqCvB;;;;;;OAMG;IACH,SAAS,CAAC,aAAa,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,IAAI;IAmC7C;;;;;;OAMG;cACa,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAuBxC,cAAc,CAAC,WAAW,GAAE,OAAY,GAAG,OAAO,CAAC,OAAO,CAAC;IAOjE;;;;;;OAMG;IACH,SAAS,CAAC,aAAa,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,IAAI;IAS7C;;;;;;OAMG;IACH,WAAW,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAmB9B;;;;;OAKG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAkD7B;;;;;;;OAOG;IACG,IAAI,CAAC,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAoDpC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAe9B;;;;;;OAMG;cACa,qBAAqB,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAmC3E;;;;;;OAMG;IACH,SAAS,CAAC,gBAAgB,IAAI,IAAI;IAsClC;;;;;OAKG;IACH,SAAS,CAAC,eAAe,IAAI,IAAI;IAiBjC;;;;;;OAMG;cACa,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAUhD;;;;;;;;OAQG;IACG,WAAW,CACf,GAAG,EAAE,YAAY,EACjB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,OAAO,GACb,OAAO,CAAC,IAAI,CAAC;IAyBhB;;;;;;;OAOG;IACG,gBAAgB,CAAC,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IASzE;;;;;OAKG;IACH,eAAe,CAAC,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,eAAe,GAAG,IAAI;IAOhE;;;;;;;OAOG;IACG,QAAQ,CAAC,GAAG,EAAE,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC;IAS7C,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAOpC;;;;;;OAMG;IACG,aAAa,CACjB,GAAG,EAAE,YAAY,EACjB,QAAQ,CAAC,EAAE,OAAO,EAClB,MAAM,GAAE,OAAc,GACrB,OAAO,CAAC,IAAI,CAAC;IAoDhB;;;;;OAKG;IACH,YAAY,IAAI;QACd,qBAAqB,EAAE,MAAM,GAAG,SAAS,CAAC;QAC1C,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;KAClC;IAOD;;;;;;;OAOG;IACH,OAAO,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,IAAI;IAQvD;;;;;;;OAOG;IACG,kBAAkB,CAAC,GAAG,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA8C5E;;;;;;;;OAQG;IACG,QAAQ,CAAC,IAAI,EAAE,gBAAgB,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;IAe5D;;;;;OAKG;IACG,oBAAoB,CACxB,UAAU,EAAE,aAAa,GACxB,OAAO,CAAC,aAAa,EAAE,GAAG,SAAS,CAAC;IAsBvC;;;;;;OAMG;IACG,UAAU,CAAC,KAAK,EAAE;QAAE,KAAK,EAAE,UAAU,CAAC;QAAC,MAAM,EAAE,KAAK,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAgH5E;;;;;;;;OAQG;IACH,gBAAgB,CAAC,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,GAAG,KAAK;IAsBvD;;;;;;OAMG;IACH,iBAAiB,CAAC,IAAI,EAAE,KAAK,GAAG,MAAM;IAQtC;;;;;;OAMG;IACH,YAAY,CAAC,IAAI,EAAE,KAAK,GAAG,aAAa,GAAG,SAAS;IAKpD;;;;;;OAMG;IACG,UAAU,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAU5C;;;;;OAKG;IACH,SAAS,CAAC,wBAAwB,IAAI,IAAI;IAsB1C;;;;;;OAMG;IACH,gBAAgB,CAAC,WAAW,EAAE,YAAY,GAAG,IAAI;IAKjD;;;;;;OAMG;IACH,cAAc,CAAC,IAAI,EAAE,gBAAgB,GAAG,IAAI;IAa5C;;;;;OAKG;IACH,qBAAqB,CACnB,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,GACf,IAAI;IAaP;;;;;OAKG;IACH,gBAAgB,IAAI,IAAI;CAmBzB"}

package/out/controller/control/grid/grid/grid.controller.js

@@ -894,10 +894,11 @@ export class GridController extends MDControlController {
             var _a;
             const type = (_a = _args.params) === null || _a === void 0 ? void 0 : _a.type;
             let data = [];
-            if (type === 'activatedPage') {
+            // 未指定类型时，默认导出当前页
+            if (!type || type === 'activatedPage') {
                 data = this.state.rows.map(row => row.data);
             }
-            if (type === 'maxRowCount' || type === 'customPage') {
+            else if (type === 'maxRowCount' || type === 'customPage') {
                 const { size } = this.state;
                 const { startPage, endPage } = _args.params;
                 const params = type === 'customPage'
@@ -909,7 +910,7 @@ export class GridController extends MDControlController {
                     : { size: 1000, page: 0 };
                 data = await this.loadData({ viewParam: params });
             }
-            if (type === 'selectedRows') {
+            else if (type === 'selectedRows') {
                 data = this.getData();
             }
             if (data.length === 0) {

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

@@ -1,5 +1,6 @@
 import { IAppDataEntity, ISearchBarFilter } from '@ibiz/model-core';
-import { IEditorContainerController, IEditorController, IEditorProvider } from '../../../interface';
+import { IEditorContainerController, IEditorController, IEditorProvider, IFilterLeafNode } from '../../../interface';
+import { SearchBarController } from './search-bar.controller';
 /** 不需要编辑器的OP */
 export declare const ExcludeOPs: string[];
 /**
@@ -12,11 +13,11 @@ export declare const ExcludeOPs: string[];
  */
 export declare class SearchBarFilterController implements IEditorContainerController {
     model: ISearchBarFilter;
-    appDataEntity: IAppDataEntity;
+    protected searchbar: SearchBarController;
     unitName: string | undefined;
     valueFormat: string | undefined;
-    context: IContext;
-    params: IParams;
+    get context(): IContext;
+    get params(): IParams;
     dataType: number | undefined;
     /**
      * 编辑器控制器
@@ -61,7 +62,16 @@ export declare class SearchBarFilterController implements IEditorContainerContro
      * @type {boolean}
      */
     noEditor: boolean;
-    constructor(model: ISearchBarFilter, appDataEntity: IAppDataEntity, context: IContext, params: IParams);
+    /**
+     * 值项
+     * @author lxm
+     * @date 2024-02-04 06:25:42
+     * @readonly
+     * @type {(string | undefined)}
+     */
+    get valueItem(): string | undefined;
+    get appDataEntity(): IAppDataEntity;
+    constructor(model: ISearchBarFilter, searchbar: SearchBarController);
     /**
      * 初始化
      * @author lxm
@@ -69,5 +79,33 @@ export declare class SearchBarFilterController implements IEditorContainerContro
      * @return {*}  {Promise<void>}
      */
     init(): Promise<void>;
+    /**
+     * 格式化给多数据查询接口的值
+     * @author lxm
+     * @date 2024-02-04 11:31:32
+     * @param {*} value
+     * @return {*}  {*}
+     */
+    formatValue(node: IData): unknown;
+    /**
+     * 计算要递给编辑器的参数
+     * @author lxm
+     * @date 2024-02-04 06:35:28
+     * @param {IFilterLeafNode} node
+     * @return {*}  {{ value: unknown; data: IData }}
+     */
+    calcEditorProps(node: IFilterLeafNode): {
+        value: unknown;
+        data: IData;
+    };
+    /**
+     * 编辑器值变更处理
+     * @author lxm
+     * @date 2024-02-04 06:42:04
+     * @param {IFilterLeafNode} node
+     * @param {unknown} value
+     * @param {string} [name]
+     */
+    onEditorChange(node: IFilterLeafNode, value: unknown, name?: string): void;
 }
 //# sourceMappingURL=search-bar-filter.controller.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"search-bar-filter.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/search-bar/search-bar-filter.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,cAAc,EACd,gBAAgB,EACjB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,0BAA0B,EAC1B,iBAAiB,EACjB,eAAe,EAChB,MAAM,oBAAoB,CAAC;AAK5B,gBAAgB;AAChB,eAAO,MAAM,UAAU,EAAE,MAAM,EAGrB,CAAC;AAEX;;;;;;;GAOG;AACH,qBAAa,yBAA0B,YAAW,0BAA0B;IA6DjE,KAAK,EAAE,gBAAgB;IACvB,aAAa,EAAE,cAAc;IA7DtC,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAE7B,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAEhC,OAAO,EAAE,QAAQ,CAAC;IAElB,MAAM,EAAE,OAAO,CAAC;IAEhB,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAE7B;;;;;;OAMG;IACH,MAAM,CAAC,EAAE,iBAAiB,CAAC;IAE3B;;;;;OAKG;IACH,cAAc,CAAC,EAAE,eAAe,CAAC;IAEjC;;;;;OAKG;IACH,SAAS,EAAE,MAAM,CAAC;IAElB;;;;;OAKG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;;;;OAKG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;;;;OAKG;IACH,QAAQ,EAAE,OAAO,CAAS;gBAGjB,KAAK,EAAE,gBAAgB,EACvB,aAAa,EAAE,cAAc,EACpC,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO;IAyBjB;;;;;OAKG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAe5B"}
+{"version":3,"file":"search-bar-filter.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/search-bar/search-bar-filter.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,cAAc,EACd,gBAAgB,EACjB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,0BAA0B,EAC1B,iBAAiB,EACjB,eAAe,EACf,eAAe,EAChB,MAAM,oBAAoB,CAAC;AAI5B,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAG9D,gBAAgB;AAChB,eAAO,MAAM,UAAU,EAAE,MAAM,EAGrB,CAAC;AAIX;;;;;;;GAOG;AACH,qBAAa,yBAA0B,YAAW,0BAA0B;IAgFjE,KAAK,EAAE,gBAAgB;IAC9B,SAAS,CAAC,SAAS,EAAE,mBAAmB;IAhF1C,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAE7B,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAEhC,IAAI,OAAO,IAAI,QAAQ,CAEtB;IAED,IAAI,MAAM,IAAI,OAAO,CAEpB;IAED,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAE7B;;;;;;OAMG;IACH,MAAM,CAAC,EAAE,iBAAiB,CAAC;IAE3B;;;;;OAKG;IACH,cAAc,CAAC,EAAE,eAAe,CAAC;IAEjC;;;;;OAKG;IACH,SAAS,EAAE,MAAM,CAAC;IAElB;;;;;OAKG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;;;;OAKG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;;;;OAKG;IACH,QAAQ,EAAE,OAAO,CAAS;IAE1B;;;;;;OAMG;IACH,IAAI,SAAS,IAAI,MAAM,GAAG,SAAS,CAElC;IAED,IAAI,aAAa,IAAI,cAAc,CAElC;gBAGQ,KAAK,EAAE,gBAAgB,EACpB,SAAS,EAAE,mBAAmB;IAqB1C;;;;;OAKG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAgB3B;;;;;;OAMG;IACH,WAAW,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO;IAgBjC;;;;;;OAMG;IACH,eAAe,CAAC,IAAI,EAAE,eAAe,GAAG;QAAE,KAAK,EAAE,OAAO,CAAC;QAAC,IAAI,EAAE,KAAK,CAAA;KAAE;IAevE;;;;;;;OAOG;IACH,cAAc,CAAC,IAAI,EAAE,eAAe,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI;CAO3E"}

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

@@ -1,12 +1,15 @@
+/* eslint-disable no-template-curly-in-string */
 import { RuntimeModelError } from '@ibiz-template/core';
 import { findFieldById } from '../../../model';
 import { getEditorProvider } from '../../../register';
 import { ValueOP } from '../../../constant';
+import { ScriptFactory } from '../../../utils';
 /** 不需要编辑器的OP */
 export const ExcludeOPs = [
     ValueOP.IS_NULL,
     ValueOP.IS_NOT_NULL,
 ];
+const ScriptValueRegex = /\$\{[^}]*\}/; // 匹配${xxx}格式字符串
 /**
  * 搜索栏过滤项控制器
  * @author lxm
@@ -16,10 +19,29 @@ export const ExcludeOPs = [
  * @implements {IEditorContainerController}
  */
 export class SearchBarFilterController {
-    constructor(model, appDataEntity, context, params) {
+    get context() {
+        return this.searchbar.context;
+    }
+    get params() {
+        return this.searchbar.params;
+    }
+    /**
+     * 值项
+     * @author lxm
+     * @date 2024-02-04 06:25:42
+     * @readonly
+     * @type {(string | undefined)}
+     */
+    get valueItem() {
+        return this.editor ? this.editor.valueItem : undefined;
+    }
+    get appDataEntity() {
+        return this.searchbar.appDataEntity;
+    }
+    constructor(model, searchbar) {
         var _a;
         this.model = model;
-        this.appDataEntity = appDataEntity;
+        this.searchbar = searchbar;
         /**
          * 不需要编辑器
          * @author lxm
@@ -27,13 +49,10 @@ export class SearchBarFilterController {
          * @type {boolean}
          */
         this.noEditor = false;
-        // 上下文、参数
-        this.context = context;
-        this.params = params;
         // 实体属性
         let field;
         if (model.appDEFieldId) {
-            field = findFieldById(appDataEntity, model.appDEFieldId);
+            field = findFieldById(this.appDataEntity, model.appDEFieldId);
         }
         this.fieldName = field ? field.codeName.toLowerCase() : model.id;
         // 属性标题
@@ -62,4 +81,58 @@ export class SearchBarFilterController {
             }
         }
     }
+    /**
+     * 格式化给多数据查询接口的值
+     * @author lxm
+     * @date 2024-02-04 11:31:32
+     * @param {*} value
+     * @return {*}  {*}
+     */
+    formatValue(node) {
+        const { value, valueItem } = node;
+        if (this.valueItem && valueItem) {
+            delete node.valueItem;
+            return valueItem;
+        }
+        // 脚本转换
+        if (ScriptValueRegex.test(value)) {
+            return ScriptFactory.execSingleLine(`\`${value}\``, Object.assign({}, this.searchbar.getEventArgs()));
+        }
+        return value;
+    }
+    /**
+     * 计算要递给编辑器的参数
+     * @author lxm
+     * @date 2024-02-04 06:35:28
+     * @param {IFilterLeafNode} node
+     * @return {*}  {{ value: unknown; data: IData }}
+     */
+    calcEditorProps(node) {
+        const tempData = {};
+        let editorValue = node.value;
+        if (node.disabled && ScriptValueRegex.test(editorValue)) {
+            editorValue = editorValue.replace('${context.srfpersonid}', '当前用户');
+            editorValue = editorValue.replace('${context.srforgid}', '当前组织');
+        }
+        if (this.valueItem) {
+            tempData[this.valueItem] = node.valueItem;
+        }
+        return { value: editorValue, data: tempData };
+    }
+    /**
+     * 编辑器值变更处理
+     * @author lxm
+     * @date 2024-02-04 06:42:04
+     * @param {IFilterLeafNode} node
+     * @param {unknown} value
+     * @param {string} [name]
+     */
+    onEditorChange(node, value, name) {
+        if (this.valueItem && name === this.valueItem) {
+            node.valueItem = value;
+        }
+        else {
+            node.value = value;
+        }
+    }
 }

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

@@ -121,6 +121,15 @@ export declare class SearchBarController extends ControlController<ISearchBar, I
      * @Date: 2023-06-01 18:08:18
      */
     onSearch(): void;
+    /**
+     * 找到过滤项控制器
+     * @author lxm
+     * @date 2024-02-04 11:29:31
+     * @param {(string | null)} fieldName
+     * @param {(string | null)} valueOP
+     * @return {*}  {(SearchBarFilterController | undefined)}
+     */
+    findFilterController(fieldName: string | null, valueOP: string | null): SearchBarFilterController | undefined;
     /**
      * 获取搜索栏的过滤参数（包括快速搜索，快速分组和过滤器的参数）
      * @author lxm
@@ -148,7 +157,7 @@ export declare class SearchBarController extends ControlController<ISearchBar, I
      * @date 2023-10-13 05:53:35
      * @return {*}  {IData}
      */
-    calcFilters(): IData[] | undefined;
+    calcFilters(valueFormat?: boolean): IData[] | undefined;
     /**
      * 初始化搜索栏分组项(获取后台分组清单并合并模型)
      * @return {*}

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":"AACA,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEhF,OAAO,EACL,eAAe,EACf,eAAe,EACf,oBAAoB,EACpB,sBAAsB,EACtB,eAAe,EAChB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAC3E,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AASxD;;;;;;;;GAQG;AACH,qBAAa,mBACX,SAAQ,iBAAiB,CAAC,UAAU,EAAE,eAAe,EAAE,eAAe,CACtE,YAAW,oBAAoB;IAE/B;;;;;OAKG;IACH,WAAW,SAAM;IAEjB;;;;;OAKG;IACH,iBAAiB,EAAE,yBAAyB,EAAE,CAAM;IAEpD;;;;;OAKG;IACH,OAAO,EAAG,gBAAgB,CAAC;IAE3B;;;;;OAKG;IACH,gBAAgB,EAAE,sBAAsB,GAAG,IAAI,CAAQ;IAEvD;;;;;OAKG;IACH,oBAAoB,UAA8C;IAElE;;;;;OAKG;IACH,gBAAgB,UAAS;IAEzB;;;;;OAKG;IACH,IAAI,YAAY,IAAI,OAAO,CAE1B;IAED;;;;;OAKG;IACH,IAAI,gBAAgB,IAAI,gBAAgB,EAAE,CAEzC;IAED;;;;OAIG;IACH,gBAAgB,UAAS;IAEzB;;;;;OAKG;IACH,IAAI,IAAI,IAAI,eAAe,GAAG,SAAS,CAEtC;IAED;;;;;OAKG;IACH,aAAa,EAAG,cAAc,CAAC;IAE/B,SAAS,CAAC,SAAS,IAAI,IAAI;cAcX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IA2B1C;;;;;OAKG;IACG,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC;IAwCzC;;;;;;OAMG;IACH,SAAS,CAAC,0BAA0B,IAAI,IAAI;IA2B5C;;;;;;OAMG;IACH,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAI9B;;;;;OAKG;IACH,QAAQ,IAAI,IAAI;IAIhB;;;;;OAKG;IACH,eAAe,IAAI,OAAO;IA4B1B;;;;OAIG;IACH,WAAW,IAAI,IAAI;IAKnB;;;;;;OAMG;cACa,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;IAiBrD;;;;;OAKG;IACH,WAAW,IAAI,KAAK,EAAE,GAAG,SAAS;IAQlC;;;;;OAKG;IACG,iBAAiB,CAAC,SAAS,GAAE,OAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAoGlE;;;;;OAKG;IACH,gBAAgB,IAAI,IAAI;IAWxB;;;;;OAKG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAmCjC;;;;;OAKG;IACG,gBAAgB,CAAC,SAAS,EAAE,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC;CA4BzE"}
+{"version":3,"file":"search-bar.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/search-bar/search-bar.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAGhF,OAAO,EACL,eAAe,EACf,eAAe,EACf,oBAAoB,EACpB,sBAAsB,EACtB,eAAe,EAEhB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAC3E,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAWxD;;;;;;;;GAQG;AACH,qBAAa,mBACX,SAAQ,iBAAiB,CAAC,UAAU,EAAE,eAAe,EAAE,eAAe,CACtE,YAAW,oBAAoB;IAE/B;;;;;OAKG;IACH,WAAW,SAAM;IAEjB;;;;;OAKG;IACH,iBAAiB,EAAE,yBAAyB,EAAE,CAAM;IAEpD;;;;;OAKG;IACH,OAAO,EAAG,gBAAgB,CAAC;IAE3B;;;;;OAKG;IACH,gBAAgB,EAAE,sBAAsB,GAAG,IAAI,CAAQ;IAEvD;;;;;OAKG;IACH,oBAAoB,UAA8C;IAElE;;;;;OAKG;IACH,gBAAgB,UAAS;IAEzB;;;;;OAKG;IACH,IAAI,YAAY,IAAI,OAAO,CAE1B;IAED;;;;;OAKG;IACH,IAAI,gBAAgB,IAAI,gBAAgB,EAAE,CAEzC;IAED;;;;OAIG;IACH,gBAAgB,UAAS;IAEzB;;;;;OAKG;IACH,IAAI,IAAI,IAAI,eAAe,GAAG,SAAS,CAGtC;IAED;;;;;OAKG;IACH,aAAa,EAAG,cAAc,CAAC;IAE/B,SAAS,CAAC,SAAS,IAAI,IAAI;cAcX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IA2B1C;;;;;OAKG;IACG,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC;IAwCzC;;;;;;OAMG;IACH,SAAS,CAAC,0BAA0B,IAAI,IAAI;IA2B5C;;;;;;OAMG;IACH,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAI9B;;;;;OAKG;IACH,QAAQ,IAAI,IAAI;IAIhB;;;;;;;OAOG;IACH,oBAAoB,CAClB,SAAS,EAAE,MAAM,GAAG,IAAI,EACxB,OAAO,EAAE,MAAM,GAAG,IAAI,GACrB,yBAAyB,GAAG,SAAS;IAUxC;;;;;OAKG;IACH,eAAe,IAAI,OAAO;IA4B1B;;;;OAIG;IACH,WAAW,IAAI,IAAI;IAKnB;;;;;;OAMG;cACa,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;IAYrD;;;;;OAKG;IACH,WAAW,CAAC,WAAW,UAAO,GAAG,KAAK,EAAE,GAAG,SAAS;IA4BpD;;;;;OAKG;IACG,iBAAiB,CAAC,SAAS,GAAE,OAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAoGlE;;;;;OAKG;IACH,gBAAgB,IAAI,IAAI;IAWxB;;;;;OAKG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAmCjC;;;;;OAKG;IACG,gBAAgB,CAAC,SAAS,EAAE,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC;CA2CzE"}

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

@@ -1,5 +1,6 @@
-import { mergeInLeft } from '@ibiz-template/core';
-import { clone } from 'ramda';
+import { mergeInLeft, recursiveIterate } from '@ibiz-template/core';
+import { clone, isNil } from 'ramda';
+import { isString } from 'lodash-es';
 import { convertNavData, ScriptFactory } from '../../../utils';
 import { ControlController } from '../../common';
 import { SearchBarFilterController } from './search-bar-filter.controller';
@@ -7,6 +8,7 @@ import { SearchBarService } from './search-bar.service';
 import { getEntitySchema } from '../../utils';
 import { calcFilterModelBySchema } from './entity-schema';
 import { calcSearchConds, getOriginFilterNodes, parseFilters, } from './use-searchcond';
+const ScriptValueRegex = /\$\{[^}]*\}/; // 匹配${xxx}格式字符串
 /**
  * 搜索栏控制器
  *
@@ -86,7 +88,8 @@ export class SearchBarController extends ControlController {
      * @Date: 2023-12-22 13:50:16
      */
     get grid() {
-        return this.ctx.getController('grid');
+        return (this.ctx.getController('grid') ||
+            this.ctx.getController('treegrid'));
     }
     initState() {
         super.initState();
@@ -200,6 +203,23 @@ export class SearchBarController extends ControlController {
     onSearch() {
         this.evt.emit('onSearch', undefined);
     }
+    /**
+     * 找到过滤项控制器
+     * @author lxm
+     * @date 2024-02-04 11:29:31
+     * @param {(string | null)} fieldName
+     * @param {(string | null)} valueOP
+     * @return {*}  {(SearchBarFilterController | undefined)}
+     */
+    findFilterController(fieldName, valueOP) {
+        return this.filterControllers.find(item => {
+            if (item.fieldName === fieldName) {
+                // 有配属性搜索模式的匹配才是，没配的都是指向没配的哪个过滤项
+                return item.valueOP ? item.valueOP === valueOP : true;
+            }
+            return false;
+        });
+    }
     /**
      * 获取搜索栏的过滤参数（包括快速搜索，快速分组和过滤器的参数）
      * @author lxm
@@ -248,7 +268,7 @@ export class SearchBarController extends ControlController {
         var _a;
         if ((_a = this.searchBarFilters) === null || _a === void 0 ? void 0 : _a.length) {
             this.searchBarFilters.forEach(item => {
-                const filterController = new SearchBarFilterController(item, this.appDataEntity, this.context, this.params);
+                const filterController = new SearchBarFilterController(item, this);
                 this.filterControllers.push(filterController);
             });
             await Promise.all(this.filterControllers.map(controller => controller.init()));
@@ -260,11 +280,22 @@ export class SearchBarController extends ControlController {
      * @date 2023-10-13 05:53:35
      * @return {*}  {IData}
      */
-    calcFilters() {
+    calcFilters(valueFormat = true) {
         if (!this.enableFilter) {
             return;
         }
         const searchconds = calcSearchConds(this.state.filterNodes);
+        if (valueFormat && searchconds) {
+            // 给多数据加载之前进行脚本值转换
+            recursiveIterate(searchconds[0], (node) => {
+                if (node.condtype === 'DEFIELD' && !isNil(node.value)) {
+                    const controller = this.findFilterController(node.fieldname, node.condop);
+                    if (controller) {
+                        node.value = controller.formatValue(node);
+                    }
+                }
+            }, { childrenFields: ['searchconds'] });
+        }
         return searchconds;
     }
     /**
@@ -381,7 +412,7 @@ export class SearchBarController extends ControlController {
      */
     async handleSave() {
         if (this.grid && this.state.selectedSearchGroupItem) {
-            const filters = this.calcFilters();
+            const filters = this.calcFilters(false);
             const saveParams = {
                 searchconds: filters,
                 sort: this.grid.state.sortQuery,
@@ -435,6 +466,17 @@ export class SearchBarController extends ControlController {
         else {
             this.state.filterNodes = getOriginFilterNodes();
         }
+        // 把带有${}的条件禁用，不能修改
+        recursiveIterate(this.state.filterNodes[0], (node) => {
+            if (node.leaf) {
+                if (node.field &&
+                    node.valueOP &&
+                    isString(node.value) &&
+                    ScriptValueRegex.test(node.value)) {
+                    node.disabled = true;
+                }
+            }
+        });
         if (this.grid && groupItem && groupItem.searchGroupData) {
             this.grid.setGroupParams(groupItem.searchGroupData);
             await this.grid.load({ isInitialLoad: true });

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

@@ -1 +1 @@
-{"version":3,"file":"use-searchcond.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/search-bar/use-searchcond.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEjD;;;;;GAKG;AACH,wBAAgB,oBAAoB,IAAI,WAAW,EAAE,CAQpD;AAED;;;;;;GAMG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,WAAW,GAAG,KAAK,CAgBtD;AAED;;;;;;GAMG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,KAAK,GAAG,WAAW,CAmBrD;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAC7B,WAAW,EAAE,WAAW,EAAE,GACzB,KAAK,EAAE,GAAG,SAAS,CAiBrB"}
+{"version":3,"file":"use-searchcond.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/search-bar/use-searchcond.ts"],"names":[],"mappings":"AAEA,OAAO,EAAmB,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAElE;;;;;GAKG;AACH,wBAAgB,oBAAoB,IAAI,WAAW,EAAE,CAQpD;AAED;;;;;;GAMG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,WAAW,GAAG,KAAK,CAsBtD;AAED;;;;;;GAMG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,KAAK,GAAG,WAAW,CAoBrD;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAC7B,WAAW,EAAE,WAAW,EAAE,GACzB,KAAK,EAAE,GAAG,SAAS,CAiBrB"}

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

@@ -31,12 +31,17 @@ export function formatFilters(node) {
             searchconds: node.children.map(item => formatFilters(item)),
         };
     }
-    return {
+    const leafNode = node;
+    const temp = {
         condtype: 'DEFIELD',
         fieldname: node.field,
         condop: node.valueOP,
         value: node.value,
     };
+    if (leafNode.valueItem) {
+        temp.valueItem = leafNode.valueItem;
+    }
+    return temp;
 }
 /**
  * 根据格式化后的过滤项反推出过滤项树节点数据集合
@@ -59,6 +64,7 @@ export function parseFilters(data) {
             field: data.fieldname || null,
             valueOP: data.condop || null,
             value: data.value || null,
+            valueItem: data.valueItem || undefined,
         };
     }
     throw new RuntimeError(`无效的condtype:${data.condtype}`);

package/out/controller/notification/internal-message.controller.d.ts

@@ -1,10 +1,11 @@
 import { IInternalMessage } from '@ibiz-template/core';
 import { QXEvent } from 'qx-util';
-import { IInternalMessageController, InternalMessageEvent } from '../../interface';
+import { IInternalMessageController, IInternalMessageEvent } from '../../interface';
 import { InternalMessageService } from '../../service';
 export declare class InternalMessageController implements IInternalMessageController {
-    readonly evt: QXEvent<InternalMessageEvent>;
+    readonly evt: QXEvent<IInternalMessageEvent>;
     total: number;
+    unreadCount: number;
     /**
      * 当前分页
      * @author lxm
@@ -14,10 +15,19 @@ export declare class InternalMessageController implements IInternalMessageContro
     page: number;
     size: number;
     messages: IInternalMessage[];
+    unreadOnly: boolean;
     protected service: InternalMessageService;
     init(): Promise<void>;
     load(): Promise<void>;
     loadMore(): Promise<void>;
+    refreshUnreadCount(): Promise<void>;
+    /**
+     * 切换是否只读
+     * @author lxm
+     * @date 2024-02-04 10:21:22
+     * @param {val} [boolean] 是否只读
+     */
+    toggleUnReadOnly(val?: boolean): void;
     protected fetch(loadMore?: boolean): Promise<void>;
     /**
      * 监听mqtt消息
@@ -26,5 +36,14 @@ export declare class InternalMessageController implements IInternalMessageContro
      * @protected
      */
     protected listenMqtt(): void;
+    markRead(message: IInternalMessage): Promise<void>;
+    /**
+     * 获取完整信息
+     * @author lxm
+     * @date 2024-01-30 05:03:25
+     * @param {string} id
+     * @return {*}  {Promise<IInternalMessage>}
+     */
+    get(id: string): Promise<IInternalMessage>;
 }
 //# sourceMappingURL=internal-message.controller.d.ts.map

package/out/controller/notification/internal-message.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"internal-message.controller.d.ts","sourceRoot":"","sources":["../../../src/controller/notification/internal-message.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAkB,MAAM,qBAAqB,CAAC;AACvE,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EACL,0BAA0B,EAC1B,oBAAoB,EACrB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAC;AAEvD,qBAAa,yBAA0B,YAAW,0BAA0B;IAC1E,QAAQ,CAAC,GAAG,EAAE,OAAO,CAAC,oBAAoB,CAAC,CAAiB;IAE5D,KAAK,EAAE,MAAM,CAAK;IAElB;;;;;OAKG;IACH,IAAI,EAAE,MAAM,CAAK;IAEjB,IAAI,EAAE,MAAM,CAAM;IAElB,QAAQ,EAAE,gBAAgB,EAAE,CAAM;IAElC,SAAS,CAAC,OAAO,yBAAgC;IAE3C,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAKrB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAIrB,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;cAIf,KAAK,CAAC,QAAQ,GAAE,OAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAyB/D;;;;;OAKG;IACH,SAAS,CAAC,UAAU,IAAI,IAAI;CAW7B"}
+{"version":3,"file":"internal-message.controller.d.ts","sourceRoot":"","sources":["../../../src/controller/notification/internal-message.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAkB,MAAM,qBAAqB,CAAC;AACvE,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EACL,0BAA0B,EAC1B,qBAAqB,EACtB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAC;AAQvD,qBAAa,yBAA0B,YAAW,0BAA0B;IAC1E,QAAQ,CAAC,GAAG,EAAE,OAAO,CAAC,qBAAqB,CAAC,CAAiB;IAE7D,KAAK,EAAE,MAAM,CAAK;IAElB,WAAW,EAAE,MAAM,CAAK;IAExB;;;;;OAKG;IACH,IAAI,EAAE,MAAM,CAAK;IAEjB,IAAI,EAAE,MAAM,CAAM;IAElB,QAAQ,EAAE,gBAAgB,EAAE,CAAM;IAElC,UAAU,UAAS;IAEnB,SAAS,CAAC,OAAO,yBAAgC;IAE3C,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAMrB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAQrB,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAIzB,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC;IASzC;;;;;OAKG;IACH,gBAAgB,CAAC,GAAG,CAAC,EAAE,OAAO,GAAG,IAAI;cAUrB,KAAK,CAAC,QAAQ,GAAE,OAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IA6C/D;;;;;OAKG;IACH,SAAS,CAAC,UAAU,IAAI,IAAI;IAkBtB,QAAQ,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;IAkBxD;;;;;;OAMG;IACG,GAAG,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC;CAIjD"}