@ibiz-template/runtime 0.1.27 → 0.1.29-dev.0

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/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);
+  }
 }

package/src/controller/control/data-view/data-view.controller.ts

@@ -195,6 +195,7 @@ export class DataViewControlController<
   }
 
   async afterLoad(args: MDCtrlLoadParams, items: IData[]): Promise<IData[]> {
+    await this.initGroupCodeListItems();
     await this.handleDataGroup();
     await this.initGroupActionStates();
     return items;
@@ -340,7 +341,7 @@ export class DataViewControlController<
   protected async initGroupCodeListItems(): Promise<void> {
     const { groupCodeListId } = this.model;
     if (!groupCodeListId) {
-      throw new RuntimeModelError(this.model, '分组代码表没有配置');
+      return;
     }
     const app = ibiz.hub.getApp(this.context.srfappid);
     this.groupCodeListItems = await app.codeList.get(
@@ -356,9 +357,9 @@ export class DataViewControlController<
    * @memberof DataViewControlController
    */
   async handleCodeListGroup(): Promise<void> {
-    const { groupAppDEFieldId } = this.model;
-    if (!this.groupCodeListItems) {
-      await this.initGroupCodeListItems();
+    const { groupAppDEFieldId, groupCodeListId } = this.model;
+    if (!groupCodeListId) {
+      throw new RuntimeModelError(this.model, '分组代码表没有配置');
     }
     const { items } = this.state;
     const groupMap: Map<string | number, IData[]> = new Map();

package/src/controller/control/index.ts

@@ -19,3 +19,5 @@ export * from './tree/index';
 export * from './wizard-panel/index';
 export * from './md-ctrl/index';
 export * from './kanban/index';
+export * from './tree-grid-ex/index';
+export * from './tree-grid/index';

package/src/controller/control/panel/panel/panel-item.controller.ts

@@ -133,10 +133,15 @@ export class PanelItemController<T extends IPanelItem = IPanelItem>
    * @date 2022-09-20 18:09:56
    * @param {string[]} names
    */
-  dataChangeNotify(names: string[]): void {
+  async dataChangeNotify(names: string[]): Promise<void> {
     // 计算动态控制逻辑
     this.calcDynamicLogic(names);
 
+    // 计算显示，禁用，必填状态
+    this.calcItemDisabled(this.data);
+    this.calcItemVisible(this.data);
+    this.calcItemRequired(this.data);
+
     // 计算动态样式表
     this.calcDynaClass(this.data);
   }
@@ -147,14 +152,109 @@ export class PanelItemController<T extends IPanelItem = IPanelItem>
    * @author lxm
    * @date 2022-09-20 18:09:07
    */
-  panelStateNotify(_state: PanelNotifyState): void {
+  async panelStateNotify(_state: PanelNotifyState): Promise<void> {
     // 计算动态控制逻辑
     this.calcDynamicLogic([], true);
 
+    // 计算显示，禁用，必填状态
+    this.calcItemDisabled(this.data);
+    this.calcItemVisible(this.data);
+    this.calcItemRequired(this.data);
+
     // 计算动态样式表
     this.calcDynaClass(this.data);
   }
 
+  /**
+   * 计算项的禁用状态
+   * @author lxm
+   * @date 2023-06-26 06:19:00
+   * @param {IData} data
+   */
+  calcItemDisabled(data: IData): void {
+    let enable = !this.dynaLogicResult.disabled;
+
+    // 上层计算为启用时计算预定义项启用逻辑
+    if (enable && this.panel.scheduler) {
+      const itemEnable = this.panel.scheduler.triggerItemEnable(
+        this.model.id!,
+        {
+          data: [data],
+        },
+      );
+      if (itemEnable !== undefined) {
+        enable = itemEnable;
+      }
+    }
+
+    // 修改state
+    this.state.disabled = !enable;
+  }
+
+  /**
+   * 计算项的显示状态
+   * @author lxm
+   * @date 2023-06-26 06:19:00
+   * @param {IData} data
+   */
+  calcItemVisible(data: IData): void {
+    let { visible } = this.dynaLogicResult;
+
+    // 上层计算为显示时计算预定义项显示逻辑
+    if (visible && this.panel.scheduler) {
+      const itemVIsible = this.panel.scheduler.triggerItemVisible(
+        this.model.id!,
+        {
+          data: [data],
+        },
+      );
+      if (itemVIsible !== undefined) {
+        visible = itemVIsible;
+      }
+    }
+
+    // 修改state
+    this.state.visible = visible;
+  }
+
+  /**
+   * 计算项的必填状态
+   * @author lxm
+   * @date 2023-06-26 06:19:00
+   * @param {IData} data
+   */
+  calcItemRequired(data: IData): void {
+    let allowEmpty = !this.dynaLogicResult.required;
+
+    // 上层计算为启用时计算预定义项启用逻辑
+    if (allowEmpty && this.panel.scheduler) {
+      const itemAllowEmpty = this.panel.scheduler.triggerItemBlank(
+        this.model.id!,
+        {
+          data: [data],
+        },
+      );
+      if (itemAllowEmpty !== undefined) {
+        allowEmpty = itemAllowEmpty;
+      }
+    }
+
+    // 修改state
+    this.state.required = !allowEmpty;
+  }
+
+  /**
+   * 动态逻辑结果
+   * @author lxm
+   * @date 2023-09-21 03:36:37
+   * @protected
+   */
+  protected dynaLogicResult = {
+    visible: true,
+    disabled: false,
+    required: false,
+  };
+
   /**
    * 计算动态逻辑
    *
@@ -182,15 +282,15 @@ export class PanelItemController<T extends IPanelItem = IPanelItem>
           switch (logic.logicCat) {
             // 动态空输入，不满足则必填
             case 'ITEMBLANK':
-              this.state.required = !ok;
+              this.dynaLogicResult.required = !ok;
               break;
             // 动态启用，满足则启用
             case 'ITEMENABLE':
-              this.state.disabled = !ok;
+              this.dynaLogicResult.disabled = !ok;
               break;
             // 动态显示，满足则显示
             case 'PANELVISIBLE':
-              this.state.visible = ok;
+              this.dynaLogicResult.visible = ok;
               break;
             default:
           }

package/src/controller/control/panel/panel/panel.controller.ts

@@ -1,6 +1,7 @@
 /* eslint-disable no-param-reassign */
-import { RuntimeError } from '@ibiz-template/core';
+import { recursiveIterate, RuntimeError } from '@ibiz-template/core';
 import {
+  IControlLogic,
   IPanel,
   IPanelContainer,
   IPanelItem,
@@ -268,4 +269,19 @@ export class PanelController<
     this.state.data[name] = value;
     this.dataChangeNotify([name]);
   }
+
+  protected initControlScheduler(logics: IControlLogic[] = []): void {
+    const actualLogics = [...logics];
+    // 遍历所有的项，如果有逻辑的话加入
+    recursiveIterate(
+      this.model,
+      (item: IPanelItem) => {
+        if (item.controlLogics) {
+          actualLogics.push(...item.controlLogics);
+        }
+      },
+      { childrenFields: ['rootPanelItems', 'panelItems', 'panelTabPages'] },
+    );
+    super.initControlScheduler(actualLogics);
+  }
 }

package/src/controller/control/toolbar/toolbar.controllerr.ts

@@ -1,4 +1,4 @@
-import { recursiveIterate } from '@ibiz-template/core';
+import { recursiveIterate, RuntimeError } from '@ibiz-template/core';
 import {
   IDEToolbar,
   IDEToolbarItem,
@@ -13,6 +13,7 @@ import {
   IExtraButton,
   IButtonState,
 } from '../../../interface';
+import { getUIActionById } from '../../../model';
 import { ControlVO } from '../../../service';
 import { UIActionUtil } from '../../../ui-action';
 import { ControlController } from '../../common';
@@ -69,15 +70,35 @@ export class ToolbarController<
     // 执行界面行为
     if (item.itemType === 'DEUIACTION') {
       const actionId = (item as IDETBUIActionItem).uiactionId;
-      const res = await this.ctx.view.call(ViewCallTag.GET_DATA);
-      const data = res || [];
-      const args = this.getEventArgs();
-      args.params = Object.assign(param, args.params);
-      await UIActionUtil.execAndResolved(actionId!, {
-        ...args,
-        data,
-        event,
-      });
+      const uiAction = await getUIActionById(actionId!);
+      if (!uiAction) {
+        throw new RuntimeError(`没有找到界面行为模型${actionId}`);
+      }
+
+      // 是否过程中启用loading
+      const enableLoading =
+        ['SYS', 'BACKEND', 'WFBACKEND'].includes(uiAction.uiactionMode!) &&
+        uiAction.showBusyIndicator !== false;
+
+      if (enableLoading) {
+        this.state.buttonsState.setLoading(item.id!);
+      }
+
+      try {
+        const res = await this.ctx.view.call(ViewCallTag.GET_DATA);
+        const data = res || [];
+        const args = this.getEventArgs();
+        args.params = Object.assign(param, args.params);
+        await UIActionUtil.execAndResolved(actionId!, {
+          ...args,
+          data,
+          event,
+        });
+      } finally {
+        if (enableLoading) {
+          this.state.buttonsState.setLoading('');
+        }
+      }
     }
   }
 
@@ -122,21 +143,16 @@ export class ToolbarController<
     event: MouseEvent,
     params?: IData,
   ): Promise<void> {
-    this.state.buttonsState.setLoading(item.id!);
     const isExtra = (item as IExtraButton).buttonType === 'extra';
-    try {
-      await this._evt.emit('onClick', {
-        event,
-        eventArg: item.id!,
-        buttonType: isExtra ? 'extra' : 'deuiaction',
-      });
-
-      // 工具栏才走界面行为
-      if (!isExtra) {
-        await this.doUIAction(item, event, params);
-      }
-    } finally {
-      this.state.buttonsState.setLoading('');
+    await this._evt.emit('onClick', {
+      event,
+      eventArg: item.id!,
+      buttonType: isExtra ? 'extra' : 'deuiaction',
+    });
+
+    // 工具栏才走界面行为
+    if (!isExtra) {
+      await this.doUIAction(item, event, params);
     }
   }
 

package/src/controller/control/tree-grid/index.ts

@@ -0,0 +1,2 @@
+export * from './tree-grid.controller';
+export * from './tree-grid.service';

package/src/controller/control/tree-grid/tree-grid.controller.ts

@@ -0,0 +1,6 @@
+import { ITreeGridController } from '../../../interface';
+import { GridController } from '../grid';
+
+export class TreeGridController
+  extends GridController
+  implements ITreeGridController {}

package/src/controller/control/tree-grid/tree-grid.service.ts

@@ -0,0 +1,12 @@
+import { GridService } from '../grid';
+
+/**
+ * 树表格部件服务
+ *
+ * @author zk
+ * @date 2023-09-25 05:09:52
+ * @export
+ * @class TreeGridService
+ * @extends {TreeService}
+ */
+export class TreeGridService extends GridService {}

package/src/controller/control/tree-grid-ex/index.ts

@@ -0,0 +1,2 @@
+export * from './tree-grid-ex.controller';
+export * from './tree-grid-ex.service';