@ibiz-template/runtime 0.1.18 → 0.1.20

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

@@ -14,6 +14,7 @@ import {
 } from '../../../../interface';
 import { hasDeCodeName } from '../../../../model';
 import { Srfuf, ControlVO } from '../../../../service';
+import { ScriptFactory } from '../../../../utils';
 import { FormNotifyState } from '../../../constant';
 import { FormController } from '../form';
 import { EditFormService } from './edit-form.service';
@@ -78,6 +79,9 @@ export class EditFormController
       res = await this.service.getDraft(this.context, queryParams);
     } catch (error) {
       await this.evt.emit('onLoadDraftError', undefined);
+      this.actionNotification('GETDRAFTERROR', {
+        error: error as Error,
+      });
       throw error;
     } finally {
       await this.endLoading();
@@ -90,6 +94,7 @@ export class EditFormController
     this.formStateNotify(FormNotifyState.DRAFT);
 
     await this.evt.emit('onLoadDraftSuccess', undefined);
+    this.actionNotification('GETDRAFTSUCCESS');
     this.state.isLoaded = true;
     return this.data;
   }
@@ -119,6 +124,9 @@ export class EditFormController
       res = await this.service.get(this.context, queryParams);
     } catch (error) {
       await this.evt.emit('onLoadError', undefined);
+      this.actionNotification('GETERROR', {
+        error: error as Error,
+      });
       throw error;
     } finally {
       await this.endLoading();
@@ -129,6 +137,7 @@ export class EditFormController
     this.formStateNotify(FormNotifyState.LOAD);
 
     await this.evt.emit('onLoadSuccess', undefined);
+    this.actionNotification('GETSUCCESS');
     this.state.isLoaded = true;
     return this.data;
   }
@@ -152,14 +161,17 @@ export class EditFormController
     }
     await this.startLoading();
     await this.evt.emit('onBeforeSave', undefined);
+    const isCreate = this.data.srfuf === Srfuf.CREATE;
     let res;
     try {
-      res =
-        this.data.srfuf === Srfuf.CREATE
-          ? await this.service.create(this.context, this.data)
-          : await this.service.update(this.context, this.data);
+      res = isCreate
+        ? await this.service.create(this.context, this.data)
+        : await this.service.update(this.context, this.data);
     } catch (error) {
       await this.evt.emit('onSaveError', undefined);
+      this.actionNotification(`${isCreate ? 'CREATE' : 'UPDATE'}ERROR`, {
+        error: error as Error,
+      });
       throw error;
     } finally {
       await this.endLoading();
@@ -171,7 +183,9 @@ export class EditFormController
     this.state.modified = false;
     await this.evt.emit('onSaveSuccess', undefined);
     this.formStateNotify(FormNotifyState.SAVE);
-    ibiz.message.success(`${this.data.srfmajortext || ''}保存成功`);
+    this.actionNotification(`${isCreate ? 'CREATE' : 'UPDATE'}SUCCESS`, {
+      default: `${this.data.srfmajortext || ''}保存成功`,
+    });
     return this.data;
   }
 
@@ -202,6 +216,9 @@ export class EditFormController
         res = await this.service.remove(this.context, this.params);
       } catch (error) {
         await this.evt.emit('onRemoveError', undefined);
+        this.actionNotification('REMOVEERROR', {
+          error: error as Error,
+        });
         throw error;
       } finally {
         await this.endLoading();
@@ -213,6 +230,7 @@ export class EditFormController
     this.state.data = new ControlVO();
     this.state.modified = false;
     await this.evt.emit('onRemoveSuccess', undefined);
+    this.actionNotification('REMOVESUCCESS');
 
     return ok;
   }
@@ -255,20 +273,39 @@ export class EditFormController
       throw new RuntimeError(`没找到${formItemUpdateId}表单项更新`);
     }
 
-    const { appDEMethodId, defiupdateDetails } = formItemUpdate;
+    const { appDEMethodId, defiupdateDetails, customCode, scriptCode } =
+      formItemUpdate;
     const updateItems = defiupdateDetails!.map(item => item.id!);
 
-    const params = { ...this.params, ...this.data.getOrigin() };
-    const res = await this.service.updateFormItem(
-      appDEMethodId!,
-      this.context,
-      params,
-    );
-    const result = res.data;
-    if (result && updateItems?.length) {
+    let updateData: IData; // 要修改的数据
+    if (customCode && scriptCode) {
+      // 脚本模式获取修改数据
+      updateData = ScriptFactory.execScriptFn(
+        {
+          ...this.getEventArgs(),
+          data: this.data,
+        },
+        scriptCode,
+        {
+          isAsync: false,
+        },
+      ) as IData;
+    } else {
+      // 后台服务获取修改数据
+      const params = { ...this.params, ...this.data.getOrigin() };
+      const res = await this.service.updateFormItem(
+        appDEMethodId!,
+        this.context,
+        params,
+      );
+      updateData = res.data;
+    }
+
+    // 修改表单项更新的值
+    if (updateData && updateItems?.length) {
       await Promise.all(
         updateItems.map(itemName =>
-          this.setDataValue(itemName, result[itemName]),
+          this.setDataValue(itemName, updateData[itemName]),
         ),
       );
     }
@@ -297,10 +334,15 @@ export class EditFormController
         },
         this.data,
       );
+    } catch (error) {
+      this.actionNotification('WFSTARTERROR', {
+        error: error as Error,
+      });
+      throw error;
     } finally {
       await this.endLoading();
     }
-    ibiz.message.success('流程启动成功');
+    this.actionNotification('WFSTARTSUCCESS', { default: '流程启动成功' });
   }
 
   /**
@@ -326,10 +368,15 @@ export class EditFormController
         },
         this.data,
       );
+    } catch (error) {
+      this.actionNotification('WFSUBMITERROR', {
+        error: error as Error,
+      });
+      throw error;
     } finally {
       await this.endLoading();
     }
-    ibiz.message.success('流程提交成功');
+    this.actionNotification('WFSUBMITSUCCESS', { default: '流程提交成功' });
   }
 
   async dataChangeNotify(names: string[]): Promise<void> {

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

@@ -1,5 +1,5 @@
 /* eslint-disable no-param-reassign */
-import { RuntimeError, debounceAndAsyncMerge } from '@ibiz-template/core';
+import { debounceAndAsyncMerge } from '@ibiz-template/core';
 import { IDEForm, IDEFormDetail } from '@ibiz/model-core';
 import {
   IFormState,
@@ -102,9 +102,10 @@ export abstract class FormController<
         return detail.dataChangeNotify(names);
       }),
     );
-    if (values.find(item => item.status === 'rejected')) {
+    const rejectedValue = values.find(item => item.status === 'rejected');
+    if (rejectedValue) {
       ibiz.log.error('dataChangeNotify报错', values);
-      throw new RuntimeError('数据变更后有错误');
+      throw (rejectedValue as PromiseRejectedResult).reason;
     }
   }
 
@@ -268,4 +269,11 @@ export abstract class FormController<
     // 找不到value为false即全部是true
     return values.findIndex(value => !value) === -1;
   }
+
+  actionNotification(
+    tag: string,
+    opts?: { default?: string; error?: Error },
+  ): void {
+    super.actionNotification(tag, { data: this.data, ...(opts || {}) });
+  }
 }

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);
   }
@@ -670,9 +691,10 @@ export class GridController
         return column.dataChangeNotify(row, names);
       }),
     );
-    if (values.find(item => item.status === 'rejected')) {
+    const rejectedValue = values.find(item => item.status === 'rejected');
+    if (rejectedValue) {
       ibiz.log.error('dataChangeNotify报错', values);
-      throw new RuntimeError('数据变更后有错误');
+      throw (rejectedValue as PromiseRejectedResult).reason;
     }
   }
 
@@ -773,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 = '';
       }
@@ -807,25 +831,37 @@ export class GridController
     const { appDEMethodId, degeiupdateDetails, customCode, scriptCode } =
       findUpdate;
     const updateItems = degeiupdateDetails!.map(item => item.id!);
+
+    let updateData: IData; // 要修改的数据
     if (customCode && scriptCode) {
-      ScriptFactory.execScriptFn({ data: row.data }, scriptCode, {
-        isAsync: false,
-      });
+      // 脚本模式获取修改数据
+      updateData = ScriptFactory.execScriptFn(
+        {
+          ...this.getEventArgs(),
+          data: row.data,
+        },
+        scriptCode,
+        {
+          isAsync: false,
+        },
+      ) as IData;
     } else {
+      // 后台服务获取修改数据
       const params = { ...this.params, ...row.data.getOrigin() };
       const res = await this.service.updateGridEditItem(
         appDEMethodId!,
         this.context,
         params,
       );
-      const result = res.data;
-      if (result && updateItems?.length) {
-        await Promise.all(
-          updateItems.map(itemName => {
-            return this.setRowValue(row, itemName, result![itemName]);
-          }),
-        );
-      }
+      updateData = res.data;
+    }
+    // 修改更新的值
+    if (updateData && updateItems?.length) {
+      await Promise.all(
+        updateItems.map(itemName => {
+          return this.setRowValue(row, itemName, updateData![itemName]);
+        }),
+      );
     }
   }
 

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/controller/control/tree/tree.controller.ts

@@ -184,7 +184,13 @@ export class TreeController
 
   setSelection(selection: IData[]): void {
     // todo 当自己点选中时，父节点选不选中，如果选中需要在这边优化
-    super.setSelection(selection);
+
+    // 通过id过滤出原始的树节点数据，避免外部使用的时候传入的选中数据有问题。
+    const selectionIds = selection.map(item => item.id);
+    const filterArr = this.state.items.filter(item =>
+      selectionIds.includes(item.id),
+    );
+    super.setSelection(filterArr);
   }
 
   /**

package/src/interface/common/i-app-hub-service/i-app-hub-service.ts

@@ -105,6 +105,16 @@ export interface IAppHubService {
    */
   hasAppView(tag: string): boolean;
 
+  /**
+   * 获取应用模型样式内容
+   *
+   * @author chitanda
+   * @date 2023-09-06 10:09:07
+   * @param {string} appId
+   * @return {*}  {(Promise<string | null>)}
+   */
+  getAppStyle(appId: string): Promise<string | null>;
+
   /**
    * 根据应用视图 codeName 或 id 获取应用视图模型
    *

package/src/interface/provider/model-loader.provider.ts

@@ -52,4 +52,14 @@ export interface ModelLoaderProvider {
     appId: string,
     codeName: string,
   ): Promise<IAppDataEntity>;
+
+  /**
+   * 获取应用样式表
+   *
+   * @author chitanda
+   * @date 2023-09-06 10:09:14
+   * @param {string} appId
+   * @return {*}  {(Promise<string | null>)}
+   */
+  getAppStyle(appId: string): Promise<string | null>;
 }

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

@@ -32,6 +32,8 @@ export class AppDataEntity implements IDataEntity {
 
   declare srfkey: string;
 
+  declare srfsourcekey: string;
+
   declare srfmajortext: string;
 
   get srfuf(): Srfuf {
@@ -87,6 +89,14 @@ export class AppDataEntity implements IDataEntity {
           return this._data[key] || _srfkey;
         },
       });
+      Object.defineProperty(this, 'srfsourcekey', {
+        set(val: unknown) {
+          this._data[key] = val;
+        },
+        get() {
+          return this._data[key];
+        },
+      });
     } else {
       ibiz.log.warn(`实体[${entity.codeName}]未配置主键字段`);
     }
@@ -162,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

@@ -27,6 +27,7 @@ export class MethodDto {
 
   constructor(
     protected entity: IAppDataEntity,
+    protected isLocalMode?: boolean,
     protected dto?: IAppDEMethodDTO,
   ) {
     if (dto) {
@@ -102,7 +103,9 @@ export class MethodDto {
    */
   async sets(context: IParams, data: IData[]): Promise<AppDataEntity[]> {
     const service = await this.app!.deService.getService(this.entity.id!);
-    service.local.clear(context);
+    if (this.isLocalMode) {
+      service.local.clear(context);
+    }
     return Promise.all(
       data.map(async datum => {
         const all = this.fields
@@ -123,7 +126,9 @@ export class MethodDto {
           await all[i];
         }
         const entityData = new AppDataEntity(this.entity, datum);
-        await service.local.add(context, entityData);
+        if (this.isLocalMode) {
+          await service.local.add(context, entityData);
+        }
         return entityData;
       }),
     );
@@ -150,7 +155,7 @@ export class MethodDto {
       entity.appDEMethodDTOs || [],
       field.refAppDEMethodDTOId!,
     )!;
-    const dto = new MethodDto(entity, methodDto);
+    const dto = new MethodDto(entity, this.isLocalMode, methodDto);
     this.dtoMap.set(field.codeName!, dto);
     return dto;
   }

package/src/service/service/authority/authority.service.ts

@@ -117,7 +117,7 @@ export class AuthorityService {
    */
   async init(appData = ibiz.appData): Promise<void> {
     if (!appData) {
-      throw new RuntimeError('没有appData数据');
+      return;
     }
     // 设置当前用户拥有的统一标识集合
     if (appData.unires) {

package/src/service/service/entity/method/de-action.ts

@@ -8,6 +8,7 @@ import { Method } from './method';
 import { IDataEntity } from '../../../../interface';
 import { findDELogic } from '../../../../model';
 import { execDELogicAction, execFieldLogics } from '../../../../de-logic';
+import { isLocalMode } from '../util/util';
 
 /**
  * 实体行为方法
@@ -31,7 +32,7 @@ export class DEActionMethod extends Method {
    * @type {boolean}
    */
   protected get isLocalMode(): boolean {
-    return this.method.actionType === 'BUILTIN';
+    return isLocalMode(this.method);
   }
 
   async exec(