@ibiz-template/runtime 0.1.1 → 0.1.3

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

@@ -57,6 +57,7 @@ export class MDControlController<
     this.state.isLoaded = false;
     this.state.singleSelect = true;
     this.state.mdctrlActiveMode = 0;
+    this.state.groups = [];
   }
 
   /**
@@ -114,44 +115,42 @@ export class MDControlController<
    * @date 2022-08-19 14:08:50
    */
   async load(args: MDCtrlLoadParams = {}): Promise<IData[]> {
-    // *初始加载需要重置分页
-    const isInitialLoad = args.isInitialLoad === true;
-    const isLoadMore = args.isLoadMore === true;
-    if (isInitialLoad) {
-      this.state.curPage = 1;
-    } else if (isLoadMore) {
-      this.state.curPage += 1;
-    }
-
-    // *查询参数处理
-    const { context } = this.handlerAbilityParams(args);
-    const params = await this.getFetchParams(args?.params);
-
-    // *发起请求
     await this.startLoading();
-    let res;
     try {
-      res = await this.service.fetch(context, params);
+      // *初始加载需要重置分页
+      const isInitialLoad = args.isInitialLoad === true;
+      const isLoadMore = args.isLoadMore === true;
+      if (isInitialLoad) {
+        this.state.curPage = 1;
+      } else if (isLoadMore) {
+        this.state.curPage += 1;
+      }
+
+      // *查询参数处理
+      const { context } = this.handlerAbilityParams(args);
+      const params = await this.getFetchParams(args?.params);
+
+      const res = await this.service.fetch(context, params);
       // 更新分页数据总条数
       if (typeof res.total === 'number') {
         this.state.total = res.total;
       }
-    } finally {
-      await this.endLoading();
-    }
 
-    if (isLoadMore) {
-      this.state.items.push(...res.data);
-    } else {
-      this.state.items = res.data;
-    }
+      if (isLoadMore) {
+        this.state.items.push(...res.data);
+      } else {
+        this.state.items = res.data;
+      }
 
-    await this.afterLoad(args, res.data);
+      await this.afterLoad(args, res.data);
 
-    this.state.isLoaded = true;
-    await this._evt.emit('onLoadSuccess', {
-      isInitialLoad,
-    });
+      this.state.isLoaded = true;
+      await this._evt.emit('onLoadSuccess', {
+        isInitialLoad,
+      });
+    } finally {
+      await this.endLoading();
+    }
 
     return this.state.items;
   }

package/src/de-logic/index.ts

@@ -1,6 +1,6 @@
-import { HttpError, HttpResponse } from '@ibiz-template/core';
+import { HttpError, HttpResponse, RuntimeError } from '@ibiz-template/core';
 import { IAppDataEntity, IAppDELogic } from '@ibiz/model-core';
-import { filterFieldLogics } from '../model';
+import { filterFieldLogics, findDELogic } from '../model';
 import { DELogic } from './de-logic';
 
 /**
@@ -8,6 +8,24 @@ import { DELogic } from './de-logic';
  */
 const deLogicMap: WeakMap<IAppDELogic, DELogic> = new Map();
 
+/**
+ * 找到实体逻辑模型
+ * @author lxm
+ * @date 2023-08-04 02:47:16
+ * @param {string} deDELogicId
+ * @param {string} dataEntityId
+ * @param {string} [appId]
+ * @return {*}  {(Promise<IAppDELogic | undefined>)}
+ */
+async function findDeLogic(
+  deDELogicId: string,
+  dataEntityId: string,
+  appId?: string,
+): Promise<IAppDELogic | undefined> {
+  const appDataEntity = await ibiz.hub.getAppDataEntity(dataEntityId, appId);
+  return findDELogic(deDELogicId, appDataEntity);
+}
+
 /**
  * 执行实体处理逻辑
  *
@@ -34,6 +52,36 @@ export async function execDELogic(
   return deLogic.exec(context, data, params);
 }
 
+/**
+ * 通过id执行实体逻辑
+ * @author lxm
+ * @date 2023-08-04 02:49:44
+ * @export
+ * @param {string} deDELogicId
+ * @param {string} dataEntityId
+ * @param {IParams} context
+ * @param {IData} data
+ * @param {IParams} params
+ * @return {*}  {Promise<unknown>}
+ */
+export async function execDELogicById(
+  deDELogicId: string,
+  dataEntityId: string,
+  context: IParams,
+  data: IData,
+  params: IParams,
+): Promise<unknown> {
+  const deLogic = await findDeLogic(
+    deDELogicId,
+    dataEntityId,
+    context.srfappid,
+  );
+  if (!deLogic) {
+    throw new RuntimeError(`${dataEntityId}找不到实体逻辑${deDELogicId}`);
+  }
+  return execDELogic(deLogic, context, data, params);
+}
+
 /**
  * 执行实体方法的实体逻辑并返回对应的response
  * @author lxm

package/src/engine/md-view.engine.ts

@@ -9,6 +9,7 @@ import {
   ISearchFormController,
   MDCtrlRemoveParams,
   ISearchBarController,
+  MDCtrlLoadParams,
 } from '../interface';
 import { calcDeCodeNameById } from '../model';
 import { ViewEngineBase } from './view-base.engine';
@@ -168,6 +169,10 @@ export class MDViewEngine extends ViewEngineBase {
       this.copy(args);
       return null;
     }
+    if (key === 'load') {
+      this.load(args);
+      return null;
+    }
     return super.call(key, args);
   }
 
@@ -206,7 +211,7 @@ export class MDViewEngine extends ViewEngineBase {
     });
 
     if (result === -1) {
-      throw new RuntimeModelError(this.view.model, `缺少opendata的视图逻辑`);
+      ibiz.log.warn(`视图[${this.view.model.codeName}]，未配置编辑打开视图`);
     }
   }
 
@@ -267,8 +272,8 @@ export class MDViewEngine extends ViewEngineBase {
    * @date 2023-05-22 03:17:33
    * @return {*}  {Promise<void>}
    */
-  protected async load(): Promise<void> {
-    await this.xdataControl.load({ isInitialLoad: true });
+  protected async load(args: MDCtrlLoadParams = {}): Promise<void> {
+    await this.xdataControl.load({ isInitialLoad: true, ...args });
   }
 
   /**

package/src/index.ts

@@ -10,6 +10,8 @@ export * from './service';
 export * from './utils';
 export * from './controller';
 export * from './ui-action';
+export * from './ui-logic';
+export * from './de-logic';
 export * from './engine';
 export * from './model';
 export { Application } from './application';

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

@@ -1,6 +1,7 @@
 import { IDEPickupViewPanel } from '@ibiz/model-core';
 import { IPickupViewPanelEvent } from '../../event';
 import { IPickupViewPanelState } from '../../state';
+import { IViewController } from '../view';
 import { IControlController } from './i-control.controller';
 
 /**
@@ -16,6 +17,15 @@ export interface IPickupViewPanelController
     IPickupViewPanelState,
     IPickupViewPanelEvent
   > {
+  /**
+   * 选择视图嵌入视图控制器
+   *
+   * @author zk
+   * @date 2023-08-04 08:08:43
+   * @type {IViewController}
+   * @memberof IPickupViewPanelController
+   */
+  embedView: IViewController;
   /**
    * 获取选中数据
    *

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

@@ -2,6 +2,7 @@ import { ITreeExpBar } from '@ibiz/model-core';
 import { ITreeExpBarEvent } from '../../event';
 import { ITreeExpBarState } from '../../state';
 import { IExpBarControlController } from './i-exp-bar-control.controller';
+import { INavViewMsg } from './panel-item';
 
 /**
  * 树导航栏控制器
@@ -15,4 +16,15 @@ export interface ITreeExpBarController
     ITreeExpBar,
     ITreeExpBarState,
     ITreeExpBarEvent
-  > {}
+  > {
+  /**
+   * 获取导航视图消息
+   *
+   * @author zk
+   * @date 2023-08-04 08:08:27
+   * @param {IData[]} data
+   * @return {*}  {(INavViewMsg | undefined)}
+   * @memberof ITreeExpBarController
+   */
+  getNavViewMsg(data: IData[]): INavViewMsg | undefined;
+}

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

@@ -13,17 +13,6 @@ import { IMDControlController } from './i-md-control.controller';
  */
 export interface ITreeController
   extends IMDControlController<IDETree, ITreeState, ITreeEvent> {
-  /**
-   * 设置展开节点
-   *
-   * @author zk
-   * @date 2023-07-10 08:07:36
-   * @param {string[]} nodeKey
-   * @param {boolean} isExpanded
-   * @memberof ITreeController
-   */
-  setExpandedKeys(nodeKeys: string[], isReplace?: boolean): void;
-
   /**
    * 树节点点击事件
    *

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

@@ -38,4 +38,20 @@ export interface IPickupViewPanelEvent extends IControlEvent {
     event: EventBase;
     emitArgs: { data: IData[] };
   };
+
+  /**
+   * 选择视图初始化
+   *
+   * @author zk
+   * @date 2023-08-04 05:08:37
+   * @type {{
+   *     event: EventBase;
+   *     emitArgs: { data: IViewController };
+   *   }}
+   * @memberof IPickupViewPanelEvent
+   */
+  onPickUpViewMounted: {
+    event: EventBase;
+    emitArgs: undefined;
+  };
 }

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

@@ -11,6 +11,31 @@ export interface IGridState extends IMDControlState {
    * @type {IGridRowState[]}
    */
   rows: IGridRowState[];
+
+  /**
+   * 表格列状态数组
+   * 顺序就是列的排序
+   * @author lxm
+   * @date 2023-08-04 07:08:16
+   * @type {IColumnState[]}
+   */
+  columnStates: IColumnState[];
+
+  /**
+   * 聚合计算的结果
+   * @author lxm
+   * @date 2023-08-07 04:09:08
+   * @type {IData}
+   */
+  aggResult: IData;
+
+  /**
+   * 远程聚合计算结果
+   * @author lxm
+   * @date 2023-08-07 05:36:54
+   * @type {IData}
+   */
+  remoteAggResult?: IData;
 }
 
 export interface IGridRowState {
@@ -82,3 +107,36 @@ export interface IGridRowState {
    */
   processing: boolean;
 }
+
+/**
+ * 表格列状态
+ * @author lxm
+ * @date 2023-08-04 07:19:02
+ * @export
+ * @interface IColumnState
+ */
+export interface IColumnState {
+  /**
+   * 列标识,是列模型的codeName
+   * @author lxm
+   * @date 2023-08-04 07:16:07
+   * @type {string}
+   */
+  key: string;
+
+  /**
+   * 列的中文标题
+   * @author lxm
+   * @date 2023-08-04 07:17:57
+   * @type {string}
+   */
+  caption: string;
+
+  /**
+   * 显示隐藏
+   * @author lxm
+   * @date 2023-08-04 07:18:47
+   * @type {boolean}
+   */
+  hidden: boolean;
+}

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

@@ -19,14 +19,14 @@ export interface ITreeState extends IMDControlState {
   rootNode: ITreeNodeData;
 
   /**
-   * 展开的节点集合
+   * 默认展开的节点集合
    *
    * @author zk
    * @date 2023-07-10 08:07:25
    * @type {string[]}
    * @memberof ITreeState
    */
-  expandedKeys: string[];
+  defaultExpandedKeys: string[];
 
   /**
    * 右键上下文菜单状态

package/src/model/layout/layout.ts

@@ -19,7 +19,9 @@ export function calcLayoutHeightWidth(layoutPos: ILayoutPos): {
   if (widthMode === 'FULL') {
     result.width = '100%';
   } else if (width && width > 0) {
-    if (widthMode === 'PERCENTAGE') {
+    if (width > 0 && width <= 1) {
+      result.width = `${width * 100}%`;
+    } else if (widthMode === 'PERCENTAGE') {
       result.width = `${width}%`;
     } else {
       result.width = `${width}px`;
@@ -28,7 +30,9 @@ export function calcLayoutHeightWidth(layoutPos: ILayoutPos): {
   if (heightMode === 'FULL') {
     result.height = '100%';
   } else if (height && height > 0) {
-    if (heightMode === 'PERCENTAGE') {
+    if (height > 0 && height <= 1) {
+      result.height = `${height * 100}%`;
+    } else if (heightMode === 'PERCENTAGE') {
       result.height = `${height}%`;
     } else {
       result.height = `${height}px`;

package/src/utils/open-redirect-view/open-redirect-view.ts

@@ -223,7 +223,7 @@ export async function openDERedirectView(
     );
     throw new RuntimeModelError(
       appView,
-      `未找到重定向标识[${rdTag}]或[${deRdTag}]或[${wfRdTag}]对应视图`,
+      `未找到重定向标识[${rdTag}]或[${deRdTag}]或工作流[${wfRdTag}]对应视图`,
     );
   }
   return { ok: true, data: [] };
@@ -248,16 +248,6 @@ export async function calcDERdTag(
   data: IData,
 ): Promise<string> {
   let rdTag = '';
-  // 重定向视图自定义类别属性
-  const typeFieldId = rdView.typeAppDEFieldId;
-  // 自定义重定向
-  if (typeFieldId) {
-    const { codeName } = findFieldById(entity, typeFieldId)!;
-    const value = data[codeName!.toLowerCase()];
-    if (notNilEmpty(value)) {
-      return value;
-    }
-  }
   const defView = `${ibiz.env.isMob ? 'MOB' : ''}EDITVIEW`;
   // 如果流程步骤存在，按照工作流优先
   const srfWf = params.srfwf;
@@ -268,10 +258,22 @@ export async function calcDERdTag(
     return `${defView}:${srfWf.toUpperCase()}`;
   }
   let typeValue = '';
-  // 从索引属性获取重定向视图类型
-  if (entity.indexTypeAppDEFieldId) {
-    const { codeName } = findFieldById(entity, entity.indexTypeAppDEFieldId)!;
-    typeValue = data[codeName!.toLowerCase()];
+  // 重定向视图自定义类别属性
+  const typeFieldId = rdView.typeAppDEFieldId;
+  // 自定义重定向
+  if (typeFieldId) {
+    const { codeName } = findFieldById(entity, typeFieldId)!;
+    const value = data[codeName!.toLowerCase()];
+    if (notNilEmpty(value)) {
+      typeValue = value;
+    }
+  }
+  if (isNilOrEmpty(typeValue)) {
+    // 从索引属性获取重定向视图类型
+    if (entity.indexTypeAppDEFieldId) {
+      const { codeName } = findFieldById(entity, entity.indexTypeAppDEFieldId)!;
+      typeValue = data[codeName!.toLowerCase()];
+    }
   }
   if (isNilOrEmpty(typeValue)) {
     // 从多表单属性判断重定向视图类型
@@ -281,7 +283,7 @@ export async function calcDERdTag(
     }
   }
   if (notNilEmpty(typeValue)) {
-    rdTag = `${defView}:${typeValue}`;
+    rdTag = `${defView}:${typeValue.toUpperCase()}`;
   } else {
     rdTag = `${defView}`;
   }