npm - @ibiz-template/runtime - Versions diffs - 0.1.19 → 0.1.21 - Mend

@ibiz-template/runtime 0.1.19 → 0.1.21

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (83) hide show

package/out/constant/index.d.ts CHANGED Viewed

@@ -2,5 +2,6 @@ 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';
 //# sourceMappingURL=index.d.ts.map

package/out/constant/index.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/constant/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,cAAc,gBAAgB,CAAC"}
1	+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/constant/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,cAAc,gBAAgB,CAAC"}

package/out/constant/index.js CHANGED Viewed

@@ -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/out/constant/view-call-tag.d.ts ADDED Viewed

@@ -0,0 +1,14 @@
+/**
+ * 视图调用call的标识
+ * @author lxm
+ * @date 2023-09-08 11:08:44
+ * @export
+ * @enum {number}
+ */
+export declare enum ViewCallTag {
+    /**
+     * 视图加载（特指初始化加载）
+     */
+    'LOAD' = "Load"
+}
+//# sourceMappingURL=view-call-tag.d.ts.map

package/out/constant/view-call-tag.d.ts.map ADDED Viewed

	@@ -0,0 +1 @@
1	+ {"version":3,"file":"view-call-tag.d.ts","sourceRoot":"","sources":["../../src/constant/view-call-tag.ts"],"names":[],"mappings":"AACA;;;;;;GAMG;AACH,oBAAY,WAAW;IACrB;;OAEG;IACH,MAAM,SAAS;CAChB"}

package/out/constant/view-call-tag.js ADDED Viewed

@@ -0,0 +1,15 @@
+/* eslint-disable no-shadow */
+/**
+ * 视图调用call的标识
+ * @author lxm
+ * @date 2023-09-08 11:08:44
+ * @export
+ * @enum {number}
+ */
+export var ViewCallTag;
+(function (ViewCallTag) {
+    /**
+     * 视图加载（特指初始化加载）
+     */
+    ViewCallTag["LOAD"] = "Load";
+})(ViewCallTag || (ViewCallTag = {}));

package/out/controller/common/control/control.controller.d.ts CHANGED Viewed

@@ -125,5 +125,18 @@ export declare class ControlController<T extends IControl = IControl, S extends
      * @return {*}  {void}
      */
     protected initControlScheduler(logics?: IControlLogic[]): void;
+    /**
+     * 执行对应部件行为消息提示
+     * @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;
 }
 //# sourceMappingURL=control.controller.d.ts.map

package/out/controller/common/control/control.controller.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"control.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/common/control/control.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;~~AAC7E~~,OAAO,EAAE,cAAc,EAAE,MAAM,IAAI,CAAC;AACpC,OAAO,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAChC,OAAO,EACL,SAAS,EACT,kBAAkB,EAClB,aAAa,EACb,aAAa,EACb,eAAe,EACf,0BAA0B,EAC3B,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EACL,gBAAgB,EAChB,kBAAkB,EAEnB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;~~AAGjE~~;;;;;;;GAOG;AACH,qBAAa,iBAAiB,CAC1B,CAAC,SAAS,QAAQ,GAAG,QAAQ,EAC7B,CAAC,SAAS,aAAa,GAAG,aAAa,EACvC,CAAC,SAAS,aAAa,GAAG,aAAa,CAEzC,SAAQ,cAAc,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAC9B,YAAW,kBAAkB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAEtC,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,aAAa,CAAC,CAEnD;IAED,IAAI,IAAI,IAAI,eAAe,CAE1B;IAED;;;;;OAKG;IACH,SAAS,CAAC,EAAE,qBAAqB,CAAC;IAElC;;;;;OAKG;IACH,YAAY,CAAC,EAAE,gBAAgB,CAAC;IAEhC,WAAW,CAAC,EAAE,0BAA0B,CAAC;IAEzC;;;;;OAKG;IACH,SAAS,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,gBAAgB,CAAA;KAAE,CAAM;IAEpD;;;;;;;;OAQG;gBACS,KAAK,EAAE,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG;IAWlE;;;;;OAKG;IACH,SAAS,CAAC,aAAa,IAAI,IAAI;IAI/B;;;;;OAKG;IACH,SAAS,CAAC,YAAY,IAAI,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC;IAStD,SAAS,CAAC,SAAS,IAAI,IAAI;cAKX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;cAc1B,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAO5C;;;;;OAKG;IACH,cAAc,IAAI,MAAM;IAIxB;;;;;OAKG;IACH,OAAO,IAAI,KAAK,EAAE,GAAG,IAAI;IAIzB;;;;;;OAMG;IACG,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAKnC;;;;;;OAMG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAKjC;;;;;;;OAOG;IACH,SAAS,CAAC,oBAAoB,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG;QACzD,OAAO,EAAE,QAAQ,CAAC;QAClB,MAAM,EAAE,OAAO,CAAC;QAChB,IAAI,EAAE,KAAK,EAAE,CAAC;KACf;IAOD;;;;;OAKG;IACH,cAAc,CAAC,KAAK,EAAE,0BAA0B,GAAG,IAAI;IAWvD;;;;;;OAMG;IACH,SAAS,CAAC,oBAAoB,CAAC,MAAM,GAAE,aAAa,EAAO,GAAG,IAAI;~~CASnE~~"}
1	+ {"version":3,"file":"control.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/common/control/control.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAG7E,OAAO,EAAE,cAAc,EAAE,MAAM,IAAI,CAAC;AACpC,OAAO,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAChC,OAAO,EACL,SAAS,EACT,kBAAkB,EAClB,aAAa,EACb,aAAa,EACb,eAAe,EACf,0BAA0B,EAC3B,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EACL,gBAAgB,EAChB,kBAAkB,EAEnB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AAIjE;;;;;;;GAOG;AACH,qBAAa,iBAAiB,CAC1B,CAAC,SAAS,QAAQ,GAAG,QAAQ,EAC7B,CAAC,SAAS,aAAa,GAAG,aAAa,EACvC,CAAC,SAAS,aAAa,GAAG,aAAa,CAEzC,SAAQ,cAAc,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAC9B,YAAW,kBAAkB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAEtC,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,aAAa,CAAC,CAEnD;IAED,IAAI,IAAI,IAAI,eAAe,CAE1B;IAED;;;;;OAKG;IACH,SAAS,CAAC,EAAE,qBAAqB,CAAC;IAElC;;;;;OAKG;IACH,YAAY,CAAC,EAAE,gBAAgB,CAAC;IAEhC,WAAW,CAAC,EAAE,0BAA0B,CAAC;IAEzC;;;;;OAKG;IACH,SAAS,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,gBAAgB,CAAA;KAAE,CAAM;IAEpD;;;;;;;;OAQG;gBACS,KAAK,EAAE,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG;IAWlE;;;;;OAKG;IACH,SAAS,CAAC,aAAa,IAAI,IAAI;IAI/B;;;;;OAKG;IACH,SAAS,CAAC,YAAY,IAAI,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC;IAStD,SAAS,CAAC,SAAS,IAAI,IAAI;cAKX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;cAc1B,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAO5C;;;;;OAKG;IACH,cAAc,IAAI,MAAM;IAIxB;;;;;OAKG;IACH,OAAO,IAAI,KAAK,EAAE,GAAG,IAAI;IAIzB;;;;;;OAMG;IACG,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAKnC;;;;;;OAMG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAKjC;;;;;;;OAOG;IACH,SAAS,CAAC,oBAAoB,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG;QACzD,OAAO,EAAE,QAAQ,CAAC;QAClB,MAAM,EAAE,OAAO,CAAC;QAChB,IAAI,EAAE,KAAK,EAAE,CAAC;KACf;IAOD;;;;;OAKG;IACH,cAAc,CAAC,KAAK,EAAE,0BAA0B,GAAG,IAAI;IAWvD;;;;;;OAMG;IACH,SAAS,CAAC,oBAAoB,CAAC,MAAM,GAAE,aAAa,EAAO,GAAG,IAAI;IAUlE;;;;;;;OAOG;IACH,kBAAkB,CAChB,GAAG,EAAE,MAAM,EACX,IAAI,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,CAAC;QAAC,KAAK,CAAC,EAAE,KAAK,CAAA;KAAE,GACjE,IAAI;CAoDR"}

package/out/controller/common/control/control.controller.js CHANGED Viewed

@@ -1,5 +1,8 @@
+import { NoticeError } from '@ibiz-template/core';
+import { isNil } from 'ramda';
 import { BaseController } from '..';
 import { getControlProvider } from '../../../register';
+import { ScriptFactory } from '../../../utils';
 /**
  * 部件控制器
  *
@@ -166,4 +169,59 @@ export class ControlController extends BaseController {
             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, opts) {
+        var _a;
+        const { ctrlMsg } = this.model;
+        const msgItem = (_a = ctrlMsg === null || ctrlMsg === void 0 ? void 0 : ctrlMsg.ctrlMsgItems) === null || _a === void 0 ? void 0 : _a.find(item => item.name === tag);
+        let message;
+        let duration;
+        if (msgItem && msgItem.content) {
+            // 自定义部件消息提示
+            duration = isNil(msgItem.timeout) ? undefined : msgItem.timeout / 1000; // 单位转换为秒
+            const scriptParams = Object.assign({}, this.getEventArgs());
+            if (opts === null || opts === void 0 ? void 0 : opts.data) {
+                scriptParams.data = opts.data;
+            }
+            message = ScriptFactory.execScriptFn(scriptParams, `\`${msgItem.content}\``, {
+                isAsync: false,
+                singleRowReturn: true,
+            });
+        }
+        else {
+            // 全局多语言资源提示信息
+            const resTag = `CONTROL.${this.model.controlType}.${tag}`.toUpperCase();
+            message = ibiz.i18n.t(resTag, '');
+            // 多语言如果给出来是标识，说明没找到，消息改成空值
+            if (message === resTag) {
+                message = '';
+            }
+        }
+        // 都没有的时候如果给了默认输出信息，弹出默认输出信息
+        if (!message && (opts === null || opts === void 0 ? void 0 : opts.default)) {
+            message = opts.default;
+        }
+        // 如果报错有Message的时候给报错的信息
+        if (!message && (opts === null || opts === void 0 ? void 0 : opts.error)) {
+            message = message || opts.error.message;
+        }
+        // 如果默认信息也没有就不弹出信息
+        if (!message) {
+            return;
+        }
+        if (opts === null || opts === void 0 ? void 0 : opts.error) {
+            // 报错时抛错误
+            throw new NoticeError(message, duration);
+        }
+        else {
+            ibiz.message.success(message, duration, duration === 0);
+        }
+    }
 }

package/out/controller/common/control/md-control.controller.d.ts CHANGED Viewed

@@ -24,6 +24,13 @@ export declare class MDControlController<T extends IMDControl = IMDControl, S ex
     service: MDControlService;
     protected get _evt(): ControllerEvent<IMDControlEvent>;
     protected initState(): void;
+    /**
+     * 实体属性映射，key是id，value是name
+     * @author lxm
+     * @date 2023-09-07 03:16:56
+     * @protected
+     */
+    protected fieldIdNameMap: Map<string, string>;
     protected onCreated(): Promise<void>;
     /**
      * 设置排序

package/out/controller/common/control/md-control.controller.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"md-control.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/common/control/md-control.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EACL,oBAAoB,EACpB,eAAe,EACf,eAAe,EACf,gBAAgB,EAChB,kBAAkB,EACnB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,gBAAgB,EAAS,MAAM,kBAAkB,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAEzD;;;;;;;;;GASG;AACH,qBAAa,mBAAmB,CAC5B,CAAC,SAAS,UAAU,GAAG,UAAU,EACjC,CAAC,SAAS,eAAe,GAAG,eAAe,EAC3C,CAAC,SAAS,eAAe,GAAG,eAAe,CAE7C,SAAQ,iBAAiB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CACjC,YAAW,oBAAoB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAExC;;;;;;OAMG;IACH,OAAO,EAAG,gBAAgB,CAAC;IAE3B,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,eAAe,CAAC,CAErD;IAED,SAAS,CAAC,SAAS,IAAI,IAAI;~~cAgBX~~,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;~~IAM1C~~;;;;;;;;OAQG;IACH,OAAO,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,IAAI;IAMnD;;;;;;OAMG;IACG,cAAc,CAAC,WAAW,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IA6B7D;;;;;OAKG;IACG,IAAI,CAAC,IAAI,GAAE,gBAAqB,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;~~IA4CzD~~;;;;;;;;OAQG;IACG,SAAS,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAIzE;;;;OAIG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAI9B;;;;;;OAMG;IACG,MAAM,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;~~IA4DtD~~;;;;;;OAMG;IACH,WAAW,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAU9B;;;;;;OAMG;IACH,OAAO,IAAI,KAAK,EAAE;IAIlB,SAAS,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAMrC,YAAY,CAAC,SAAS,EAAE,KAAK,EAAE,GAAG,IAAI;IAWtC;;;;;;OAMG;IACG,UAAU,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAmB5C;;;;;;OAMG;IACG,YAAY,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAM9C;;;;;;OAMG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAwBjC;;;;;;OAMG;IACG,UAAU,CAAC,KAAK,EAAE;QAAE,KAAK,EAAE,UAAU,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAkC9D"}
1	+ {"version":3,"file":"md-control.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/common/control/md-control.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EACL,oBAAoB,EACpB,eAAe,EACf,eAAe,EACf,gBAAgB,EAChB,kBAAkB,EACnB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,gBAAgB,EAAS,MAAM,kBAAkB,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAEzD;;;;;;;;;GASG;AACH,qBAAa,mBAAmB,CAC5B,CAAC,SAAS,UAAU,GAAG,UAAU,EACjC,CAAC,SAAS,eAAe,GAAG,eAAe,EAC3C,CAAC,SAAS,eAAe,GAAG,eAAe,CAE7C,SAAQ,iBAAiB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CACjC,YAAW,oBAAoB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAExC;;;;;;OAMG;IACH,OAAO,EAAG,gBAAgB,CAAC;IAE3B,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,eAAe,CAAC,CAErD;IAED,SAAS,CAAC,SAAS,IAAI,IAAI;IAgB3B;;;;;OAKG;IACH,SAAS,CAAC,cAAc,sBAA6B;cAErC,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAe1C;;;;;;;;OAQG;IACH,OAAO,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,IAAI;IAMnD;;;;;;OAMG;IACG,cAAc,CAAC,WAAW,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IA6B7D;;;;;OAKG;IACG,IAAI,CAAC,IAAI,GAAE,gBAAqB,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAgDzD;;;;;;;;OAQG;IACG,SAAS,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAIzE;;;;OAIG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAI9B;;;;;;OAMG;IACG,MAAM,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IAiEtD;;;;;;OAMG;IACH,WAAW,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAU9B;;;;;;OAMG;IACH,OAAO,IAAI,KAAK,EAAE;IAIlB,SAAS,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAMrC,YAAY,CAAC,SAAS,EAAE,KAAK,EAAE,GAAG,IAAI;IAWtC;;;;;;OAMG;IACG,UAAU,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAmB5C;;;;;;OAMG;IACG,YAAY,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAM9C;;;;;;OAMG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAwBjC;;;;;;OAMG;IACG,UAAU,CAAC,KAAK,EAAE;QAAE,KAAK,EAAE,UAAU,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAkC9D"}

package/out/controller/common/control/md-control.controller.js CHANGED Viewed

@@ -14,6 +14,16 @@ import { ControlController } from './control.controller';
  * @template T
  */
 export class MDControlController extends ControlController {
+    constructor() {
+        super(...arguments);
+        /**
+         * 实体属性映射，key是id，value是name
+         * @author lxm
+         * @date 2023-09-07 03:16:56
+         * @protected
+         */
+        this.fieldIdNameMap = new Map();
+    }
     get _evt() {
         return this.evt;
     }
@@ -33,7 +43,13 @@ export class MDControlController extends ControlController {
         this.state.groups = [];
     }
     async onCreated() {
+        var _a;
         await super.onCreated();
+        // 初始化实体属性id和name的映射
+        const dataEntity = await ibiz.hub.getAppDataEntity(this.model.appDataEntityId);
+        (_a = dataEntity.appDEFields) === null || _a === void 0 ? void 0 : _a.forEach(field => {
+            this.fieldIdNameMap.set(field.id, field.name);
+        });
         // 设置默认排序
         this.setSort();
     }
@@ -120,11 +136,15 @@ export class MDControlController extends ControlController {
         }
         catch (error) {
             await this._evt.emit('onLoadError', undefined);
+            this.actionNotification('FETCHERROR', {
+                error: error,
+            });
             throw error;
         }
         finally {
             await this.endLoading();
         }
+        this.actionNotification('FETCHSUCCESS');
         return this.state.items;
     }
     /**
@@ -186,8 +206,9 @@ export class MDControlController extends ControlController {
                 this.afterRemove(item);
             }));
             if ((args === null || args === void 0 ? void 0 : args.silent) !== true) {
-                ibiz.notification.success({
-                    desc: `数据[${data
+                this.actionNotification('REMOVESUCCESS', {
+                    data,
+                    default: `数据[${data
                         .map(item => item.srfmajortext)
                         .join('、')}]删除成功!`,
                 });
@@ -199,6 +220,10 @@ export class MDControlController extends ControlController {
         }
         catch (error) {
             await this._evt.emit('onRemoveError', undefined);
+            this.actionNotification('REMOVEERROR', {
+                error: error,
+                data,
+            });
             throw error;
         }
         finally {

package/out/controller/control/data-view/data-view.controller.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"data-view.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/data-view/data-view.controller.ts"],"names":[],"mappings":"AACA,OAAO,EACL,WAAW,EACX,eAAe,EACf,oBAAoB,EACrB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,qBAAqB,EACrB,qBAAqB,EACrB,0BAA0B,EAC1B,gBAAgB,EAGjB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,oBAAoB,EAAuB,MAAM,aAAa,CAAC;AACxE,OAAO,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAE7D,qBAAa,yBACX,SAAQ,mBAAmB,CACzB,WAAW,EACX,qBAAqB,EACrB,qBAAqB,CAEvB,YAAW,0BAA0B;IAErC;;;;;OAKG;IACK,OAAO,EAAE,sBAAsB,CAAC;IAExC;;;;;OAKG;IACH,SAAS,CAAC,SAAS,IAAI,IAAI;IAK3B;;;;;;OAMG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAO1C;;;;;OAKG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAMzB,SAAS,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAKzE;;;;;OAKG;IACH,eAAe,IAAI,eAAe,GAAG,IAAI;IAazC;;;;;;OAMG;IACH,gBAAgB,CAAC,IAAI,EAAE,KAAK,GAAG,oBAAoB;IA2BnD;;;;;;;;OAQG;IACG,aAAa,CACjB,MAAM,EAAE,oBAAoB,EAC5B,IAAI,EAAE,KAAK,EACX,KAAK,EAAE,UAAU,GAChB,OAAO,CAAC,IAAI,CAAC;IAWhB;;;;OAIG;IACG,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAWtC;;;;OAIG;IACH,eAAe,IAAI,IAAI;IAqBvB;;;;OAIG;IACG,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;IAmC1C;;;;;;;OAOG;IACH,OAAO,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,IAAI;~~CAapD~~"}
1	+ {"version":3,"file":"data-view.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/data-view/data-view.controller.ts"],"names":[],"mappings":"AACA,OAAO,EACL,WAAW,EACX,eAAe,EACf,oBAAoB,EACrB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,qBAAqB,EACrB,qBAAqB,EACrB,0BAA0B,EAC1B,gBAAgB,EAGjB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,oBAAoB,EAAuB,MAAM,aAAa,CAAC;AACxE,OAAO,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAE7D,qBAAa,yBACX,SAAQ,mBAAmB,CACzB,WAAW,EACX,qBAAqB,EACrB,qBAAqB,CAEvB,YAAW,0BAA0B;IAErC;;;;;OAKG;IACK,OAAO,EAAE,sBAAsB,CAAC;IAExC;;;;;OAKG;IACH,SAAS,CAAC,SAAS,IAAI,IAAI;IAK3B;;;;;;OAMG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAO1C;;;;;OAKG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAMzB,SAAS,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAKzE;;;;;OAKG;IACH,eAAe,IAAI,eAAe,GAAG,IAAI;IAazC;;;;;;OAMG;IACH,gBAAgB,CAAC,IAAI,EAAE,KAAK,GAAG,oBAAoB;IA2BnD;;;;;;;;OAQG;IACG,aAAa,CACjB,MAAM,EAAE,oBAAoB,EAC5B,IAAI,EAAE,KAAK,EACX,KAAK,EAAE,UAAU,GAChB,OAAO,CAAC,IAAI,CAAC;IAWhB;;;;OAIG;IACG,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAWtC;;;;OAIG;IACH,eAAe,IAAI,IAAI;IAqBvB;;;;OAIG;IACG,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;IAmC1C;;;;;;;OAOG;IACH,OAAO,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,IAAI;CAcpD"}

package/out/controller/control/data-view/data-view.controller.js CHANGED Viewed

@@ -197,7 +197,8 @@ export class DataViewControlController extends MDControlController {
             // 设置默认排序或者置空
             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/out/controller/control/form/edit-form/edit-form.controller.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"edit-form.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/form/edit-form/edit-form.controller.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,OAAO,EACL,cAAc,EACd,cAAc,EACd,mBAAmB,EACpB,MAAM,uBAAuB,CAAC;AAK/B,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AACzC,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD;;;;;;;;GAQG;AACH,qBAAa,kBACX,SAAQ,cAAc,CAAC,WAAW,EAAE,cAAc,EAAE,cAAc,CAClE,YAAW,mBAAmB;IAE9B;;;;;OAKG;IACH,OAAO,EAAG,eAAe,CAAC;IAE1B;;;;;;;OAOG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAY1C;;;;;OAKG;IACG,SAAS,IAAI,OAAO,CAAC,KAAK,CAAC;~~IA6BjC~~;;;;;OAKG;IACG,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;~~IAiC5B~~;;;;;OAKG;IACG,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;~~IAoC5B~~;;;;;;OAMG;IACG,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC;~~IAmChC~~;;;;;;OAMG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAc7B;;;;;;;OAOG;IACG,cAAc,CAAC,gBAAgB,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA+C7D;;;;;;;OAOG;IACG,OAAO,CAAC,WAAW,GAAE,OAAY,GAAG,OAAO,CAAC,IAAI,CAAC;~~IAqBvD~~;;;;;;;OAOG;IACG,QAAQ,CAAC,WAAW,GAAE,OAAY,GAAG,OAAO,CAAC,IAAI,CAAC;~~IAqBlD~~,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAKtD;;;;;OAKG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;CAUhC"}
1	+ {"version":3,"file":"edit-form.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/form/edit-form/edit-form.controller.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,OAAO,EACL,cAAc,EACd,cAAc,EACd,mBAAmB,EACpB,MAAM,uBAAuB,CAAC;AAK/B,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AACzC,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD;;;;;;;;GAQG;AACH,qBAAa,kBACX,SAAQ,cAAc,CAAC,WAAW,EAAE,cAAc,EAAE,cAAc,CAClE,YAAW,mBAAmB;IAE9B;;;;;OAKG;IACH,OAAO,EAAG,eAAe,CAAC;IAE1B;;;;;;;OAOG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAY1C;;;;;OAKG;IACG,SAAS,IAAI,OAAO,CAAC,KAAK,CAAC;IAiCjC;;;;;OAKG;IACG,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;IAqC5B;;;;;OAKG;IACG,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;IAyC5B;;;;;;OAMG;IACG,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC;IAuChC;;;;;;OAMG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAc7B;;;;;;;OAOG;IACG,cAAc,CAAC,gBAAgB,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA+C7D;;;;;;;OAOG;IACG,OAAO,CAAC,WAAW,GAAE,OAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IA0BvD;;;;;;;OAOG;IACG,QAAQ,CAAC,WAAW,GAAE,OAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IA0BlD,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAKtD;;;;;OAKG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;CAUhC"}

package/out/controller/control/form/edit-form/edit-form.controller.js CHANGED Viewed

@@ -53,6 +53,9 @@ export class EditFormController extends FormController {
         }
         catch (error) {
             await this.evt.emit('onLoadDraftError', undefined);
+            this.actionNotification('GETDRAFTERROR', {
+                error: error,
+            });
             throw error;
         }
         finally {
@@ -63,6 +66,7 @@ export class EditFormController extends FormController {
         mergeDefaultInLeft(this.data, params);
         this.formStateNotify(FormNotifyState.DRAFT);
         await this.evt.emit('onLoadDraftSuccess', undefined);
+        this.actionNotification('GETDRAFTSUCCESS');
         this.state.isLoaded = true;
         return this.data;
     }
@@ -87,6 +91,9 @@ export class EditFormController extends FormController {
         }
         catch (error) {
             await this.evt.emit('onLoadError', undefined);
+            this.actionNotification('GETERROR', {
+                error: error,
+            });
             throw error;
         }
         finally {
@@ -96,6 +103,7 @@ export class EditFormController extends FormController {
         this.state.data = res.data;
         this.formStateNotify(FormNotifyState.LOAD);
         await this.evt.emit('onLoadSuccess', undefined);
+        this.actionNotification('GETSUCCESS');
         this.state.isLoaded = true;
         return this.data;
     }
@@ -117,15 +125,18 @@ export class EditFormController extends FormController {
         }
         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,
+            });
             throw error;
         }
         finally {
@@ -138,7 +149,9 @@ export class EditFormController extends FormController {
         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;
     }
     /**
@@ -169,6 +182,9 @@ export class EditFormController extends FormController {
             }
             catch (error) {
                 await this.evt.emit('onRemoveError', undefined);
+                this.actionNotification('REMOVEERROR', {
+                    error: error,
+                });
                 throw error;
             }
             finally {
@@ -180,6 +196,7 @@ export class EditFormController extends FormController {
         this.state.data = new ControlVO();
         this.state.modified = false;
         await this.evt.emit('onRemoveSuccess', undefined);
+        this.actionNotification('REMOVESUCCESS');
         return ok;
     }
     /**
@@ -254,10 +271,16 @@ export class EditFormController extends FormController {
         try {
             await this.service.wfStart(this.context, Object.assign(Object.assign({}, this.params), extraParams), this.data);
         }
+        catch (error) {
+            this.actionNotification('WFSTARTERROR', {
+                error: error,
+            });
+            throw error;
+        }
         finally {
             await this.endLoading();
         }
-        ibiz.message.success('流程启动成功');
+        this.actionNotification('WFSTARTSUCCESS', { default: '流程启动成功' });
     }
     /**
      * 工作流提交(调用前先确保调用保存)
@@ -276,10 +299,16 @@ export class EditFormController extends FormController {
         try {
             await this.service.wfSubmit(this.context, Object.assign(Object.assign({}, this.params), extraParams), this.data);
         }
+        catch (error) {
+            this.actionNotification('WFSUBMITERROR', {
+                error: error,
+            });
+            throw error;
+        }
         finally {
             await this.endLoading();
         }
-        ibiz.message.success('流程提交成功');
+        this.actionNotification('WFSUBMITSUCCESS', { default: '流程提交成功' });
     }
     async dataChangeNotify(names) {
         await super.dataChangeNotify(names);

package/out/controller/control/form/form/form.controller.d.ts CHANGED Viewed

@@ -126,5 +126,9 @@ export declare abstract class FormController<T extends IDEForm = IDEForm, S exte
      * @returns {*}  {Promise<boolean>}
      */
     validate(): Promise<boolean>;
+    actionNotification(tag: string, opts?: {
+        default?: string;
+        error?: Error;
+    }): void;
 }
 //# sourceMappingURL=form.controller.d.ts.map

package/out/controller/control/form/form/form.controller.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"form.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/form/form/form.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAC1D,OAAO,EACL,UAAU,EACV,UAAU,EACV,eAAe,EACf,qBAAqB,EACrB,mBAAmB,EACpB,MAAM,uBAAuB,CAAC;AAI/B,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,eAAe,EAAiB,MAAM,gBAAgB,CAAC;AAChE,OAAO,KAAK,EACV,wBAAwB,EACxB,kBAAkB,EACnB,MAAM,gBAAgB,CAAC;AAExB;;;;;;;;;GASG;AACH,8BAAsB,cAAc,CAChC,CAAC,SAAS,OAAO,GAAG,OAAO,EAC3B,CAAC,SAAS,UAAU,GAAG,UAAU,EACjC,CAAC,SAAS,UAAU,GAAG,UAAU,CAEnC,SAAQ,iBAAiB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CACjC,YAAW,eAAe,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAEnC,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,UAAU,CAAC,CAEhD;IAED;;;;;;OAMG;IACH,OAAO,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,qBAAqB,CAAA;KAAE,CAAM;IAEvD;;;;;;OAMG;IACH,SAAS,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,mBAAmB,CAAA;KAAE,CAAM;IAEvD;;;;;;OAMG;IACH,SAAS,EAAE,kBAAkB,EAAE,CAAM;IAErC;;;;;;;OAOG;IACH,IAAI,IAAI,IAAI,KAAK,CAEhB;IAED,SAAS,CAAC,SAAS,IAAI,IAAI;IAQ3B;;;;;;OAMG;IACG,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IActD;;;;;OAKG;IACH,eAAe,CAAC,KAAK,EAAE,eAAe,GAAG,IAAI;IAM7C;;;;;;;OAOG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAc1C;;;;;OAKG;IACG,cAAc,IAAI,OAAO,CAAC,KAAK,CAAC;IAQtC;;;;;;OAMG;cACa,qBAAqB,CACnC,OAAO,GAAE,aAAa,EAA4B,EAClD,IAAI,GAAE,cAAqB,EAC3B,MAAM,GAAE,wBAAwB,GAAG,SAAqB,GACvD,OAAO,CAAC,IAAI,CAAC;IAkChB;;;;;;OAMG;IACH,QAAQ,CAAC,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;IAE/B;;;;;;OAMG;IACH,OAAO,IAAI,KAAK,EAAE;IAIlB;;;;;;;OAOG;IACG,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAwB/D;;;;;;OAMG;IACG,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC;~~CAQnC~~"}
1	+ {"version":3,"file":"form.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/form/form/form.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAC1D,OAAO,EACL,UAAU,EACV,UAAU,EACV,eAAe,EACf,qBAAqB,EACrB,mBAAmB,EACpB,MAAM,uBAAuB,CAAC;AAI/B,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,eAAe,EAAiB,MAAM,gBAAgB,CAAC;AAChE,OAAO,KAAK,EACV,wBAAwB,EACxB,kBAAkB,EACnB,MAAM,gBAAgB,CAAC;AAExB;;;;;;;;;GASG;AACH,8BAAsB,cAAc,CAChC,CAAC,SAAS,OAAO,GAAG,OAAO,EAC3B,CAAC,SAAS,UAAU,GAAG,UAAU,EACjC,CAAC,SAAS,UAAU,GAAG,UAAU,CAEnC,SAAQ,iBAAiB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CACjC,YAAW,eAAe,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAEnC,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,UAAU,CAAC,CAEhD;IAED;;;;;;OAMG;IACH,OAAO,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,qBAAqB,CAAA;KAAE,CAAM;IAEvD;;;;;;OAMG;IACH,SAAS,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,mBAAmB,CAAA;KAAE,CAAM;IAEvD;;;;;;OAMG;IACH,SAAS,EAAE,kBAAkB,EAAE,CAAM;IAErC;;;;;;;OAOG;IACH,IAAI,IAAI,IAAI,KAAK,CAEhB;IAED,SAAS,CAAC,SAAS,IAAI,IAAI;IAQ3B;;;;;;OAMG;IACG,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IActD;;;;;OAKG;IACH,eAAe,CAAC,KAAK,EAAE,eAAe,GAAG,IAAI;IAM7C;;;;;;;OAOG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAc1C;;;;;OAKG;IACG,cAAc,IAAI,OAAO,CAAC,KAAK,CAAC;IAQtC;;;;;;OAMG;cACa,qBAAqB,CACnC,OAAO,GAAE,aAAa,EAA4B,EAClD,IAAI,GAAE,cAAqB,EAC3B,MAAM,GAAE,wBAAwB,GAAG,SAAqB,GACvD,OAAO,CAAC,IAAI,CAAC;IAkChB;;;;;;OAMG;IACH,QAAQ,CAAC,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;IAE/B;;;;;;OAMG;IACH,OAAO,IAAI,KAAK,EAAE;IAIlB;;;;;;;OAOG;IACG,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAwB/D;;;;;;OAMG;IACG,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC;IASlC,kBAAkB,CAChB,GAAG,EAAE,MAAM,EACX,IAAI,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,KAAK,CAAA;KAAE,GACzC,IAAI;CAGR"}

package/out/controller/control/form/form/form.controller.js CHANGED Viewed

@@ -197,4 +197,7 @@ export class FormController extends ControlController {
         // 找不到value为false即全部是true
         return values.findIndex(value => !value) === -1;
     }
+    actionNotification(tag, opts) {
+        super.actionNotification(tag, Object.assign({ data: this.data }, (opts || {})));
+    }
 }

package/out/controller/control/form/search-form/search-form.controller.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"search-form.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/form/search-form/search-form.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EACL,qBAAqB,EACrB,gBAAgB,EAChB,gBAAgB,EACjB,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAE1D;;;;;;;;;GASG;AACH,qBAAa,oBACX,SAAQ,cAAc,CAAC,aAAa,EAAE,gBAAgB,EAAE,gBAAgB,CACxE,YAAW,qBAAqB;IAEhC;;;;;;OAMG;IACH,OAAO,EAAG,iBAAiB,CAAC;cAEZ,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAS1C;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;~~IAe5B~~;;;;;;OAMG;IACH,SAAS,IAAI,OAAO;IAIpB;;;;;OAKG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAI7B;;;;;OAKG;IACG,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;IAI1C;;;;;OAKG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAK5B;;;;;;OAMG;IACG,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAOtD;;;;;;OAMG;IACG,OAAO,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;CAOnD"}
1	+ {"version":3,"file":"search-form.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/form/search-form/search-form.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EACL,qBAAqB,EACrB,gBAAgB,EAChB,gBAAgB,EACjB,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAE1D;;;;;;;;;GASG;AACH,qBAAa,oBACX,SAAQ,cAAc,CAAC,aAAa,EAAE,gBAAgB,EAAE,gBAAgB,CACxE,YAAW,qBAAqB;IAEhC;;;;;;OAMG;IACH,OAAO,EAAG,iBAAiB,CAAC;cAEZ,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAS1C;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;IAwB5B;;;;;;OAMG;IACH,SAAS,IAAI,OAAO;IAIpB;;;;;OAKG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAI7B;;;;;OAKG;IACG,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;IAI1C;;;;;OAKG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAK5B;;;;;;OAMG;IACG,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAOtD;;;;;;OAMG;IACG,OAAO,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;CAOnD"}

package/out/controller/control/form/search-form/search-form.controller.js CHANGED Viewed

@@ -34,11 +34,21 @@ export class SearchFormController extends FormController {
         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,
+            });
+            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/out/controller/control/grid/grid/grid.controller.d.ts CHANGED Viewed

@@ -278,7 +278,7 @@ export declare class GridController extends MDControlController<IDEGrid, IGridSt
      * @param {string} key 排序字段
      * @param {string} order 排序顺序
      */
-    setSort(key?: string, order?: 'asc' | 'desc'): void;
+    setSort(fieldId?: string, order?: 'asc' | 'desc'): void;
     /**
      * 表格编辑项更新
      *

package/out/controller/control/grid/grid/grid.controller.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"grid.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/grid/grid/grid.controller.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,OAAO,EAAsB,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAE9E,OAAO,EAAE,yBAAyB,EAAE,MAAM,+DAA+D,CAAC;AAC1G,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EACL,6BAA6B,EAC7B,sBAAsB,EACvB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,UAAU,EACV,UAAU,EACV,eAAe,EACf,mBAAmB,EACnB,YAAY,EACZ,gBAAgB,EACjB,MAAM,uBAAuB,CAAC;AAG/B,OAAO,EAAE,SAAS,EAAS,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAIpD;;;;;;;;GAQG;AACH,qBAAa,cACX,SAAQ,mBAAmB,CAAC,OAAO,EAAE,UAAU,EAAE,UAAU,CAC3D,YAAW,eAAe;IAE1B;;;;;;OAMG;IACK,OAAO,EAAE,WAAW,CAAC;IAE7B;;;;;OAKG;IACH,iBAAiB,EAAE,OAAO,CAAS;IAEnC;;;;;OAKG;IACH,kBAAkB,EAAE,OAAO,CAAS;IAEpC;;;;;;OAMG;IACH,OAAO,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,oBAAoB,CAAA;KAAE,CAAM;IAEtD;;;;;;OAMG;IACH,YAAY,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,yBAAyB,CAAA;KAAE,CAAM;IAEhE;;;;;;OAMG;IACH,SAAS,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,sBAAsB,CAAA;KAAE,CAAM;IAE1D;;;;;;OAMG;IACH,WAAW,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,6BAA6B,CAAA;KAAE,CAAM;IAEnE;;;;;;OAMG;IACH,SAAS,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,mBAAmB,CAAA;KAAE,CAAM;IAEvD;;;;;OAKG;IACH,gBAAgB,CAAC,EAAE,yBAAyB,CAAC;IAE7C;;;;;OAKG;IACH,QAAQ,EAAE,MAAM,CAAQ;IAExB;;;;;OAKG;IACH,IAAI,kBAAkB,IAAI,QAAQ,CAAC,YAAY,EAAE,CAAC,GAAG,SAAS,CAE7D;IAED;;;;;;OAMG;IACH,IAAI,SAAS,IAAI,OAAO,CAEvB;IAED;;;;;;OAMG;IACH,IAAI,YAAY,IAAI,OAAO,CAE1B;IAED,SAAS,CAAC,SAAS,IAAI,IAAI;IAW3B;;;;;;;OAOG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAqB1C;;;;;;OAMG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAiDpC,SAAS,CACb,IAAI,EAAE,gBAAgB,EACtB,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC,SAAS,EAAE,CAAC;IA8BvB;;;;;;OAMG;IACH,SAAS,CAAC,aAAa,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,IAAI;IAkC7C;;;;;;OAMG;cACa,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAuB9C;;;;;;OAMG;IACH,SAAS,CAAC,aAAa,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,IAAI;IAS7C;;;;;;OAMG;IACH,WAAW,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAqB9B;;;;;OAKG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;~~IAyB7B~~;;;;;;;OAOG;IACG,IAAI,CAAC,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;~~IAmDpC~~,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAe9B;;;;;;OAMG;cACa,qBAAqB,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAgC3E;;;;;;OAMG;IACH,SAAS,CAAC,gBAAgB,IAAI,IAAI;IAkBlC;;;;;OAKG;IACH,SAAS,CAAC,eAAe,IAAI,IAAI;IAiBjC;;;;;;OAMG;cACa,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAUhD;;;;;;;;OAQG;IACG,WAAW,CACf,GAAG,EAAE,YAAY,EACjB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,OAAO,GACb,OAAO,CAAC,IAAI,CAAC;IAyBhB;;;;;;;OAOG;IACG,gBAAgB,CAAC,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAczE;;;;;OAKG;IACH,eAAe,CAAC,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,eAAe,GAAG,IAAI;IAOhE;;;;;;;OAOG;IACG,QAAQ,CAAC,GAAG,EAAE,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC;IAS7C,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAOpC;;;;;;OAMG;IACG,aAAa,CACjB,GAAG,EAAE,YAAY,EACjB,QAAQ,CAAC,EAAE,OAAO,EAClB,MAAM,GAAE,OAAc,GACrB,OAAO,CAAC,IAAI,CAAC;IAyChB;;;;;;;OAOG;IACH,OAAO,CAAC,~~GAAG~~,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,IAAI;~~IAcnD~~;;;;;;;OAOG;IACG,kBAAkB,CAAC,GAAG,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA8C5E;;;;;;;;OAQG;IACG,QAAQ,CAAC,IAAI,EAAE,gBAAgB,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;IAe5D;;;;;;OAMG;IACG,UAAU,CAAC,KAAK,EAAE;QAAE,KAAK,EAAE,UAAU,CAAC;QAAC,MAAM,EAAE,KAAK,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CA4F7E"}
1	+ {"version":3,"file":"grid.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/grid/grid/grid.controller.ts"],"names":[],"mappings":"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"}

package/out/controller/control/grid/grid/grid.controller.js CHANGED Viewed

@@ -323,13 +323,23 @@ export class GridController extends MDControlController {
         if (editingRow) {
             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,
+            });
+            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 });
     }
     /**
      * 保存
@@ -371,6 +381,14 @@ export class GridController extends MDControlController {
                 ? 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,
+                data: rowState.data,
+            });
+            throw error;
+        }
         finally {
             await this.endLoading();
         }
@@ -380,6 +398,10 @@ export class GridController extends MDControlController {
         rowState.data = res.data;
         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);
     }
@@ -620,15 +642,17 @@ export class GridController extends MDControlController {
      * @param {string} key 排序字段
      * @param {string} order 排序顺序
      */
-    setSort(key, order) {
-        if (key && order) {
-            super.setSort(key, order);
+    setSort(fieldId, order) {
+        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/out/controller/control/list/list.controller.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"list.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/list/list.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EACL,UAAU,EACV,UAAU,EACV,eAAe,EACf,kBAAkB,EAClB,gBAAgB,EAGjB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C,qBAAa,cACX,SAAQ,mBAAmB,CAAC,OAAO,EAAE,UAAU,EAAE,UAAU,CAC3D,YAAW,eAAe;IAElB,OAAO,EAAE,WAAW,CAAC;IAE7B,SAAS,CAAC,SAAS,IAAI,IAAI;cAKX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAO1C;;;;;;;OAOG;IACH,OAAO,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,IAAI;~~IAcnD~~;;;;;;;;OAQG;IACH,SAAS,KAAK,sBAAsB,IAAI,kBAAkB,GAAG,SAAS,CAKrE;IAED;;;;;;;;OAQG;IACH,SAAS,KAAK,sBAAsB,IAAI,kBAAkB,GAAG,SAAS,CAKrE;IAED;;;;;;;OAOG;IACH,YAAY,CAAC,SAAS,EAAE,KAAK,EAAE,GAAG,IAAI;IAatC;;;;;OAKG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAMzB,SAAS,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAKzE;;;;;;;OAOG;IACH,OAAO,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,IAAI;IAI7B;;;;;;;OAOG;IACH,UAAU,IAAI,KAAK,EAAE;IAIrB;;;;OAIG;cACa,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAWhD;;;;OAIG;IACH,SAAS,CAAC,eAAe,IAAI,IAAI;IAqBjC;;;;OAIG;cACa,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;CAkCrD"}
1	+ {"version":3,"file":"list.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/list/list.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EACL,UAAU,EACV,UAAU,EACV,eAAe,EACf,kBAAkB,EAClB,gBAAgB,EAGjB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C,qBAAa,cACX,SAAQ,mBAAmB,CAAC,OAAO,EAAE,UAAU,EAAE,UAAU,CAC3D,YAAW,eAAe;IAElB,OAAO,EAAE,WAAW,CAAC;IAE7B,SAAS,CAAC,SAAS,IAAI,IAAI;cAKX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAO1C;;;;;;;OAOG;IACH,OAAO,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,IAAI;IAenD;;;;;;;;OAQG;IACH,SAAS,KAAK,sBAAsB,IAAI,kBAAkB,GAAG,SAAS,CAKrE;IAED;;;;;;;;OAQG;IACH,SAAS,KAAK,sBAAsB,IAAI,kBAAkB,GAAG,SAAS,CAKrE;IAED;;;;;;;OAOG;IACH,YAAY,CAAC,SAAS,EAAE,KAAK,EAAE,GAAG,IAAI;IAatC;;;;;OAKG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAMzB,SAAS,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAKzE;;;;;;;OAOG;IACH,OAAO,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,IAAI;IAI7B;;;;;;;OAOG;IACH,UAAU,IAAI,KAAK,EAAE;IAIrB;;;;OAIG;cACa,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAWhD;;;;OAIG;IACH,SAAS,CAAC,eAAe,IAAI,IAAI;IAqBjC;;;;OAIG;cACa,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;CAkCrD"}

package/out/controller/control/list/list.controller.js CHANGED Viewed

@@ -27,7 +27,8 @@ export class ListController extends MDControlController {
             // 设置默认排序或者置空
             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/out/engine/md-view.engine.js CHANGED Viewed

@@ -1,5 +1,5 @@
 import { RuntimeModelError } from '@ibiz-template/core';
-import { SysUIActionTag } from '../constant';
+import { SysUIActionTag, ViewCallTag } from '../constant';
 import { calcDeCodeNameById } from '../model';
 import { ViewEngineBase } from './view-base.engine';
 /**
@@ -145,7 +145,7 @@ export class MDViewEngine extends ViewEngineBase {
             this.copy(args);
             return null;
         }
-        if (key === 'load') {
+        if (key === ViewCallTag.LOAD) {
             this.load(args);
             return null;
         }

package/out/global/global-util/global-util.d.ts CHANGED Viewed

@@ -36,5 +36,19 @@ export declare class GlobalUtil {
      * @date 2023-08-24 10:47:06
      */
     getExportExcel?: () => Promise<IExportExcelUtil>;
+    /**
+     * 显示应用级别的加载提示
+     *
+     * @author chitanda
+     * @date 2023-09-08 10:09:43
+     */
+    showAppLoading(): void;
+    /**
+     * 隐藏应用级别的加载提示
+     *
+     * @author chitanda
+     * @date 2023-09-08 10:09:15
+     */
+    hiddenAppLoading(): void;
 }
 //# sourceMappingURL=global-util.d.ts.map

package/out/global/global-util/global-util.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"global-util.d.ts","sourceRoot":"","sources":["../../../src/global/global-util/global-util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,QAAQ,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAExE;;;;;;;GAOG;AACH,qBAAa,UAAU;IACrB;;;;;OAKG;IACH,QAAQ,CAAC,WAAW,kBAAyB;IAE7C;;;;;OAKG;IACH,QAAQ,CAAC,IAAI,WAAkB;IAE/B;;;;;OAKG;IACH,QAAQ,CAAC,GAAG,iBAAwB;IAEpC;;;;OAIG;IACH,cAAc,CAAC,EAAE,MAAM,OAAO,CAAC,gBAAgB,CAAC,CAAC;~~CAClD~~"}
1	+ {"version":3,"file":"global-util.d.ts","sourceRoot":"","sources":["../../../src/global/global-util/global-util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,QAAQ,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAExE;;;;;;;GAOG;AACH,qBAAa,UAAU;IACrB;;;;;OAKG;IACH,QAAQ,CAAC,WAAW,kBAAyB;IAE7C;;;;;OAKG;IACH,QAAQ,CAAC,IAAI,WAAkB;IAE/B;;;;;OAKG;IACH,QAAQ,CAAC,GAAG,iBAAwB;IAEpC;;;;OAIG;IACH,cAAc,CAAC,EAAE,MAAM,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAEjD;;;;;OAKG;IACH,cAAc,IAAI,IAAI;IAOtB;;;;;OAKG;IACH,gBAAgB,IAAI,IAAI;CAQzB"}