@ibiz-template/runtime 0.1.18 → 0.1.20

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

@@ -1,5 +1,6 @@
 import { MethodDto } from '../../../dto/method.dto';
 import { findModelChild } from '../../../../model';
+import { isLocalMode } from '../util/util';
 /**
  * 应用实体方法输入转换
  *
@@ -9,21 +10,24 @@ import { findModelChild } from '../../../../model';
  * @class MethodInput
  */
 export class MethodInput {
+    get isLocalMode() {
+        return isLocalMode(this.method);
+    }
     /**
      * Creates an instance of MethodInput.
-     *
      * @author chitanda
-     * @date 2022-10-11 17:10:59
+     * @date 2023-09-06 16:09:26
      * @param {IAppDataEntity} entity
-     * @param {IAppDEMethodInput} [input]
+     * @param {IAppDEMethod} method
      */
-    constructor(entity, input) {
+    constructor(entity, method) {
         this.entity = entity;
-        this.input = input;
+        this.method = method;
+        const input = method.appDEMethodInput;
         if (input) {
             const methodDto = findModelChild(entity.appDEMethodDTOs || [], input.appDEMethodDTOId);
             if (methodDto) {
-                this.dto = new MethodDto(entity, methodDto);
+                this.dto = new MethodDto(entity, this.isLocalMode, methodDto);
             }
         }
     }

package/out/service/service/entity/method/method-renturn.d.ts

@@ -1,4 +1,4 @@
-import { IAppDataEntity, IAppDEMethodReturn } from '@ibiz/model-core';
+import { IAppDataEntity, IAppDEMethod } from '@ibiz/model-core';
 import { MethodDto } from '../../../dto/method.dto';
 import { IDataEntity } from '../../../../interface';
 /**
@@ -11,17 +11,18 @@ import { IDataEntity } from '../../../../interface';
  */
 export declare class MethodReturn {
     protected entity: IAppDataEntity;
-    protected output?: IAppDEMethodReturn | undefined;
+    protected method: IAppDEMethod;
     protected dto?: MethodDto;
+    protected get isLocalMode(): boolean;
     /**
      * Creates an instance of MethodReturn.
-     *
      * @author chitanda
-     * @date 2022-10-11 17:10:47
+     * @date 2023-09-06 16:09:45
      * @param {IAppDataEntity} entity
+     * @param {IAppDEMethod} method
      * @param {IAppDEMethodReturn} [output]
      */
-    constructor(entity: IAppDataEntity, output?: IAppDEMethodReturn | undefined);
+    constructor(entity: IAppDataEntity, method: IAppDEMethod);
     /**
      * 处理请求返回参数
      *

package/out/service/service/entity/method/method-renturn.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"method-renturn.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/method-renturn.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACtE,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAGpD,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEpD;;;;;;;GAOG;AACH,qBAAa,YAAY;IAYrB,SAAS,CAAC,MAAM,EAAE,cAAc;IAChC,SAAS,CAAC,MAAM,CAAC;IAZnB,SAAS,CAAC,GAAG,CAAC,EAAE,SAAS,CAAC;IAE1B;;;;;;;OAOG;gBAES,MAAM,EAAE,cAAc,EACtB,MAAM,CAAC,gCAAoB;IAavC;;;;;;;;OAQG;IACG,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,WAAW,CAAC;CAOlE"}
+{"version":3,"file":"method-renturn.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/method-renturn.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChE,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAGpD,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAGpD;;;;;;;GAOG;AACH,qBAAa,YAAY;IAgBrB,SAAS,CAAC,MAAM,EAAE,cAAc;IAChC,SAAS,CAAC,MAAM,EAAE,YAAY;IAhBhC,SAAS,CAAC,GAAG,CAAC,EAAE,SAAS,CAAC;IAE1B,SAAS,KAAK,WAAW,IAAI,OAAO,CAEnC;IAED;;;;;;;OAOG;gBAES,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,YAAY;IAchC;;;;;;;;OAQG;IACG,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,WAAW,CAAC;CAOlE"}

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

@@ -1,6 +1,7 @@
 import { MethodDto } from '../../../dto/method.dto';
 import { AppDataEntity } from '../../../app-data-entity/app-data-entity';
 import { findModelChild } from '../../../../model';
+import { isLocalMode } from '../util/util';
 /**
  * 应用实体方法输出转换
  *
@@ -10,21 +11,25 @@ import { findModelChild } from '../../../../model';
  * @class MethodReturn
  */
 export class MethodReturn {
+    get isLocalMode() {
+        return isLocalMode(this.method);
+    }
     /**
      * Creates an instance of MethodReturn.
-     *
      * @author chitanda
-     * @date 2022-10-11 17:10:47
+     * @date 2023-09-06 16:09:45
      * @param {IAppDataEntity} entity
+     * @param {IAppDEMethod} method
      * @param {IAppDEMethodReturn} [output]
      */
-    constructor(entity, output) {
+    constructor(entity, method) {
         this.entity = entity;
-        this.output = output;
+        this.method = method;
+        const output = method.appDEMethodReturn;
         if (output) {
             const methodDto = findModelChild(entity.appDEMethodDTOs || [], output.appDEMethodDTOId);
             if (methodDto) {
-                this.dto = new MethodDto(entity, methodDto);
+                this.dto = new MethodDto(entity, this.isLocalMode, methodDto);
             }
         }
     }

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

@@ -27,8 +27,8 @@ export class Method {
         this.entity = entity;
         this.method = method;
         this.app = ibiz.hub.getApp(entity.appId);
-        this.input = new MethodInput(entity, method.appDEMethodInput);
-        this.result = new MethodReturn(entity, method.appDEMethodReturn);
+        this.input = new MethodInput(entity, method);
+        this.result = new MethodReturn(entity, method);
     }
     /**
      * 发送请求
@@ -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/service/entity/util/util.d.ts

@@ -0,0 +1,12 @@
+import { IAppDEMethod } from '@ibiz/model-core';
+/**
+ * 是否为本地模式
+ *
+ * @author chitanda
+ * @date 2023-09-06 16:09:06
+ * @export
+ * @param {IAppDEMethod} method
+ * @return {*}  {boolean}
+ */
+export declare function isLocalMode(method: IAppDEMethod): boolean;
+//# sourceMappingURL=util.d.ts.map

package/out/service/service/entity/util/util.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/util/util.ts"],"names":[],"mappings":"AAAA,OAAO,EAA+B,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAE7E;;;;;;;;GAQG;AACH,wBAAgB,WAAW,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAKzD"}

package/out/service/service/entity/util/util.js

@@ -0,0 +1,13 @@
+/**
+ * 是否为本地模式
+ *
+ * @author chitanda
+ * @date 2023-09-06 16:09:06
+ * @export
+ * @param {IAppDEMethod} method
+ * @return {*}  {boolean}
+ */
+export function isLocalMode(method) {
+    return (method.actionType === 'BUILTIN' ||
+        method.dataSetType === 'DATAQUERY');
+}

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/out/utils/handlebars/helpers/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/utils/handlebars/helpers/index.ts"],"names":[],"mappings":"AAmBA;;;;;;GAMG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,KAAK,GAAG,IAAI,CAmB/C"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/utils/handlebars/helpers/index.ts"],"names":[],"mappings":"AAoBA;;;;;;GAMG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,KAAK,GAAG,IAAI,CAoB/C"}

package/out/utils/handlebars/helpers/index.js

@@ -5,7 +5,8 @@ import { HelperEq } from './eq/eq';
 import { HelperGt } from './gt/gt';
 import { HelperGte } from './gte/gte';
 import { HelperEqPropertyValue } from './eq-property-value/eq-property-value';
-import { HelperJson } from './json/json';
+import { HelperJsonParse } from './json/json-parse';
+import { HelperJsonStringify } from './json/json-stringify';
 import { HelperLowerCase } from './lower-case/lower-case';
 import { HelperLt } from './lt/lt';
 import { HelperLte } from './lte/lte';
@@ -30,7 +31,8 @@ export function installHelpers(hsb) {
     new HelperEq(hsb);
     new HelperGt(hsb);
     new HelperGte(hsb);
-    new HelperJson(hsb);
+    new HelperJsonParse(hsb);
+    new HelperJsonStringify(hsb);
     new HelperLowerCase(hsb);
     new HelperLt(hsb);
     new HelperLte(hsb);

package/out/utils/handlebars/helpers/json/json-parse.d.ts

@@ -0,0 +1,16 @@
+import { HelperBase } from '../helper-base';
+/**
+ * json字符创 转 对象
+ *
+ * @description 用法 {{json xxx 2}}，支持第二个参数传递格式化。效果: 将 json 对象转为 json 字符串
+ * @author chitanda
+ * @date 2021-12-24 15:12:59
+ * @export
+ * @class HelperJson
+ * @extends {HelperBase}
+ */
+export declare class HelperJsonParse extends HelperBase {
+    constructor(hbs: IData);
+    onExecute(obj: string): string;
+}
+//# sourceMappingURL=json-parse.d.ts.map

package/out/utils/handlebars/helpers/json/json-parse.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"json-parse.d.ts","sourceRoot":"","sources":["../../../../../src/utils/handlebars/helpers/json/json-parse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C;;;;;;;;;GASG;AACH,qBAAa,eAAgB,SAAQ,UAAU;gBACjC,GAAG,EAAE,KAAK;IAItB,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;CAG/B"}

package/out/utils/handlebars/helpers/json/json-parse.js

@@ -0,0 +1,19 @@
+import { HelperBase } from '../helper-base';
+/**
+ * json字符创 转 对象
+ *
+ * @description 用法 {{json xxx 2}}，支持第二个参数传递格式化。效果: 将 json 对象转为 json 字符串
+ * @author chitanda
+ * @date 2021-12-24 15:12:59
+ * @export
+ * @class HelperJson
+ * @extends {HelperBase}
+ */
+export class HelperJsonParse extends HelperBase {
+    constructor(hbs) {
+        super(hbs, 'jsonParse');
+    }
+    onExecute(obj) {
+        return JSON.parse(obj);
+    }
+}

package/out/utils/handlebars/helpers/json/{json.d.ts → json-stringify.d.ts}

@@ -6,11 +6,11 @@ import { HelperBase } from '../helper-base';
  * @author chitanda
  * @date 2021-12-24 15:12:59
  * @export
- * @class HelperJson
+ * @class HelperJsonStringify
  * @extends {HelperBase}
  */
-export declare class HelperJson extends HelperBase {
+export declare class HelperJsonStringify extends HelperBase {
     constructor(hbs: IData);
     onExecute(obj: Record<string, unknown> | unknown[], space: number): string;
 }
-//# sourceMappingURL=json.d.ts.map
+//# sourceMappingURL=json-stringify.d.ts.map

package/out/utils/handlebars/helpers/json/json-stringify.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"json-stringify.d.ts","sourceRoot":"","sources":["../../../../../src/utils/handlebars/helpers/json/json-stringify.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C;;;;;;;;;GASG;AACH,qBAAa,mBAAoB,SAAQ,UAAU;gBACrC,GAAG,EAAE,KAAK;IAItB,SAAS,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,EAAE,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM;CAO3E"}

package/out/utils/handlebars/helpers/json/{json.js → json-stringify.js}

@@ -6,10 +6,10 @@ import { HelperBase } from '../helper-base';
  * @author chitanda
  * @date 2021-12-24 15:12:59
  * @export
- * @class HelperJson
+ * @class HelperJsonStringify
  * @extends {HelperBase}
  */
-export class HelperJson extends HelperBase {
+export class HelperJsonStringify extends HelperBase {
     constructor(hbs) {
         super(hbs, 'jsonStringify');
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.1.18",
+  "version": "0.1.20",
   "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": "d363fb94c05e098f5a6c928533788e7cba99f833"
+  "gitHead": "bd9c4f935e57362567b12c7b4b91a64f4c099616"
 }

package/src/app-hub.ts

@@ -204,6 +204,21 @@ export class AppHub implements IAppHubService {
     return this.view2appMap.has(id);
   }
 
+  /**
+   * 获取应用样式
+   *
+   * @author chitanda
+   * @date 2023-09-06 10:09:22
+   * @param {string} appId
+   * @return {*}  {(Promise<string | null>)}
+   */
+  async getAppStyle(appId: string): Promise<string | null> {
+    if (this.modelLoaderProvider) {
+      return this.modelLoaderProvider.getAppStyle(appId);
+    }
+    return null;
+  }
+
   /**
    * 根据视图代码名称查找视图
    *

package/src/application.ts

@@ -112,23 +112,14 @@ export class Application implements IAppService {
    * @return {*}  {Promise<void>}
    */
   protected async loadAppModelStyle(): Promise<void> {
-    await this.net
-      .get(`${ibiz.env.remoteModelUrl}/PSSYSAPP.json.css`)
-      .then(res => {
-        const dom = document.createElement('style');
-        dom.setAttribute('type', 'text/css');
-        if (res.request && res.request.responseURL) {
-          const url = new URL(res.request.responseURL);
-          dom.id = url.pathname;
-        }
-        dom.innerHTML = res.data as unknown as string;
-        document.head.appendChild(dom);
-      })
-      .catch(err => {
-        ibiz.log.error(
-          `应用[${this.appId}]模型全局样式加载失败：${err.message}`,
-        );
-      });
+    const style = await ibiz.hub.getAppStyle(this.appId);
+    if (style) {
+      const dom = document.createElement('style');
+      dom.setAttribute('type', 'text/css');
+      dom.id = this.appId;
+      dom.innerHTML = style;
+      document.head.appendChild(dom);
+    }
   }
 
   /**

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

@@ -1,4 +1,3 @@
-import { RuntimeError } from '@ibiz-template/core';
 import {
   IDashboard,
   IDBContainerPortletPart,
@@ -119,9 +118,10 @@ export class DashboardController
         return portlet.dataChangeNotify(data);
       }),
     );
-    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;
     }
   }
 }

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 = '';
       }