@ibiz-template/runtime 0.1.27 → 0.1.28

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/interface/controller/controller/control/panel-item/i-panel-item.controller.ts

@@ -43,7 +43,7 @@ export interface IPanelItemController {
    * @date 2022-09-20 18:09:56
    * @param {string[]} names
    */
-  dataChangeNotify(names: string[]): void;
+  dataChangeNotify(names: string[]): Promise<void>;
 
   /**
    * 面板状态变更通知
@@ -51,5 +51,5 @@ export interface IPanelItemController {
    * @author lxm
    * @date 2022-09-20 18:09:07
    */
-  panelStateNotify(_state: PanelNotifyState): void;
+  panelStateNotify(state: PanelNotifyState): Promise<void>;
 }

package/src/logic-scheduler/trigger/item-dyna-logic-trigger.ts

@@ -39,7 +39,11 @@ export class ItemDynaLogicTrigger extends LogicTrigger {
 
   match(matchParams: ITriggerMatchParams): boolean {
     const superResult = super.match(matchParams);
-    return superResult && matchParams.itemName === this.logic.itemName;
+    return (
+      superResult &&
+      // 忽略大小写匹配
+      matchParams.itemName?.toLowerCase() === this.logic.itemName?.toLowerCase()
+    );
   }
 
   execute(executeParams: IUILogicParams): boolean {

package/src/service/service/entity/method/method.ts

@@ -115,7 +115,7 @@ export abstract class Method {
           );
           break;
         case 'GET':
-          res = await this.app.net.get(`${path}/${methodName}`, data);
+          res = await this.app.net.get(`${path}/${methodName}`, data || params);
           break;
         case 'PUT': {
           res = await this.app.net.put(
@@ -125,7 +125,10 @@ export abstract class Method {
           break;
         }
         case 'DELETE':
-          res = await this.app.net.delete(`${path}/${methodName}`, data);
+          res = await this.app.net.delete(
+            `${path}/${methodName}`,
+            data || params,
+          );
           break;
         default:
           if (requestMethod) {

package/src/service/utils/dynamic-code-list/dynamic-code-list.ts

@@ -158,11 +158,11 @@ export class DynamicCodeListCache {
   ): Promise<CodeListItem[]> {
     const app = ibiz.hub.getApp(context.srfappid);
     // *预定义加载
+    // 特殊处理，避免预置代码表加载不全
+    if (!params.size) {
+      params = { ...params, size: 10000 };
+    }
     if (this.isPredefined) {
-      // 特殊处理，避免预置代码表加载不全
-      if (!params.size) {
-        params = { ...params, size: 10000 };
-      }
       const res = await app.net.get(
         `/dictionaries/codelist/${this.codeList.codeName}`,
         params,

package/src/utils/wf-helper/wf-helper.ts

@@ -34,8 +34,8 @@ export function getWFSubmitViewId(
   const key = type
     ? `WFUTILACTION@${type.toUpperCase()}`
     : `WFACTION@${ibiz.env.isMob ? sequenceflowmobview : sequenceflowview}`;
-  const submitViewRef = appViewRefs!.find(viewRef => {
-    return viewRef.name === key;
+  const submitViewRef = appViewRefs?.find(viewRef => {
+    return viewRef.name!.indexOf(key) !== -1;
   });
   return submitViewRef?.refAppViewId;
 }