@ibiz-template/runtime 0.1.12-dev.0 → 0.1.13

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

@@ -1 +1 @@
-{"version":3,"file":"md-control.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/common/control/md-control.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EACL,oBAAoB,EACpB,eAAe,EACf,eAAe,EACf,gBAAgB,EAChB,kBAAkB,EACnB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,gBAAgB,EAAS,MAAM,kBAAkB,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAEzD;;;;;;;;;GASG;AACH,qBAAa,mBAAmB,CAC5B,CAAC,SAAS,UAAU,GAAG,UAAU,EACjC,CAAC,SAAS,eAAe,GAAG,eAAe,EAC3C,CAAC,SAAS,eAAe,GAAG,eAAe,CAE7C,SAAQ,iBAAiB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CACjC,YAAW,oBAAoB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAExC;;;;;;OAMG;IACH,OAAO,EAAG,gBAAgB,CAAC;IAE3B,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,eAAe,CAAC,CAErD;IAED,SAAS,CAAC,SAAS,IAAI,IAAI;cAgBX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAM1C;;;;;;;;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;IAyCzD;;;;;;;;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;IAwDtD;;;;;;OAMG;IACH,WAAW,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAQ9B;;;;;;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,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EACL,oBAAoB,EACpB,eAAe,EACf,eAAe,EACf,gBAAgB,EAChB,kBAAkB,EACnB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,gBAAgB,EAAS,MAAM,kBAAkB,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAEzD;;;;;;;;;GASG;AACH,qBAAa,mBAAmB,CAC5B,CAAC,SAAS,UAAU,GAAG,UAAU,EACjC,CAAC,SAAS,eAAe,GAAG,eAAe,EAC3C,CAAC,SAAS,eAAe,GAAG,eAAe,CAE7C,SAAQ,iBAAiB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CACjC,YAAW,oBAAoB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAExC;;;;;;OAMG;IACH,OAAO,EAAG,gBAAgB,CAAC;IAE3B,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,eAAe,CAAC,CAErD;IAED,SAAS,CAAC,SAAS,IAAI,IAAI;cAgBX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAM1C;;;;;;;;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;IA4CzD;;;;;;;;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;IA4DtD;;;;;;OAMG;IACH,WAAW,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAQ9B;;;;;;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

@@ -118,6 +118,10 @@ export class MDControlController extends ControlController {
                 isInitialLoad,
             });
         }
+        catch (error) {
+            await this._evt.emit('onLoadError', undefined);
+            throw error;
+        }
         finally {
             await this.endLoading();
         }
@@ -165,6 +169,7 @@ export class MDControlController extends ControlController {
                 return;
             }
         }
+        await this._evt.emit('onBeforeRemove', undefined);
         await this.startLoading();
         let needRefresh = false;
         try {
@@ -192,6 +197,10 @@ export class MDControlController extends ControlController {
                 this.refresh();
             }
         }
+        catch (error) {
+            await this._evt.emit('onRemoveError', undefined);
+            throw error;
+        }
         finally {
             await this.endLoading();
         }

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: IContext;
+        context: IData;
         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,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"}
+{"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"}

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

@@ -61,7 +61,7 @@ export class EditorController {
         }
         if (this.model.editorParams) {
             Object.keys(this.model.editorParams).forEach(key => {
-                this.editorParams[key.toLowerCase()] = this.model.editorParams[key];
+                this.editorParams[key] = this.model.editorParams[key];
             });
         }
     }
@@ -79,13 +79,11 @@ 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);
         }
-        const _params = Object.assign(Object.assign({}, params), selfParams);
-        return { context: _context, params: _params };
+        return { context: selfContext, params: selfParams };
     }
     /**
      * 字符串转对象、数组对象

package/out/controller/control/app-menu/app-menu.controller.d.ts

@@ -32,7 +32,7 @@ export declare class AppMenuController extends ControlController<IAppMenu, IAppM
      * @param {string} id
      * @return {*}  {Promise<void>}
      */
-    onClickMenuItem(id: string, event?: MouseEvent): Promise<void>;
+    onClickMenuItem(id: string, event?: MouseEvent, useDepth?: boolean): Promise<void>;
     /**
      * 初始化菜单项状态
      *

package/out/controller/control/app-menu/app-menu.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"app-menu.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/app-menu/app-menu.controller.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEnD,OAAO,EACL,aAAa,EACb,aAAa,EACb,kBAAkB,EACnB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAEjD;;;;;;;;GAQG;AACH,qBAAa,iBACX,SAAQ,iBAAiB,CAAC,QAAQ,EAAE,aAAa,EAAE,aAAa,CAChE,YAAW,kBAAkB;IAE7B,GAAG,EAAG,WAAW,CAAC;IAElB,SAAS,CAAC,SAAS,IAAI,IAAI;IAK3B;;;;;;OAMG;IACH,IAAI,UAAU,IAAI,MAAM,GAAG,SAAS,CAEnC;cAEe,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAW1C;;;;;;;OAOG;IACG,eAAe,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAkCpE;;;;;;OAMG;IAEH,iBAAiB,CAAC,IAAI,EAAE,YAAY,GAAG;QACrC,OAAO,EAAE,OAAO,CAAC;QACjB,SAAS,EAAE,OAAO,CAAC;KACpB;IAwBD;;;;;OAKG;IACH,WAAW,IAAI,YAAY,EAAE;IAc7B;;;;;OAKG;IACH,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,UAAU,GAAG,IAAI;CAO1C"}
+{"version":3,"file":"app-menu.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/app-menu/app-menu.controller.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEnD,OAAO,EACL,aAAa,EACb,aAAa,EACb,kBAAkB,EACnB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAEjD;;;;;;;;GAQG;AACH,qBAAa,iBACX,SAAQ,iBAAiB,CAAC,QAAQ,EAAE,aAAa,EAAE,aAAa,CAChE,YAAW,kBAAkB;IAE7B,GAAG,EAAG,WAAW,CAAC;IAElB,SAAS,CAAC,SAAS,IAAI,IAAI;IAK3B;;;;;;OAMG;IACH,IAAI,UAAU,IAAI,MAAM,GAAG,SAAS,CAEnC;cAEe,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAW1C;;;;;;;OAOG;IACG,eAAe,CACnB,EAAE,EAAE,MAAM,EACV,KAAK,CAAC,EAAE,UAAU,EAClB,QAAQ,GAAE,OAAc,GACvB,OAAO,CAAC,IAAI,CAAC;IAiChB;;;;;;OAMG;IAEH,iBAAiB,CAAC,IAAI,EAAE,YAAY,GAAG;QACrC,OAAO,EAAE,OAAO,CAAC;QACjB,SAAS,EAAE,OAAO,CAAC;KACpB;IAwBD;;;;;OAKG;IACH,WAAW,IAAI,YAAY,EAAE;IAc7B;;;;;OAKG;IACH,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,UAAU,GAAG,IAAI;CAO1C"}

package/out/controller/control/app-menu/app-menu.controller.js

@@ -42,7 +42,7 @@ export class AppMenuController extends ControlController {
      * @param {string} id
      * @return {*}  {Promise<void>}
      */
-    async onClickMenuItem(id, event) {
+    async onClickMenuItem(id, event, useDepth = true) {
         const menuItem = findRecursiveChild(this.model, id, {
             compareField: 'id',
             childrenFields: ['appMenuItems'],
@@ -58,7 +58,7 @@ export class AppMenuController extends ControlController {
             throw new RuntimeModelError(menuItem, '没有配置应用功能');
         }
         const tempContext = this.context.clone();
-        if (this.routeDepth) {
+        if (this.routeDepth && useDepth) {
             Object.assign(tempContext, {
                 toRouteDepth: this.routeDepth + 1,
             });

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

@@ -1 +1 @@
-{"version":3,"file":"caption-bar.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/caption-bar/caption-bar.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EACL,gBAAgB,EAChB,gBAAgB,EAChB,qBAAqB,EACtB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAEjD;;;;;;;;GAQG;AACH,qBAAa,oBACX,SAAQ,iBAAiB,CAAC,WAAW,EAAE,gBAAgB,EAAE,gBAAgB,CACzE,YAAW,qBAAqB;IAEhC,SAAS,CAAC,SAAS,IAAI,IAAI;cAaX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;CAS3C"}
+{"version":3,"file":"caption-bar.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/caption-bar/caption-bar.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EACL,gBAAgB,EAChB,gBAAgB,EAChB,qBAAqB,EACtB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAEjD;;;;;;;;GAQG;AACH,qBAAa,oBACX,SAAQ,iBAAiB,CAAC,WAAW,EAAE,gBAAgB,EAAE,gBAAgB,CACzE,YAAW,qBAAqB;IAEhC,SAAS,CAAC,SAAS,IAAI,IAAI;cAYX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;CAS3C"}

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

@@ -12,8 +12,7 @@ export class CaptionBarController extends ControlController {
     initState() {
         super.initState();
         if (this.view.model.capLanguageRes) {
-            this.state.caption = ibiz.i18n.t(this.view.model.capLanguageRes.lanResTag, this.view.model.capLanguageRes.defaultContent ||
-                this.view.model.caption);
+            this.state.caption = ibiz.i18n.t(this.view.model.capLanguageRes.lanResTag, this.view.model.caption);
         }
         else {
             this.state.caption = this.view.model.caption;

package/out/controller/control/chart/chart.controller.js

@@ -12,7 +12,7 @@ export class ChartController extends MDControlController {
         this.service = new ChartService(this.model);
         await this.service.init(this.context);
         this.generator = new ChartOptionsGenerator(this.model);
-        await this.generator.loadCodeList(this.context, this.params);
+        await this.generator.init(this.context, this.params);
         // 监听resize调整图表大小
         window.addEventListener('resize', this.resizeChart);
     }

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

@@ -1 +1 @@
-{"version":3,"file":"base-series-generator.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/chart/generator/base-series-generator.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,cAAc,EACf,MAAM,kBAAkB,CAAC;AAO1B,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAE5D,OAAO,EACL,qBAAqB,EAEtB,MAAM,2BAA2B,CAAC;AAQnC,cAAc;AACd,MAAM,MAAM,UAAU,GAAG;IACvB;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;;;;OAKG;IACH,MAAM,CAAC,EAAE,KAAK,CAAC;CAChB,CAAC;AACF,sBAAsB;AACtB,MAAM,MAAM,WAAW,GAAG,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;AAElD,sBAAsB;AACtB,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;AAEpD,eAAO,MAAM,aAAa,mBAAmB,CAAC;AAE9C,qBAAa,mBAAmB,CAAC,CAAC,SAAS,cAAc,GAAG,cAAc;IAyF/D,KAAK,EAAE,CAAC;IACf,SAAS,CAAC,cAAc,EAAE,qBAAqB;IAzFjD;;;;;OAKG;IACH,YAAY,EAAE,MAAM,CAAC;IAErB;;;;;OAKG;IACH,UAAU,EAAE,MAAM,CAAC;IAEnB;;;;;OAKG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;;;;OAKG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;;;;OAKG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;;;;OAKG;IACH,UAAU,EAAE,MAAM,CAAC;IAEnB;;;;;OAKG;IACH,SAAS,CAAC,EAAE,SAAS,CAAC;IAEtB;;;;;OAKG;IACH,aAAa,EAAE,YAAY,CAAM;IAEjC;;;;;OAKG;IACH,eAAe,CAAC,EAAE,YAAY,CAAC;IAE/B;;;;;OAKG;IACH,oBAAoB,EAAE,OAAO,CAAQ;IAErC;;;;;;OAMG;gBAEM,KAAK,EAAE,CAAC,EACL,cAAc,EAAE,qBAAqB;IA6BjD;;;;OAIG;IACH,SAAS,CAAC,iBAAiB,IAAI,YAAY;IAmB3C;;;;;;;;;;;OAWG;IACH,YAAY,CACV,WAAW,EAAE,MAAM,GAAG,SAAS,EAC/B,GAAG,EAAE,MAAM,GAAG,SAAS,EACvB,SAAS,GAAE,OAAe,GACzB,MAAM,GAAG,SAAS;IAiBrB;;;;;;OAMG;IACH,SAAS,CAAC,aAAa,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,SAAS;IA2DjD;;;;;;;OAOG;IACH,SAAS,CAAC,eAAe,CAAC,SAAS,EAAE,SAAS,GAAG,YAAY,EAAE;IAuB/D;;;;;;;OAOG;IAEH,SAAS,CAAC,cAAc,CAAC,WAAW,EAAE,WAAW,GAAG,GAAG;IAQvD;;;;;;OAMG;IACH,UAAU,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,YAAY,EAAE,GAAG,YAAY;IAOxD;;;;;;OAMG;IACH,iBAAiB,CAAC,MAAM,EAAE,cAAc,GAAG,MAAM;IAIjD;;;;;OAKG;IACH,cAAc,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,KAAK,EAAE;IAmDtC;;;;;;OAMG;IACH,YAAY,CAAC,IAAI,EAAE,SAAS,GAAG,IAAI;IA+BnC;;;;;;OAMG;IACH,WAAW,CAAC,IAAI,EAAE,SAAS,GAAG,IAAI;CAgInC"}
+{"version":3,"file":"base-series-generator.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/chart/generator/base-series-generator.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,cAAc,EACf,MAAM,kBAAkB,CAAC;AAO1B,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAE5D,OAAO,EACL,qBAAqB,EAEtB,MAAM,2BAA2B,CAAC;AAQnC,cAAc;AACd,MAAM,MAAM,UAAU,GAAG;IACvB;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;;;;OAKG;IACH,MAAM,CAAC,EAAE,KAAK,CAAC;CAChB,CAAC;AACF,sBAAsB;AACtB,MAAM,MAAM,WAAW,GAAG,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;AAElD,sBAAsB;AACtB,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;AAEpD,eAAO,MAAM,aAAa,mBAAmB,CAAC;AAE9C,qBAAa,mBAAmB,CAAC,CAAC,SAAS,cAAc,GAAG,cAAc;IAyF/D,KAAK,EAAE,CAAC;IACf,SAAS,CAAC,cAAc,EAAE,qBAAqB;IAzFjD;;;;;OAKG;IACH,YAAY,EAAE,MAAM,CAAC;IAErB;;;;;OAKG;IACH,UAAU,EAAE,MAAM,CAAC;IAEnB;;;;;OAKG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;;;;OAKG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;;;;OAKG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;;;;OAKG;IACH,UAAU,EAAE,MAAM,CAAC;IAEnB;;;;;OAKG;IACH,SAAS,CAAC,EAAE,SAAS,CAAC;IAEtB;;;;;OAKG;IACH,aAAa,EAAE,YAAY,CAAM;IAEjC;;;;;OAKG;IACH,eAAe,CAAC,EAAE,YAAY,CAAC;IAE/B;;;;;OAKG;IACH,oBAAoB,EAAE,OAAO,CAAQ;IAErC;;;;;;OAMG;gBAEM,KAAK,EAAE,CAAC,EACL,cAAc,EAAE,qBAAqB;IA+BjD;;;;OAIG;IACH,SAAS,CAAC,iBAAiB,IAAI,YAAY;IAmB3C;;;;;;;;;;;OAWG;IACH,YAAY,CACV,WAAW,EAAE,MAAM,GAAG,SAAS,EAC/B,GAAG,EAAE,MAAM,GAAG,SAAS,EACvB,SAAS,GAAE,OAAe,GACzB,MAAM,GAAG,SAAS;IAiBrB;;;;;;OAMG;IACH,SAAS,CAAC,aAAa,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,SAAS;IA2DjD;;;;;;;OAOG;IACH,SAAS,CAAC,eAAe,CAAC,SAAS,EAAE,SAAS,GAAG,YAAY,EAAE;IAuB/D;;;;;;;OAOG;IAEH,SAAS,CAAC,cAAc,CAAC,WAAW,EAAE,WAAW,GAAG,GAAG;IAQvD;;;;;;OAMG;IACH,UAAU,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,YAAY,EAAE,GAAG,YAAY;IAOxD;;;;;;OAMG;IACH,iBAAiB,CAAC,MAAM,EAAE,cAAc,GAAG,MAAM;IAIjD;;;;;OAKG;IACH,cAAc,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,KAAK,EAAE;IAmDtC;;;;;;OAMG;IACH,YAAY,CAAC,IAAI,EAAE,SAAS,GAAG,IAAI;IA+BnC;;;;;;OAMG;IACH,WAAW,CAAC,IAAI,EAAE,SAAS,GAAG,IAAI;CAgInC"}

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

@@ -22,7 +22,6 @@ export class BaseSeriesGenerator {
      * @param {ChartOptionsGenerator} chartGenerator 图表生成器
      */
     constructor(model, chartGenerator) {
-        var _a;
         this.model = model;
         this.chartGenerator = chartGenerator;
         /**
@@ -48,9 +47,11 @@ export class BaseSeriesGenerator {
         if (!model.valueField) {
             throw new RuntimeModelError(model, '缺少值属性配置');
         }
-        this.catalogField = model.catalogField.toLowerCase();
-        this.valueField = model.valueField.toLowerCase();
-        this.groupField = (_a = model.seriesField) === null || _a === void 0 ? void 0 : _a.toLowerCase();
+        this.catalogField = chartGenerator.getFieldKey(model.catalogField);
+        this.valueField = chartGenerator.getFieldKey(model.valueField);
+        this.groupField = model.seriesField
+            ? chartGenerator.getFieldKey(model.seriesField)
+            : undefined;
         const { chartXAxisId, chartYAxisId } = (chartSeriesEncode ||
             {});
         this.xAxisIndex = toNumberOrNil(chartXAxisId);

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

@@ -1,5 +1,5 @@
 import type { EChartsOption, XAXisComponentOption, YAXisComponentOption, ECElementEvent } from 'echarts';
-import { IChartXAxis, IChartYAxis, IDEChart, IDEChartLegend, IDEChartTitle } from '@ibiz/model-core';
+import { IAppDataEntity, IChartXAxis, IChartYAxis, IDEChart, IDEChartLegend, IDEChartTitle } from '@ibiz/model-core';
 import { BaseSeriesGenerator } from './base-series-generator';
 import { RadarCoordSystem } from './radar-coord-system';
 import { CodeListItem } from '../../../../interface';
@@ -14,6 +14,13 @@ import { CodeListItem } from '../../../../interface';
 export declare function parseUserParams(userParams: Record<string, string>): IData;
 export declare class ChartOptionsGenerator {
     private model;
+    /**
+     * 实体模型
+     * @author lxm
+     * @date 2023-08-29 06:39:01
+     * @type {IAppDataEntity}
+     */
+    entity: IAppDataEntity;
     /**
      * 根据模型配置算出来的静态echarts配置
      * @author lxm
@@ -60,6 +67,23 @@ export declare class ChartOptionsGenerator {
     protected calcTitleOption(chartTitle: IDEChartTitle): EChartsOption['title'];
     protected calcLegendOption(chartLegend: IDEChartLegend): EChartsOption['legend'];
     protected calcXYAxisOption(chartAxises: IChartYAxis[] | IChartXAxis[]): XAXisComponentOption[] | YAXisComponentOption[];
+    /**
+     * 初始化
+     * @author lxm
+     * @date 2023-08-29 06:34:04
+     * @param {IContext} context
+     * @param {IParams} params
+     * @return {*}  {Promise<void>}
+     */
+    init(context: IContext, params: IParams): Promise<void>;
+    /**
+     * 找到实体属性的codeName小写
+     * @author lxm
+     * @date 2023-08-29 06:42:06
+     * @param {string} fieldName 属性的name
+     * @return {*}  {string}
+     */
+    getFieldKey(fieldName: string): string;
     /**
      * 加载代码表，
      * - 如果已经加载过会清空缓存重新加载

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,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;IAoDpB,OAAO,CAAC,KAAK;IAnDzB;;;;;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;IAqCnC,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;;;;;;;;;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,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"}

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

@@ -76,7 +76,6 @@ export class ChartOptionsGenerator {
          * @date 2023-06-09 07:47:35
          */
         this.codeListMap = new Map();
-        this.initSeriesGenerators();
         const { dechartTitle, dechartLegend, chartXAxises, chartYAxises, userParam, } = model;
         // 标题
         if (dechartTitle) {
@@ -149,9 +148,14 @@ 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;
@@ -200,6 +204,30 @@ export class ChartOptionsGenerator {
         });
         return AxisOption;
     }
+    /**
+     * 初始化
+     * @author lxm
+     * @date 2023-08-29 06:34:04
+     * @param {IContext} context
+     * @param {IParams} params
+     * @return {*}  {Promise<void>}
+     */
+    async init(context, params) {
+        await this.loadCodeList(context, params);
+        this.entity = await ibiz.hub.getAppDataEntity(this.model.appDataEntityId);
+        this.initSeriesGenerators();
+    }
+    /**
+     * 找到实体属性的codeName小写
+     * @author lxm
+     * @date 2023-08-29 06:42:06
+     * @param {string} fieldName 属性的name
+     * @return {*}  {string}
+     */
+    getFieldKey(fieldName) {
+        const find = this.entity.appDEFields.find(item => item.name === fieldName);
+        return find ? find.codeName.toLowerCase() : fieldName.toLowerCase();
+    }
     /**
      * 加载代码表，
      * - 如果已经加载过会清空缓存重新加载

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

@@ -1 +1 @@
-{"version":3,"file":"exp-bar.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/exp-bar/exp-bar.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,OAAO,EAEP,OAAO,EACP,OAAO,EACP,WAAW,EACX,YAAY,EACb,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EACL,mBAAmB,EACnB,mBAAmB,EACnB,wBAAwB,EACxB,oBAAoB,EACpB,kBAAkB,EAClB,SAAS,EACT,SAAS,EACT,WAAW,EACX,0BAA0B,EAC3B,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C,KAAK,iBAAiB,GAAG,OAAO,GAAG,OAAO,GAAG,WAAW,CAAC;AAEzD;;;;;;;;;;;;GAYG;AACH,qBAAa,uBAAuB,CAChC,CAAC,SAAS,OAAO,GAAG,OAAO,EAC3B,CAAC,SAAS,mBAAmB,GAAG,mBAAmB,EACnD,CAAC,SAAS,mBAAmB,GAAG,mBAAmB,CAErD,SAAQ,iBAAiB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CACjC,YAAW,wBAAwB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAE5C,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,mBAAmB,CAAC,CAEzD;IAED;;;;;;;;OAQG;IACH,IAAI,UAAU,IAAI,MAAM,GAAG,SAAS,CAEnC;IAED;;;;;;;OAOG;IACH,SAAS,EAAG,MAAM,CAAC;IAEnB;;;;;;OAMG;IACH,UAAU,SAAY;IAEtB,SAAS,CAAC,SAAS,IAAI,IAAI;IAK3B;;;;;;;OAOG;IACH,IAAI,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;IAIxB;;;;;;;;OAQG;IACH,IAAI,eAAe,IAAI,oBAAoB,CAS1C;IAED;;;;;;OAMG;IACH,IAAI,iBAAiB,IAAI,kBAAkB,GAAG,SAAS,CAKtD;IAED;;;;;;;;OAQG;IACH,IAAI,UAAU,IAAI,iBAAiB,GAAG,SAAS,CAO9C;IAED;;;;;;;;OAQG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAK1C;;;;;;;;OAQG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IA6B1C;;;;;;OAMG;IACH,gBAAgB,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI;IAaxC;;;;;OAKG;IACH,SAAS,CAAC,kBAAkB,IAAI,IAAI;IAgBpC;;;;;;;OAOG;IACH,SAAS,CAAC,qBAAqB,IAAI,IAAI;IAUvC;;;;;;;OAOG;IACH,WAAW,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI;IAMnC;;;;;;;;OAQG;IACH,aAAa,CACX,UAAU,EAAE,YAAY,GAAG;QAAE,eAAe,CAAC,EAAE,MAAM,CAAA;KAAE,EACvD,IAAI,EAAE,KAAK,EACX,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd;QAAE,OAAO,EAAE,QAAQ,CAAC;QAAC,MAAM,EAAE,OAAO,CAAA;KAAE;IA6BzC;;;;;;;OAOG;IACI,eAAe,IAAI,MAAM,GAAG,SAAS;IAS5C;;;;;;;;OAQG;IACI,aAAa,CAClB,IAAI,EAAE,KAAK,EACX,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd,WAAW;IAWd;;;;;;OAMG;IACH,SAAS,CAAC,wBAAwB,IAAI,OAAO;IAe7C,cAAc,CAAC,KAAK,EAAE,0BAA0B,GAAG,IAAI;CAaxD"}
+{"version":3,"file":"exp-bar.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/exp-bar/exp-bar.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,OAAO,EAEP,OAAO,EACP,OAAO,EACP,WAAW,EACX,YAAY,EACb,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EACL,mBAAmB,EACnB,mBAAmB,EACnB,wBAAwB,EACxB,oBAAoB,EACpB,kBAAkB,EAClB,SAAS,EACT,SAAS,EACT,WAAW,EACX,0BAA0B,EAC3B,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C,KAAK,iBAAiB,GAAG,OAAO,GAAG,OAAO,GAAG,WAAW,CAAC;AAEzD;;;;;;;;;;;;GAYG;AACH,qBAAa,uBAAuB,CAChC,CAAC,SAAS,OAAO,GAAG,OAAO,EAC3B,CAAC,SAAS,mBAAmB,GAAG,mBAAmB,EACnD,CAAC,SAAS,mBAAmB,GAAG,mBAAmB,CAErD,SAAQ,iBAAiB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CACjC,YAAW,wBAAwB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAE5C,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,mBAAmB,CAAC,CAEzD;IAED;;;;;;;;OAQG;IACH,IAAI,UAAU,IAAI,MAAM,GAAG,SAAS,CAEnC;IAED;;;;;;;OAOG;IACH,SAAS,EAAG,MAAM,CAAC;IAEnB;;;;;;OAMG;IACH,UAAU,SAAY;IAEtB,SAAS,CAAC,SAAS,IAAI,IAAI;IAK3B;;;;;;;OAOG;IACH,IAAI,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;IAIxB;;;;;;;;OAQG;IACH,IAAI,eAAe,IAAI,oBAAoB,CAS1C;IAED;;;;;;OAMG;IACH,IAAI,iBAAiB,IAAI,kBAAkB,GAAG,SAAS,CAKtD;IAED;;;;;;;;OAQG;IACH,IAAI,UAAU,IAAI,iBAAiB,GAAG,SAAS,CAO9C;IAED;;;;;;;;OAQG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IA8B1C;;;;;;;;OAQG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IA6B1C;;;;;;OAMG;IACH,gBAAgB,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI;IAaxC;;;;;OAKG;IACH,SAAS,CAAC,kBAAkB,IAAI,IAAI;IAgBpC;;;;;;;OAOG;IACH,SAAS,CAAC,qBAAqB,IAAI,IAAI;IAUvC;;;;;;;OAOG;IACH,WAAW,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI;IAMnC;;;;;;;;OAQG;IACH,aAAa,CACX,UAAU,EAAE,YAAY,GAAG;QAAE,eAAe,CAAC,EAAE,MAAM,CAAA;KAAE,EACvD,IAAI,EAAE,KAAK,EACX,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd;QAAE,OAAO,EAAE,QAAQ,CAAC;QAAC,MAAM,EAAE,OAAO,CAAA;KAAE;IA6BzC;;;;;;;OAOG;IACI,eAAe,IAAI,MAAM,GAAG,SAAS;IAS5C;;;;;;;;OAQG;IACI,aAAa,CAClB,IAAI,EAAE,KAAK,EACX,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd,WAAW;IAWd;;;;;;OAMG;IACH,SAAS,CAAC,wBAAwB,IAAI,OAAO;IAe7C,cAAc,CAAC,KAAK,EAAE,0BAA0B,GAAG,IAAI;CAaxD"}

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

@@ -110,8 +110,27 @@ export class ExpBarControlController extends ControlController {
      * @memberof ExpBarControlController
      */
     async onCreated() {
+        var _a;
         await super.onCreated();
         this.childNames.push(this.model.xdataControlName);
+        const appDataEntity = await ibiz.hub.getAppDataEntity(this.model.appDataEntityId, this.context.srfappid);
+        if (appDataEntity) {
+            const searchFields = (_a = appDataEntity.appDEFields) === null || _a === void 0 ? void 0 : _a.filter(field => {
+                return field.enableQuickSearch;
+            });
+            const placeHolders = [];
+            searchFields === null || searchFields === void 0 ? void 0 : searchFields.forEach(searchField => {
+                if ((searchField === null || searchField === void 0 ? void 0 : searchField.lnlanguageRes) && searchField.lnlanguageRes.lanResTag) {
+                    placeHolders.push(ibiz.i18n.t(searchField.lnlanguageRes.lanResTag, searchField.logicName));
+                }
+                else if (searchField === null || searchField === void 0 ? void 0 : searchField.logicName) {
+                    placeHolders.push(searchField.logicName);
+                }
+            });
+            if (placeHolders.length > 0) {
+                this.state.placeHolder = placeHolders.join('、');
+            }
+        }
     }
     /**
      * 组件挂载

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

@@ -28,6 +28,13 @@ export declare class EditFormController extends FormController<IDEEditForm, IEdi
      * @returns {*}  {Promise<void>}
      */
     protected onCreated(): Promise<void>;
+    /**
+     * 加载草稿行为
+     * @author lxm
+     * @date 2023-08-25 02:45:11
+     * @return {*}  {Promise<IData>}
+     */
+    loadDraft(): Promise<IData>;
     /**
      * 部件加载数据行为
      *

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

@@ -1 +1 @@
-{"version":3,"file":"edit-form.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/form/edit-form/edit-form.controller.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,OAAO,EACL,cAAc,EACd,cAAc,EACd,mBAAmB,EACpB,MAAM,uBAAuB,CAAC;AAI/B,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AACzC,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD;;;;;;;;GAQG;AACH,qBAAa,kBACX,SAAQ,cAAc,CAAC,WAAW,EAAE,cAAc,EAAE,cAAc,CAClE,YAAW,mBAAmB;IAE9B;;;;;OAKG;IACH,OAAO,EAAG,eAAe,CAAC;IAE1B;;;;;;;OAOG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAY1C;;;;;OAKG;IACG,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;IA6C5B;;;;;OAKG;IACG,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;IAgC5B;;;;;;OAMG;IACG,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC;IA+BhC;;;;;;OAMG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAc7B;;;;;;;OAOG;IACG,cAAc,CAAC,gBAAgB,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA4B7D;;;;;;;OAOG;IACG,OAAO,CAAC,WAAW,GAAE,OAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAqBvD;;;;;;;OAOG;IACG,QAAQ,CAAC,WAAW,GAAE,OAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAqBlD,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAKtD;;;;;OAKG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;CAUhC"}
+{"version":3,"file":"edit-form.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/form/edit-form/edit-form.controller.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,OAAO,EACL,cAAc,EACd,cAAc,EACd,mBAAmB,EACpB,MAAM,uBAAuB,CAAC;AAI/B,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AACzC,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD;;;;;;;;GAQG;AACH,qBAAa,kBACX,SAAQ,cAAc,CAAC,WAAW,EAAE,cAAc,EAAE,cAAc,CAClE,YAAW,mBAAmB;IAE9B;;;;;OAKG;IACH,OAAO,EAAG,eAAe,CAAC;IAE1B;;;;;;;OAOG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAY1C;;;;;OAKG;IACG,SAAS,IAAI,OAAO,CAAC,KAAK,CAAC;IA6BjC;;;;;OAKG;IACG,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;IAiC5B;;;;;OAKG;IACG,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;IAoC5B;;;;;;OAMG;IACG,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC;IAmChC;;;;;;OAMG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAc7B;;;;;;;OAOG;IACG,cAAc,CAAC,gBAAgB,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA4B7D;;;;;;;OAOG;IACG,OAAO,CAAC,WAAW,GAAE,OAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAqBvD;;;;;;;OAOG;IACG,QAAQ,CAAC,WAAW,GAAE,OAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAqBlD,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAKtD;;;;;OAKG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;CAUhC"}

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

@@ -33,6 +33,38 @@ export class EditFormController extends FormController {
             trailing: true,
         });
     }
+    /**
+     * 加载草稿行为
+     * @author lxm
+     * @date 2023-08-25 02:45:11
+     * @return {*}  {Promise<IData>}
+     */
+    async loadDraft() {
+        const queryParams = Object.assign({}, this.params);
+        // 新建默认值给到graft接口，接口会回来
+        const params = await this.getDraftParams(); // 新建默认值
+        Object.assign(queryParams, params);
+        let res;
+        try {
+            await this.startLoading();
+            await this.evt.emit('onBeforeLoadDraft', { params: queryParams });
+            res = await this.service.getDraft(this.context, queryParams);
+        }
+        catch (error) {
+            await this.evt.emit('onLoadDraftError', undefined);
+            throw error;
+        }
+        finally {
+            await this.endLoading();
+        }
+        this.state.data = res.data;
+        // 处理后台导致的新建默认值丢失
+        mergeDefaultInLeft(this.data, params);
+        this.formStateNotify(FormNotifyState.DRAFT);
+        await this.evt.emit('onLoadDraftSuccess', undefined);
+        this.state.isLoaded = true;
+        return this.data;
+    }
     /**
      * 部件加载数据行为
      *
@@ -41,35 +73,28 @@ export class EditFormController extends FormController {
      */
     async load() {
         const isLoadDraft = !hasDeCodeName(this.context, this.model.appDataEntityId);
-        const queryParams = Object.assign({}, this.params);
-        // 新建默认值给到graft接口，接口会回来
-        let params = {};
+        // 加载草稿单独走一个方法
         if (isLoadDraft) {
-            params = await this.getDraftParams();
-            Object.assign(queryParams, params);
+            return this.loadDraft();
         }
-        await this.startLoading();
+        const queryParams = Object.assign({}, this.params);
         let res;
         try {
-            res = isLoadDraft
-                ? await this.service.getDraft(this.context, queryParams)
-                : await this.service.get(this.context, queryParams);
+            await this.startLoading();
+            await this.evt.emit('onBeforeLoad', undefined);
+            res = await this.service.get(this.context, queryParams);
+        }
+        catch (error) {
+            await this.evt.emit('onLoadError', undefined);
+            throw error;
         }
         finally {
             await this.endLoading();
         }
-        if (isLoadDraft) {
-            // !getDraft的时候不替换，进行合并，空值不覆盖
-            mergeInLeft(this.data, res.data);
-        }
-        else {
-            this.state.data = res.data;
-        }
         this.state.modified = false;
         this.state.data = res.data;
-        mergeDefaultInLeft(this.data, params);
-        this.formStateNotify(isLoadDraft ? FormNotifyState.DRAFT : FormNotifyState.LOAD);
-        await this.evt.emit(isLoadDraft ? 'onLoadDraftSuccess' : 'onLoadSuccess', undefined);
+        this.formStateNotify(FormNotifyState.LOAD);
+        await this.evt.emit('onLoadSuccess', undefined);
         this.state.isLoaded = true;
         return this.data;
     }
@@ -90,6 +115,7 @@ export class EditFormController extends FormController {
             throw new RuntimeError('请检查表单填写！');
         }
         await this.startLoading();
+        await this.evt.emit('onBeforeSave', undefined);
         let res;
         try {
             res =
@@ -97,6 +123,10 @@ export class EditFormController extends FormController {
                     ? await this.service.create(this.context, this.data)
                     : await this.service.update(this.context, this.data);
         }
+        catch (error) {
+            await this.evt.emit('onSaveError', undefined);
+            throw error;
+        }
         finally {
             await this.endLoading();
         }
@@ -121,6 +151,7 @@ export class EditFormController extends FormController {
         // 新建数据清空数据
         let res;
         let ok = false;
+        await this.evt.emit('onBeforeRemove', undefined);
         // 新建的数据不用进行后台删除
         if (this.data.srfuf === Srfuf.UPDATE) {
             ok = await ibiz.modal.confirm({
@@ -135,6 +166,10 @@ export class EditFormController extends FormController {
             try {
                 res = await this.service.remove(this.context, this.params);
             }
+            catch (error) {
+                await this.evt.emit('onRemoveError', undefined);
+                throw error;
+            }
             finally {
                 await this.endLoading();
             }

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

@@ -1,7 +1,9 @@
-import { IControl } from '@ibiz/model-core';
+import { IControl, IDEFormDetail } from '@ibiz/model-core';
 import { IFormController } from '../../../../../../../interface';
 import { CTX } from '../../../../../../ctx';
 import { EditFormController } from '../../../../edit-form';
+import { FormController } from '../../../../form';
+import { FormGroupPanelController } from '../../../form-group-panel';
 /**
  * 表单多数据部件项控制器
  *
@@ -13,6 +15,6 @@ import { EditFormController } from '../../../../edit-form';
  */
 export declare class FormMDCtrlItemController extends EditFormController implements IFormController {
     constructor(model: IControl, context: IContext, params: IParams, ctx: CTX, data: IData);
-    onInit(): Promise<void>;
+    protected initDetailControllers(details?: IDEFormDetail[], form?: FormController, parent?: FormGroupPanelController | undefined): Promise<void>;
 }
 //# sourceMappingURL=form-mdctrl-repeater-form-item.controller.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"form-mdctrl-repeater-form-item.controller.d.ts","sourceRoot":"","sources":["../../../../../../../../src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-repeater/form-mdctrl-repeater-form/form-mdctrl-repeater-form-item.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAiB,MAAM,kBAAkB,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAC5C,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAE3D;;;;;;;;GAQG;AACH,qBAAa,wBACX,SAAQ,kBACR,YAAW,eAAe;gBAGxB,KAAK,EAAE,QAAQ,EACf,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,EACf,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,KAAK;IAOA,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;CAKrC"}
+{"version":3,"file":"form-mdctrl-repeater-form-item.controller.d.ts","sourceRoot":"","sources":["../../../../../../../../src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-repeater/form-mdctrl-repeater-form/form-mdctrl-repeater-form-item.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAiB,MAAM,kBAAkB,CAAC;AAC1E,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAGjE,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAC5C,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,wBAAwB,EAAE,MAAM,2BAA2B,CAAC;AAGrE;;;;;;;;GAQG;AACH,qBAAa,wBACX,SAAQ,kBACR,YAAW,eAAe;gBAGxB,KAAK,EAAE,QAAQ,EACf,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,EACf,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,KAAK;cAOG,qBAAqB,CACnC,OAAO,GAAE,aAAa,EAAiD,EACvE,IAAI,GAAE,cAAqB,EAC3B,MAAM,GAAE,wBAAwB,GAAG,SAAqB,GACvD,OAAO,CAAC,IAAI,CAAC;CAiCjB"}

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

@@ -1,3 +1,5 @@
+import { findChildFormDetails } from '../../../../../../../model';
+import { getFormDetailProvider } from '../../../../../../../register';
 import { EditFormController } from '../../../../edit-form';
 /**
  * 表单多数据部件项控制器
@@ -14,7 +16,25 @@ export class FormMDCtrlItemController extends EditFormController {
         this.state.data = data;
         this.state.isSimple = true;
     }
-    async onInit() {
-        await this.initDetailControllers(this.model.deformDetails);
+    async initDetailControllers(details = this.model.deformDetails, form = this, parent = undefined) {
+        await Promise.all(details.map(async (detail) => {
+            // 生成表单成员控制器
+            const detailProvider = await getFormDetailProvider(detail);
+            if (!detailProvider) {
+                return;
+            }
+            form.providers[detail.id] = detailProvider;
+            const detailController = await detailProvider.createController(detail, form, parent);
+            form.details[detail.id] = detailController;
+            if (detail.detailType === 'FORMITEM' ||
+                detail.detailType === 'MDCTRL') {
+                form.formItems.push(detailController);
+            }
+            // 有子成员的生成子控制器
+            const childDetails = findChildFormDetails(detail);
+            if (childDetails.length) {
+                await this.initDetailControllers(childDetails, form, detailController);
+            }
+        }));
     }
 }

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

@@ -1,8 +1,5 @@
-import { IDEFormDetail } from '@ibiz/model-core';
-import { FormController } from '../../../../form';
-import { FormGroupPanelController } from '../../../form-group-panel';
 import { FormMDCtrlContentTypeController } from '../../form-mdctrl-content-type.controller';
-import { IFormDetailController } from '../../../../../../../interface';
+import { FormMDCtrlItemController } from './form-mdctrl-repeater-form-item.controller';
 /**
  * 表单多数据部件表格类型控制器
  *
@@ -14,48 +11,6 @@ import { IFormDetailController } from '../../../../../../../interface';
  * @implements {IFormController}
  */
 export declare class FormMDCtrlRepeaterFormController extends FormMDCtrlContentTypeController {
-    /**
-     * 表单项控制器的集合（二维数组）
-     *
-     * @author zk
-     * @date 2023-07-25 05:07:56
-     * @type {Array<Array<FormItemController>>}
-     * @memberof FormMDCtrlController
-     */
-    formDetails: Array<Array<{
-        name: string;
-        detailType: string;
-        c: IFormDetailController;
-    }>>;
-    /**
-     * 表单ctx
-     *
-     * @author zk
-     * @date 2023-07-31 12:07:00
-     * @private
-     * @type {CTX}
-     * @memberof FormMDCtrlRepeaterFormController
-     */
-    private formCtx;
-    /**
-     * uiState
-     *
-     * @author zk
-     * @date 2023-07-31 12:07:07
-     * @type {{ isInit: boolean }}
-     * @memberof FormMDCtrlRepeaterFormController
-     */
-    state: {
-        isInit: boolean;
-    };
-    /**
-     * 初始化表单成员控制器
-     *
-     * @author lxm
-     * @date 2022-08-24 21:08:48
-     * @protected
-     */
-    protected initFormMDCtrlItemControllers(details: IDEFormDetail[], index: number, form?: FormController, data?: IData, parent?: FormGroupPanelController | undefined): Promise<IData>;
     /**
      * 数据插入
      *
@@ -73,22 +28,7 @@ export declare class FormMDCtrlRepeaterFormController extends FormMDCtrlContentT
      * @memberof FormMDCtrlController
      */
     onDataRemove(index: number): void;
-    /**
-     * 初始化formCtx
-     *
-     * @author zk
-     * @date 2023-07-29 05:07:21
-     * @memberof FormMDCtrlRepeaterFormController
-     */
-    useFormMdCtrlCtx(): void;
-    /**
-     * 初始化数据
-     *
-     * @author zk
-     * @date 2023-07-31 12:07:37
-     * @memberof FormMDCtrlRepeaterFormController
-     */
-    initData(): Promise<void>;
+    formControllerArray: Array<FormMDCtrlItemController>;
     /**
      * 表单项值规则校验
      *
@@ -97,5 +37,6 @@ export declare class FormMDCtrlRepeaterFormController extends FormMDCtrlContentT
      * @memberof FormMDCtrlRepeaterFormController
      */
     validate(): Promise<boolean>;
+    setFromController(c: FormMDCtrlItemController): void;
 }
 //# sourceMappingURL=form-mdctrl-repeater-form.controller.d.ts.map