@ibiz-template/runtime 0.2.12 → 0.2.15

package/src/controller/control/grid/grid-column/grid-field-column/grid-field-column.controller.ts

@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
-import { DataTypes, ModelError } from '@ibiz-template/core';
+import { DataTypes, ModelError, plus } from '@ibiz-template/core';
 import { IAppCodeList, IDEGridFieldColumn } from '@ibiz/model-core';
 import dayjs from 'dayjs';
 import { debounce } from 'lodash-es';
@@ -236,13 +236,13 @@ export class GridFieldColumnController extends GridColumnController<IDEGridField
         case 'SUM':
           aggValue = items
             .map(item => item[fieldName] as number)
-            .reduce((a, b) => a + b, 0);
+            .reduce((a, b) => plus(a, b), 0);
           break;
         case 'AVG':
           aggValue =
             items
               .map(item => item[fieldName] as number)
-              .reduce((a, b) => a + b, 0) / items.length;
+              .reduce((a, b) => plus(a, b), 0) / items.length;
           break;
         case 'MAX':
           aggValue = Math.max(...items.map(item => item[fieldName] as number));

package/src/controller/control/medit-view-panel/medit-view-panel.controller.ts

@@ -10,8 +10,7 @@ import {
   IPanelUiItem,
   DataChangeEvent,
 } from '../../../interface';
-import { calcDeCodeNameById } from '../../../model';
-import { ControlVO, Srfuf } from '../../../service';
+import { ControlVO } from '../../../service';
 import { MDControlController } from '../../common';
 import { MEditViewPanelService } from './medit-view-panel.service';
 
@@ -32,12 +31,6 @@ export class MEditViewPanelController
 {
   declare service: MEditViewPanelService;
 
-  /**
-   * 是否显示底部按钮
-   *
-   */
-  showButton: boolean = true;
-
   /**
    * 当前应用视图参数对象
    *
@@ -56,6 +49,7 @@ export class MEditViewPanelController
     this.state.panelUiItems = [];
     this.state.activeTab = '';
     this.state.size = 1000;
+    this.state.isNeedScroll = false;
   }
 
   /**
@@ -99,12 +93,17 @@ export class MEditViewPanelController
     items: ControlVO[],
   ): Promise<ControlVO[]> {
     await super.afterLoad(args, items);
+    // 找出临时UI数据
+    const tempPanelUiItems = this.state.panelUiItems.filter(UiItem => {
+      return UiItem.id.startsWith('mockId:');
+    });
     this.state.panelUiItems = [];
-    this.doItems(items);
+    this.doItems(items, tempPanelUiItems);
     // 设置默认激活
     if (
       this.model.panelStyle === 'TAB_TOP' &&
-      this.state.panelUiItems.length > 0
+      this.state.panelUiItems.length > 0 &&
+      tempPanelUiItems.length === 0
     ) {
       this.state.activeTab = this.state.panelUiItems[0].id;
     }
@@ -158,11 +157,14 @@ export class MEditViewPanelController
    * @author: zhujiamin
    * @Date: 2023-10-16 15:00:02
    */
-  doItems(datas: ControlVO[]): void {
+  doItems(datas: ControlVO[], tempPanelUiItems?: IPanelUiItem[]): void {
     datas.forEach((arg: ControlVO) => {
       const item = this.handlePanelItemParams(arg);
       this.state.panelUiItems.push(item);
     });
+    if (tempPanelUiItems) {
+      this.state.panelUiItems.push(...tempPanelUiItems);
+    }
   }
 
   /**
@@ -172,6 +174,7 @@ export class MEditViewPanelController
    * @Date: 2023-10-16 15:18:01
    */
   async handleAdd(): Promise<void> {
+    this.state.isNeedScroll = true;
     this.doItems([{ srfuf: 0 } as ControlVO]);
     if (this.model.panelStyle === 'TAB_TOP') {
       // 上分页添加后激活最后一个
@@ -188,6 +191,7 @@ export class MEditViewPanelController
    * @Date: 2023-10-16 15:23:59
    */
   async handleDelete(item: IPanelUiItem): Promise<void> {
+    this.state.isNeedScroll = false;
     // 新建的界面上删除即可
     if (item.data.srfuf === 0) {
       // 删除items中已删除的项
@@ -196,7 +200,7 @@ export class MEditViewPanelController
       });
       this.state.panelUiItems.splice(index, 1);
     } else {
-      await this.remove({ data: [item.data] });
+      await this.remove({ data: [item.data], notRefresh: true });
     }
   }
 
@@ -253,53 +257,33 @@ export class MEditViewPanelController
   onViewDataChange(args: DataChangeEvent, id: string): void {
     // 新建的保存成功后该部件需要保存来更新数据
     if (args.eventName === 'onSaveSuccess') {
-      this.save(args.data[0] as ControlVO, id);
+      this.handleDataChange(args.data[0] as ControlVO, id);
     }
   }
 
   /**
-   * 保存
+   * 处理数据变化
    *
    * @param {ControlVO} data
    * @returns {*}  {Promise<void>}
    */
-  async save(data: ControlVO, id: string): Promise<void> {
+  async handleDataChange(data: ControlVO, id: string): Promise<void> {
     const panelUiItemIndex = this.state.panelUiItems.findIndex(
       item => item.id === id,
     );
-    if (!panelUiItemIndex) {
+    if (panelUiItemIndex < 0) {
       throw new RuntimeError('编辑视图面板部件UI数据不存在');
     }
-    await this.startLoading();
-    let res;
-    const isCreate = data.srfuf === Srfuf.CREATE;
-    const deName = calcDeCodeNameById(this.model.appDataEntityId!);
-    const tempContext = this.context.clone();
-    tempContext[deName] = data.srfkey;
-    try {
-      res = isCreate
-        ? await this.service.create(tempContext, data)
-        : await this.service.update(tempContext, data);
-    } catch (error) {
-      await this.evt.emit('onSaveError', undefined);
-      this.actionNotification(`${isCreate ? 'CREATE' : 'UPDATE'}ERROR`, {
-        error: error as Error,
-        data: this.state.panelUiItems[panelUiItemIndex].data,
-      });
-      throw error;
-    } finally {
-      await this.endLoading();
+    const tempUiItem = this.state.panelUiItems[panelUiItemIndex];
+    if (tempUiItem.id.startsWith('mockId:')) {
+      this.state.panelUiItems[panelUiItemIndex] =
+        this.handlePanelItemParams(data);
+    } else {
+      tempUiItem.srfmajortext = data.srfmajortext!;
+    }
+    if (this.model.panelStyle === 'TAB_TOP') {
+      // 上分页保存后激活保存的这一个
+      this.state.activeTab = this.state.panelUiItems[panelUiItemIndex].id;
     }
-    // 后续处理
-    const index = this.state.items.findIndex(
-      item => item.srfkey === data.srfkey,
-    );
-    this.state.items.splice(index, 1, res.data);
-    this.state.panelUiItems.splice(
-      panelUiItemIndex,
-      1,
-      this.handlePanelItemParams(res.data),
-    );
-    await this.evt.emit('onSaveSuccess', undefined);
   }
 }

package/src/controller/control/tab-exp-panel/tab-exp-panel.controller.ts

@@ -9,6 +9,7 @@ import {
 import { calcDeCodeNameById } from '../../../model';
 import { calcNavParams } from '../../../utils';
 import { ControlController } from '../../common';
+import { hasSubRoute } from '../../utils';
 
 /**
  * 分页导航面板
@@ -57,6 +58,19 @@ export class TabExpPanelController
     return ibiz.config.view.expCacheMode.includes(this.model.controlType!);
   }
 
+  /**
+   * 当前路由视图的层级
+   *
+   * @author zk
+   * @date 2023-07-11 10:07:20
+   * @readonly
+   * @type {(number | undefined)}
+   * @memberof ExpBarControlController
+   */
+  get routeDepth(): number | undefined {
+    return this.view.modal.routeDepth;
+  }
+
   /**
    * 初始化state的属性
    *
@@ -141,23 +155,25 @@ export class TabExpPanelController
    * @memberof TabExpPanelController
    */
   initDefaultPage(): void {
-    const initFirstPage = (): void => {
-      this.state.activeName = this.state.tabPages[0].tabTag;
-      this.handleTabChange();
-    };
-    if (!this.state.defaultTabName) {
-      initFirstPage();
-    } else {
+    // 跳转指定的默认分页
+    if (this.state.defaultTabName) {
       const activeTab = this.state.tabPages.find(
         item => item.tabTag === this.state.defaultTabName,
       );
-      if (!activeTab) {
-        initFirstPage();
-      } else {
+      if (activeTab) {
         this.state.activeName = activeTab.tabTag;
-        this.changeToTab();
+        this.changeToTab(
+          this.activeTabViewPanelModel,
+          // 路由模式下并且有子路由
+          this.routeDepth !== undefined && hasSubRoute(this.routeDepth),
+        );
+        return;
       }
     }
+
+    // 没有默认分页或者匹配不到时，跳转第一个分页
+    this.state.activeName = this.state.tabPages[0].tabTag;
+    this.handleTabChange();
   }
 
   /**
@@ -169,8 +185,12 @@ export class TabExpPanelController
    */
   protected changeToTab(
     tab: IDETabViewPanel = this.activeTabViewPanelModel!,
+    isRoutePushed = false,
   ): void {
     const navViewMsg = this.getNavViewMsg(tab);
+    if (isRoutePushed === true) {
+      navViewMsg.isRoutePushed = true;
+    }
     this.evt.emit('onNavViewChange', { navViewMsg });
   }
 

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

@@ -41,6 +41,7 @@ export class TreeController
     // 根节点初始化
     this.state.defaultExpandedKeys = [];
     this.state.expandedKeys = [];
+    this.state.navigational = false;
     this.state.size = 0;
   }
 
@@ -154,6 +155,14 @@ export class TreeController
    * @memberof TreeController
    */
   async onTreeNodeClick(nodeData: ITreeNodeData): Promise<void> {
+    // 导航的时候，没有导航视图的时候，节点后续点击逻辑都不走，也不选中
+    if (this.state.navigational) {
+      const nodeModel = this.getNodeModel(nodeData.nodeId);
+      if (!nodeModel?.navAppViewId) {
+        return;
+      }
+    }
+
     // 单选时，单击才会触发选中逻辑
     if (this.state.singleSelect) {
       // 选中相关处理
@@ -363,4 +372,31 @@ export class TreeController
       children: nodes,
     });
   }
+
+  async expandNodeByKey(expandKeys: string[]): Promise<void> {
+    const noExpandKeys = expandKeys.filter(
+      key => !this.state.expandedKeys.includes(key),
+    );
+    if (noExpandKeys.length === 0) {
+      return;
+    }
+
+    // 找到已存在的要展开的节点
+    const existNodes = this.state.items.filter(item =>
+      noExpandKeys.includes(item.id),
+    );
+
+    // 补充所有未展开的节点标识，查询过程中会自动加载后续展开
+    this.state.expandedKeys.push(...noExpandKeys);
+
+    if (existNodes.length === 0) {
+      return;
+    }
+    // 展开加载节点
+    await Promise.all(
+      existNodes.map(node => {
+        return this.loadNodes(node);
+      }),
+    );
+  }
 }

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

@@ -207,6 +207,29 @@ export class WizardPanelController
     }
   }
 
+  /**
+   * 根据tag获取应该激活的向导表单
+   * @param {string} tag
+   * @return {*}
+   * @author: zhujiamin
+   * @Date: 2023-11-10 18:35:37
+   */
+  getWizardFormByTag(tag: string): IDEWizardForm | undefined {
+    if (!this.model.dewizard?.dewizardForms) {
+      throw new RuntimeError(`没有配置向导表单集合`);
+      return;
+    }
+    const wizardForm = this.model.dewizard.dewizardForms.find(
+      (form: IDEWizardForm) => {
+        return form.formTag === tag;
+      },
+    );
+    if (!wizardForm) {
+      throw new RuntimeError(`找不到标识为${tag}的向导表单`);
+    }
+    return wizardForm;
+  }
+
   /**
    * 执行初始化操作，存在初始化实体行为的时候加载数据并把主键放入上下文
    *
@@ -221,8 +244,22 @@ export class WizardPanelController
       if (res.data && res.data.srfkey) {
         this.context[deName] = res.data.srfkey;
       }
+      // 初始化时状态向导面板根据状态属性去决定当前激活哪个表单
+      if (
+        res.data &&
+        this.model.stateAppDEFieldId &&
+        res.data[this.model.stateAppDEFieldId]
+      ) {
+        const activeForm = this.getWizardFormByTag(
+          res.data[this.model.stateAppDEFieldId],
+        );
+        if (activeForm) {
+          this.state.activeFormTag = activeForm.formTag!;
+        }
+      }
     }
-    if (this.firstForm) {
+    // 没有激活的表单标识就选配置的首表单
+    if (!this.state.activeFormTag && this.firstForm) {
       this.state.activeFormTag = this.firstForm.formTag!;
       this.tagHistory.push(this.firstForm.formTag!);
     }
@@ -250,10 +287,20 @@ export class WizardPanelController
    */
   async onPrevClick(): Promise<void> {
     // 先执行表单返回行为
-    await this.activeFormController.goBack();
-    // 返回上一个表单
-    this.tagHistory.pop();
-    const prevTag = this.tagHistory[this.tagHistory.length - 1];
+    const data = await this.activeFormController.goBack();
+    let prevTag;
+    // 返回上一个表单优先级 stateAppDEFieldId > tagHistory
+    if (this.model.stateAppDEFieldId && data[this.model.stateAppDEFieldId]) {
+      const wizardForm = this.getWizardFormByTag(
+        data[this.model.stateAppDEFieldId],
+      );
+      if (wizardForm) {
+        prevTag = data[this.model.stateAppDEFieldId];
+      }
+    } else {
+      prevTag = this.tagHistory[this.tagHistory.length - 1];
+      this.tagHistory.pop();
+    }
     if (!prevTag) {
       throw new RuntimeError('没有上一个表单');
     }
@@ -272,15 +319,21 @@ export class WizardPanelController
     const data = await this.activeFormController.save();
     let nextTag;
     if (data.srfnextform) {
-      const wizardForm = this.model.dewizard!.dewizardForms!.find(
-        (_wizardForm: IDEWizardForm) => {
-          return _wizardForm.formTag === data.srfnextform;
-        },
+      const wizardForm = this.getWizardFormByTag(data.srfnextform);
+      if (wizardForm) {
+        nextTag = data.srfnextform;
+        this.tagHistory.push(nextTag);
+      }
+    } else if (
+      this.model.stateAppDEFieldId &&
+      data[this.model.stateAppDEFieldId]
+    ) {
+      const wizardForm = this.getWizardFormByTag(
+        data[this.model.stateAppDEFieldId],
       );
-      if (!wizardForm) {
-        throw new RuntimeError(`找不到标识为${data.srfnextform}的向导表单`);
+      if (wizardForm) {
+        nextTag = data[this.model.stateAppDEFieldId];
       }
-      nextTag = data.srfnextform;
     } else {
       // 通过步骤找,找到下一个步骤对应的第一个向导表单
       const { formTag } = this.activeWizardForm!;
@@ -293,12 +346,8 @@ export class WizardPanelController
         if (!nextWizardStep) {
           throw new RuntimeError('找不到下一个向导步骤');
         }
-        const nextWizardForm = this.model.dewizard!.dewizardForms!.find(
-          (wizardForm: IDEWizardForm) => {
-            return wizardForm.formTag === nextWizardStep.stepTag;
-          },
-        );
-        if (nextWizardForm) {
+        const nextWizardForm = this.getWizardFormByTag(nextWizardStep.stepTag!);
+        if (nextWizardForm && nextWizardForm.formTag) {
           nextTag = nextWizardForm.formTag;
         }
       }

package/src/controller/utils/index.ts

@@ -2,6 +2,7 @@ export * from './counter';
 export * from './loading/loading.state';
 export * from './button-state';
 export * from './event';
+export * from './route/route';
 export * from './util/util';
 export * from './value-rule/value-rule';
 export * from './value-ex/value-ex';

package/src/controller/utils/route/route.ts

@@ -0,0 +1,11 @@
+/**
+ * 是否有子路由路径
+ * @author lxm
+ * @date 2023-11-08 10:12:54
+ * @export
+ * @param {number} routeDepth
+ * @return {*}  {boolean}
+ */
+export function hasSubRoute(routeDepth: number): boolean {
+  return window.location.hash.split('/').length > routeDepth * 2 + 2;
+}

package/src/controller/utils/view-msg/view-msg-controller.ts

@@ -146,13 +146,16 @@ export class ViewMsgController {
    */
   protected calcStaticMsg(detail: IAppViewMsgGroupDetail): IViewMessage {
     const { position: position1 } = detail;
+    const viewMsg = this.viewMsgMap.get(detail.appViewMsgId!)!;
     const {
       title,
       message,
       removeMode,
       position: position2,
       messageType,
-    } = this.viewMsgMap.get(detail.appViewMsgId!)!;
+    } = viewMsg;
+    const { userTag, userTag2, userTag3, userTag4 } = viewMsg as IData;
+
     // detail里的位置优先
     const position = position1 || position2;
     return {
@@ -161,6 +164,13 @@ export class ViewMsgController {
       position,
       messageType,
       removeMode,
+      // 额外参数
+      extraParams: {
+        userTag,
+        userTag2,
+        userTag3,
+        userTag4,
+      },
     };
   }
 

package/src/interface/common/i-data-ability-params/i-data-ability-params.ts

@@ -30,4 +30,12 @@ export interface IDataAbilityParams {
    * @type {IData[]}
    */
   data?: IData[] | IData;
+
+  /**
+   * 是否静默执行，不出loading效果，不弹成功提示
+   * @author lxm
+   * @date 2023-11-10 06:35:27
+   * @type {boolean}
+   */
+  silent?: boolean;
 }

package/src/interface/controller/common/i-nav-view-msg/i-nav-view-msg.ts

@@ -65,4 +65,14 @@ export interface INavViewMsg {
    * @memberof INavViewMsg
    */
   isCache?: boolean;
+
+  /**
+   * 是否404
+   *
+   * @author zk
+   * @date 2023-09-26 06:09:17
+   * @type {string}
+   * @memberof INavViewMsg
+   */
+  is404?: boolean;
 }

package/src/interface/controller/common/view-message/i-view-message.ts

@@ -39,4 +39,14 @@ export interface IViewMessage {
    * @type {string}
    */
   message?: string;
+
+  /**
+   * 额外参数
+   *
+   * @author zk
+   * @date 2023-11-06 11:11:50
+   * @type {IData}
+   * @memberof IViewMessage
+   */
+  extraParams: IData;
 }

package/src/interface/controller/controller/control/i-exp-bar-control.controller.ts

@@ -64,5 +64,5 @@ export interface IExpBarControlController<
    * @date 2023-09-14 07:03:39
    * @param {{ srfnav?: string; path: string }} info 当前系统的路由的从一级到最后一级的所有路径。
    */
-  onRouterChange(info: { srfnav: string; path: string }): void;
+  onRouterChange(info: { srfnav: string; path: string }): Promise<void>;
 }

package/src/interface/controller/controller/control/i-md-control.controller.ts

@@ -28,6 +28,14 @@ export interface MDCtrlRemoveParams extends IDataAbilityParams {
    * @type {boolean}
    */
   silent?: boolean;
+
+  /**
+   * 是否不需要刷新(默认为否，如果不需要刷新传true)
+   * @author lxm
+   * @date 2023-08-17 06:04:23
+   * @type {boolean}
+   */
+  notRefresh?: boolean;
 }
 
 /**

package/src/interface/controller/controller/control/i-medit-view-panel.controller.ts

@@ -14,4 +14,11 @@ export interface IMEditViewPanelController<
   T extends IDEMultiEditViewPanel = IDEMultiEditViewPanel,
   S extends IMEditViewPanelState = IMEditViewPanelState,
   E extends IMEditViewPanelEvent = IMEditViewPanelEvent,
-> extends IMDControlController<T, S, E> {}
+> extends IMDControlController<T, S, E> {
+  /**
+   * 处理添加
+   *
+   * @memberof IMEditViewPanelController
+   */
+  handleAdd(): Promise<void>;
+}

package/src/interface/controller/controller/control/i-tree.controller.ts

@@ -57,4 +57,13 @@ export interface ITreeController
     nodeData: ITreeNodeData | IData,
     refreshParent?: boolean,
   ): Promise<void>;
+
+  /**
+   * 展开并加载节点
+   * @author lxm
+   * @date 2023-11-07 03:00:54
+   * @param {string[]} expandedKeys 要展开的节点标识集合
+   * @return {*}  {Promise<void>}
+   */
+  expandNodeByKey(expandedKeys: string[]): Promise<void>;
 }

package/src/interface/controller/state/control/i-medit-view-panel.state.ts

@@ -33,4 +33,10 @@ export interface IMEditViewPanelState extends IMDControlState {
    *
    */
   activeTab: string;
+
+  /**
+   * 是否需要滚动
+   *
+   */
+  isNeedScroll: boolean;
 }

package/src/interface/controller/state/control/i-tree.state.ts

@@ -37,6 +37,14 @@ export interface ITreeState extends IMDControlState {
    * @type {string[]}
    */
   expandedKeys: string[];
+
+  /**
+   * 是否是导航的（即树导航里的树）
+   * @author lxm
+   * @date 2023-11-08 03:25:21
+   * @type {boolean}
+   */
+  navigational: boolean;
 }
 
 /**

package/src/logic-scheduler/executor/app-ui-action-executor.ts

@@ -1,3 +1,4 @@
+import { RuntimeModelError } from '@ibiz-template/core';
 import { IUILogicParams } from '../../interface';
 import { UIActionUtil } from '../../ui-action';
 import { LogicExecutor } from './logic-executor';
@@ -15,6 +16,12 @@ export class AppDEUIActionExecutor extends LogicExecutor {
 
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   execute(executeParams: IUILogicParams): any {
-    UIActionUtil.execAndResolved(this.logic.appDEUIActionId!, executeParams);
+    if (!this.logic.appDEUIActionId) {
+      throw new RuntimeModelError(
+        this.logic,
+        `逻辑中缺少触发应用实体界面行为id`,
+      );
+    }
+    UIActionUtil.execAndResolved(this.logic.appDEUIActionId, executeParams);
   }
 }

package/src/service/service/entity/util/util.ts

@@ -3,6 +3,7 @@ import { IAppDEAction, IAppDEDataSet, IAppDEMethod } from '@ibiz/model-core';
 /**
  * 是否为本地模式
  *
+ * @description 行为类型: 内置方法、数据集类型: 数据查询，才是本地模式
  * @author chitanda
  * @date 2023-09-06 16:09:06
  * @export