@ibiz-template/runtime 0.1.28 → 0.1.29

package/out/app-hub.d.ts

@@ -3,6 +3,7 @@ import { Application } from './application';
 import { IAppHubService, ModelLoaderProvider } from './interface';
 import { AppConfigService, Convert } from './hub';
 import { HubController } from './controller';
+import { ConfigService } from './service';
 /**
  * 运行时总集
  *
@@ -27,6 +28,14 @@ export declare class AppHub implements IAppHubService {
      * @date 2023-08-21 15:08:48
      */
     readonly controller: HubController;
+    /**
+     * 基座级配置存储服务
+     *
+     * @author chitanda
+     * @date 2023-09-22 10:09:25
+     * @type {ConfigService}
+     */
+    configCache: ConfigService;
     /**
      * 应用总集
      *

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;AAE7C;;;;;;;GAOG;AACH,qBAAa,MAAO,YAAW,cAAc;IAC3C;;;;;;OAMG;IACH,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAiB;IAE1C;;;;;OAKG;IACH,QAAQ,CAAC,UAAU,gBAAuB;IAE1C;;;;;;;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;IAmB3D;;;;;;;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,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"}

package/out/app-hub.js

@@ -2,6 +2,7 @@ import { RuntimeError } from '@ibiz-template/core';
 import { Application } from './application';
 import { AppConfigService, Convert } from './hub';
 import { HubController } from './controller';
+import { ConfigService } from './service';
 /**
  * 运行时总集
  *
@@ -269,6 +270,9 @@ export class AppHub {
         const app = new Application(appModel);
         this.appMap.set(id, app);
         await app.init();
+        if (!this.configCache) {
+            this.configCache = new ConfigService(ibiz.env.appId, 'PSSysHub', 'Global');
+        }
         return app;
     }
     /**

package/out/application.d.ts

@@ -1,6 +1,6 @@
 import { Net } from '@ibiz-template/core';
 import { IAppDEUIAction, IAppFunc, IApplication, IDEOPPriv, IDEUILogic } from '@ibiz/model-core';
-import { AuthorityService, CodeListService, DEServiceUtil } from './service';
+import { AuthorityService, CodeListService, ConfigService, DEServiceUtil } from './service';
 import { IAppService } from './interface';
 /**
  * 应用对象
@@ -38,6 +38,14 @@ export declare class Application implements IAppService {
      * @type {Net}
      */
     readonly net: Net;
+    /**
+     * 应用级配置存储服务
+     *
+     * @author chitanda
+     * @date 2023-09-22 10:09:58
+     * @type {ConfigService}
+     */
+    readonly configCache: ConfigService;
     /**
      * 应用实体服务工具对象
      *

package/out/application.d.ts.map

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

package/out/application.js

@@ -1,5 +1,5 @@
 import { Net } from '@ibiz-template/core';
-import { AuthorityService, CodeListService, DEServiceUtil } from './service';
+import { AuthorityService, CodeListService, ConfigService, DEServiceUtil, } from './service';
 /**
  * 应用对象
  *
@@ -41,6 +41,7 @@ export class Application {
         this.net = new Net({
             baseURL: `${ibiz.env.baseUrl}/${model.appId}`,
         });
+        this.configCache = new ConfigService(model.appId, 'PSSysApp', model.codeName);
         this.deService = new DEServiceUtil(model);
         this.codeList = new CodeListService(model);
         this.authority = new AuthorityService(model);

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

@@ -21,7 +21,7 @@ export declare class OpenAppViewCommand {
      * @param {IData} [_opts={}]
      * @return {*}  {(Promise<IModalData | void>)}
      */
-    exec(appViewId: string, context: IContext, params?: IParams, opts?: IOpenViewOptions): Promise<IModalData | void>;
+    exec(appViewId: string, _context: IContext, params?: IParams, opts?: IOpenViewOptions): Promise<IModalData | void>;
     /**
      * 首页导航模式打开
      *

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

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

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

@@ -1,6 +1,8 @@
 import { ModelError, RuntimeError } from '@ibiz-template/core';
+import { clone } from 'ramda';
 import { calcDeCodeNameById } from '../../../model';
 import { openRedirectView } from '../../../utils';
+import { Srfuf } from '../../../service';
 /**
  * 打开应用视图
  *
@@ -24,16 +26,25 @@ export class OpenAppViewCommand {
      * @param {IData} [_opts={}]
      * @return {*}  {(Promise<IModalData | void>)}
      */
-    async exec(appViewId, context, params = {}, opts = {}) {
+    async exec(appViewId, _context, params = {}, opts = {}) {
+        const context = clone(_context);
         const appView = await ibiz.hub.config.view.get(appViewId);
         if (!appView) {
             throw new RuntimeError(`应用视图[${appViewId}]不存在`);
         }
-        // 识别上下文的srfkey并转成对应视图实体名称，然后置空srfkey
-        if (context.srfkey && appView.appDataEntityId) {
+        if ((context.srfkey || params.srfuf === Srfuf.CREATE) &&
+            appView.appDataEntityId) {
             const deName = calcDeCodeNameById(appView.appDataEntityId);
-            context[deName] = context.srfkey;
-            context.srfkey = undefined;
+            // 识别上下文的srfkey并转成对应视图实体名称，然后置空srfkey
+            if (context.srfkey) {
+                context[deName] = context.srfkey;
+                context.srfkey = undefined;
+            }
+            // 识别参数的 srfuf=0 时为新建。置空和当前要打开视图同实体的主键，避免同上下文导致后一个页面识别为了编辑。然后置空srfuf
+            if (params.srfuf === Srfuf.CREATE) {
+                context[deName] = undefined;
+                delete params.srfuf;
+            }
         }
         if (appView.redirectView) {
             const fullViewModel = await ibiz.hub.getAppView(appViewId);

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;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;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;IAgDzD;;;;;;;;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;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"}

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

@@ -2,6 +2,7 @@
 import { isElementSame, RuntimeError } from '@ibiz-template/core';
 import { calcDeCodeNameById } from '../../../model';
 import { Srfuf } from '../../../service';
+import { handleAllSettled } from '../../../utils';
 import { ControlController } from './control.controller';
 /**
  * 多数据部件控制器
@@ -129,6 +130,9 @@ export class MDControlController extends ControlController {
      * @date 2022-08-19 14:08:50
      */
     async load(args = {}) {
+        if (this.state.isSimple) {
+            return [];
+        }
         await this.startLoading();
         try {
             // *初始加载需要重置分页
@@ -220,7 +224,7 @@ export class MDControlController extends ControlController {
         let needRefresh = false;
         try {
             const deName = calcDeCodeNameById(this.model.appDataEntityId);
-            await Promise.allSettled(data.map(async (item) => {
+            await handleAllSettled(data.map(async (item) => {
                 // 新建未保存的数据直接走后续删除处理逻辑
                 if (item.srfuf !== Srfuf.CREATE) {
                     const tempContext = context.clone();

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

@@ -1,12 +1,13 @@
 import { IAppView } from '@ibiz/model-core';
 import { LoadingState } from '../../utils/loading/loading.state';
-import { IViewController, IViewEvent, IViewLayoutPanelController, IControlProvider, IModal, IModalData, IUIActionResult, IUILogicParams, IViewEngine } from '../../../interface';
+import { IViewController, IViewEvent, IViewLayoutPanelController, IControlProvider, IModal, IModalData, IUIActionResult, IUILogicParams, IViewEngine, IViewMessage } from '../../../interface';
 import { CTX } from '../../ctx';
 import { ControllerEvent } from '../../utils';
 import { BaseController } from '../base.controller';
 import { IViewState } from '../../../interface/controller/state';
 import { AppCounter } from '../../../service';
 import { ViewLogicScheduler } from '../../../logic-scheduler';
+import { ViewMsgController } from '../../utils/view-msg';
 /**
  * 视图控制器
  *
@@ -63,6 +64,13 @@ export declare class ViewController<T extends IAppView = IAppView, S extends IVi
      */
     scheduler?: ViewLogicScheduler;
     layoutPanel?: IViewLayoutPanelController;
+    /**
+     * 视图消息控制器
+     * @author lxm
+     * @date 2023-09-20 08:20:23
+     * @type {ViewMsgController}
+     */
+    viewMsgController?: ViewMsgController;
     /**
      * Creates an instance of ViewController.
      * @author lxm
@@ -125,5 +133,19 @@ export declare class ViewController<T extends IAppView = IAppView, S extends IVi
      * @param {IViewLayoutPanelController} panel
      */
     setLayoutPanel(panel: IViewLayoutPanelController): void;
+    /**
+     * 初始化视图消息
+     * @author lxm
+     * @date 2023-09-20 09:19:20
+     */
+    initViewMsg(): Promise<void>;
+    /**
+     * 弹出视图消息,一个接一个弹
+     * @author lxm
+     * @date 2023-09-20 10:17:42
+     * @param {ViewMessage[]} messages
+     * @return {*}  {Promise<void>}
+     */
+    alertViewMessage(messages: IViewMessage[]): Promise<void>;
 }
 //# sourceMappingURL=view.controller.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"view.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/common/view/view.controller.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"view.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/common/view/view.controller.ts"],"names":[],"mappings":"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"}

package/out/controller/common/view/view.controller.js

@@ -10,6 +10,7 @@ import { BaseController } from '../base.controller';
 import { getControlProvider } from '../../../register';
 import { CounterService } from '../../../service';
 import { getControlsByView, getViewEngines, getViewLogics, } from '../../../model';
+import { ViewMsgController } from '../../utils/view-msg';
 /**
  * 视图控制器
  *
@@ -149,6 +150,7 @@ export class ViewController extends BaseController {
         this.state.isLoading = false;
         this.state.caption = this.model.caption;
         this.state.srfactiveviewdata = null;
+        this.state.viewMessages = {};
     }
     async onCreated() {
         await super.onCreated();
@@ -195,6 +197,8 @@ export class ViewController extends BaseController {
                 });
             }
         }
+        // 初始化视图消息
+        this.initViewMsg();
         // 执行视图引擎的doCreated
         if (this.engines.length) {
             await Promise.all(this.engines.map(engine => engine.onCreated()));
@@ -310,4 +314,52 @@ export class ViewController extends BaseController {
             });
         }
     }
+    /**
+     * 初始化视图消息
+     * @author lxm
+     * @date 2023-09-20 09:19:20
+     */
+    async initViewMsg() {
+        const { appViewMsgGroupId } = this.model;
+        if (appViewMsgGroupId) {
+            this.state.viewMessages = { TOP: [], BOTTOM: [], BODY: [], POPUP: [] };
+            this.viewMsgController = new ViewMsgController(appViewMsgGroupId);
+            await this.viewMsgController.init(this.context);
+            const messages = await this.viewMsgController.calcViewMessages(this.context, this.params);
+            messages.forEach(message => {
+                if (['TOP', 'BOTTOM', 'BODY', 'POPUP'].includes(message.position)) {
+                    this.state.viewMessages[message.position].push(message);
+                }
+            });
+            if (this.state.viewMessages.POPUP.length) {
+                this.alertViewMessage(this.state.viewMessages.POPUP);
+            }
+        }
+    }
+    /**
+     * 弹出视图消息,一个接一个弹
+     * @author lxm
+     * @date 2023-09-20 10:17:42
+     * @param {ViewMessage[]} messages
+     * @return {*}  {Promise<void>}
+     */
+    async alertViewMessage(messages) {
+        const [message, ...rest] = messages;
+        const modalParams = {
+            title: message.title,
+            desc: message.message,
+        };
+        if (message.messageType === 'WARN') {
+            await ibiz.modal.warning(modalParams);
+        }
+        else if (message.messageType === 'ERROR') {
+            await ibiz.modal.error(modalParams);
+        }
+        else {
+            await ibiz.modal.info(modalParams);
+        }
+        if (rest.length) {
+            this.alertViewMessage(rest);
+        }
+    }
 }

package/out/controller/control/dashboard/custom-dashboard.controller.d.ts

@@ -0,0 +1,69 @@
+import { IDashboard } from '@ibiz/model-core';
+import { ConfigService } from '../../../service';
+/**
+ * 自定义数据看板部件控制器
+ * @author lxm
+ * @date 2023-07-07 03:27:29
+ * @export
+ * @class CustomDashboardController
+ */
+export declare class CustomDashboardController {
+    /**
+     * 自定义布局模型数据
+     *
+     * @author: zhujiamin
+     * @Date: 2023-09-20 16:42:36
+     */
+    customModelData: IData[];
+    /**
+     * 动态设计水平列数
+     *
+     * @author: zhujiamin
+     * @Date: 2023-09-20 16:43:39
+     */
+    layoutColNum: number;
+    /**
+     * 动态设计单元格高度，80px
+     *
+     * @author: zhujiamin
+     * @Date: 2023-09-20 16:43:39
+     */
+    layoutRowH: number;
+    /**
+     * 看板模型
+     *
+     * @author: zhujiamin
+     * @Date: 2023-09-20 16:43:39
+     */
+    model: IDashboard | null;
+    /**
+     * 应用配置存储服务
+     *
+     * @return {*}
+     * @author: zhujiamin
+     * @Date: 2023-09-22 18:07:42
+     */
+    config: ConfigService;
+    /**
+     * Creates an instance of BaseController.
+     * @author lxm
+     * @date 2023-04-26 06:46:21
+     * @param {CTX} ctx 跨组件上下文环境，内部机制不暴露
+     */
+    constructor(model: IDashboard);
+    /**
+     * 加载自定义布局模型数据
+     *
+     * @author: zhujiamin
+     * @Date: 2023-09-20 16:22:49
+     */
+    loadCustomModelData(): Promise<IData[]>;
+    /**
+     * 保存自定义布局模型数据
+     *
+     * @author: zhujiamin
+     * @Date: 2023-09-20 16:22:49
+     */
+    saveCustomModelData(model: IData[]): Promise<IData[]>;
+}
+//# sourceMappingURL=custom-dashboard.controller.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"custom-dashboard.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/dashboard/custom-dashboard.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD;;;;;;GAMG;AACH,qBAAa,yBAAyB;IACpC;;;;;OAKG;IACH,eAAe,EAAE,KAAK,EAAE,CAAM;IAE9B;;;;;OAKG;IACH,YAAY,EAAE,MAAM,CAAM;IAE1B;;;;;OAKG;IACH,UAAU,EAAE,MAAM,CAAM;IAExB;;;;;OAKG;IACH,KAAK,EAAE,UAAU,GAAG,IAAI,CAAQ;IAEhC;;;;;;OAMG;IACH,MAAM,EAAE,aAAa,CAAC;IAEtB;;;;;OAKG;gBACS,KAAK,EAAE,UAAU;IAW7B;;;;;OAKG;IACG,mBAAmB,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;IAc7C;;;;;OAKG;IACG,mBAAmB,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;CAW5D"}

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

@@ -0,0 +1,85 @@
+import { ConfigService } from '../../../service';
+/**
+ * 自定义数据看板部件控制器
+ * @author lxm
+ * @date 2023-07-07 03:27:29
+ * @export
+ * @class CustomDashboardController
+ */
+export class CustomDashboardController {
+    /**
+     * Creates an instance of BaseController.
+     * @author lxm
+     * @date 2023-04-26 06:46:21
+     * @param {CTX} ctx 跨组件上下文环境，内部机制不暴露
+     */
+    constructor(model) {
+        var _a, _b;
+        /**
+         * 自定义布局模型数据
+         *
+         * @author: zhujiamin
+         * @Date: 2023-09-20 16:42:36
+         */
+        this.customModelData = [];
+        /**
+         * 动态设计水平列数
+         *
+         * @author: zhujiamin
+         * @Date: 2023-09-20 16:43:39
+         */
+        this.layoutColNum = 12;
+        /**
+         * 动态设计单元格高度，80px
+         *
+         * @author: zhujiamin
+         * @Date: 2023-09-20 16:43:39
+         */
+        this.layoutRowH = 80;
+        /**
+         * 看板模型
+         *
+         * @author: zhujiamin
+         * @Date: 2023-09-20 16:43:39
+         */
+        this.model = null;
+        this.model = model;
+        this.config = new ConfigService(model.appId, 'dynadashboard', `dashboard_${((_a = this.model.appDataEntityId) === null || _a === void 0 ? void 0 : _a.toLowerCase()) || 'app'}_${(_b = this.model.codeName) === null || _b === void 0 ? void 0 : _b.toLowerCase()}`);
+    }
+    /**
+     * 加载自定义布局模型数据
+     *
+     * @author: zhujiamin
+     * @Date: 2023-09-20 16:22:49
+     */
+    async loadCustomModelData() {
+        const res = await this.config.load();
+        if (res.model) {
+            this.customModelData = res.model;
+        }
+        if (res.colNum) {
+            this.layoutColNum = res.colNum;
+        }
+        if (res.rowH) {
+            this.layoutRowH = res.rowH;
+        }
+        return this.customModelData;
+    }
+    /**
+     * 保存自定义布局模型数据
+     *
+     * @author: zhujiamin
+     * @Date: 2023-09-20 16:22:49
+     */
+    async saveCustomModelData(model) {
+        const res = await this.config.save({
+            model,
+            colNum: this.layoutColNum,
+            rowH: this.layoutRowH,
+        });
+        if (res) {
+            this.customModelData = model;
+        }
+        return model;
+    }
+}

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;AAC1B,OAAO,EACL,eAAe,EACf,eAAe,EACf,oBAAoB,EACpB,gBAAgB,EAChB,kBAAkB,EAClB,2BAA2B,EAC5B,MAAM,oBAAoB,CAAC;AAE5B,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;IA0BhB;;;;;;OAMG;IACG,gBAAgB,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;CAanD"}
+{"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;AAC1B,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;IA0BhB;;;;;;OAMG;IACG,gBAAgB,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;CAQnD"}

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

@@ -1,4 +1,5 @@
 import { getPortletProvider } from '../../../register';
+import { handleAllSettled } from '../../../utils';
 import { ControlController } from '../../common';
 import { getOriginData } from '../../utils';
 /**
@@ -82,13 +83,8 @@ export class DashboardController extends ControlController {
      */
     async dataChangeNotify(data) {
         // 通知所有成员项去处理成员项相关逻辑
-        const values = await Promise.allSettled(Object.values(this.portlets).map(async (portlet) => {
+        await handleAllSettled(Object.values(this.portlets).map(async (portlet) => {
             return portlet.dataChangeNotify(data);
         }));
-        const rejectedValue = values.find(item => item.status === 'rejected');
-        if (rejectedValue) {
-            ibiz.log.error('dataChangeNotify报错', values);
-            throw rejectedValue.reason;
-        }
     }
 }

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

@@ -1,3 +1,4 @@
 export * from './dashboard.controller';
+export * from './custom-dashboard.controller';
 export * from './portlet/index';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/dashboard/index.ts"],"names":[],"mappings":"AAAA,cAAc,wBAAwB,CAAC;AACvC,cAAc,iBAAiB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/dashboard/index.ts"],"names":[],"mappings":"AAAA,cAAc,wBAAwB,CAAC;AACvC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,iBAAiB,CAAC"}

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

@@ -1,2 +1,3 @@
 export * from './dashboard.controller';
+export * from './custom-dashboard.controller';
 export * from './portlet/index';

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

@@ -1,5 +1,5 @@
 import { IDBPortletPart, IUIActionGroupDetail } from '@ibiz/model-core';
-import { IPortletController, IDashboardController, IPortletContainerController } from '../../../../../interface';
+import { IPortletController, IDashboardController, IPortletContainerController, DataChangeEvent } from '../../../../../interface';
 import { PortletPartState } from './portlet-part.state';
 /**
  * 门户部件控制器基类
@@ -87,6 +87,14 @@ export declare class PortletPartController<T extends IDBPortletPart = IDBPortlet
      * @memberof PortletPartController
      */
     protected createState(): PortletPartState;
+    /**
+     * 数据改变方法
+     * @param {DataChangeEvent} event
+     * @return {*}
+     * @author: zhujiamin
+     * @Date: 2023-09-22 17:39:44
+     */
+    onDataChange(event: DataChangeEvent): void;
     /**
      * 初始化标题右侧界面行为按钮的状态
      *
@@ -119,5 +127,11 @@ export declare class PortletPartController<T extends IDBPortletPart = IDBPortlet
      * @param {IData} data
      */
     protected calcDynaClass(data: IData): void;
+    /**
+     * 销毁
+     * @author lxm
+     * @date 2023-04-25 11:08:54
+     */
+    destroyed(): Promise<void>;
 }
 //# sourceMappingURL=portlet-part.controller.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"portlet-part.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/dashboard/portlet/portlet-part/portlet-part.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACxE,OAAO,EACL,kBAAkB,EAClB,oBAAoB,EACpB,2BAA2B,EAC5B,MAAM,0BAA0B,CAAC;AAKlC,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAExD;;;;;;;;GAQG;AACH,qBAAa,qBAAqB,CAAC,CAAC,SAAS,cAAc,GAAG,cAAc,CAC1E,YAAW,kBAAkB;IAE7B,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;IAElB;;;;;OAKG;IACH,KAAK,EAAE,gBAAgB,CAAC;IAExB;;;;;;OAMG;IACH,QAAQ,CAAC,SAAS,EAAE,oBAAoB,CAAC;IAEzC;;;;;;OAMG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE,2BAA2B,CAAC;IAE9C;;;;;;;OAOG;IACH,IAAI,OAAO,IAAI,QAAQ,CAEtB;IAED;;;;;;;OAOG;IACH,IAAI,MAAM,IAAI,OAAO,CAEpB;IAED;;;;;;OAMG;IACH,IAAI,cAAc,IAAI,MAAM,EAAE,CAE7B;IAED;;;;;;;OAOG;gBAED,KAAK,EAAE,CAAC,EACR,SAAS,EAAE,oBAAoB,EAC/B,MAAM,CAAC,EAAE,2BAA2B;IAQtC;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;cAIX,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAkBvC;;;;;;OAMG;IACH,SAAS,CAAC,WAAW,IAAI,gBAAgB;IAIzC;;;;;;OAMG;IACG,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IAoCvC;;;;;;;OAOG;IACG,aAAa,CACjB,MAAM,EAAE,oBAAoB,EAC5B,KAAK,EAAE,UAAU,EACjB,IAAI,GAAE,KAAK,EAAO,GACjB,OAAO,CAAC,IAAI,CAAC;IAYhB;;;;;;OAMG;IACG,gBAAgB,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAWlD;;;;;OAKG;IACH,SAAS,CAAC,aAAa,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;CAQ3C"}
+{"version":3,"file":"portlet-part.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/dashboard/portlet/portlet-part/portlet-part.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACxE,OAAO,EACL,kBAAkB,EAClB,oBAAoB,EACpB,2BAA2B,EAC3B,eAAe,EAChB,MAAM,0BAA0B,CAAC;AAKlC,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAExD;;;;;;;;GAQG;AACH,qBAAa,qBAAqB,CAAC,CAAC,SAAS,cAAc,GAAG,cAAc,CAC1E,YAAW,kBAAkB;IAE7B,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;IAElB;;;;;OAKG;IACH,KAAK,EAAE,gBAAgB,CAAC;IAExB;;;;;;OAMG;IACH,QAAQ,CAAC,SAAS,EAAE,oBAAoB,CAAC;IAEzC;;;;;;OAMG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE,2BAA2B,CAAC;IAE9C;;;;;;;OAOG;IACH,IAAI,OAAO,IAAI,QAAQ,CAEtB;IAED;;;;;;;OAOG;IACH,IAAI,MAAM,IAAI,OAAO,CAEpB;IAED;;;;;;OAMG;IACH,IAAI,cAAc,IAAI,MAAM,EAAE,CAE7B;IAED;;;;;;;OAOG;gBAED,KAAK,EAAE,CAAC,EACR,SAAS,EAAE,oBAAoB,EAC/B,MAAM,CAAC,EAAE,2BAA2B;IAQtC;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;cAIX,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAkBvC;;;;;;OAMG;IACH,SAAS,CAAC,WAAW,IAAI,gBAAgB;IAIzC;;;;;;OAMG;IACH,YAAY,CAAC,KAAK,EAAE,eAAe,GAAG,IAAI;IAa1C;;;;;;OAMG;IACG,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IA4BvC;;;;;;;OAOG;IACG,aAAa,CACjB,MAAM,EAAE,oBAAoB,EAC5B,KAAK,EAAE,UAAU,EACjB,IAAI,GAAE,KAAK,EAAO,GACjB,OAAO,CAAC,IAAI,CAAC;IAYhB;;;;;;OAMG;IACG,gBAAgB,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAWlD;;;;;OAKG;IACH,SAAS,CAAC,aAAa,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAS1C;;;;OAIG;IACG,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;CAIjC"}

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

@@ -93,6 +93,22 @@ export class PortletPartController {
     createState() {
         return new PortletPartState();
     }
+    /**
+     * 数据改变方法
+     * @param {DataChangeEvent} event
+     * @return {*}
+     * @author: zhujiamin
+     * @Date: 2023-09-22 17:39:44
+     */
+    onDataChange(event) {
+        let data = event.data[0];
+        if (data && data instanceof ControlVO) {
+            data = data.getOrigin();
+        }
+        if (data) {
+            this.state.actionGroupState.update(data, this.dashboard.view.model.appDataEntityId);
+        }
+    }
     /**
      * 初始化标题右侧界面行为按钮的状态
      *
@@ -120,15 +136,7 @@ export class PortletPartController {
         // 实体门户视图监听视图数据变更，刷新界面行为组的状态。
         const { appDataEntityId } = this.dashboard.view.model;
         if (appDataEntityId) {
-            this.dashboard.view.evt.on('onDataChange', event => {
-                let data = event.data[0];
-                if (data && data instanceof ControlVO) {
-                    data = data.getOrigin();
-                }
-                if (data) {
-                    this.state.actionGroupState.update(data, appDataEntityId);
-                }
-            });
+            this.dashboard.view.evt.on('onDataChange', this.onDataChange);
         }
     }
     /**
@@ -179,4 +187,13 @@ export class PortletPartController {
             }
         }
     }
+    /**
+     * 销毁
+     * @author lxm
+     * @date 2023-04-25 11:08:54
+     */
+    async destroyed() {
+        ibiz.log.debug(`${this.model.codeName} onDestroyed`);
+        this.dashboard.view.evt.off('onDataChange', this.onDataChange);
+    }
 }