@ibiz-template/runtime 0.1.19 → 0.1.21

package/out/global/global-util/global-util.js

@@ -31,4 +31,30 @@ export class GlobalUtil {
          */
         this.hbs = new HandlebarsUtil();
     }
+    /**
+     * 显示应用级别的加载提示
+     *
+     * @author chitanda
+     * @date 2023-09-08 10:09:43
+     */
+    showAppLoading() {
+        const el = document.getElementById('app-loading-x');
+        if (el) {
+            el.style.display = 'none';
+        }
+    }
+    /**
+     * 隐藏应用级别的加载提示
+     *
+     * @author chitanda
+     * @date 2023-09-08 10:09:15
+     */
+    hiddenAppLoading() {
+        setTimeout(() => {
+            const el = document.getElementById('app-loading-x');
+            if (el) {
+                el.style.display = 'none';
+            }
+        }, 300);
+    }
 }

package/out/logic-scheduler/executor/app-ui-logic-executor.d.ts

@@ -50,5 +50,6 @@ export declare class AppUILogicExecutor extends LogicExecutor {
      * @return {*}  {(Promise<IAppUILogicRefViewBase | undefined>)}
      */
     protected getWizardNewViewRef(appUILogic: IAppUINewDataLogic, parameters: IUILogicParams): Promise<IAppUILogicRefViewBase | undefined>;
+    protected calcOpenViewRef(appUILogic: IAppUIOpenDataLogic, parameters: IUILogicParams): Promise<IAppUILogicRefViewBase>;
 }
 //# sourceMappingURL=app-ui-logic-executor.d.ts.map

package/out/logic-scheduler/executor/app-ui-logic-executor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"app-ui-logic-executor.d.ts","sourceRoot":"","sources":["../../../src/logic-scheduler/executor/app-ui-logic-executor.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,mBAAmB,EAEnB,kBAAkB,EAClB,sBAAsB,EACvB,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAE7D,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD;;;;;;;GAOG;AACH,qBAAa,kBAAmB,SAAQ,aAAa;IAC3C,IAAI,EAAE,YAAY,CAAC;IAG3B,OAAO,CAAC,aAAa,EAAE,cAAc,GAAG,GAAG;IAiB3C;;;;;;;;;;;OAWG;IACG,yBAAyB,CAC7B,UAAU,EAAE,mBAAmB,EAC/B,UAAU,EAAE,cAAc,GACzB,OAAO,CAAC,UAAU,CAAC;IA+CtB;;;;;;;;;;;OAWG;IACG,wBAAwB,CAC5B,UAAU,EAAE,kBAAkB,EAC9B,UAAU,EAAE,cAAc,GACzB,OAAO,CAAC,UAAU,CAAC;IA8DtB;;;;;;;;;;OAUG;cACa,mBAAmB,CACjC,UAAU,EAAE,kBAAkB,EAC9B,UAAU,EAAE,cAAc,GACzB,OAAO,CAAC,sBAAsB,GAAG,SAAS,CAAC;CAkC/C"}
+{"version":3,"file":"app-ui-logic-executor.d.ts","sourceRoot":"","sources":["../../../src/logic-scheduler/executor/app-ui-logic-executor.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,mBAAmB,EAEnB,kBAAkB,EAClB,sBAAsB,EACvB,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAG7D,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD;;;;;;;GAOG;AACH,qBAAa,kBAAmB,SAAQ,aAAa;IAC3C,IAAI,EAAE,YAAY,CAAC;IAG3B,OAAO,CAAC,aAAa,EAAE,cAAc,GAAG,GAAG;IAiB3C;;;;;;;;;;;OAWG;IACG,yBAAyB,CAC7B,UAAU,EAAE,mBAAmB,EAC/B,UAAU,EAAE,cAAc,GACzB,OAAO,CAAC,UAAU,CAAC;IAqDtB;;;;;;;;;;;OAWG;IACG,wBAAwB,CAC5B,UAAU,EAAE,kBAAkB,EAC9B,UAAU,EAAE,cAAc,GACzB,OAAO,CAAC,UAAU,CAAC;IA8DtB;;;;;;;;;;OAUG;cACa,mBAAmB,CACjC,UAAU,EAAE,kBAAkB,EAC9B,UAAU,EAAE,cAAc,GACzB,OAAO,CAAC,sBAAsB,GAAG,SAAS,CAAC;cAmC9B,eAAe,CAC7B,UAAU,EAAE,mBAAmB,EAC/B,UAAU,EAAE,cAAc,GACzB,OAAO,CAAC,sBAAsB,CAAC;CA0BnC"}

package/out/logic-scheduler/executor/app-ui-logic-executor.js

@@ -12,6 +12,7 @@ var __rest = (this && this.__rest) || function (s, e) {
 import { ModelError, RuntimeError, RuntimeModelError, } from '@ibiz-template/core';
 import { notNilEmpty } from 'qx-util';
 import { OpenAppViewCommand } from '../../command';
+import { getFormTypeFieldName } from '../../model';
 import { convertNavData } from '../../utils';
 import { LogicExecutor } from './logic-executor';
 /**
@@ -52,10 +53,17 @@ export class AppUILogicExecutor extends LogicExecutor {
         if (!(data === null || data === void 0 ? void 0 : data[0])) {
             throw new RuntimeError('opendata没有可操作数据！');
         }
-        // 准备需要的模型
-        const openViewRef = appUILogic.openDataAppView;
-        if (!openViewRef) {
-            throw new RuntimeModelError(appUILogic, 'opendata视图逻辑没有配置默认打开视图');
+        const openViewRefs = appUILogic.openDataAppViews;
+        let openViewRef;
+        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) {
@@ -171,4 +179,25 @@ export class AppUILogicExecutor extends LogicExecutor {
         }
         return findView;
     }
+    async calcOpenViewRef(appUILogic, parameters) {
+        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 === null || openViewRefs === void 0 ? void 0 : openViewRefs.find(item => item.refMode === formTypeValue);
+        if (!findView) {
+            throw new RuntimeError(`没有找到与表单类型${formTypeValue}相关的实体的编辑视图`);
+        }
+        return findView;
+    }
 }

package/out/logic-scheduler/trigger/control-event-trigger.js

@@ -21,7 +21,7 @@ export class ControlEventTrigger extends LogicTrigger {
          * @type {string[]}
          */
         this.listenEventNames = [];
-        const names = logic.eventNames.split(',');
+        const names = logic.eventNames.split(';');
         this.listenEventNames = names.map(name => StudioControlEvents[name] || name);
     }
     match(matchParams) {

package/out/logic-scheduler/trigger/view-event-trigger.js

@@ -21,7 +21,7 @@ export class ViewEventTrigger extends LogicTrigger {
          * @type {string[]}
          */
         this.listenEventNames = [];
-        const names = logic.eventNames.split(',');
+        const names = logic.eventNames.split(';');
         this.listenEventNames = names.map(name => StudioViewEvents[name] || name);
     }
     match(matchParams) {

package/out/model/data-entity/data-entity.d.ts

@@ -26,6 +26,17 @@ export declare function hasDeCodeName(params: IParams, entityId: string): boolea
  * @Date: 2023-05-31 10:26:24
  */
 export declare function getDeACMode(appDEACModeId: string, entityId: string, srfappid?: string): Promise<IAppDEACMode | undefined>;
+/**
+ * 从实体里找到表单类型应用实体属性
+ *
+ * @author zk
+ * @date 2023-09-07 05:09:41
+ * @export
+ * @param {string} entityId
+ * @param {string} [srfappid]
+ * @return {*}  {(Promise<string | undefined>)}
+ */
+export declare function getFormTypeFieldName(entityId: string): Promise<string | undefined>;
 /**
  * 从实体里找到实体逻辑
  * @author lxm

package/out/model/data-entity/data-entity.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"data-entity.d.ts","sourceRoot":"","sources":["../../../src/model/data-entity/data-entity.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,YAAY,EACZ,WAAW,EACX,QAAQ,EACT,MAAM,kBAAkB,CAAC;AAG1B;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAGrD;AAED;;;;;;;;;GASG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAGxE;AAED;;;;;GAKG;AACH,wBAAsB,WAAW,CAC/B,aAAa,EAAE,MAAM,EACrB,QAAQ,EAAE,MAAM,EAChB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC,CAMnC;AAED;;;;;;;;GAQG;AACH,wBAAgB,WAAW,CACzB,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,cAAc,GACrB,QAAQ,GAAG,SAAS,CAEtB;AAED;;;;;;;;GAQG;AACH,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,SAAS,GAAG,QAAQ,GAAG,SAAS,GACrC,QAAQ,EAAE,CAYZ;AAED;;;;;;;;GAQG;AACH,wBAAgB,aAAa,CAC3B,MAAM,EAAE,cAAc,EACtB,OAAO,EAAE,MAAM,GACd,WAAW,GAAG,SAAS,CAEzB"}
+{"version":3,"file":"data-entity.d.ts","sourceRoot":"","sources":["../../../src/model/data-entity/data-entity.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,YAAY,EACZ,WAAW,EACX,QAAQ,EACT,MAAM,kBAAkB,CAAC;AAG1B;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAGrD;AAED;;;;;;;;;GASG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAGxE;AAED;;;;;GAKG;AACH,wBAAsB,WAAW,CAC/B,aAAa,EAAE,MAAM,EACrB,QAAQ,EAAE,MAAM,EAChB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC,CAMnC;AAED;;;;;;;;;GASG;AACH,wBAAsB,oBAAoB,CACxC,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAG7B;AAED;;;;;;;;GAQG;AACH,wBAAgB,WAAW,CACzB,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,cAAc,GACrB,QAAQ,GAAG,SAAS,CAEtB;AAED;;;;;;;;GAQG;AACH,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,SAAS,GAAG,QAAQ,GAAG,SAAS,GACrC,QAAQ,EAAE,CAYZ;AAED;;;;;;;;GAQG;AACH,wBAAgB,aAAa,CAC3B,MAAM,EAAE,cAAc,EACtB,OAAO,EAAE,MAAM,GACd,WAAW,GAAG,SAAS,CAEzB"}

package/out/model/data-entity/data-entity.js

@@ -39,6 +39,20 @@ export async function getDeACMode(appDEACModeId, entityId, srfappid) {
     });
     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) {
+    const appDataEntity = await ibiz.hub.getAppDataEntity(entityId);
+    return appDataEntity.formTypeAppDEFieldId;
+}
 /**
  * 从实体里找到实体逻辑
  * @author lxm

package/out/model/index.d.ts

@@ -7,4 +7,5 @@ export * from './tree/index';
 export * from './grid/index';
 export * from './form/index';
 export * from './view/view';
+export * from './panel/index';
 //# sourceMappingURL=index.d.ts.map

package/out/model/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/model/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC;AACxB,cAAc,iBAAiB,CAAC;AAChC,cAAc,yBAAyB,CAAC;AACxC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,uBAAuB,CAAC;AACtC,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/model/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC;AACxB,cAAc,iBAAiB,CAAC;AAChC,cAAc,yBAAyB,CAAC;AACxC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,uBAAuB,CAAC;AACtC,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,eAAe,CAAC"}

package/out/model/index.js

@@ -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/out/model/panel/data-container.d.ts

@@ -0,0 +1,11 @@
+import { IPanelItem } from '@ibiz/model-core';
+/**
+ * 判断面板成员模型是否是数据容器
+ * @author lxm
+ * @date 2023-09-06 04:56:01
+ * @export
+ * @param {IPanelItem} panelItem
+ * @return {*}  {boolean}
+ */
+export declare function isDataContainer(panelItem: IPanelItem): boolean;
+//# sourceMappingURL=data-container.d.ts.map

package/out/model/panel/data-container.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"data-container.d.ts","sourceRoot":"","sources":["../../../src/model/panel/data-container.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE/D;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,SAAS,EAAE,UAAU,GAAG,OAAO,CAO9D"}

package/out/model/panel/data-container.js

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

package/out/model/panel/index.d.ts

@@ -0,0 +1,2 @@
+export * from './data-container';
+//# sourceMappingURL=index.d.ts.map

package/out/model/panel/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/model/panel/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAC"}

package/out/model/panel/index.js

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

package/out/service/app-data-entity/app-data-entity.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"app-data-entity.d.ts","sourceRoot":"","sources":["../../../src/service/app-data-entity/app-data-entity.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEpC,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE9C;;;;;;;GAOG;AACH,qBAAa,aAAc,YAAW,WAAW;IAC/C,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,GAAG,CAAC;IAE5B,UAAkB,KAAK,EAAE,KAAK,CAAC;IAE/B,UAAkB,OAAO,EAAE,cAAc,CAAC;IAElC,OAAO,EAAE,MAAM,CAAC;IAEhB,aAAa,EAAE,MAAM,CAAC;IAEtB,UAAU,EAAE,MAAM,CAAC;IAEnB,YAAY,EAAE,MAAM,CAAC;IAErB,MAAM,EAAE,MAAM,CAAC;IAEf,YAAY,EAAE,MAAM,CAAC;IAErB,YAAY,EAAE,MAAM,CAAC;IAE7B,IAAI,KAAK,IAAI,KAAK,CAEjB;IAED;;;;;;;OAOG;gBACS,MAAM,EAAE,cAAc,EAAE,IAAI,EAAE,KAAK,GAAG,aAAa;IA6E/D;;;;;;OAMG;IACH,SAAS,CAAC,gBAAgB,IAAI,IAAI;IAgClC;;;;;;OAMG;IACH,KAAK,IAAI,aAAa;IAItB;;;;;;;OAOG;IACH,MAAM,CAAC,IAAI,EAAE,KAAK,GAAG,aAAa,GAAG,aAAa;CAQnD"}
+{"version":3,"file":"app-data-entity.d.ts","sourceRoot":"","sources":["../../../src/service/app-data-entity/app-data-entity.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEpC,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE9C;;;;;;;GAOG;AACH,qBAAa,aAAc,YAAW,WAAW;IAC/C,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,GAAG,CAAC;IAE5B,UAAkB,KAAK,EAAE,KAAK,CAAC;IAE/B,UAAkB,OAAO,EAAE,cAAc,CAAC;IAElC,OAAO,EAAE,MAAM,CAAC;IAEhB,aAAa,EAAE,MAAM,CAAC;IAEtB,UAAU,EAAE,MAAM,CAAC;IAEnB,YAAY,EAAE,MAAM,CAAC;IAErB,MAAM,EAAE,MAAM,CAAC;IAEf,YAAY,EAAE,MAAM,CAAC;IAErB,YAAY,EAAE,MAAM,CAAC;IAE7B,IAAI,KAAK,IAAI,KAAK,CAEjB;IAED;;;;;;;OAOG;gBACS,MAAM,EAAE,cAAc,EAAE,IAAI,EAAE,KAAK,GAAG,aAAa;IA6E/D;;;;;;OAMG;IACH,SAAS,CAAC,gBAAgB,IAAI,IAAI;IAgClC;;;;;;OAMG;IACH,KAAK,IAAI,aAAa;IAMtB;;;;;;;OAOG;IACH,MAAM,CAAC,IAAI,EAAE,KAAK,GAAG,aAAa,GAAG,aAAa;CAQnD"}

package/out/service/app-data-entity/app-data-entity.js

@@ -140,7 +140,9 @@ export class AppDataEntity {
      * @return {*}  {AppDataEntity}
      */
     clone() {
-        return new AppDataEntity(this._entity, this._data);
+        const entity = new AppDataEntity(this._entity, this._data);
+        entity.srfkey = this.srfkey;
+        return entity;
     }
     /**
      * 合并参数

package/out/service/dto/method.dto.js

@@ -126,7 +126,7 @@ export class MethodDto {
         }
         const entity = await ibiz.hub.getAppDataEntity(field.refAppDataEntityId, this.entity.appId);
         const methodDto = findModelChild(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/out/service/service/entity/method/method.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"method.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/method.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAqB,MAAM,qBAAqB,CAAC;AACtE,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhE,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAGtD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEnE;;;;;;;GAOG;AACH,8BAAsB,MAAM;IA2CxB,SAAS,CAAC,MAAM,EAAE,cAAc;IAChC,SAAS,CAAC,MAAM,EAAE,YAAY;IA3ChC,SAAS,CAAC,GAAG,EAAG,WAAW,CAAC;IAE5B;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAG,WAAW,CAAC;IAE9B;;;;;;;OAOG;IACH,SAAS,CAAC,MAAM,EAAG,YAAY,CAAC;IAEhC;;;;;;;OAOG;IACH,SAAS,CAAC,OAAO,CAAC,EAAE,aAAa,CAAC;IAElC;;;;;;;;OAQG;gBAES,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,YAAY;IAOhC;;;;;;;;;OASG;IACH,QAAQ,CAAC,IAAI,CACX,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,KAAK,EACb,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,YAAY,CAAC;IAExB;;;;;;;;;;;OAWG;cACa,OAAO,CACrB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,EACX,MAAM,EAAE,OAAO,GAEd,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;IAuC7B;;;;;;;;OAQG;IACH,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM;IAM5C;;;;;;;OAOG;cACa,UAAU,IAAI,OAAO,CAAC,aAAa,CAAC;IAOpD;;;;;;;;OAQG;IACH,SAAS,CAAC,YAAY,CAAC,IAAI,EAAE,KAAK,GAAG,WAAW,GAAG,WAAW;CAG/D"}
+{"version":3,"file":"method.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/method.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAqB,MAAM,qBAAqB,CAAC;AACtE,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhE,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAGtD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEnE;;;;;;;GAOG;AACH,8BAAsB,MAAM;IA2CxB,SAAS,CAAC,MAAM,EAAE,cAAc;IAChC,SAAS,CAAC,MAAM,EAAE,YAAY;IA3ChC,SAAS,CAAC,GAAG,EAAG,WAAW,CAAC;IAE5B;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAG,WAAW,CAAC;IAE9B;;;;;;;OAOG;IACH,SAAS,CAAC,MAAM,EAAG,YAAY,CAAC;IAEhC;;;;;;;OAOG;IACH,SAAS,CAAC,OAAO,CAAC,EAAE,aAAa,CAAC;IAElC;;;;;;;;OAQG;gBAES,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,YAAY;IAOhC;;;;;;;;;OASG;IACH,QAAQ,CAAC,IAAI,CACX,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,KAAK,EACb,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,YAAY,CAAC;IAExB;;;;;;;;;;;OAWG;cACa,OAAO,CACrB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,EACX,MAAM,EAAE,OAAO,GAEd,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;IAuC7B;;;;;;;;OAQG;IACH,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM;IAM5C;;;;;;;OAOG;cACa,UAAU,IAAI,OAAO,CAAC,aAAa,CAAC;IAOpD;;;;;;;;OAQG;IACH,SAAS,CAAC,YAAY,CAAC,IAAI,EAAE,KAAK,GAAG,WAAW,GAAG,WAAW;CAM/D"}

package/out/service/service/entity/method/method.js

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

package/out/service/vo/control.vo.js

@@ -126,8 +126,8 @@ export class ControlVO {
      * @returns {*}
      */
     linkProperty(uiKey, dataKey, isOriginField = true) {
-        // srfuf不做处理
-        if (uiKey === 'srfuf') {
+        // srfuf和srfkey不做处理
+        if (uiKey === 'srfuf' || uiKey === 'srfkey') {
             return;
         }
         // 后台数据存在$origin里，其他存在ControlVo上

package/out/ui-logic/ui-logic-node/msg-box-node/msg-box-node.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"msg-box-node.d.ts","sourceRoot":"","sources":["../../../../src/ui-logic/ui-logic-node/msg-box-node/msg-box-node.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEpD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C;;;;;;;;GAQG;AACH,qBAAa,UAAW,SAAQ,WAAW;IACjC,KAAK,EAAE,gBAAgB,CAAC;IAEhC,SAAS,CAAC,OAAO;;;;;MAKN;IAEL,IAAI,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;CA6D/C"}
+{"version":3,"file":"msg-box-node.d.ts","sourceRoot":"","sources":["../../../../src/ui-logic/ui-logic-node/msg-box-node/msg-box-node.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEpD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C;;;;;;;;GAQG;AACH,qBAAa,UAAW,SAAQ,WAAW;IACjC,KAAK,EAAE,gBAAgB,CAAC;IAEhC,SAAS,CAAC,OAAO;;;;;MAKN;IAEL,IAAI,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;CA4D/C"}

package/out/ui-logic/ui-logic-node/msg-box-node/msg-box-node.js

@@ -72,7 +72,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]);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.1.19",
+  "version": "0.1.21",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -29,7 +29,7 @@
   "author": "chitanda",
   "license": "MIT",
   "devDependencies": {
-    "@ibiz-template/core": "^0.1.18",
+    "@ibiz-template/core": "^0.1.20",
     "@ibiz/model-core": "^0.0.15",
     "@types/path-browserify": "^1.0.0",
     "@types/qs": "^6.9.7",
@@ -57,5 +57,5 @@
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
-  "gitHead": "62b9073941f08f79c2a5ae70c9b895d1a9300c26"
+  "gitHead": "51da056249d0ed3e037db1e6d8a3b646e1ce06b6"
 }

package/src/constant/index.ts

@@ -2,4 +2,5 @@ export { ControlType } from './control-type';
 export { ViewType } from './view-type';
 export { ViewMode } from './view-mode';
 export { SysUIActionTag } from './sys-uiaction-tag';
+export { ViewCallTag } from './view-call-tag';
 export * from './studio-event';

package/src/constant/view-call-tag.ts

@@ -0,0 +1,14 @@
+/* eslint-disable no-shadow */
+/**
+ * 视图调用call的标识
+ * @author lxm
+ * @date 2023-09-08 11:08:44
+ * @export
+ * @enum {number}
+ */
+export enum ViewCallTag {
+  /**
+   * 视图加载（特指初始化加载）
+   */
+  'LOAD' = 'Load',
+}

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

@@ -1,4 +1,6 @@
 import { IControl, IControlLogic, IViewLayoutPanel } from '@ibiz/model-core';
+import { NoticeError } from '@ibiz-template/core';
+import { isNil } from 'ramda';
 import { BaseController } from '..';
 import { CTX } from '../../ctx';
 import {
@@ -17,6 +19,7 @@ import {
 } from '../../../interface';
 import { ControlLogicScheduler } from '../../../logic-scheduler';
 import { getControlProvider } from '../../../register';
+import { ScriptFactory } from '../../../utils';
 
 /**
  * 部件控制器
@@ -235,4 +238,68 @@ export class ControlController<
       return this.getEventArgs();
     };
   }
+
+  /**
+   * 执行对应部件行为消息提示
+   * @author lxm
+   * @date 2023-09-07 04:51:21
+   * @param {string} tag
+   * @param {({ default?: string; data?: IData | IData[]; error?: Error })} [opts]
+   * @return {*}  {void}
+   */
+  actionNotification(
+    tag: string,
+    opts?: { default?: string; data?: IData | IData[]; error?: Error },
+  ): void {
+    const { ctrlMsg } = this.model;
+    const msgItem = ctrlMsg?.ctrlMsgItems?.find(item => item.name === tag);
+    let message: string;
+    let duration: number | undefined;
+    if (msgItem && msgItem.content) {
+      // 自定义部件消息提示
+      duration = isNil(msgItem.timeout) ? undefined : msgItem.timeout / 1000; // 单位转换为秒
+      const scriptParams: IParams = { ...this.getEventArgs() };
+      if (opts?.data) {
+        scriptParams.data = opts.data;
+      }
+      message = ScriptFactory.execScriptFn(
+        scriptParams,
+        `\`${msgItem.content}\``,
+        {
+          isAsync: false,
+          singleRowReturn: true,
+        },
+      ) as string;
+    } else {
+      // 全局多语言资源提示信息
+      const resTag = `CONTROL.${this.model.controlType}.${tag}`.toUpperCase();
+      message = ibiz.i18n.t(resTag, '');
+      // 多语言如果给出来是标识，说明没找到，消息改成空值
+      if (message === resTag) {
+        message = '';
+      }
+    }
+
+    // 都没有的时候如果给了默认输出信息，弹出默认输出信息
+    if (!message && opts?.default) {
+      message = opts.default;
+    }
+
+    // 如果报错有Message的时候给报错的信息
+    if (!message && opts?.error) {
+      message = message || opts.error.message;
+    }
+
+    // 如果默认信息也没有就不弹出信息
+    if (!message) {
+      return;
+    }
+
+    if (opts?.error) {
+      // 报错时抛错误
+      throw new NoticeError(message, duration);
+    } else {
+      ibiz.message.success(message, duration, duration === 0);
+    }
+  }
 }

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

@@ -60,8 +60,25 @@ export class MDControlController<
     this.state.groups = [];
   }
 
+  /**
+   * 实体属性映射，key是id，value是name
+   * @author lxm
+   * @date 2023-09-07 03:16:56
+   * @protected
+   */
+  protected fieldIdNameMap = new Map<string, string>();
+
   protected async onCreated(): Promise<void> {
     await super.onCreated();
+
+    // 初始化实体属性id和name的映射
+    const dataEntity = await ibiz.hub.getAppDataEntity(
+      this.model.appDataEntityId!,
+    );
+    dataEntity.appDEFields?.forEach(field => {
+      this.fieldIdNameMap.set(field.id!, field.name!);
+    });
+
     // 设置默认排序
     this.setSort();
   }
@@ -159,11 +176,15 @@ export class MDControlController<
       });
     } catch (error) {
       await this._evt.emit('onLoadError', undefined);
+      this.actionNotification('FETCHERROR', {
+        error: error as Error,
+      });
       throw error;
     } finally {
       await this.endLoading();
     }
 
+    this.actionNotification('FETCHSUCCESS');
     return this.state.items;
   }
 
@@ -234,8 +255,9 @@ export class MDControlController<
       );
 
       if (args?.silent !== true) {
-        ibiz.notification.success({
-          desc: `数据[${data
+        this.actionNotification('REMOVESUCCESS', {
+          data,
+          default: `数据[${data
             .map(item => item.srfmajortext)
             .join('、')}]删除成功!`,
         });
@@ -247,6 +269,10 @@ export class MDControlController<
       }
     } catch (error) {
       await this._evt.emit('onRemoveError', undefined);
+      this.actionNotification('REMOVEERROR', {
+        error: error as Error,
+        data,
+      });
       throw error;
     } finally {
       await this.endLoading();

package/src/controller/control/data-view/data-view.controller.ts

@@ -249,7 +249,8 @@ export class DataViewControlController
       // 设置默认排序或者置空
       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/form/edit-form/edit-form.controller.ts

@@ -79,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();
@@ -91,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;
   }
@@ -120,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();
@@ -130,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;
   }
@@ -153,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();
@@ -172,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;
   }
 
@@ -203,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();
@@ -214,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;
   }
@@ -317,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: '流程启动成功' });
   }
 
   /**
@@ -346,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

@@ -269,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 || {}) });
+  }
 }