@ibiz-template/runtime 0.2.5 → 0.2.7

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

@@ -1,4 +1,5 @@
 import { IControl, IControlLogic, IViewLayoutPanel } from '@ibiz/model-core';
+import { IBizParams } from '@ibiz-template/core';
 import { BaseController } from '..';
 import { CTX } from '../../ctx';
 import { EventBase, IControlController, IControlEvent, IControlState, IViewController, IViewLayoutPanelController } from '../../../interface/controller';
@@ -49,6 +50,7 @@ export declare class ControlController<T extends IControl = IControl, S extends
     providers: {
         [key: string]: IProvider;
     };
+    params: IBizParams;
     /**
      * Creates an instance of ControlController.
      *
@@ -77,6 +79,17 @@ export declare class ControlController<T extends IControl = IControl, S extends
     protected onCreated(): Promise<void>;
     protected onMounted(): Promise<void>;
     protected onDestroyed(): Promise<void>;
+    /**
+     * 处理上下文和导航参数相关的，如自定义导航参数的处理
+     *
+     * @author lxm
+     * @date 2022-09-08 15:09:47
+     * @protected
+     */
+    updateContextParams(opts: {
+        context?: IContext;
+        params?: IParams;
+    }): void;
     /**
      * 获取部件类型
      * @author lxm

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":"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"}
+{"version":3,"file":"control.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/common/control/control.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EACR,aAAa,EAEb,gBAAgB,EACjB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAe,UAAU,EAAe,MAAM,qBAAqB,CAAC;AAG3E,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,kBAAkB,EAClB,SAAS,EAEV,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;;;;;;;OAOG;IACH,aAAa,EAAE,KAAK,CAAM;IAE1B;;;;;OAKG;IACH,SAAS,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE,CAAM;IAErC,MAAM,EAAE,UAAU,CAAC;IAE3B;;;;;;;;OAQG;gBACS,KAAK,EAAE,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG;IAkBlE;;;;;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;cA0B1B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;cAO1B,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAQ5C;;;;;;OAMG;IACH,mBAAmB,CAAC,IAAI,EAAE;QAAE,OAAO,CAAC,EAAE,QAAQ,CAAC;QAAC,MAAM,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,IAAI;IAyBzE;;;;;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;IAqBD;;;;;OAKG;IACH,cAAc,CAAC,KAAK,EAAE,0BAA0B,GAAG,IAAI;IAWvD;;;;;;;OAOG;IACH,SAAS,CAAC,mBAAmB,IAAI,IAAI;IAYrC;;;;;;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

@@ -1,4 +1,4 @@
-import { NoticeError } from '@ibiz-template/core';
+import { IBizContext, IBizParams, NoticeError } from '@ibiz-template/core';
 import { isNil } from 'ramda';
 import { notNilEmpty } from 'qx-util';
 import { BaseController } from '..';
@@ -29,7 +29,7 @@ export class ControlController extends BaseController {
      * @param {IParams} [params={}]
      */
     constructor(model, context, params, ctx) {
-        super(model, context, params, ctx);
+        super(model, IBizContext.create({}, context), new IBizParams({}, params), ctx);
         /**
          * 部件参数
          *
@@ -51,6 +51,7 @@ export class ControlController extends BaseController {
         if (panelModel) {
             this.controlPanel = panelModel;
         }
+        this.updateContextParams({});
     }
     /**
      * 往ctx里注册控制器
@@ -106,6 +107,36 @@ export class ControlController extends BaseController {
         if (this.scheduler) {
             this.scheduler.destroy();
         }
+        this.params.destroy();
+    }
+    /**
+     * 处理上下文和导航参数相关的，如自定义导航参数的处理
+     *
+     * @author lxm
+     * @date 2022-09-08 15:09:47
+     * @protected
+     */
+    updateContextParams(opts) {
+        // 不改变引用的情况下，重置控制器里的上下文和视图参数。
+        if (opts.context) {
+            this.context.reset({}, opts.context);
+        }
+        if (opts.params) {
+            this.params.reset({}, opts.params);
+        }
+        const { controlNavContexts, controlNavParams } = this.model;
+        // 处理自定义导航上下文
+        let context = {};
+        if (notNilEmpty(controlNavContexts)) {
+            context = convertNavData(controlNavContexts, this.params, this.context);
+        }
+        Object.assign(this.context, context);
+        // 处理自定义视图参数
+        let params = {};
+        if (notNilEmpty(controlNavParams)) {
+            params = convertNavData(controlNavParams, this.params, this.context);
+        }
+        Object.assign(this.params, params);
     }
     /**
      * 获取部件类型

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,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;AAE3D,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;cAiB1B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAS1C,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;IAmDzD;;;;;;;;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;AAE3D,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;cAiB1B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAS1C,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;IAuDzD;;;;;;;;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

@@ -174,6 +174,9 @@ export class MDControlController extends ControlController {
         finally {
             await this.endLoading();
         }
+        this.state.items.forEach((item, index) => {
+            item.srfserialnum = index + 1;
+        });
         this.actionNotification('FETCHSUCCESS');
         return this.state.items;
     }

package/out/controller/control/chart/generator/chart-options-generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"chart-options-generator.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/chart/generator/chart-options-generator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,aAAa,EAEb,oBAAoB,EACpB,oBAAoB,EACpB,cAAc,EACf,MAAM,SAAS,CAAC;AACjB,OAAO,EACL,cAAc,EACd,WAAW,EACX,WAAW,EACX,QAAQ,EACR,cAAc,EACd,aAAa,EACd,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAM9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAExD,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,KAAK,CAmBzE;AAED,qBAAa,qBAAqB;IA4DpB,OAAO,CAAC,KAAK;IA3DzB;;;;;OAKG;IACH,MAAM,EAAG,cAAc,CAAC;IAExB;;;;;OAKG;IACH,aAAa,EAAE,aAAa,CAI1B;IAEF;;;;;OAKG;IACH,OAAO,EAAE,aAAa,CAAM;IAE5B;;;;;OAKG;IACH,cAAc,CAAC,EAAE,aAAa,CAAC;IAE/B;;;;;OAKG;IACH,gBAAgB,EAAE,mBAAmB,EAAE,CAAM;IAE7C;;;;;OAKG;IACH,QAAQ,gCAAuC;IAE/C;;;;OAIG;IACH,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,YAAY,EAAE,CAAC,CAAC,CAAa;gBAE3C,KAAK,EAAE,QAAQ;IAoCnC,SAAS,CAAC,oBAAoB,IAAI,IAAI;IAgCtC,SAAS,CAAC,eAAe,CAAC,UAAU,EAAE,aAAa,GAAG,aAAa,CAAC,OAAO,CAAC;IAmB5E,SAAS,CAAC,gBAAgB,CACxB,WAAW,EAAE,cAAc,GAC1B,aAAa,CAAC,QAAQ,CAAC;IAmB1B,SAAS,CAAC,gBAAgB,CACxB,WAAW,EAAE,WAAW,EAAE,GAAG,WAAW,EAAE,GACzC,oBAAoB,EAAE,GAAG,oBAAoB,EAAE;IAwClD;;;;;;;OAOG;IACG,IAAI,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAM7D;;;;;;OAMG;IACH,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM;IAKtC;;;;;;;;;OASG;IACG,YAAY,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAyBrE;;;;;;OAMG;IACH,iBAAiB,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,aAAa;IAkD/C,iBAAiB,CAAC,MAAM,EAAE,cAAc,GAAG,MAAM;CA8DlD"}
+{"version":3,"file":"chart-options-generator.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/chart/generator/chart-options-generator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,aAAa,EAEb,oBAAoB,EACpB,oBAAoB,EACpB,cAAc,EAEf,MAAM,SAAS,CAAC;AACjB,OAAO,EACL,cAAc,EACd,WAAW,EACX,WAAW,EACX,QAAQ,EACR,cAAc,EACd,aAAa,EACd,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAM9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAExD,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,KAAK,CAmBzE;AAED,qBAAa,qBAAqB;IA4DpB,OAAO,CAAC,KAAK;IA3DzB;;;;;OAKG;IACH,MAAM,EAAG,cAAc,CAAC;IAExB;;;;;OAKG;IACH,aAAa,EAAE,aAAa,CAI1B;IAEF;;;;;OAKG;IACH,OAAO,EAAE,aAAa,CAAM;IAE5B;;;;;OAKG;IACH,cAAc,CAAC,EAAE,aAAa,CAAC;IAE/B;;;;;OAKG;IACH,gBAAgB,EAAE,mBAAmB,EAAE,CAAM;IAE7C;;;;;OAKG;IACH,QAAQ,gCAAuC;IAE/C;;;;OAIG;IACH,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,YAAY,EAAE,CAAC,CAAC,CAAa;gBAE3C,KAAK,EAAE,QAAQ;IAoCnC,SAAS,CAAC,oBAAoB,IAAI,IAAI;IAgCtC,SAAS,CAAC,eAAe,CAAC,UAAU,EAAE,aAAa,GAAG,aAAa,CAAC,OAAO,CAAC;IAmB5E,SAAS,CAAC,gBAAgB,CACxB,WAAW,EAAE,cAAc,GAC1B,aAAa,CAAC,QAAQ,CAAC;IAe1B,SAAS,CAAC,gBAAgB,CACxB,WAAW,EAAE,WAAW,EAAE,GAAG,WAAW,EAAE,GACzC,oBAAoB,EAAE,GAAG,oBAAoB,EAAE;IAwClD;;;;;;;OAOG;IACG,IAAI,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAM7D;;;;;;OAMG;IACH,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM;IAKtC;;;;;;;;;OASG;IACG,YAAY,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAyBrE;;;;;;OAMG;IACH,iBAAiB,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,aAAa;IA8D/C,iBAAiB,CAAC,MAAM,EAAE,cAAc,GAAG,MAAM;CA8DlD"}

package/out/controller/control/chart/generator/chart-options-generator.js

@@ -148,14 +148,9 @@ export class ChartOptionsGenerator {
         return titleOption;
     }
     calcLegendOption(chartLegend) {
-        var _a;
         const { showLegend, legendPos } = chartLegend;
         const legendOption = {};
         legendOption.show = showLegend;
-        // 图表单序列不应出图例
-        if (((_a = this.model.dechartSerieses) === null || _a === void 0 ? void 0 : _a.length) === 1) {
-            legendOption.show = false;
-        }
         const position = legendPos === null || legendPos === void 0 ? void 0 : legendPos.toLowerCase();
         if (position === 'left' || position === 'right') {
             legendOption.left = position;
@@ -295,6 +290,15 @@ export class ChartOptionsGenerator {
             }
         });
         this.options.series = seriesOption;
+        // 柱状图、折线图、散点图单个序列并且该序列分组数据只有一条时，不用显示图例
+        if (this.seriesGenerators.length === 1 &&
+            this.seriesGenerators[0].groupData &&
+            Object.keys(this.seriesGenerators[0].groupData).length === 1 &&
+            seriesOption[0].type &&
+            ['bar', 'line', 'scatter'].includes(seriesOption[0].type) &&
+            this.staticOptions.legend) {
+            this.staticOptions.legend.show = false;
+        }
         // 合并静态和动态的options
         this.options = mergeDeepRight(this.staticOptions, this.options);
         // 有自定义参数的合并自定义参数

package/out/controller/control/chart/generator/funnel-series-generator.d.ts

@@ -1,6 +1,10 @@
 import { IChartSeriesFunnel } from '@ibiz/model-core';
 import type { ECElementEvent, SeriesOption } from 'echarts';
 import { BaseSeriesGenerator, CatalogData } from './base-series-generator';
+interface funnelSeriesData {
+    name: string;
+    value: IData[];
+}
 /**
  * 漏斗图序列生成器
  * @author lxm
@@ -11,10 +15,8 @@ import { BaseSeriesGenerator, CatalogData } from './base-series-generator';
  */
 export declare class FunnelSeriesGenerator extends BaseSeriesGenerator<IChartSeriesFunnel> {
     protected calcStaticOptions(): SeriesOption;
-    protected calcSeriesData(catalogData: CatalogData): {
-        name: string;
-        value: IData[];
-    }[];
+    protected calcSeriesData(catalogData: CatalogData): funnelSeriesData[];
     getSrfkeyByParams(params: ECElementEvent): string;
 }
+export {};
 //# sourceMappingURL=funnel-series-generator.d.ts.map

package/out/controller/control/chart/generator/funnel-series-generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"funnel-series-generator.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/chart/generator/funnel-series-generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,KAAK,EAAE,cAAc,EAAsB,YAAY,EAAE,MAAM,SAAS,CAAC;AAChF,OAAO,EAAE,mBAAmB,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAE3E;;;;;;;GAOG;AACH,qBAAa,qBAAsB,SAAQ,mBAAmB,CAAC,kBAAkB,CAAC;IAChF,SAAS,CAAC,iBAAiB,IAAI,YAAY;IAS3C,SAAS,CAAC,cAAc,CAAC,WAAW,EAAE,WAAW,GAAG;QAClD,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,KAAK,EAAE,CAAC;KAChB,EAAE;IAOH,iBAAiB,CAAC,MAAM,EAAE,cAAc,GAAG,MAAM;CAGlD"}
+{"version":3,"file":"funnel-series-generator.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/chart/generator/funnel-series-generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,KAAK,EAAE,cAAc,EAAsB,YAAY,EAAE,MAAM,SAAS,CAAC;AAChF,OAAO,EAAE,mBAAmB,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAE3E,UAAU,gBAAgB;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,KAAK,EAAE,CAAC;CAChB;AAED;;;;;;;GAOG;AACH,qBAAa,qBAAsB,SAAQ,mBAAmB,CAAC,kBAAkB,CAAC;IAChF,SAAS,CAAC,iBAAiB,IAAI,YAAY;IAS3C,SAAS,CAAC,cAAc,CAAC,WAAW,EAAE,WAAW,GAAG,gBAAgB,EAAE;IAWtE,iBAAiB,CAAC,MAAM,EAAE,cAAc,GAAG,MAAM;CAGlD"}

package/out/controller/control/chart/generator/funnel-series-generator.js

@@ -15,11 +15,15 @@ export class FunnelSeriesGenerator extends BaseSeriesGenerator {
         return options;
     }
     calcSeriesData(catalogData) {
-        return Object.keys(catalogData).map(catalog => {
+        const temData = [];
+        catalogData.forEach((catalog, key) => {
             var _a;
-            const data = catalogData.get(catalog);
-            return { name: catalog, value: [data.value, (_a = data.deData) === null || _a === void 0 ? void 0 : _a.srfkey] };
+            temData.push({
+                name: key,
+                value: [catalog.value, (_a = catalog.deData) === null || _a === void 0 ? void 0 : _a.srfkey],
+            });
         });
+        return temData;
     }
     getSrfkeyByParams(params) {
         return params.value[1];

package/out/controller/control/chart/generator/pie-series-generator.d.ts

@@ -1,6 +1,10 @@
 import { IChartSeriesPie } from '@ibiz/model-core';
 import type { ECElementEvent, SeriesOption } from 'echarts';
 import { BaseSeriesGenerator, CatalogData } from './base-series-generator';
+interface pieSeriesData {
+    name: string;
+    value: IData[];
+}
 /**
  * 饼图序列生成器
  * @author lxm
@@ -11,10 +15,8 @@ import { BaseSeriesGenerator, CatalogData } from './base-series-generator';
  */
 export declare class PieSeriesGenerator extends BaseSeriesGenerator<IChartSeriesPie> {
     protected calcStaticOptions(): SeriesOption;
-    protected calcSeriesData(catalogData: CatalogData): {
-        name: string;
-        value: IData[];
-    }[];
+    protected calcSeriesData(catalogData: CatalogData): pieSeriesData[];
     getSrfkeyByParams(params: ECElementEvent): string;
 }
+export {};
 //# sourceMappingURL=pie-series-generator.d.ts.map

package/out/controller/control/chart/generator/pie-series-generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pie-series-generator.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/chart/generator/pie-series-generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,KAAK,EAAE,cAAc,EAAmB,YAAY,EAAE,MAAM,SAAS,CAAC;AAC7E,OAAO,EAAE,mBAAmB,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAE3E;;;;;;;GAOG;AACH,qBAAa,kBAAmB,SAAQ,mBAAmB,CAAC,eAAe,CAAC;IAC1E,SAAS,CAAC,iBAAiB,IAAI,YAAY;IAS3C,SAAS,CAAC,cAAc,CAAC,WAAW,EAAE,WAAW,GAAG;QAClD,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,KAAK,EAAE,CAAC;KAChB,EAAE;IAOH,iBAAiB,CAAC,MAAM,EAAE,cAAc,GAAG,MAAM;CAGlD"}
+{"version":3,"file":"pie-series-generator.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/chart/generator/pie-series-generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,KAAK,EAAE,cAAc,EAAmB,YAAY,EAAE,MAAM,SAAS,CAAC;AAC7E,OAAO,EAAE,mBAAmB,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAE3E,UAAU,aAAa;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,KAAK,EAAE,CAAC;CAChB;AAED;;;;;;;GAOG;AACH,qBAAa,kBAAmB,SAAQ,mBAAmB,CAAC,eAAe,CAAC;IAC1E,SAAS,CAAC,iBAAiB,IAAI,YAAY;IAS3C,SAAS,CAAC,cAAc,CAAC,WAAW,EAAE,WAAW,GAAG,aAAa,EAAE;IAWnE,iBAAiB,CAAC,MAAM,EAAE,cAAc,GAAG,MAAM;CAGlD"}

package/out/controller/control/chart/generator/pie-series-generator.js

@@ -15,11 +15,15 @@ export class PieSeriesGenerator extends BaseSeriesGenerator {
         return options;
     }
     calcSeriesData(catalogData) {
-        return Object.keys(catalogData).map(catalog => {
+        const temData = [];
+        catalogData.forEach((catalog, key) => {
             var _a;
-            const data = catalogData.get(catalog);
-            return { name: catalog, value: [data.value, (_a = data.deData) === null || _a === void 0 ? void 0 : _a.srfkey] };
+            temData.push({
+                name: key,
+                value: [catalog.value, (_a = catalog.deData) === null || _a === void 0 ? void 0 : _a.srfkey],
+            });
         });
+        return temData;
     }
     getSrfkeyByParams(params) {
         return params.value[1];

package/out/controller/control/chart/generator/radar-series-generator.d.ts

@@ -2,7 +2,7 @@ import { IChartSeriesRadar } from '@ibiz/model-core';
 import type { ECElementEvent, SeriesOption } from 'echarts';
 import { BaseSeriesGenerator } from './base-series-generator';
 /**
- * 饼图序列生成器
+ * 雷达序列生成器
  * @author lxm
  * @date 2023-06-11 06:19:03
  * @export

package/out/controller/control/chart/generator/radar-series-generator.js

@@ -2,7 +2,7 @@ import { mergeDeepRight } from 'ramda';
 import { BaseSeriesGenerator, DEFAULT_GROUP } from './base-series-generator';
 import { RadarCoordSystem } from './radar-coord-system';
 /**
- * 饼图序列生成器
+ * 雷达序列生成器
  * @author lxm
  * @date 2023-06-11 06:19:03
  * @export
@@ -29,8 +29,8 @@ export class RadarSeriesGenerator extends BaseSeriesGenerator {
         const radar = this.chartGenerator.radarMap.get(this.catalogField);
         // 更新雷达坐标系指示器和最大值
         Object.values(groupData).forEach(catalogData => {
-            Object.keys(catalogData).forEach(catalog => {
-                radar.updateIndicator(catalog, catalogData.get(catalog).value);
+            catalogData.forEach((catalog, key) => {
+                radar.updateIndicator(key, catalog.value);
             });
         });
     }

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

@@ -1 +1 @@
-{"version":3,"file":"dashboard.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/dashboard/dashboard.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EAEV,cAAc,EACf,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EACL,eAAe,EACf,eAAe,EACf,oBAAoB,EACpB,gBAAgB,EAChB,kBAAkB,EAClB,2BAA2B,EAC5B,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAGjD;;;;;;;;GAQG;AACH,qBAAa,mBACX,SAAQ,iBAAiB,CAAC,UAAU,EAAE,eAAe,EAAE,eAAe,CACtE,YAAW,oBAAoB;IAE/B;;;;;;OAMG;IACH,SAAS,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,gBAAgB,CAAA;KAAE,CAAM;IAEpD;;;;;;OAMG;IACH,QAAQ,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,kBAAkB,CAAA;KAAE,CAAM;IAErD,SAAS,CAAC,SAAS,IAAI,IAAI;cAIX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAgB1C;;;;;;;;OAQG;IACG,YAAY,CAChB,aAAa,EAAE,cAAc,EAAE,EAC/B,MAAM,CAAC,EAAE,2BAA2B,GACnC,OAAO,CAAC,IAAI,CAAC;IA6BhB;;;;;;OAMG;IACG,gBAAgB,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;CAQnD"}
+{"version":3,"file":"dashboard.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/dashboard/dashboard.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EAEV,cAAc,EACf,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EACL,eAAe,EACf,eAAe,EACf,oBAAoB,EACpB,gBAAgB,EAChB,kBAAkB,EAClB,2BAA2B,EAC5B,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAGjD;;;;;;;;GAQG;AACH,qBAAa,mBACX,SAAQ,iBAAiB,CAAC,UAAU,EAAE,eAAe,EAAE,eAAe,CACtE,YAAW,oBAAoB;IAE/B;;;;;;OAMG;IACH,SAAS,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,gBAAgB,CAAA;KAAE,CAAM;IAEpD;;;;;;OAMG;IACH,QAAQ,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,kBAAkB,CAAA;KAAE,CAAM;IAErD,SAAS,CAAC,SAAS,IAAI,IAAI;cAIX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAgB1C;;;;;;;;OAQG;IACG,YAAY,CAChB,aAAa,EAAE,cAAc,EAAE,EAC/B,MAAM,CAAC,EAAE,2BAA2B,GACnC,OAAO,CAAC,IAAI,CAAC;IAuChB;;;;;;OAMG;IACG,gBAAgB,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;CAQnD"}

package/out/controller/control/dashboard/dashboard.controller.js

@@ -62,9 +62,17 @@ export class DashboardController extends ControlController {
         if (!(portletModels === null || portletModels === void 0 ? void 0 : portletModels.length)) {
             return;
         }
+        // 这块只初始化子门户部件，忽略子门户部件里面嵌入的部件
+        const ignorePortletTypes = [
+            ControlType.CHART,
+            ControlType.APP_MENU,
+            ControlType.TOOLBAR,
+            ControlType.LIST,
+        ];
         await Promise.all(portletModels.map(async (portlet) => {
             var _a;
-            if (portlet.controlType === ControlType.CHART) {
+            if (portlet.controlType &&
+                ignorePortletTypes.includes(portlet.controlType)) {
                 return;
             }
             const provider = await getPortletProvider(portlet);

package/out/controller/control/dashboard/portlet/actionbar-portlet/actionbar-portlet.controller.d.ts

@@ -0,0 +1,5 @@
+import { IDBToolbarPortlet } from '@ibiz/model-core';
+import { PortletPartController } from '../portlet-part/portlet-part.controller';
+export declare class ActionBarPortletController extends PortletPartController<IDBToolbarPortlet> {
+}
+//# sourceMappingURL=actionbar-portlet.controller.d.ts.map

package/out/controller/control/dashboard/portlet/actionbar-portlet/actionbar-portlet.controller.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"actionbar-portlet.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/dashboard/portlet/actionbar-portlet/actionbar-portlet.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,qBAAqB,EAAE,MAAM,yCAAyC,CAAC;AAEhF,qBAAa,0BAA2B,SAAQ,qBAAqB,CAAC,iBAAiB,CAAC;CAAG"}

package/out/controller/control/dashboard/portlet/actionbar-portlet/actionbar-portlet.controller.js

@@ -0,0 +1,3 @@
+import { PortletPartController } from '../portlet-part/portlet-part.controller';
+export class ActionBarPortletController extends PortletPartController {
+}

package/out/controller/control/dashboard/portlet/actionbar-portlet/index.d.ts

@@ -0,0 +1,2 @@
+export * from './actionbar-portlet.controller';
+//# sourceMappingURL=index.d.ts.map

package/out/controller/control/dashboard/portlet/actionbar-portlet/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/dashboard/portlet/actionbar-portlet/index.ts"],"names":[],"mappings":"AAAA,cAAc,gCAAgC,CAAC"}

package/out/controller/control/dashboard/portlet/actionbar-portlet/index.js

@@ -0,0 +1 @@
+export * from './actionbar-portlet.controller';

package/out/controller/control/dashboard/portlet/html-portlet/html-portlet.controller.d.ts

@@ -0,0 +1,5 @@
+import { IDBHtmlPortletPart } from '@ibiz/model-core';
+import { PortletPartController } from '../portlet-part/portlet-part.controller';
+export declare class HtmlPortletController extends PortletPartController<IDBHtmlPortletPart> {
+}
+//# sourceMappingURL=html-portlet.controller.d.ts.map

package/out/controller/control/dashboard/portlet/html-portlet/html-portlet.controller.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"html-portlet.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/dashboard/portlet/html-portlet/html-portlet.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAE,qBAAqB,EAAE,MAAM,yCAAyC,CAAC;AAEhF,qBAAa,qBAAsB,SAAQ,qBAAqB,CAAC,kBAAkB,CAAC;CAAG"}

package/out/controller/control/dashboard/portlet/html-portlet/html-portlet.controller.js

@@ -0,0 +1,3 @@
+import { PortletPartController } from '../portlet-part/portlet-part.controller';
+export class HtmlPortletController extends PortletPartController {
+}

package/out/controller/control/dashboard/portlet/html-portlet/index.d.ts

@@ -0,0 +1,2 @@
+export * from './html-portlet.controller';
+//# sourceMappingURL=index.d.ts.map

package/out/controller/control/dashboard/portlet/html-portlet/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/dashboard/portlet/html-portlet/index.ts"],"names":[],"mappings":"AAAA,cAAc,2BAA2B,CAAC"}

package/out/controller/control/dashboard/portlet/html-portlet/index.js

@@ -0,0 +1 @@
+export * from './html-portlet.controller';

package/out/controller/control/dashboard/portlet/index.d.ts

@@ -3,4 +3,8 @@ export * from './container-portlet';
 export * from './view-portlet';
 export * from './menu-portlet';
 export * from './chart-portlet';
+export * from './actionbar-portlet';
+export * from './html-portlet';
+export * from './list-portlet';
+export * from './rawitem-portlet';
 //# sourceMappingURL=index.d.ts.map

package/out/controller/control/dashboard/portlet/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/dashboard/portlet/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,qBAAqB,CAAC;AACpC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,iBAAiB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/dashboard/portlet/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,qBAAqB,CAAC;AACpC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,iBAAiB,CAAC;AAChC,cAAc,qBAAqB,CAAC;AACpC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,mBAAmB,CAAC"}

package/out/controller/control/dashboard/portlet/index.js

@@ -3,3 +3,7 @@ export * from './container-portlet';
 export * from './view-portlet';
 export * from './menu-portlet';
 export * from './chart-portlet';
+export * from './actionbar-portlet';
+export * from './html-portlet';
+export * from './list-portlet';
+export * from './rawitem-portlet';

package/out/controller/control/dashboard/portlet/list-portlet/index.d.ts

@@ -0,0 +1,2 @@
+export * from './list-portlet.controller';
+//# sourceMappingURL=index.d.ts.map

package/out/controller/control/dashboard/portlet/list-portlet/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/dashboard/portlet/list-portlet/index.ts"],"names":[],"mappings":"AAAA,cAAc,2BAA2B,CAAC"}

package/out/controller/control/dashboard/portlet/list-portlet/index.js

@@ -0,0 +1 @@
+export * from './list-portlet.controller';

package/out/controller/control/dashboard/portlet/list-portlet/list-portlet.controller.d.ts

@@ -0,0 +1,5 @@
+import { IDBListPortletPart } from '@ibiz/model-core';
+import { PortletPartController } from '../portlet-part/portlet-part.controller';
+export declare class ListPortletController extends PortletPartController<IDBListPortletPart> {
+}
+//# sourceMappingURL=list-portlet.controller.d.ts.map

package/out/controller/control/dashboard/portlet/list-portlet/list-portlet.controller.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"list-portlet.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/dashboard/portlet/list-portlet/list-portlet.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAE,qBAAqB,EAAE,MAAM,yCAAyC,CAAC;AAEhF,qBAAa,qBAAsB,SAAQ,qBAAqB,CAAC,kBAAkB,CAAC;CAAG"}

package/out/controller/control/dashboard/portlet/list-portlet/list-portlet.controller.js

@@ -0,0 +1,3 @@
+import { PortletPartController } from '../portlet-part/portlet-part.controller';
+export class ListPortletController extends PortletPartController {
+}

package/out/controller/control/dashboard/portlet/rawitem-portlet/index.d.ts

@@ -0,0 +1,2 @@
+export * from './rawitem-portlet.controller';
+//# sourceMappingURL=index.d.ts.map

package/out/controller/control/dashboard/portlet/rawitem-portlet/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/dashboard/portlet/rawitem-portlet/index.ts"],"names":[],"mappings":"AAAA,cAAc,8BAA8B,CAAC"}

package/out/controller/control/dashboard/portlet/rawitem-portlet/index.js

@@ -0,0 +1 @@
+export * from './rawitem-portlet.controller';

package/out/controller/control/dashboard/portlet/rawitem-portlet/rawitem-portlet.controller.d.ts

@@ -0,0 +1,5 @@
+import { IDBRawItemPortletPart } from '@ibiz/model-core';
+import { PortletPartController } from '../portlet-part/portlet-part.controller';
+export declare class RawItemPortletController extends PortletPartController<IDBRawItemPortletPart> {
+}
+//# sourceMappingURL=rawitem-portlet.controller.d.ts.map

package/out/controller/control/dashboard/portlet/rawitem-portlet/rawitem-portlet.controller.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"rawitem-portlet.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/dashboard/portlet/rawitem-portlet/rawitem-portlet.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,EAAE,qBAAqB,EAAE,MAAM,yCAAyC,CAAC;AAEhF,qBAAa,wBAAyB,SAAQ,qBAAqB,CAAC,qBAAqB,CAAC;CAAG"}

package/out/controller/control/dashboard/portlet/rawitem-portlet/rawitem-portlet.controller.js

@@ -0,0 +1,3 @@
+import { PortletPartController } from '../portlet-part/portlet-part.controller';
+export class RawItemPortletController extends PortletPartController {
+}

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

@@ -1,8 +1,8 @@
 import { IDEFormDetail } from '@ibiz/model-core';
 import { IFormDetailController, IFormDetailContainerController } from '../../../../../interface';
 import { FormNotifyState } from '../../../../constant';
-import { FormController } from '../../form/form.controller';
 import { FormDetailState } from './form-detail.state';
+import { FormController } from '../../form';
 export declare class FormDetailController<T extends IDEFormDetail = IDEFormDetail> implements IFormDetailController {
     /**
      * 表单成员模型
@@ -33,7 +33,7 @@ export declare class FormDetailController<T extends IDEFormDetail = IDEFormDetai
      *
      * @author lxm
      * @date 2022-08-24 22:08:59
-     * @type {FormController}
+     * @type {IFormDetailContainerController}
      */
     readonly parent?: IFormDetailContainerController;
     /**

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

@@ -1 +1 @@
-{"version":3,"file":"form-detail.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-detail/form-detail.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EACL,qBAAqB,EACrB,8BAA8B,EAC/B,MAAM,0BAA0B,CAAC;AAGlC,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD,qBAAa,oBAAoB,CAAC,CAAC,SAAS,aAAa,GAAG,aAAa,CACvE,YAAW,qBAAqB;IAEhC;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;IAElB;;;;;;OAMG;IACH,KAAK,EAAE,eAAe,CAAC;IAEvB;;;;;;OAMG;IACH,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAC;IAE9B;;;;;;OAMG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE,8BAA8B,CAAC;IAEjD;;;;;;OAMG;IACH,IAAI,IAAI,IAAI,KAAK,CAEhB;IAED;;;;;;OAMG;IACH,IAAI,cAAc,IAAI,MAAM,EAAE,CAE7B;IAED;;;;;;OAMG;IACH,IAAI,UAAU,IAAI,MAAM,EAAE,CAEzB;IAED;;;;;OAKG;gBAED,KAAK,EAAE,CAAC,EACR,IAAI,EAAE,cAAc,EACpB,MAAM,CAAC,EAAE,8BAA8B;IAQzC;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;cAIX,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAsBvC;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,IAAI,eAAe;IAIxC;;;;;;OAMG;IACG,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAatD;;;;;OAKG;IACG,eAAe,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAa7D;;;;;;;;;OASG;IACH,SAAS,CAAC,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,QAAQ,GAAE,OAAe,GAAG,IAAI;IAmC5E;;;;;;OAMG;IACH,KAAK,CAAC,SAAS,CAAC,EAAE,MAAM,IAAI,GAAG,IAAI;IAKnC;;;;;OAKG;IACH,SAAS,CAAC,aAAa,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAe1C;;;;OAIG;IACH,kBAAkB,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAiBrC;;;;OAIG;IACH,iBAAiB,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAoBpC;;;;OAIG;IACH,kBAAkB,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAoBrC;;;;;OAKG;IACH,SAAS,CAAC,eAAe;;;;MAIvB;CACH"}
+{"version":3,"file":"form-detail.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-detail/form-detail.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EACL,qBAAqB,EACrB,8BAA8B,EAC/B,MAAM,0BAA0B,CAAC;AAGlC,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAE5C,qBAAa,oBAAoB,CAAC,CAAC,SAAS,aAAa,GAAG,aAAa,CACvE,YAAW,qBAAqB;IAEhC;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;IAElB;;;;;;OAMG;IACH,KAAK,EAAE,eAAe,CAAC;IAEvB;;;;;;OAMG;IACH,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAC;IAE9B;;;;;;OAMG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE,8BAA8B,CAAC;IAEjD;;;;;;OAMG;IACH,IAAI,IAAI,IAAI,KAAK,CAEhB;IAED;;;;;;OAMG;IACH,IAAI,cAAc,IAAI,MAAM,EAAE,CAE7B;IAED;;;;;;OAMG;IACH,IAAI,UAAU,IAAI,MAAM,EAAE,CAEzB;IAED;;;;;OAKG;gBAED,KAAK,EAAE,CAAC,EACR,IAAI,EAAE,cAAc,EACpB,MAAM,CAAC,EAAE,8BAA8B;IAQzC;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;cAIX,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAsBvC;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,IAAI,eAAe;IAIxC;;;;;;OAMG;IACG,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAatD;;;;;OAKG;IACG,eAAe,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAa7D;;;;;;;;;OASG;IACH,SAAS,CAAC,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,QAAQ,GAAE,OAAe,GAAG,IAAI;IAmC5E;;;;;;OAMG;IACH,KAAK,CAAC,SAAS,CAAC,EAAE,MAAM,IAAI,GAAG,IAAI;IAKnC;;;;;OAKG;IACH,SAAS,CAAC,aAAa,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAe1C;;;;OAIG;IACH,kBAAkB,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAiBrC;;;;OAIG;IACH,iBAAiB,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAoBpC;;;;OAIG;IACH,kBAAkB,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAoBrC;;;;;OAKG;IACH,SAAS,CAAC,eAAe;;;;MAIvB;CACH"}

package/out/controller/control/form/form-detail/form-mdctrl/form-mdctrl-content-type.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"form-mdctrl-content-type.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-content-type.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAEhE;;;;;;;;GAQG;AACH,qBAAa,+BAA+B;IAsBvB,MAAM,EAAE,oBAAoB;IArB/C,IAAI,IAAI,IAAI,KAAK,EAAE,CAElB;IAED;;;;;;;OAOG;IACH,KAAK,EAAG,aAAa,CAAC;IAEtB;;;;;;OAMG;gBACgB,MAAM,EAAE,oBAAoB;IAI/C;;;;;;;;OAQG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAE7B;;;;;;;OAOG;IACH,YAAY,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI;IAKjC;;;;;;;;OAQG;IACH,gBAAgB,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;IAKlD;;;;;;;OAOG;IACH,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAQjC;;;;;;;OAOG;IACH,YAAY,CAAC,IAAI,CAAC,EAAE,KAAK,GAAG,IAAI;IAKhC;;;;;;OAMG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAe/B;;;;;;OAMG;IACG,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC;CAGnC"}
+{"version":3,"file":"form-mdctrl-content-type.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-content-type.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAEhE;;;;;;;;GAQG;AACH,qBAAa,+BAA+B;IAsBvB,MAAM,EAAE,oBAAoB;IArB/C,IAAI,IAAI,IAAI,KAAK,EAAE,CAElB;IAED;;;;;;;OAOG;IACH,KAAK,EAAG,aAAa,CAAC;IAEtB;;;;;;OAMG;gBACgB,MAAM,EAAE,oBAAoB;IAI/C;;;;;;;;OAQG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAE7B;;;;;;;OAOG;IACH,YAAY,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI;IAKjC;;;;;;;;OAQG;IACH,gBAAgB,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;IAKlD;;;;;;;OAOG;IACH,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAQjC;;;;;;;OAOG;IACH,YAAY,CAAC,IAAI,CAAC,EAAE,KAAK,GAAG,IAAI;IAKhC;;;;;;OAMG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAsB/B;;;;;;OAMG;IACG,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC;CAGnC"}

package/out/controller/control/form/form-detail/form-mdctrl/form-mdctrl-content-type.controller.js

@@ -94,12 +94,21 @@ export class FormMDCtrlContentTypeController {
     async initData() {
         const name = this.model.appDEFieldId || this.model.fieldName || this.model.id;
         if (name) {
+            const data = this.parent.data[name];
             if (this.model.contentType === 'REPEATER' &&
                 this.model.detailStyle === 'STYLE3') {
-                this.parent.state.contentCtrlData = this.parent.data[name] || {};
+                if (Array.isArray(data)) {
+                    this.parent.state.contentCtrlData = {};
+                }
+                else {
+                    this.parent.state.contentCtrlData = data || {};
+                }
+            }
+            else if (!Array.isArray(data)) {
+                this.parent.state.contentCtrlData = [];
             }
             else {
-                this.parent.state.contentCtrlData = this.parent.data[name] || [];
+                this.parent.state.contentCtrlData = data || [];
             }
         }
     }

package/out/controller/control/form/form-detail/form-mdctrl/form-mdctrl.controller.d.ts

@@ -2,6 +2,7 @@ import { IDEFormMDCtrl } from '@ibiz/model-core';
 import { FormDetailController } from '../form-detail';
 import { FormMDCtrlContentTypeController } from './form-mdctrl-content-type.controller';
 import { FormMDCtrlState } from './form-mdctrl.state';
+import { EditFormController } from '../../edit-form';
 /**
  * 表单多数据部件控制器
  *
@@ -21,6 +22,7 @@ export declare class FormMDCtrlController extends FormDetailController<IDEFormMD
      * @memberof FormMDCtrlController
      */
     state: FormMDCtrlState;
+    form: EditFormController;
     /**
      * Creates an instance of FormMDCtrlController.
      *
@@ -59,14 +61,6 @@ export declare class FormMDCtrlController extends FormDetailController<IDEFormMD
      * @memberof FormMDCtrlController
      */
     setFormDataValue(): void;
-    /**
-     * 加载数据，要在表单加载完成之后再去加载
-     *
-     * @author zk
-     * @date 2023-07-28 11:07:09
-     * @memberof FormMDCtrlController
-     */
-    loadData(): Promise<void>;
     /**
      * 表单校验，通知子表单进行校验
      *

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

@@ -1 +1 @@
-{"version":3,"file":"form-mdctrl.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-mdctrl/form-mdctrl.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,EAAE,+BAA+B,EAAE,MAAM,uCAAuC,CAAC;AAQxF,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD;;;;;;;;GAQG;AACH,qBAAa,oBAAqB,SAAQ,oBAAoB,CAAC,aAAa,CAAC;IAC3E;;;;;;;OAOG;IACK,KAAK,EAAE,eAAe,CAAC;IAE/B;;;;;;;;OAQG;IACH,SAAS,CAAC,WAAW,IAAI,eAAe;IAIxC;;;;;;;;OAQG;IACI,uBAAuB,EAAG,+BAA+B,CAAC;IAEjE;;;;;;;;OAQG;cACa,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAwCvC;;;;;;OAMG;IACH,gBAAgB,IAAI,IAAI;IAQxB;;;;;;OAMG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAI/B;;;;;;OAMG;IACG,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC;IAIlC;;;;;;OAMG;IACH,eAAe,IAAI,IAAI;CAGxB"}
+{"version":3,"file":"form-mdctrl.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-mdctrl/form-mdctrl.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,EAAE,+BAA+B,EAAE,MAAM,uCAAuC,CAAC;AAQxF,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAErD;;;;;;;;GAQG;AACH,qBAAa,oBAAqB,SAAQ,oBAAoB,CAAC,aAAa,CAAC;IAC3E;;;;;;;OAOG;IACK,KAAK,EAAE,eAAe,CAAC;IAEvB,IAAI,EAAE,kBAAkB,CAAC;IAEjC;;;;;;;;OAQG;IACH,SAAS,CAAC,WAAW,IAAI,eAAe;IAIxC;;;;;;;;OAQG;IACI,uBAAuB,EAAG,+BAA+B,CAAC;IAEjE;;;;;;;;OAQG;cACa,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAiDvC;;;;;;OAMG;IACH,gBAAgB,IAAI,IAAI;IAQxB;;;;;;OAMG;IACG,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC;IAIlC;;;;;;OAMG;IACH,eAAe,IAAI,IAAI;CAGxB"}

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

@@ -72,6 +72,15 @@ export class FormMDCtrlController extends FormDetailController {
         if (this.mdCtrlContentController) {
             await this.mdCtrlContentController.onInit();
         }
+        if (this.form.state.isLoaded) {
+            this.mdCtrlContentController.initData();
+        }
+        this.form.evt.on('onLoadDraftSuccess', () => {
+            this.mdCtrlContentController.initData();
+        });
+        this.form.evt.on('onLoadSuccess', () => {
+            this.mdCtrlContentController.initData();
+        });
     }
     /**
      * 手动通知外部表单值变更
@@ -86,16 +95,6 @@ export class FormMDCtrlController extends FormDetailController {
             this.form.setDataValue(name, this.state.contentCtrlData);
         }
     }
-    /**
-     * 加载数据，要在表单加载完成之后再去加载
-     *
-     * @author zk
-     * @date 2023-07-28 11:07:09
-     * @memberof FormMDCtrlController
-     */
-    async loadData() {
-        await this.mdCtrlContentController.initData();
-    }
     /**
      * 表单校验，通知子表单进行校验
      *