@ibiz-template/runtime 0.1.28 → 0.1.29

package/out/utils/error-handler/error-handler-center.js

@@ -0,0 +1,59 @@
+/**
+ * 事件处理工具
+ *
+ * @author lxm
+ * @date 2022-09-21 18:09:31
+ * @export
+ * @class ErrorHandler
+ */
+export class ErrorHandlerCenter {
+    constructor() {
+        /**
+         * 处理器集合
+         * @author lxm
+         * @date 2023-09-26 04:56:29
+         * @type {IErrorHandler[]}
+         */
+        this.handlers = [];
+    }
+    /**
+     * 注册处理器（后注册的优先级更高）
+     * @author lxm
+     * @date 2023-09-26 04:59:06
+     * @param {IErrorHandler} handler
+     */
+    register(handler) {
+        this.handlers.unshift(handler);
+    }
+    /**
+     * 处理单个报错
+     * @author lxm
+     * @date 2023-09-26 05:18:18
+     * @protected
+     * @param {unknown} error
+     */
+    handleSingle(error) {
+        const find = this.handlers.find(item => {
+            return !!item.handle(error);
+        });
+        if (!find) {
+            ibiz.log.error('没有找到能处理该错误的处理器', error);
+        }
+    }
+    /**
+     * 按顺序检测处理器，最先满足条件的处理该异常
+     * @author lxm
+     * @date 2023-09-26 05:01:08
+     * @param {unknown} error
+     */
+    handle(error) {
+        if (error instanceof Array) {
+            error.forEach(item => {
+                this.handleSingle(item);
+            });
+        }
+        else {
+            this.handleSingle(error);
+        }
+    }
+}

package/out/utils/error-handler/index.d.ts

@@ -0,0 +1,3 @@
+export { DefaultErrorHandler } from './default-error-handler';
+export { ErrorHandlerCenter } from './error-handler-center';
+//# sourceMappingURL=index.d.ts.map

package/out/utils/error-handler/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utils/error-handler/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC"}

package/out/utils/error-handler/index.js

@@ -0,0 +1,2 @@
+export { DefaultErrorHandler } from './default-error-handler';
+export { ErrorHandlerCenter } from './error-handler-center';

package/out/utils/index.d.ts

@@ -10,4 +10,5 @@ export * from './value-rule/value-rule';
 export * from './script/index';
 export { TextUtil } from './text-util/text-util';
 export { RawValueUtil } from './raw-value-util/raw-value-util';
+export { handleAllSettled } from './promise/promise';
 //# sourceMappingURL=index.d.ts.map

package/out/utils/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC7D,cAAc,yBAAyB,CAAC;AACxC,OAAO,EACL,yBAAyB,EACzB,gBAAgB,GACjB,MAAM,yCAAyC,CAAC;AACjD,cAAc,UAAU,CAAC;AACzB,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AACxE,cAAc,uBAAuB,CAAC;AACtC,cAAc,eAAe,CAAC;AAC9B,cAAc,yBAAyB,CAAC;AACxC,cAAc,gBAAgB,CAAC;AAC/B,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC7D,cAAc,yBAAyB,CAAC;AACxC,OAAO,EACL,yBAAyB,EACzB,gBAAgB,GACjB,MAAM,yCAAyC,CAAC;AACjD,cAAc,UAAU,CAAC;AACzB,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AACxE,cAAc,uBAAuB,CAAC;AACtC,cAAc,eAAe,CAAC;AAC9B,cAAc,yBAAyB,CAAC;AACxC,cAAc,gBAAgB,CAAC;AAC/B,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC"}

package/out/utils/index.js

@@ -10,3 +10,4 @@ export * from './value-rule/value-rule';
 export * from './script/index';
 export { TextUtil } from './text-util/text-util';
 export { RawValueUtil } from './raw-value-util/raw-value-util';
+export { handleAllSettled } from './promise/promise';

package/out/utils/promise/promise.d.ts

@@ -0,0 +1,15 @@
+/**
+ * 异步等待所有promise完成后才会结束异步
+ * 只返回成功的promise的返回值集合
+ * - 如果isThrow为true，有异常时抛出异常
+ * - 如果isThrow为false，有异常时用全局异常处理弹提示，逻辑不会中断
+ * @author lxm
+ * @date 2023-09-26 06:57:33
+ * @export
+ * @template T
+ * @param {(Iterable<T | PromiseLike<T>>)} values
+ * @param {boolean} [isThrow=true]
+ * @return {*}  {Promise<Awaited<T>[]>}
+ */
+export declare function handleAllSettled<T>(values: Iterable<T | PromiseLike<T>>, isThrow?: boolean): Promise<Awaited<T>[]>;
+//# sourceMappingURL=promise.d.ts.map

package/out/utils/promise/promise.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"promise.d.ts","sourceRoot":"","sources":["../../../src/utils/promise/promise.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AACH,wBAAsB,gBAAgB,CAAC,CAAC,EACtC,MAAM,EAAE,QAAQ,CAAC,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,EACpC,OAAO,UAAO,GACb,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAwBvB"}

package/out/utils/promise/promise.js

@@ -0,0 +1,38 @@
+/**
+ * 异步等待所有promise完成后才会结束异步
+ * 只返回成功的promise的返回值集合
+ * - 如果isThrow为true，有异常时抛出异常
+ * - 如果isThrow为false，有异常时用全局异常处理弹提示，逻辑不会中断
+ * @author lxm
+ * @date 2023-09-26 06:57:33
+ * @export
+ * @template T
+ * @param {(Iterable<T | PromiseLike<T>>)} values
+ * @param {boolean} [isThrow=true]
+ * @return {*}  {Promise<Awaited<T>[]>}
+ */
+export async function handleAllSettled(values, isThrow = true) {
+    const allResults = await Promise.allSettled(values);
+    const successResult = [];
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const errorResult = [];
+    allResults.forEach(item => {
+        if (item.status === 'fulfilled') {
+            successResult.push(item.value);
+        }
+        else {
+            errorResult.push(item.reason);
+        }
+    });
+    // 有报错时根据是否抛出处理，抛出就抛，不抛就拿全局的异常处理弹提示。
+    if (errorResult.length > 0) {
+        const error = errorResult.length === 1 ? errorResult[0] : errorResult;
+        if (isThrow) {
+            throw error;
+        }
+        else {
+            ibiz.util.error.handle(error);
+        }
+    }
+    return successResult;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.1.28",
+  "version": "0.1.29",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -57,5 +57,5 @@
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
-  "gitHead": "143f856b53d9767d9ce655551148ab6d6abd2482"
+  "gitHead": "ad1df38edba37a696e639c986b12087f72ead394"
 }

package/src/app-hub.ts

@@ -4,6 +4,7 @@ import { Application } from './application';
 import { IAppHubService, ModelLoaderProvider } from './interface';
 import { AppConfigService, Convert } from './hub';
 import { HubController } from './controller';
+import { ConfigService } from './service';
 
 /**
  * 运行时总集
@@ -31,6 +32,15 @@ export class AppHub implements IAppHubService {
    */
   readonly controller = new HubController();
 
+  /**
+   * 基座级配置存储服务
+   *
+   * @author chitanda
+   * @date 2023-09-22 10:09:25
+   * @type {ConfigService}
+   */
+  configCache!: ConfigService;
+
   /**
    * 应用总集
    *
@@ -303,6 +313,13 @@ export class AppHub implements IAppHubService {
     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/src/application.ts

@@ -6,7 +6,12 @@ import {
   IDEOPPriv,
   IDEUILogic,
 } from '@ibiz/model-core';
-import { AuthorityService, CodeListService, DEServiceUtil } from './service';
+import {
+  AuthorityService,
+  CodeListService,
+  ConfigService,
+  DEServiceUtil,
+} from './service';
 import { IAppService } from './interface';
 
 /**
@@ -49,6 +54,15 @@ export class Application implements IAppService {
    */
   readonly net: Net;
 
+  /**
+   * 应用级配置存储服务
+   *
+   * @author chitanda
+   * @date 2023-09-22 10:09:58
+   * @type {ConfigService}
+   */
+  readonly configCache: ConfigService;
+
   /**
    * 应用实体服务工具对象
    *
@@ -86,6 +100,11 @@ export class Application implements IAppService {
     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/src/command/app/open-app-view/open-app-view.ts

@@ -1,8 +1,10 @@
 import { ModelError, RuntimeError } from '@ibiz-template/core';
 import { IAppRedirectView } from '@ibiz/model-core';
+import { clone } from 'ramda';
 import { IModalData, IOpenViewOptions, IViewConfig } from '../../../interface';
 import { calcDeCodeNameById } from '../../../model';
 import { openRedirectView } from '../../../utils';
+import { Srfuf } from '../../../service';
 
 /**
  * 打开应用视图
@@ -32,20 +34,31 @@ export class OpenAppViewCommand {
    */
   async exec(
     appViewId: string,
-    context: IContext,
+    _context: IContext,
     params: IParams = {},
     opts: IOpenViewOptions = {},
   ): Promise<IModalData | void> {
+    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) {

package/src/controller/common/control/md-control.controller.ts

@@ -10,6 +10,7 @@ import {
 } from '../../../interface';
 import { calcDeCodeNameById } from '../../../model';
 import { MDControlService, Srfuf } from '../../../service';
+import { handleAllSettled } from '../../../utils';
 import { ControllerEvent } from '../../utils';
 import { ControlController } from './control.controller';
 
@@ -181,6 +182,9 @@ export class MDControlController<
    * @date 2022-08-19 14:08:50
    */
   async load(args: MDCtrlLoadParams = {}): Promise<IData[]> {
+    if (this.state.isSimple) {
+      return [];
+    }
     await this.startLoading();
     try {
       // *初始加载需要重置分页
@@ -279,7 +283,7 @@ export class MDControlController<
     let needRefresh = false;
     try {
       const deName = calcDeCodeNameById(this.model.appDataEntityId!);
-      await Promise.allSettled(
+      await handleAllSettled(
         data.map(async item => {
           // 新建未保存的数据直接走后续删除处理逻辑
           if (item.srfuf !== Srfuf.CREATE) {

package/src/controller/common/view/view.controller.ts

@@ -14,6 +14,8 @@ import {
   IUIActionResult,
   IUILogicParams,
   IViewEngine,
+  IViewMessage,
+  ModalParams,
 } from '../../../interface';
 import { SysUIActionTag } from '../../../constant';
 import { convertNavData, Modal } from '../../../utils';
@@ -29,6 +31,7 @@ import {
   getViewLogics,
 } from '../../../model';
 import { ViewLogicScheduler } from '../../../logic-scheduler';
+import { ViewMsgController } from '../../utils/view-msg';
 
 /**
  * 视图控制器
@@ -107,6 +110,14 @@ export class ViewController<
 
   layoutPanel?: IViewLayoutPanelController;
 
+  /**
+   * 视图消息控制器
+   * @author lxm
+   * @date 2023-09-20 08:20:23
+   * @type {ViewMsgController}
+   */
+  viewMsgController?: ViewMsgController;
+
   /**
    * Creates an instance of ViewController.
    * @author lxm
@@ -210,6 +221,7 @@ export class ViewController<
     this.state.isLoading = false;
     this.state.caption = this.model.caption!;
     this.state.srfactiveviewdata = null;
+    this.state.viewMessages = {};
   }
 
   protected async onCreated(): Promise<void> {
@@ -267,6 +279,9 @@ export class ViewController<
       }
     }
 
+    // 初始化视图消息
+    this.initViewMsg();
+
     // 执行视图引擎的doCreated
     if (this.engines.length) {
       await Promise.all(this.engines.map(engine => engine.onCreated()));
@@ -404,4 +419,56 @@ export class ViewController<
       });
     }
   }
+
+  /**
+   * 初始化视图消息
+   * @author lxm
+   * @date 2023-09-20 09:19:20
+   */
+  async initViewMsg(): Promise<void> {
+    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: IViewMessage[]): Promise<void> {
+    const [message, ...rest] = messages;
+    const modalParams: 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/src/controller/control/dashboard/custom-dashboard.controller.ts

@@ -0,0 +1,107 @@
+import { IDashboard } from '@ibiz/model-core';
+import { ConfigService } from '../../../service';
+
+/**
+ * 自定义数据看板部件控制器
+ * @author lxm
+ * @date 2023-07-07 03:27:29
+ * @export
+ * @class CustomDashboardController
+ */
+export class CustomDashboardController {
+  /**
+   * 自定义布局模型数据
+   *
+   * @author: zhujiamin
+   * @Date: 2023-09-20 16:42:36
+   */
+  customModelData: IData[] = [];
+
+  /**
+   * 动态设计水平列数
+   *
+   * @author: zhujiamin
+   * @Date: 2023-09-20 16:43:39
+   */
+  layoutColNum: number = 12;
+
+  /**
+   * 动态设计单元格高度，80px
+   *
+   * @author: zhujiamin
+   * @Date: 2023-09-20 16:43:39
+   */
+  layoutRowH: number = 80;
+
+  /**
+   * 看板模型
+   *
+   * @author: zhujiamin
+   * @Date: 2023-09-20 16:43:39
+   */
+  model: IDashboard | null = 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) {
+    this.model = model;
+    this.config = new ConfigService(
+      model.appId!,
+      'dynadashboard',
+      `dashboard_${
+        this.model.appDataEntityId?.toLowerCase() || 'app'
+      }_${this.model.codeName?.toLowerCase()}`,
+    );
+  }
+
+  /**
+   * 加载自定义布局模型数据
+   *
+   * @author: zhujiamin
+   * @Date: 2023-09-20 16:22:49
+   */
+  async loadCustomModelData(): Promise<IData[]> {
+    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: IData[]): Promise<IData[]> {
+    const res = await this.config.save({
+      model,
+      colNum: this.layoutColNum,
+      rowH: this.layoutRowH,
+    });
+    if (res) {
+      this.customModelData = model;
+    }
+    return model;
+  }
+}

package/src/controller/control/dashboard/dashboard.controller.ts

@@ -12,6 +12,7 @@ import {
   IPortletContainerController,
 } from '../../../interface';
 import { getPortletProvider } from '../../../register';
+import { handleAllSettled } from '../../../utils';
 import { ControlController } from '../../common';
 import { getOriginData } from '../../utils';
 
@@ -113,15 +114,10 @@ export class DashboardController
    */
   async dataChangeNotify(data: IData): Promise<void> {
     // 通知所有成员项去处理成员项相关逻辑
-    const values = await Promise.allSettled(
+    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 as PromiseRejectedResult).reason;
-    }
   }
 }

package/src/controller/control/dashboard/index.ts

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

package/src/controller/control/dashboard/portlet/portlet-part/portlet-part.controller.ts

@@ -3,6 +3,7 @@ import {
   IPortletController,
   IDashboardController,
   IPortletContainerController,
+  DataChangeEvent,
 } from '../../../../../interface';
 import { calcLayoutHeightWidth, calcDynaClass } from '../../../../../model';
 import { ControlVO } from '../../../../../service';
@@ -144,6 +145,26 @@ export class PortletPartController<T extends IDBPortletPart = IDBPortletPart>
     return new PortletPartState();
   }
 
+  /**
+   * 数据改变方法
+   * @param {DataChangeEvent} event
+   * @return {*}
+   * @author: zhujiamin
+   * @Date: 2023-09-22 17:39:44
+   */
+  onDataChange(event: DataChangeEvent): void {
+    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!,
+      );
+    }
+  }
+
   /**
    * 初始化标题右侧界面行为按钮的状态
    *
@@ -175,15 +196,7 @@ export class PortletPartController<T extends IDBPortletPart = IDBPortletPart>
     // 实体门户视图监听视图数据变更，刷新界面行为组的状态。
     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);
     }
   }
 
@@ -243,4 +256,14 @@ export class PortletPartController<T extends IDBPortletPart = IDBPortletPart>
       }
     }
   }
+
+  /**
+   * 销毁
+   * @author lxm
+   * @date 2023-04-25 11:08:54
+   */
+  async destroyed(): Promise<void> {
+    ibiz.log.debug(`${this.model.codeName} onDestroyed`);
+    this.dashboard.view.evt.off('onDataChange', this.onDataChange);
+  }
 }