@ibiz-template/runtime 0.3.1 → 0.3.3

package/out/app-hub.d.ts

@@ -1,6 +1,6 @@
 import { IAppDataEntity, IAppView, IApplication } from '@ibiz/model-core';
 import { Application } from './application';
-import { IAppHubService, ModelLoaderProvider } from './interface';
+import { IAppHubService, IAppService, ModelLoaderProvider } from './interface';
 import { AppConfigService, Convert } from './hub';
 import { HubController } from './controller';
 import { ConfigService } from './service';
@@ -207,17 +207,17 @@ export declare class AppHub implements IAppHubService {
      * @author chitanda
      * @date 2023-04-17 21:04:41
      * @param {string} [key=ibiz.env.appId]
-     * @return {*}  {Promise<Application>}
+     * @return {*}  {Promise<IAppService>}
      */
-    getAppAsync(key?: string): Promise<Application>;
+    getAppAsync(key?: string): Promise<IAppService>;
     /**
      * 根据应用 id 或应用模型获取应用实例
      *
      * @author chitanda
      * @date 2023-04-17 22:04:42
      * @param {(string | IApplication)} [app]
-     * @return {*}  {Application}
+     * @return {*}  {IAppService}
      */
-    getApp(app?: string | IApplication): Application;
+    getApp(app?: string | IApplication): IAppService;
 }
 //# sourceMappingURL=app-hub.d.ts.map

package/out/app-hub.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"app-hub.d.ts","sourceRoot":"","sources":["../src/app-hub.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAE1E,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAClE,OAAO,EAAE,gBAAgB,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAE1C;;;;;;;GAOG;AACH,qBAAa,MAAO,YAAW,cAAc;IAC3C;;;;;;OAMG;IACH,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAiB;IAE1C;;;;;OAKG;IACH,QAAQ,CAAC,UAAU,gBAAuB;IAE1C;;;;;;OAMG;IACH,WAAW,EAAG,aAAa,CAAC;IAE5B;;;;;;;OAOG;IACH,SAAS,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAa;IAEvD;;;;;;;OAOG;IACH,SAAS,CAAC,IAAI,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAa;IAEtD;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAa;IAEvD;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAa;IAEnD;;;;;;;OAOG;IACH,SAAS,CAAC,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC,CAAa;IAE7E;;;;;;OAMG;IACH,SAAS,CAAC,mBAAmB,CAAC,EAAE,mBAAmB,CAAC;IAEpD;;;;OAIG;IACH,MAAM,mBAA0B;IAEhC;;;;;;OAMG;IACH,uBAAuB,EAAE,MAAM,CAAW;IAE1C;;;;;;;;OAQG;IACH,SAAS,CAAC,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAW5C;;;;;;OAMG;IACH,2BAA2B,CAAC,QAAQ,EAAE,mBAAmB,GAAG,IAAI;IAIhE;;;;;;OAMG;IACH,WAAW,CAAC,KAAK,EAAE,YAAY,GAAG,IAAI;IAItC;;;;;;OAMG;IACH,eAAe,CAAC,KAAK,EAAE,QAAQ,GAAG,IAAI;IAItC;;;;;;;OAOG;IACH,qBAAqB,CACnB,KAAK,EAAE,cAAc,EACrB,KAAK,GAAE,MAAuB,GAC7B,IAAI;IAQP;;;;;;;OAOG;IACH,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,GAAE,MAAuB,GAAG,IAAI;IAK7D;;;;;;;OAOG;IACH,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;IAKhC;;;;;;;OAOG;IACG,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAOxD;;;;;;;OAOG;IACG,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC;IAiBhD;;;;;;;;OAQG;IACG,gBAAgB,CACpB,EAAE,EAAE,MAAM,EACV,KAAK,GAAE,MAAuB,GAC7B,OAAO,CAAC,cAAc,CAAC;IAuB1B;;;;;;;OAOG;cACa,SAAS,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;IA0B3D;;;;;;;OAOG;IACG,WAAW,CAAC,GAAG,GAAE,MAAuB,GAAG,OAAO,CAAC,WAAW,CAAC;IAIrE;;;;;;;OAOG;IACH,MAAM,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,YAAY,GAAG,WAAW;CAajD"}
+{"version":3,"file":"app-hub.d.ts","sourceRoot":"","sources":["../src/app-hub.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAE1E,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAC/E,OAAO,EAAE,gBAAgB,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAE1C;;;;;;;GAOG;AACH,qBAAa,MAAO,YAAW,cAAc;IAC3C;;;;;;OAMG;IACH,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAiB;IAE1C;;;;;OAKG;IACH,QAAQ,CAAC,UAAU,gBAAuB;IAE1C;;;;;;OAMG;IACH,WAAW,EAAG,aAAa,CAAC;IAE5B;;;;;;;OAOG;IACH,SAAS,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAa;IAEvD;;;;;;;OAOG;IACH,SAAS,CAAC,IAAI,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAa;IAEtD;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAa;IAEvD;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAa;IAEnD;;;;;;;OAOG;IACH,SAAS,CAAC,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC,CAAa;IAE7E;;;;;;OAMG;IACH,SAAS,CAAC,mBAAmB,CAAC,EAAE,mBAAmB,CAAC;IAEpD;;;;OAIG;IACH,MAAM,mBAA0B;IAEhC;;;;;;OAMG;IACH,uBAAuB,EAAE,MAAM,CAAW;IAE1C;;;;;;;;OAQG;IACH,SAAS,CAAC,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAW5C;;;;;;OAMG;IACH,2BAA2B,CAAC,QAAQ,EAAE,mBAAmB,GAAG,IAAI;IAIhE;;;;;;OAMG;IACH,WAAW,CAAC,KAAK,EAAE,YAAY,GAAG,IAAI;IAItC;;;;;;OAMG;IACH,eAAe,CAAC,KAAK,EAAE,QAAQ,GAAG,IAAI;IAItC;;;;;;;OAOG;IACH,qBAAqB,CACnB,KAAK,EAAE,cAAc,EACrB,KAAK,GAAE,MAAuB,GAC7B,IAAI;IAQP;;;;;;;OAOG;IACH,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,GAAE,MAAuB,GAAG,IAAI;IAK7D;;;;;;;OAOG;IACH,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;IAKhC;;;;;;;OAOG;IACG,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAOxD;;;;;;;OAOG;IACG,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC;IAiBhD;;;;;;;;OAQG;IACG,gBAAgB,CACpB,EAAE,EAAE,MAAM,EACV,KAAK,GAAE,MAAuB,GAC7B,OAAO,CAAC,cAAc,CAAC;IAuB1B;;;;;;;OAOG;cACa,SAAS,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;IA0B3D;;;;;;;OAOG;IACG,WAAW,CAAC,GAAG,GAAE,MAAuB,GAAG,OAAO,CAAC,WAAW,CAAC;IAIrE;;;;;;;OAOG;IACH,MAAM,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,YAAY,GAAG,WAAW;CAajD"}

package/out/app-hub.js

@@ -281,7 +281,7 @@ export class AppHub {
      * @author chitanda
      * @date 2023-04-17 21:04:41
      * @param {string} [key=ibiz.env.appId]
-     * @return {*}  {Promise<Application>}
+     * @return {*}  {Promise<IAppService>}
      */
     async getAppAsync(key = ibiz.env.appId) {
         return this.createApp(key);
@@ -292,7 +292,7 @@ export class AppHub {
      * @author chitanda
      * @date 2023-04-17 22:04:42
      * @param {(string | IApplication)} [app]
-     * @return {*}  {Application}
+     * @return {*}  {IAppService}
      */
     getApp(app) {
         let key = null;

package/out/config/global-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"global-config.d.ts","sourceRoot":"","sources":["../../src/config/global-config.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,iBAAiB,EACjB,oBAAoB,EACpB,qBAAqB,EACrB,iBAAiB,EAClB,MAAM,cAAc,CAAC;AAEtB;;;;;;;;GAQG;AACH,qBAAa,YAAa,YAAW,aAAa;IAEhD,IAAI,EAAE,iBAAiB,CAGrB;IAGF,IAAI,EAAE,iBAAiB,CAGrB;IAGF,OAAO,EAAE,oBAAoB,CAE3B;IAGF,QAAQ,EAAE,qBAAqB,CAE7B;CACH"}
+{"version":3,"file":"global-config.d.ts","sourceRoot":"","sources":["../../src/config/global-config.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,iBAAiB,EACjB,oBAAoB,EACpB,qBAAqB,EACrB,iBAAiB,EAClB,MAAM,cAAc,CAAC;AAEtB;;;;;;;;GAQG;AACH,qBAAa,YAAa,YAAW,aAAa;IAEhD,IAAI,EAAE,iBAAiB,CAGrB;IAGF,IAAI,EAAE,iBAAiB,CAIrB;IAGF,OAAO,EAAE,oBAAoB,CAE3B;IAGF,QAAQ,EAAE,qBAAqB,CAE7B;CACH"}

package/out/config/global-config.js

@@ -18,6 +18,7 @@ export class GlobalConfig {
         this.grid = {
             editShowMode: 'row',
             editSaveMode: 'cell-blur',
+            overflowMode: 'wrap',
         };
         // 全局菜单配置
         this.appMenu = {

package/out/constant/sys-uiaction-tag.d.ts

@@ -90,6 +90,10 @@ export declare enum SysUIActionTag {
      * 搜索
      */
     'SEARCH' = "Search",
+    /**
+     * 重置
+     */
+    'RESET' = "Reset",
     /**
      * 完成
      */

package/out/constant/sys-uiaction-tag.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sys-uiaction-tag.d.ts","sourceRoot":"","sources":["../../src/constant/sys-uiaction-tag.ts"],"names":[],"mappings":"AACA;;;;;;GAMG;AACH,oBAAY,cAAc;IACxB;;OAEG;IACH,KAAK,QAAQ;IACb;;OAEG;IACH,MAAM,SAAS;IACf;;OAEG;IACH,SAAS,YAAY;IACrB;;OAEG;IACH,MAAM,SAAS;IACf;;OAEG;IACH,eAAe,gBAAgB;IAC/B;;OAEG;IACH,cAAc,eAAe;IAC7B;;OAEG;IACH,MAAM,SAAS;IACf;;OAEG;IACH,UAAU,YAAY;IACtB;;OAEG;IACH,QAAQ,WAAW;IACnB;;OAEG;IACH,iBAAiB,kBAAkB;IACnC;;OAEG;IACH,SAAS,WAAW;IACpB;;OAEG;IACH,eAAe,iBAAiB;IAChC;;OAEG;IACH,QAAQ,WAAW;IACnB;;OAEG;IACH,cAAc,gBAAgB;IAC9B;;OAEG;IACH,gBAAgB,iBAAiB;IACjC;;OAEG;IACH,cAAc,eAAe;IAC7B;;OAEG;IACH,IAAI,OAAO;IACX;;OAEG;IACH,KAAK,QAAQ;IACb;;OAEG;IACH,QAAQ,WAAW;IACnB;;OAEG;IACH,IAAI,OAAO;IACX;;OAEG;IACH,QAAQ,WAAW;IACnB;;OAEG;IACH,QAAQ,WAAW;IACnB;;OAEG;IACH,WAAW,aAAa;IACxB;;OAEG;IACH,WAAW,aAAa;IACxB;;OAEG;IACH,eAAe,iBAAiB;IAChC;;OAEG;IACH,kBAAkB,oBAAoB;IACtC;;OAEG;IACH,YAAY,cAAc;IAC1B;;OAEG;IACH,SAAS,WAAW;IACpB;;OAEG;IACH,QAAQ,WAAW;IACnB;;OAEG;IACH,OAAO,UAAU;IACjB;;OAEG;IACH,gBAAgB,kBAAkB;IAClC;;OAEG;IACH,MAAM,SAAS;IACf;;OAEG;IACH,MAAM,SAAS;IACf;;OAEG;IACH,iBAAiB,kBAAkB;IACnC;;OAEG;IACH,aAAa,eAAe;IAC5B;;OAEG;IACH,gBAAgB,kBAAkB;IAIlC;;OAEG;IACH,WAAW,aAAa;CAGzB"}
+{"version":3,"file":"sys-uiaction-tag.d.ts","sourceRoot":"","sources":["../../src/constant/sys-uiaction-tag.ts"],"names":[],"mappings":"AACA;;;;;;GAMG;AACH,oBAAY,cAAc;IACxB;;OAEG;IACH,KAAK,QAAQ;IACb;;OAEG;IACH,MAAM,SAAS;IACf;;OAEG;IACH,SAAS,YAAY;IACrB;;OAEG;IACH,MAAM,SAAS;IACf;;OAEG;IACH,eAAe,gBAAgB;IAC/B;;OAEG;IACH,cAAc,eAAe;IAC7B;;OAEG;IACH,MAAM,SAAS;IACf;;OAEG;IACH,UAAU,YAAY;IACtB;;OAEG;IACH,QAAQ,WAAW;IACnB;;OAEG;IACH,iBAAiB,kBAAkB;IACnC;;OAEG;IACH,SAAS,WAAW;IACpB;;OAEG;IACH,eAAe,iBAAiB;IAChC;;OAEG;IACH,QAAQ,WAAW;IACnB;;OAEG;IACH,cAAc,gBAAgB;IAC9B;;OAEG;IACH,gBAAgB,iBAAiB;IACjC;;OAEG;IACH,cAAc,eAAe;IAC7B;;OAEG;IACH,IAAI,OAAO;IACX;;OAEG;IACH,KAAK,QAAQ;IACb;;OAEG;IACH,QAAQ,WAAW;IACnB;;OAEG;IACH,IAAI,OAAO;IACX;;OAEG;IACH,QAAQ,WAAW;IACnB;;OAEG;IACH,OAAO,UAAU;IACjB;;OAEG;IACH,QAAQ,WAAW;IACnB;;OAEG;IACH,WAAW,aAAa;IACxB;;OAEG;IACH,WAAW,aAAa;IACxB;;OAEG;IACH,eAAe,iBAAiB;IAChC;;OAEG;IACH,kBAAkB,oBAAoB;IACtC;;OAEG;IACH,YAAY,cAAc;IAC1B;;OAEG;IACH,SAAS,WAAW;IACpB;;OAEG;IACH,QAAQ,WAAW;IACnB;;OAEG;IACH,OAAO,UAAU;IACjB;;OAEG;IACH,gBAAgB,kBAAkB;IAClC;;OAEG;IACH,MAAM,SAAS;IACf;;OAEG;IACH,MAAM,SAAS;IACf;;OAEG;IACH,iBAAiB,kBAAkB;IACnC;;OAEG;IACH,aAAa,eAAe;IAC5B;;OAEG;IACH,gBAAgB,kBAAkB;IAIlC;;OAEG;IACH,WAAW,aAAa;CAGzB"}

package/out/constant/sys-uiaction-tag.js

@@ -92,6 +92,10 @@ export var SysUIActionTag;
      * 搜索
      */
     SysUIActionTag["SEARCH"] = "Search";
+    /**
+     * 重置
+     */
+    SysUIActionTag["RESET"] = "Reset";
     /**
      * 完成
      */

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

@@ -1,5 +1,5 @@
 import { IBizContext, IBizParams, NoticeError } from '@ibiz-template/core';
-import { isNil } from 'ramda';
+import { clone, isNil } from 'ramda';
 import { notNilEmpty } from 'qx-util';
 import { BaseController } from '..';
 import { getControlProvider } from '../../../register';
@@ -49,7 +49,7 @@ export class ControlController extends BaseController {
         this.registerToCtx();
         const panelModel = ibiz.util.layoutPanel.get(`${model.controlType}_DEFAULT`);
         if (panelModel) {
-            this.controlPanel = panelModel;
+            this.controlPanel = clone(panelModel);
         }
         this.updateContextParams({});
     }

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

@@ -1,6 +1,5 @@
 import { IAppMenu, IAppMenuItem } from '@ibiz/model-core';
-import { Application } from '../../../application';
-import { IAppMenuState, IAppMenuEvent, IAppMenuController } from '../../../interface';
+import { IAppMenuState, IAppMenuEvent, IAppMenuController, IAppService } from '../../../interface';
 import { AppCounter } from '../../../service';
 import { ControlController } from '../../common';
 /**
@@ -13,7 +12,7 @@ import { ControlController } from '../../common';
  * @extends {ControlController}
  */
 export declare class AppMenuController extends ControlController<IAppMenu, IAppMenuState, IAppMenuEvent> implements IAppMenuController {
-    app: Application;
+    app: IAppService;
     protected initState(): 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,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"}
+{"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;AAE1D,OAAO,EACL,aAAa,EACb,aAAa,EACb,kBAAkB,EAClB,WAAW,EACZ,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/form/edit-form/edit-form.service.js

@@ -179,7 +179,7 @@ export class EditFormService extends ControlService {
         recursiveIterate(this.model, (item) => {
             if (item.detailType === 'FORMITEM' || item.detailType === 'MDCTRL') {
                 const formItem = item;
-                const uiKey = formItem.fieldName || formItem.id.toLowerCase();
+                const uiKey = formItem.id.toLowerCase();
                 const deField = formItem.fieldName || item.appDEFieldId;
                 let mapField;
                 if (deField) {

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

@@ -21,7 +21,7 @@ export class FormItemController extends FormDetailController {
      * @readonly
      */
     get name() {
-        return this.model.fieldName || this.model.id;
+        return this.model.id;
     }
     /**
      * 表单项对应属性的值

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

@@ -76,5 +76,14 @@ export declare class SearchFormController extends FormController<IDESearchForm,
      * @date 2022-09-27 16:48:47
      */
     onKeyUp(event: KeyboardEvent): Promise<void>;
+    /**
+     * 根据搜索表单的按钮位置和按钮样式
+     * 预处理部件布局面板模型
+     * @author lxm
+     * @date 2023-11-21 04:17:43
+     * @protected
+     * @return {*}
+     */
+    protected preprocessLayoutPanel(): void;
 }
 //# sourceMappingURL=search-form.controller.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"search-form.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/form/search-form/search-form.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EACL,qBAAqB,EACrB,gBAAgB,EAChB,gBAAgB,EACjB,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAE1D;;;;;;;;;GASG;AACH,qBAAa,oBACX,SAAQ,cAAc,CAAC,aAAa,EAAE,gBAAgB,EAAE,gBAAgB,CACxE,YAAW,qBAAqB;IAEhC;;;;;;OAMG;IACH,OAAO,EAAG,iBAAiB,CAAC;cAEZ,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;cAS1B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAS1C;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;IAwB5B;;;;;;OAMG;IACH,eAAe,IAAI,OAAO;IAY1B;;;;;OAKG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAI7B;;;;;OAKG;IACG,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;IAI1C;;;;;OAKG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAK5B;;;;;;OAMG;IACG,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAOtD;;;;;;OAMG;IACG,OAAO,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;CAOnD"}
+{"version":3,"file":"search-form.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/form/search-form/search-form.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EACL,qBAAqB,EACrB,gBAAgB,EAChB,gBAAgB,EACjB,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAE1D;;;;;;;;;GASG;AACH,qBAAa,oBACX,SAAQ,cAAc,CAAC,aAAa,EAAE,gBAAgB,EAAE,gBAAgB,CACxE,YAAW,qBAAqB;IAEhC;;;;;;OAMG;IACH,OAAO,EAAG,iBAAiB,CAAC;cAEZ,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;cAU1B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAS1C;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;IAwB5B;;;;;;OAMG;IACH,eAAe,IAAI,OAAO;IAY1B;;;;;OAKG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAI7B;;;;;OAKG;IACG,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;IAI1C;;;;;OAKG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAK5B;;;;;;OAMG;IACG,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAOtD;;;;;;OAMG;IACG,OAAO,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAQlD;;;;;;;OAOG;IACH,SAAS,CAAC,qBAAqB,IAAI,IAAI;CAsDxC"}

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

@@ -15,6 +15,7 @@ import { SearchFormService } from './search-form.service';
 export class SearchFormController extends FormController {
     async onCreated() {
         await super.onCreated();
+        this.preprocessLayoutPanel();
         // 实例部件服务
         this.service = new SearchFormService(this.model);
         await this.service.init(this.context);
@@ -131,4 +132,62 @@ export class SearchFormController extends FormController {
             await this.onSearchButtonClick();
         }
     }
+    /**
+     * 根据搜索表单的按钮位置和按钮样式
+     * 预处理部件布局面板模型
+     * @author lxm
+     * @date 2023-11-21 04:17:43
+     * @protected
+     * @return {*}
+     */
+    preprocessLayoutPanel() {
+        if (!this.controlPanel) {
+            return;
+        }
+        const { searchButtonStyle } = this.model;
+        let deleteRight = false;
+        let deleteBottom = false;
+        const searchButtonPos = this.model.searchButtonPos || 'RIGHT';
+        deleteRight = searchButtonPos === 'BOTTOM';
+        deleteBottom = searchButtonPos !== 'BOTTOM';
+        if (searchButtonStyle === 'NONE') {
+            deleteRight = true;
+            deleteBottom = true;
+        }
+        /**
+         * 递归面板项
+         * @author lxm
+         * @date 2023-11-21 04:16:36
+         * @param {IData} parent
+         */
+        const recursivePanelItems = (parent) => {
+            let children;
+            let childrenKey = '';
+            ['rootPanelItems', 'panelItems'].find(key => {
+                if (parent[key]) {
+                    children = parent[key];
+                    childrenKey = key;
+                    return true;
+                }
+                return false;
+            });
+            if (children && children.length > 0) {
+                const newArr = [];
+                children.forEach((item) => {
+                    const isDelete = (deleteRight && item.id === 'control_buttons_right') ||
+                        (deleteBottom && item.id === 'control_buttons_bottom');
+                    if (!isDelete) {
+                        newArr.push(item);
+                        recursivePanelItems(item);
+                    }
+                });
+                if (newArr.length < children.length) {
+                    parent[childrenKey] = newArr;
+                }
+            }
+        };
+        if (deleteBottom || deleteRight) {
+            recursivePanelItems(this.controlPanel);
+        }
+    }
 }

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

@@ -1,10 +1,10 @@
-import { IDEGrid, IDEGridColumn } from '@ibiz/model-core';
+import { IDEGrid, IDEGridColumn, IDEDataExport } from '@ibiz/model-core';
 import { GridFieldColumnController } from '../grid-column/grid-field-column/grid-field-column.controller';
 import { GridColumnController } from './grid-column.controller';
 import { GridRowState } from './grid-row.state';
 import { GridService } from './grid.service';
 import { GridFieldEditColumnController, GridUAColumnController } from '../grid-column';
-import { IGridState, IGridEvent, IGridController, IGridColumnProvider, CodeListItem, MDCtrlLoadParams, IGridRowState } from '../../../../interface';
+import { IGridState, IGridEvent, IGridController, IGridColumnProvider, CodeListItem, MDCtrlLoadParams, IGridRowState, IExportColumn } from '../../../../interface';
 import { ControlVO } from '../../../../service';
 import { MDControlController } from '../../../common';
 import { GridNotifyState } from '../../../constant';
@@ -104,6 +104,20 @@ export declare class GridController extends MDControlController<IDEGrid, IGridSt
      * @type {string}
      */
     aggTitle: string;
+    /**
+     * 数据导出对象
+     * @author lxm
+     * @date 2023-08-07 04:11:00
+     * @type {IDEDataExport}
+     */
+    dataExport: IDEDataExport | undefined;
+    /**
+     * 数据导出列
+     * @author lxm
+     * @date 2023-08-07 04:11:00
+     * @type {IDEDataExport}
+     */
+    allExportColumns: IExportColumn[] | undefined;
     /**
      * 分组代码表项集合
      * @author lxm
@@ -127,6 +141,14 @@ export declare class GridController extends MDControlController<IDEGrid, IGridSt
      * @type {boolean}
      */
     get allowRowEdit(): boolean;
+    /**
+     * 单元格超出呈现模式
+     * @author lxm
+     * @date 2023-11-17 01:56:26
+     * @readonly
+     * @type {('wrap' | 'ellipsis')}
+     */
+    get overflowMode(): 'wrap' | 'ellipsis';
     protected initState(): void;
     /**
      * 初始化方法
@@ -298,6 +320,13 @@ export declare class GridController extends MDControlController<IDEGrid, IGridSt
      * @memberof GridController
      */
     loadData(args: MDCtrlLoadParams): Promise<ControlVO[]>;
+    /**
+     * 初始化数据导出列
+     * @return {*}
+     * @author: zhujiamin
+     * @Date: 2023-11-21 18:54:16
+     */
+    findAllExportColumns(dataExport: IDEDataExport): Promise<IExportColumn[] | undefined>;
     /**
      * 数据导出
      *

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":"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"}

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

@@ -114,6 +114,16 @@ export class GridController extends MDControlController {
     get allowRowEdit() {
         return !!this.model.enableRowEdit && this.state.rowEditOpen;
     }
+    /**
+     * 单元格超出呈现模式
+     * @author lxm
+     * @date 2023-11-17 01:56:26
+     * @readonly
+     * @type {('wrap' | 'ellipsis')}
+     */
+    get overflowMode() {
+        return ibiz.config.grid.overflowMode;
+    }
     initState() {
         super.initState();
         this.state.rows = [];
@@ -728,6 +738,30 @@ export class GridController extends MDControlController {
         }
         return res.data;
     }
+    /**
+     * 初始化数据导出列
+     * @return {*}
+     * @author: zhujiamin
+     * @Date: 2023-11-21 18:54:16
+     */
+    async findAllExportColumns(dataExport) {
+        var _a;
+        const app = ibiz.hub.getApp(this.context.srfappid);
+        const exportColumnsPromises = (_a = dataExport.dedataExportItems) === null || _a === void 0 ? void 0 : _a.map(async (item) => {
+            const tempExportColumn = Object.assign({}, item);
+            if (item.codeListId) {
+                // 加载代码表模型
+                tempExportColumn.codeList = app.codeList.getCodeList(item.codeListId);
+                tempExportColumn.codeListItems = await app.codeList.get(item.codeListId);
+            }
+            return tempExportColumn;
+        });
+        // 使用 Promise.all 等待所有 Promise 解析
+        if (exportColumnsPromises) {
+            return Promise.all(exportColumnsPromises);
+        }
+        return undefined;
+    }
     /**
      * 数据导出
      *
@@ -736,32 +770,52 @@ export class GridController extends MDControlController {
      * @memberof MDControlController
      */
     async exportData(_args) {
-        // 前台导出
-        const items = this.fieldColumns;
+        var _a;
+        // 初始化导出对象
+        if (this.model.dedataExportId && !this.dataExport) {
+            this.dataExport = (_a = this.dataEntity.appDEDataExports) === null || _a === void 0 ? void 0 : _a.find(dataExport => {
+                return dataExport.id === this.model.dedataExportId;
+            });
+            if (this.dataExport) {
+                this.allExportColumns = await this.findAllExportColumns(this.dataExport);
+            }
+        }
         // 数据格式化
         const formatExcelData = (data) => {
-            // const codeListMap: Map<string, readonly CodeListItem[]> = new Map();
-            // Object.keys(items).forEach((key: string) => {
-            //   if (items[key].codeList) {
-            //     codeListMap.set(key, items[key].codeListItems!);
-            //   }
-            // });
+            var _a;
+            const codeListMap = new Map();
+            if (this.allExportColumns && this.allExportColumns.length > 0) {
+                (_a = this.allExportColumns) === null || _a === void 0 ? void 0 : _a.forEach((exportColumn) => {
+                    if (exportColumn.codeListItems) {
+                        codeListMap.set(exportColumn.appDEFieldId, exportColumn.codeListItems);
+                    }
+                });
+            }
+            else {
+                Object.keys(this.fieldColumns).forEach((key) => {
+                    if (this.fieldColumns[key].codeList) {
+                        codeListMap.set(key, this.fieldColumns[key].codeListItems);
+                    }
+                });
+            }
             const cloneData = clone(data.map(item => {
                 return item.getOrigin();
             }));
-            // cloneData.forEach(item => {
-            //   const fields = Object.keys(item);
-            //   fields.forEach((key: string) => {
-            //     if (codeListMap.get(key)) {
-            //       item[key] =
-            //         codeListMap.get(key)!.find(_item => {
-            //           return _item.value === item[key];
-            //         })?.text || item[key];
-            //     }
-            //   });
-            // });
+            cloneData.forEach(item => {
+                const fields = Object.keys(item);
+                fields.forEach((key) => {
+                    var _a;
+                    if (codeListMap.get(key)) {
+                        item[key] =
+                            ((_a = codeListMap.get(key).find(_item => {
+                                return _item.value === item[key];
+                            })) === null || _a === void 0 ? void 0 : _a.text) || item[key];
+                    }
+                });
+            });
             return cloneData;
         };
+        // 获取导出数据
         const getExportData = async () => {
             var _a;
             const type = (_a = _args.params) === null || _a === void 0 ? void 0 : _a.type;
@@ -798,9 +852,17 @@ export class GridController extends MDControlController {
             });
         };
         // 头部id数组
-        const filterVal = Object.keys(items).map((key) => items[key].model.id);
+        let filterVal = [];
         // 表头数组
-        const header = Object.keys(items).map((key) => items[key].model.caption);
+        let header = [];
+        if (this.allExportColumns && this.allExportColumns.length > 0) {
+            filterVal = this.allExportColumns.map((column) => column.appDEFieldId);
+            header = this.allExportColumns.map((column) => column.caption);
+        }
+        else {
+            filterVal = Object.keys(this.fieldColumns).map((key) => this.fieldColumns[key].model.id);
+            header = Object.keys(this.fieldColumns).map((key) => this.fieldColumns[key].model.caption);
+        }
         // 二维数组
         const data = formatArrayData(filterVal, await getExportData());
         await exportData(header, data, this.model.logicName);

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

@@ -1,9 +1,10 @@
 import { IControlLogic, IPanel, IPanelItem } from '@ibiz/model-core';
-import { IPanelState, IPanelEvent, IPanelController, IPanelItemController, IPanelItemProvider, IControlProvider, IPanelItemContainerController } from '../../../../interface';
+import { IPanelState, IPanelEvent, IPanelController, IPanelItemController, IPanelItemProvider, IControlProvider, IPanelItemContainerController, IController } from '../../../../interface';
 import { PanelData } from '../../../../service/vo';
 import { ControlController } from '../../../common';
 import { PanelNotifyState } from '../../../constant';
 import { ControllerEvent } from '../../../utils';
+import { CTX } from '../../../ctx';
 /**
  * 面板部件控制器
  *
@@ -44,6 +45,7 @@ export declare class PanelController<T extends IPanel = IPanel, S extends IPanel
      * @memberof PanelController
      */
     inputData: IData | undefined;
+    container?: IController;
     /**
      * 面板数据
      *
@@ -53,6 +55,7 @@ export declare class PanelController<T extends IPanel = IPanel, S extends IPanel
      * @memberof PanelController
      */
     get data(): IData;
+    constructor(model: T, context: IContext, params: IParams, ctx: CTX, container?: IController);
     protected initState(): void;
     setInputData(data: IData | undefined): void;
     getData(): IData[];

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

@@ -1 +1 @@
-{"version":3,"file":"panel.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/panel/panel/panel.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,aAAa,EACb,MAAM,EAEN,UAAU,EAEX,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,WAAW,EACX,WAAW,EACX,gBAAgB,EAChB,oBAAoB,EACpB,kBAAkB,EAClB,gBAAgB,EAChB,6BAA6B,EAC9B,MAAM,uBAAuB,CAAC;AAG/B,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAEjD;;;;;;;;GAQG;AACH,qBAAa,eAAe,CACxB,CAAC,SAAS,MAAM,GAAG,MAAM,EACzB,CAAC,SAAS,WAAW,GAAG,WAAW,EACnC,CAAC,SAAS,WAAW,GAAG,WAAW,CAErC,SAAQ,iBAAiB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CACjC,YAAW,gBAAgB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAEpC,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,WAAW,CAAC,CAEjD;IAED;;;;;;OAMG;IACH,UAAU,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,oBAAoB,CAAA;KAAE,CAAM;IAEzD;;;;;;OAMG;IACH,SAAS,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,kBAAkB,GAAG,gBAAgB,CAAA;KAAE,CAAM;IAEzE;;;;;;;OAOG;IACH,SAAS,EAAE,KAAK,GAAG,SAAS,CAAC;IAE7B;;;;;;;OAOG;IACH,IAAI,IAAI,IAAI,KAAK,CAEhB;IAED,SAAS,CAAC,SAAS,IAAI,IAAI;IAK3B,YAAY,CAAC,IAAI,EAAE,KAAK,GAAG,SAAS,GAAG,IAAI;IAI3C,OAAO,IAAI,KAAK,EAAE;cAIF,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;cAgB1B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;cAI1B,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAQ5C;;;;;;OAMG;cACa,wBAAwB,CACtC,UAAU,GAAE,UAAU,EAAE,GAAG,SAAqC,EAChE,KAAK,GAAE,eAAsB,EAC7B,MAAM,GAAE,6BAA6B,GAAG,SAAqB,GAC5D,OAAO,CAAC,IAAI,CAAC;IAyChB;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAe3B;;;;;;;OAOG;IACG,WAAW,IAAI,OAAO,CAAC,KAAK,GAAG,SAAS,CAAC;IAiB/C;;;;;;;;OAQG;IACH,WAAW,CAAC,IAAI,EAAE,KAAK,GAAG,SAAS;IAcnC;;;;;;OAMG;IACH,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI;IAMvC;;;;;OAKG;IACH,gBAAgB,CAAC,KAAK,EAAE,gBAAgB,GAAG,IAAI;IAM/C;;;;;OAKG;IACG,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAa/D,SAAS,CAAC,oBAAoB,CAAC,MAAM,GAAE,aAAa,EAAO,GAAG,IAAI;CAcnE"}
+{"version":3,"file":"panel.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/panel/panel/panel.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,aAAa,EACb,MAAM,EAEN,UAAU,EAEX,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,WAAW,EACX,WAAW,EACX,gBAAgB,EAChB,oBAAoB,EACpB,kBAAkB,EAClB,gBAAgB,EAChB,6BAA6B,EAC7B,WAAW,EACZ,MAAM,uBAAuB,CAAC;AAG/B,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AAEnC;;;;;;;;GAQG;AACH,qBAAa,eAAe,CACxB,CAAC,SAAS,MAAM,GAAG,MAAM,EACzB,CAAC,SAAS,WAAW,GAAG,WAAW,EACnC,CAAC,SAAS,WAAW,GAAG,WAAW,CAErC,SAAQ,iBAAiB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CACjC,YAAW,gBAAgB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAEpC,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,WAAW,CAAC,CAEjD;IAED;;;;;;OAMG;IACH,UAAU,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,oBAAoB,CAAA;KAAE,CAAM;IAEzD;;;;;;OAMG;IACH,SAAS,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,kBAAkB,GAAG,gBAAgB,CAAA;KAAE,CAAM;IAEzE;;;;;;;OAOG;IACH,SAAS,EAAE,KAAK,GAAG,SAAS,CAAC;IAE7B,SAAS,CAAC,EAAE,WAAW,CAAC;IAExB;;;;;;;OAOG;IACH,IAAI,IAAI,IAAI,KAAK,CAEhB;gBAGC,KAAK,EAAE,CAAC,EACR,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,EACf,GAAG,EAAE,GAAG,EACR,SAAS,CAAC,EAAE,WAAW;IAMzB,SAAS,CAAC,SAAS,IAAI,IAAI;IAK3B,YAAY,CAAC,IAAI,EAAE,KAAK,GAAG,SAAS,GAAG,IAAI;IAI3C,OAAO,IAAI,KAAK,EAAE;cAIF,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;cAgB1B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;cAI1B,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAQ5C;;;;;;OAMG;cACa,wBAAwB,CACtC,UAAU,GAAE,UAAU,EAAE,GAAG,SAAqC,EAChE,KAAK,GAAE,eAAsB,EAC7B,MAAM,GAAE,6BAA6B,GAAG,SAAqB,GAC5D,OAAO,CAAC,IAAI,CAAC;IAyChB;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAe3B;;;;;;;OAOG;IACG,WAAW,IAAI,OAAO,CAAC,KAAK,GAAG,SAAS,CAAC;IAiB/C;;;;;;;;OAQG;IACH,WAAW,CAAC,IAAI,EAAE,KAAK,GAAG,SAAS;IAcnC;;;;;;OAMG;IACH,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI;IAMvC;;;;;OAKG;IACH,gBAAgB,CAAC,KAAK,EAAE,gBAAgB,GAAG,IAAI;IAM/C;;;;;OAKG;IACG,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAa/D,SAAS,CAAC,oBAAoB,CAAC,MAAM,GAAE,aAAa,EAAO,GAAG,IAAI;CAcnE"}

package/out/controller/control/panel/panel/panel.controller.js

@@ -15,8 +15,22 @@ import { PanelNotifyState } from '../../../constant';
  * @extends {ControlController<PanelModel>}
  */
 export class PanelController extends ControlController {
-    constructor() {
-        super(...arguments);
+    get _evt() {
+        return this.evt;
+    }
+    /**
+     * 面板数据
+     *
+     * @author lxm
+     * @date 2023-02-10 07:21:09
+     * @readonly
+     * @memberof PanelController
+     */
+    get data() {
+        return this.state.data;
+    }
+    constructor(model, context, params, ctx, container) {
+        super(model, context, params, ctx);
         /**
          * 所有面板成员的控制器
          *
@@ -33,20 +47,7 @@ export class PanelController extends ControlController {
          * @type {{ [key: string]: IPanelItemProvider  | IControlProvider}}
          */
         this.providers = {};
-    }
-    get _evt() {
-        return this.evt;
-    }
-    /**
-     * 面板数据
-     *
-     * @author lxm
-     * @date 2023-02-10 07:21:09
-     * @readonly
-     * @memberof PanelController
-     */
-    get data() {
-        return this.state.data;
+        this.container = container;
     }
     initState() {
         super.initState();

package/out/controller/utils/data-file-util/data-file-util.d.ts

@@ -1,4 +1,4 @@
-import { IAppDataEntity } from '@ibiz/model-core';
+import { IAppDEDataImport, IAppDataEntity } from '@ibiz/model-core';
 export type ImportDataResult = {
     total: number;
     success: number;
@@ -18,7 +18,7 @@ export type IExportDataResult = {
  * @param {IAppDataEntity} appDataEntity
  * @return {*}  {Promise<IData>}
  */
-export declare function asyncImportData(file: File, appDataEntity: IAppDataEntity): Promise<void>;
+export declare function asyncImportData(file: File, appDataEntity: IAppDataEntity, dataImport?: IAppDEDataImport): Promise<void>;
 /**
  * 标准导入方法
  *
@@ -29,7 +29,7 @@ export declare function asyncImportData(file: File, appDataEntity: IAppDataEntit
  * @param {IAppDataEntity} appDataEntity
  * @return {*}  {Promise<IData>}
  */
-export declare function importData(file: File, appDataEntity: IAppDataEntity): Promise<ImportDataResult>;
+export declare function importData(file: File, appDataEntity: IAppDataEntity, dataImport?: IAppDEDataImport): Promise<ImportDataResult>;
 /**
  * 标准导出方法
  *

package/out/controller/utils/data-file-util/data-file-util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"data-file-util.d.ts","sourceRoot":"","sources":["../../../../src/controller/utils/data-file-util/data-file-util.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AASlD,MAAM,MAAM,gBAAgB,GAAG;IAC7B,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAE9B,EAAE,EAAE,OAAO,CAAC;IAEZ,GAAG,CAAC,EAAE,MAAM,CAAC;CACd,CAAC;AA6BF;;;;;;;;;GASG;AACH,wBAAsB,eAAe,CACnC,IAAI,EAAE,IAAI,EACV,aAAa,EAAE,cAAc,GAC5B,OAAO,CAAC,IAAI,CAAC,CAef;AAED;;;;;;;;;GASG;AACH,wBAAsB,UAAU,CAC9B,IAAI,EAAE,IAAI,EACV,aAAa,EAAE,cAAc,GAC5B,OAAO,CAAC,gBAAgB,CAAC,CAW3B;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,UAAU,CAC9B,MAAM,EAAE,MAAM,EAAE,EAChB,IAAI,EAAE,KAAK,EAAE,EAAE,EACf,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,iBAAiB,CAAC,CAmB5B"}
+{"version":3,"file":"data-file-util.d.ts","sourceRoot":"","sources":["../../../../src/controller/utils/data-file-util/data-file-util.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AASpE,MAAM,MAAM,gBAAgB,GAAG;IAC7B,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAE9B,EAAE,EAAE,OAAO,CAAC;IAEZ,GAAG,CAAC,EAAE,MAAM,CAAC;CACd,CAAC;AA6BF;;;;;;;;;GASG;AACH,wBAAsB,eAAe,CACnC,IAAI,EAAE,IAAI,EACV,aAAa,EAAE,cAAc,EAC7B,UAAU,CAAC,EAAE,gBAAgB,GAC5B,OAAO,CAAC,IAAI,CAAC,CAkBf;AAED;;;;;;;;;GASG;AACH,wBAAsB,UAAU,CAC9B,IAAI,EAAE,IAAI,EACV,aAAa,EAAE,cAAc,EAC7B,UAAU,CAAC,EAAE,gBAAgB,GAC5B,OAAO,CAAC,gBAAgB,CAAC,CAc3B;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,UAAU,CAC9B,MAAM,EAAE,MAAM,EAAE,EAChB,IAAI,EAAE,KAAK,EAAE,EAAE,EACf,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,iBAAiB,CAAC,CAmB5B"}

package/out/controller/utils/data-file-util/data-file-util.js

@@ -39,10 +39,13 @@ function listenAsyncAction(id) {
  * @param {IAppDataEntity} appDataEntity
  * @return {*}  {Promise<IData>}
  */
-export async function asyncImportData(file, appDataEntity) {
+export async function asyncImportData(file, appDataEntity, dataImport) {
     const data = new FormData();
     data.append('file', file);
-    const url = `${appDataEntity.codeName2.toLowerCase()}/${asyncImportUrl}`;
+    let url = `${appDataEntity.codeName2.toLowerCase()}/${asyncImportUrl}`;
+    if (dataImport === null || dataImport === void 0 ? void 0 : dataImport.codeName) {
+        url += `?srfimporttag=${dataImport.codeName}`;
+    }
     const res = await ibiz.net.request(url, {
         method: 'post',
         data,
@@ -62,10 +65,13 @@ export async function asyncImportData(file, appDataEntity) {
  * @param {IAppDataEntity} appDataEntity
  * @return {*}  {Promise<IData>}
  */
-export async function importData(file, appDataEntity) {
+export async function importData(file, appDataEntity, dataImport) {
     const data = new FormData();
     data.append('file', file);
-    const url = `${appDataEntity.codeName2.toLowerCase()}/${importUrl}`;
+    let url = `${appDataEntity.codeName2.toLowerCase()}/${importUrl}`;
+    if (dataImport === null || dataImport === void 0 ? void 0 : dataImport.codeName) {
+        url += `?srfimporttag=${dataImport.codeName}`;
+    }
     const res = await ibiz.net.request(url, {
         method: 'post',
         data,