@ibiz-template/runtime 0.1.19 → 0.1.21

package/src/controller/control/form/search-form/search-form.controller.ts

@@ -55,11 +55,20 @@ export class SearchFormController
     const params = await this.getDraftParams();
     Object.assign(queryParams, params);
     await this.evt.emit('onBeforeLoadDraft', { params: queryParams });
-    const res = await this.service.getDraft(this.context, queryParams);
+    let res;
+    try {
+      res = await this.service.getDraft(this.context, queryParams);
+    } catch (error) {
+      this.actionNotification('GETDRAFTERROR', {
+        error: error as Error,
+      });
+      throw error;
+    }
     this.state.data = res.data;
     mergeDefaultInLeft(this.data, params);
     this.state.isLoaded = true;
     this.formStateNotify(FormNotifyState.DRAFT);
+    this.actionNotification('GETDRAFTSUCCESS');
     return this.data;
   }
 

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

@@ -430,13 +430,23 @@ export class GridController
       throw new RuntimeError('请先完成当前行编辑中的行的操作');
     }
 
-    const res = await this.service.getDraft(this.context, this.params);
+    let res;
+    try {
+      res = await this.service.getDraft(this.context, this.params);
+    } catch (error) {
+      this.actionNotification('GETDRAFTERROR', {
+        error: error as Error,
+      });
+      throw error;
+    }
+
     // 加载完后续处理
     this.state.items.unshift(res.data);
     const newRow = new GridRowState(res.data, this);
     this.state.rows.unshift(newRow);
     this.gridStateNotify(newRow, GridNotifyState.DRAFT);
     this.switchRowEdit(this.state.rows[0], true);
+    this.actionNotification('GETDRAFTSUCCESS', { data: res.data });
   }
 
   /**
@@ -482,6 +492,13 @@ export class GridController
       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: rowState.data,
+      });
+      throw error;
     } finally {
       await this.endLoading();
     }
@@ -494,6 +511,10 @@ export class GridController
     rowState.modified = false;
 
     ibiz.message.success(`${res.data.srfmajortext || ''}保存成功`);
+    this.actionNotification(`${isCreate ? 'CREATE' : 'UPDATE'}SUCCESS`, {
+      default: `${res.data.srfmajortext || ''}保存成功`,
+      data: res.data,
+    });
     this.gridStateNotify(rowState, GridNotifyState.SAVE);
     await this.evt.emit('onSaveSuccess', undefined);
   }
@@ -774,14 +795,16 @@ export class GridController
    * @param {string} key 排序字段
    * @param {string} order 排序顺序
    */
-  setSort(key?: string, order?: 'asc' | 'desc'): void {
-    if (key && order) {
-      super.setSort(key, order);
+  setSort(fieldId?: string, order?: 'asc' | 'desc'): void {
+    if (fieldId && order) {
+      const fieldName = this.fieldIdNameMap.get(fieldId)!.toLowerCase();
+      super.setSort(fieldName, order);
     } else {
       // 设置默认排序或者置空
       const { minorSortAppDEFieldId, minorSortDir } = this.model;
       if (minorSortAppDEFieldId && minorSortDir) {
-        this.state.sortQuery = `${minorSortAppDEFieldId.toLowerCase()},${minorSortDir.toLowerCase()}`;
+        const fieldName = this.fieldIdNameMap.get(minorSortAppDEFieldId)!;
+        this.state.sortQuery = `${fieldName.toLowerCase()},${minorSortDir.toLowerCase()}`;
       } else {
         this.state.sortQuery = '';
       }

package/src/controller/control/list/list.controller.ts

@@ -44,7 +44,8 @@ export class ListController
       // 设置默认排序或者置空
       const { minorSortAppDEFieldId, minorSortDir } = this.model;
       if (minorSortAppDEFieldId && minorSortDir) {
-        this.state.sortQuery = `${minorSortAppDEFieldId.toLowerCase()},${minorSortDir.toLowerCase()}`;
+        const fieldName = this.fieldIdNameMap.get(minorSortAppDEFieldId)!;
+        this.state.sortQuery = `${fieldName.toLowerCase()},${minorSortDir.toLowerCase()}`;
       } else {
         this.state.sortQuery = '';
       }

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

@@ -1,6 +1,6 @@
 import { RuntimeModelError } from '@ibiz-template/core';
 import { IAppDEMultiDataView } from '@ibiz/model-core';
-import { SysUIActionTag } from '../constant';
+import { SysUIActionTag, ViewCallTag } from '../constant';
 import { ViewController } from '../controller';
 import {
   IMDViewEvent,
@@ -180,7 +180,7 @@ export class MDViewEngine extends ViewEngineBase {
       this.copy(args);
       return null;
     }
-    if (key === 'load') {
+    if (key === ViewCallTag.LOAD) {
       this.load(args);
       return null;
     }

package/src/global/global-util/global-util.ts

@@ -40,4 +40,32 @@ export class GlobalUtil {
    * @date 2023-08-24 10:47:06
    */
   getExportExcel?: () => Promise<IExportExcelUtil>;
+
+  /**
+   * 显示应用级别的加载提示
+   *
+   * @author chitanda
+   * @date 2023-09-08 10:09:43
+   */
+  showAppLoading(): void {
+    const el = document.getElementById('app-loading-x') as HTMLDivElement;
+    if (el) {
+      el.style.display = 'none';
+    }
+  }
+
+  /**
+   * 隐藏应用级别的加载提示
+   *
+   * @author chitanda
+   * @date 2023-09-08 10:09:15
+   */
+  hiddenAppLoading(): void {
+    setTimeout(() => {
+      const el = document.getElementById('app-loading-x') as HTMLDivElement;
+      if (el) {
+        el.style.display = 'none';
+      }
+    }, 300);
+  }
 }

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

@@ -12,6 +12,7 @@ import {
 import { notNilEmpty } from 'qx-util';
 import { OpenAppViewCommand } from '../../command';
 import { IModalData, IUILogicParams } from '../../interface';
+import { getFormTypeFieldName } from '../../model';
 import { convertNavData } from '../../utils';
 import { LogicExecutor } from './logic-executor';
 
@@ -65,13 +66,19 @@ export class AppUILogicExecutor extends LogicExecutor {
     if (!data?.[0]) {
       throw new RuntimeError('opendata没有可操作数据！');
     }
-    // 准备需要的模型
-    const openViewRef = appUILogic.openDataAppView;
-    if (!openViewRef) {
-      throw new RuntimeModelError(
-        appUILogic,
-        'opendata视图逻辑没有配置默认打开视图',
-      );
+    const openViewRefs = appUILogic.openDataAppViews;
+    let openViewRef: IAppUILogicRefViewBase | undefined;
+    if (openViewRefs) {
+      openViewRef = await this.calcOpenViewRef(appUILogic, parameters);
+    } else {
+      // 准备需要的模型
+      openViewRef = appUILogic.openDataAppView;
+      if (!openViewRef) {
+        throw new RuntimeModelError(
+          appUILogic,
+          'opendata视图逻辑没有配置默认打开视图',
+        );
+      }
     }
     const openView = openViewRef.refAppViewId;
     if (!openView) {
@@ -231,4 +238,34 @@ export class AppUILogicExecutor extends LogicExecutor {
     }
     return findView;
   }
+
+  protected async calcOpenViewRef(
+    appUILogic: IAppUIOpenDataLogic,
+    parameters: IUILogicParams,
+  ): Promise<IAppUILogicRefViewBase> {
+    const appDataEntityId = parameters.view.model.appDataEntityId!;
+    // 表单类型属性
+    const formTypeName = await getFormTypeFieldName(appDataEntityId);
+    if (!formTypeName) {
+      throw new RuntimeModelError(
+        appUILogic,
+        `${appDataEntityId}实体缺少表单类型应用实体属性`,
+      );
+    }
+    const { data } = parameters;
+    // 表单类型值
+    const formTypeValue = data[0][formTypeName];
+    if (!formTypeValue) {
+      throw new RuntimeModelError(appUILogic, '数据源无表单类型应用实体属性值');
+    }
+    const openViewRefs = appUILogic.openDataAppViews;
+    // 根据表单类型值找到实际打开的视图
+    const findView = openViewRefs?.find(item => item.refMode === formTypeValue);
+    if (!findView) {
+      throw new RuntimeError(
+        `没有找到与表单类型${formTypeValue}相关的实体的编辑视图`,
+      );
+    }
+    return findView;
+  }
 }

package/src/logic-scheduler/trigger/control-event-trigger.ts

@@ -28,7 +28,7 @@ export class ControlEventTrigger extends LogicTrigger {
     protected scheduler: LogicScheduler,
   ) {
     super(logic, scheduler);
-    const names = logic.eventNames!.split(',');
+    const names = logic.eventNames!.split(';');
     this.listenEventNames = names.map(
       name => StudioControlEvents[name as keyof StudioControlEvents] || name,
     );

package/src/logic-scheduler/trigger/view-event-trigger.ts

@@ -28,7 +28,7 @@ export class ViewEventTrigger extends LogicTrigger {
     protected scheduler: LogicScheduler,
   ) {
     super(logic, scheduler);
-    const names = logic.eventNames!.split(',');
+    const names = logic.eventNames!.split(';');
     this.listenEventNames = names.map(
       name => StudioViewEvents[name as keyof StudioViewEvents] || name,
     );

package/src/model/data-entity/data-entity.ts

@@ -52,6 +52,23 @@ export async function getDeACMode(
   return deACMode;
 }
 
+/**
+ * 从实体里找到表单类型应用实体属性
+ *
+ * @author zk
+ * @date 2023-09-07 05:09:41
+ * @export
+ * @param {string} entityId
+ * @param {string} [srfappid]
+ * @return {*}  {(Promise<string | undefined>)}
+ */
+export async function getFormTypeFieldName(
+  entityId: string,
+): Promise<string | undefined> {
+  const appDataEntity = await ibiz.hub.getAppDataEntity(entityId)!;
+  return appDataEntity.formTypeAppDEFieldId;
+}
+
 /**
  * 从实体里找到实体逻辑
  * @author lxm

package/src/model/index.ts

@@ -7,3 +7,4 @@ export * from './tree/index';
 export * from './grid/index';
 export * from './form/index';
 export * from './view/view';
+export * from './panel/index';

package/src/model/panel/data-container.ts

@@ -0,0 +1,18 @@
+import { IPanelContainer, IPanelItem } from '@ibiz/model-core';
+
+/**
+ * 判断面板成员模型是否是数据容器
+ * @author lxm
+ * @date 2023-09-06 04:56:01
+ * @export
+ * @param {IPanelItem} panelItem
+ * @return {*}  {boolean}
+ */
+export function isDataContainer(panelItem: IPanelItem): boolean {
+  return (
+    panelItem.itemType === 'CONTAINER' &&
+    ['CONTAINER_MULTIDATA', 'CONTAINER_SINGLEDATA'].includes(
+      (panelItem as IPanelContainer).predefinedType!,
+    )
+  );
+}

package/src/model/panel/index.ts

@@ -0,0 +1 @@
+export * from './data-container';

package/src/service/app-data-entity/app-data-entity.ts

@@ -172,7 +172,9 @@ export class AppDataEntity implements IDataEntity {
    * @return {*}  {AppDataEntity}
    */
   clone(): AppDataEntity {
-    return new AppDataEntity(this._entity, this._data);
+    const entity = new AppDataEntity(this._entity, this._data);
+    entity.srfkey = this.srfkey;
+    return entity;
   }
 
   /**

package/src/service/dto/method.dto.ts

@@ -155,7 +155,7 @@ export class MethodDto {
       entity.appDEMethodDTOs || [],
       field.refAppDEMethodDTOId!,
     )!;
-    const dto = new MethodDto(entity, this.isLocalMode, methodDto);
+    const dto = new MethodDto(entity, true, methodDto);
     this.dtoMap.set(field.codeName!, dto);
     return dto;
   }

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

@@ -181,6 +181,9 @@ export abstract class Method {
    * @return {*}  {IDataEntity}
    */
   protected createEntity(data: IData | IDataEntity): IDataEntity {
+    if (data instanceof AppDataEntity) {
+      return data.clone();
+    }
     return new AppDataEntity(this.entity, data);
   }
 }

package/src/service/vo/control.vo.ts

@@ -169,8 +169,8 @@ export class ControlVO {
     dataKey: string,
     isOriginField: boolean = true,
   ): void {
-    // srfuf不做处理
-    if (uiKey === 'srfuf') {
+    // srfuf和srfkey不做处理
+    if (uiKey === 'srfuf' || uiKey === 'srfkey') {
       return;
     }
 

package/src/ui-logic/ui-logic-node/msg-box-node/msg-box-node.ts

@@ -80,7 +80,6 @@ export class MsgBoxNode extends UILogicNode {
       default:
         throw new ModelError(this.model, `${buttonsType}暂未支持`);
     }
-    console.log(this.model, modalParams);
     const result = await ibiz.modal.confirm(modalParams);
     ctx.setLastReturn(resultTags[result ? 0 : 1]);
   }