@ibiz-template/runtime 0.1.28 → 0.1.29-dev.0

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/service/service/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,cAAc,WAAW,CAAC;AAC1B,cAAc,aAAa,CAAC;AAC5B,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/service/service/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,cAAc,WAAW,CAAC;AAC1B,cAAc,aAAa,CAAC;AAC5B,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC"}

package/out/service/service/index.js

@@ -1,4 +1,5 @@
 export { CodeListService } from './code-list/code-list.service';
+export { ConfigService } from './config/config.service';
 export { CounterService } from './counter/counter.service';
 export { DEService } from './entity/de.service';
 export { WorkFlowService } from './work-flow/work-flow.service';

package/out/service/vo/control.vo.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"control.vo.d.ts","sourceRoot":"","sources":["../../../src/service/vo/control.vo.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C;;;;;;;GAOG;AACH,qBAAa,SAAS;IAEpB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,GAAG,CAAC;IAE5B;;;;;;;OAOG;IACK,OAAO,EAAE,KAAK,CAAC;IAEvB;;;;;;;OAOG;IACK,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAE5C;;;;;;OAMG;IACH,IAAI,KAAK,IAAI,KAAK,CAKjB;IAED;;;;;;OAMG;IACH,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED;;;;;;OAMG;IACH,IAAI,YAAY,IAAI,MAAM,CAEzB;IAED;;;;;;OAMG;IACH,IAAI,OAAO,IAAI,MAAM,CAEpB;IAED;;;;;;OAMG;IACH,IAAI,aAAa,IAAI,MAAM,CAE1B;IAED;;;;;;OAMG;IACH,IAAI,UAAU,IAAI,MAAM,CAEvB;IAED;;;;;;OAMG;IACH,IAAI,YAAY,IAAI,MAAM,CAEzB;IAED;;;;;;OAMG;gBAED,OAAO,GAAE,KAAU,EACnB,UAAU,GAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAa;IA8BjD;;;;;;;;;;;OAWG;IACH,OAAO,CAAC,YAAY;IA6CpB;;;;;;OAMG;IACH,SAAS,IAAI,KAAK;IAIlB;;;;;;OAMG;IACH,SAAS,CAAC,IAAI,EAAE,KAAK,GAAG,SAAS,GAAG,IAAI;IAIxC;;;;;;OAMG;IACH,KAAK,IAAI,SAAS;CAQnB"}
+{"version":3,"file":"control.vo.d.ts","sourceRoot":"","sources":["../../../src/service/vo/control.vo.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C;;;;;;;GAOG;AACH,qBAAa,SAAS;IAEpB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,GAAG,CAAC;IAE5B;;;;;;;OAOG;IACK,OAAO,EAAE,KAAK,CAAC;IAEvB;;;;;;;OAOG;IACK,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAE5C;;;;;;OAMG;IACH,IAAI,KAAK,IAAI,KAAK,CAKjB;IAED;;;;;;OAMG;IACH,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED;;;;;;OAMG;IACH,IAAI,YAAY,IAAI,MAAM,CAEzB;IAED;;;;;;OAMG;IACH,IAAI,OAAO,IAAI,MAAM,CAEpB;IAED;;;;;;OAMG;IACH,IAAI,aAAa,IAAI,MAAM,CAE1B;IAED;;;;;;OAMG;IACH,IAAI,UAAU,IAAI,MAAM,CAEvB;IAED;;;;;;OAMG;IACH,IAAI,YAAY,IAAI,MAAM,CAEzB;IAED;;;;;;OAMG;gBAED,OAAO,GAAE,KAAU,EACnB,UAAU,GAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAa;IA8BjD;;;;;;;;;;;OAWG;IACH,OAAO,CAAC,YAAY;IAwCpB;;;;;;OAMG;IACH,SAAS,IAAI,KAAK;IAIlB;;;;;;OAMG;IACH,SAAS,CAAC,IAAI,EAAE,KAAK,GAAG,SAAS,GAAG,IAAI;IAIxC;;;;;;OAMG;IACH,KAAK,IAAI,SAAS;CAQnB"}

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

@@ -146,13 +146,9 @@ export class ControlVO {
                 },
                 set(val) {
                     // 有mapField的走它的转换
-                    this.$origin[dataKey] = mapField ? mapField.convertVal(val) : val;
+                    this.$origin[dataKey] = val;
                 },
             });
-            // 一开始初始化的时候先把值转换一下。
-            if (mapField) {
-                this[uiKey] = mapField.convertVal(this.$origin[dataKey]);
-            }
         }
         else {
             Object.defineProperty(this, uiKey, {

package/out/ui-action/provider/backend-ui-action-provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"backend-ui-action-provider.d.ts","sourceRoot":"","sources":["../../../src/ui-action/provider/backend-ui-action-provider.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAGlD,OAAO,EAAE,cAAc,EAAE,eAAe,EAAc,MAAM,iBAAiB,CAAC;AAC9E,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE;;;;;;;;GAQG;AACH,qBAAa,uBAAwB,SAAQ,oBAAoB;IACzD,UAAU,CACd,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;CAsE5B"}
+{"version":3,"file":"backend-ui-action-provider.d.ts","sourceRoot":"","sources":["../../../src/ui-action/provider/backend-ui-action-provider.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAGlD,OAAO,EAAE,cAAc,EAAE,eAAe,EAAc,MAAM,iBAAiB,CAAC;AAC9E,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE;;;;;;;;GAQG;AACH,qBAAa,uBAAwB,SAAQ,oBAAoB;IACzD,UAAU,CACd,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;CAyE5B"}

package/out/ui-action/provider/backend-ui-action-provider.js

@@ -48,8 +48,11 @@ export class BackendUIActionProvider extends UIActionProviderBase {
         const isMultiData = ['MULTIKEY', 'MULTIDATA'].includes(action.actionTarget);
         const res = await app.deService.exec(entityName, methodName, resultContext, isMultiData ? _data : _data[0], tempParams);
         // 适配界面行为成功提示信息
-        if (res.ok && action.successMsg) {
-            ibiz.message.success(action.successMsg);
+        if (res.ok) {
+            const successMsg = this.calcMessage('success', action, args);
+            if (successMsg) {
+                ibiz.message.success(successMsg);
+            }
         }
         Object.assign(actionResult, {
             data: isArray(res.data) ? res.data : [res.data],

package/out/ui-action/provider/ui-action-provider-base.d.ts

@@ -36,7 +36,7 @@ export declare abstract class UIActionProviderBase implements IUIActionProvider
      * @param {IAppDEUIAction} action 界面行为模型
      * @returns {*}  {Promise<boolean>}
      */
-    isConfirm(action: IAppDEUIAction): Promise<boolean>;
+    isConfirm(action: IAppDEUIAction, args: IUILogicParams): Promise<boolean>;
     /**
      * 执行具体界面行为的独有逻辑(子类重写)
      *
@@ -86,5 +86,16 @@ export declare abstract class UIActionProviderBase implements IUIActionProvider
         resultData: IData[];
         resultParams: IParams;
     }>;
+    /**
+     * 计算消息信息（动态，多语言资源）
+     * @author lxm
+     * @date 2023-09-25 03:03:01
+     * @protected
+     * @param {('confirm' | 'success')} type
+     * @param {IAppDEUIAction} action
+     * @param {IUILogicParams} args
+     * @return {*}
+     */
+    protected calcMessage(type: 'confirm' | 'success', action: IAppDEUIAction, args: IUILogicParams): string | undefined;
 }
 //# sourceMappingURL=ui-action-provider-base.d.ts.map

package/out/ui-action/provider/ui-action-provider-base.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ui-action-provider-base.d.ts","sourceRoot":"","sources":["../../../src/ui-action/provider/ui-action-provider-base.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAkB,MAAM,kBAAkB,CAAC;AAClE,OAAO,EACL,iBAAiB,EACjB,eAAe,EACf,cAAc,EACf,MAAM,iBAAiB,CAAC;AAMzB;;;;;;;GAOG;AACH,8BAAsB,oBAAqB,YAAW,iBAAiB;IACrE;;;;;;;OAOG;IACG,IAAI,CACR,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;IAwD3B;;;;;;;;OAQG;IACH,SAAS,CAAC,WAAW,CAAC,MAAM,EAAE,eAAe,GAAG,eAAe;IAO/D;;;;;;;OAOG;IACG,SAAS,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC;IAOzD;;;;;;;;;;;;OAYG;IACH,QAAQ,CAAC,UAAU,CACjB,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,cAAc,GACrB,OAAO,CAAC,eAAe,CAAC;IAE3B;;;;;;;;;;;OAWG;IACG,YAAY,CAChB,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,cAAc,GACrB,OAAO,CAAC,eAAe,GAAG,SAAS,CAAC;IAOvC;;;;;;;;;;;;;;;;OAgBG;cACa,YAAY,CAC1B,MAAM,EAAE,cAAc,EACtB,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,KAAK,EAAE,EACb,MAAM,EAAE,OAAO,GACd,OAAO,CAAC;QACT,aAAa,EAAE,QAAQ,CAAC;QACxB,UAAU,EAAE,KAAK,EAAE,CAAC;QACpB,YAAY,EAAE,OAAO,CAAC;KACvB,CAAC;CAkFH"}
+{"version":3,"file":"ui-action-provider-base.d.ts","sourceRoot":"","sources":["../../../src/ui-action/provider/ui-action-provider-base.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAgC,MAAM,kBAAkB,CAAC;AAChF,OAAO,EACL,iBAAiB,EACjB,eAAe,EACf,cAAc,EACf,MAAM,iBAAiB,CAAC;AAMzB;;;;;;;GAOG;AACH,8BAAsB,oBAAqB,YAAW,iBAAiB;IACrE;;;;;;;OAOG;IACG,IAAI,CACR,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;IAwD3B;;;;;;;;OAQG;IACH,SAAS,CAAC,WAAW,CAAC,MAAM,EAAE,eAAe,GAAG,eAAe;IAO/D;;;;;;;OAOG;IACG,SAAS,CACb,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,OAAO,CAAC;IAQnB;;;;;;;;;;;;OAYG;IACH,QAAQ,CAAC,UAAU,CACjB,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,cAAc,GACrB,OAAO,CAAC,eAAe,CAAC;IAE3B;;;;;;;;;;;OAWG;IACG,YAAY,CAChB,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,cAAc,GACrB,OAAO,CAAC,eAAe,GAAG,SAAS,CAAC;IAOvC;;;;;;;;;;;;;;;;OAgBG;cACa,YAAY,CAC1B,MAAM,EAAE,cAAc,EACtB,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,KAAK,EAAE,EACb,MAAM,EAAE,OAAO,GACd,OAAO,CAAC;QACT,aAAa,EAAE,QAAQ,CAAC;QACxB,UAAU,EAAE,KAAK,EAAE,CAAC;QACpB,YAAY,EAAE,OAAO,CAAC;KACvB,CAAC;IAmFF;;;;;;;;;OASG;IACH,SAAS,CAAC,WAAW,CACnB,IAAI,EAAE,SAAS,GAAG,SAAS,EAC3B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,MAAM,GAAG,SAAS;CA2CtB"}

package/out/ui-action/provider/ui-action-provider-base.js

@@ -1,7 +1,7 @@
 import { RuntimeModelError } from '@ibiz-template/core';
 import { calcDeCodeNameById } from '../../model';
 import { execUILogic } from '../../ui-logic';
-import { convertNavData, formatMultiData } from '../../utils';
+import { convertNavData, formatMultiData, ScriptFactory } from '../../utils';
 import { UIActionUtil } from '../uiaction-util';
 /**
  * 界面行为处理器基类
@@ -37,7 +37,7 @@ export class UIActionProviderBase {
             return result;
         }
         // **用户操作确认**
-        if (!(await this.isConfirm(action))) {
+        if (!(await this.isConfirm(action, args))) {
             return this.returnError(result);
         }
         // ** 执行不同类型的界面行为独有逻辑，并且合并result
@@ -87,9 +87,10 @@ export class UIActionProviderBase {
      * @param {IAppDEUIAction} action 界面行为模型
      * @returns {*}  {Promise<boolean>}
      */
-    async isConfirm(action) {
-        if (action.enableConfirm && action.confirmMsg) {
-            return ibiz.modal.confirm({ title: action.confirmMsg });
+    async isConfirm(action, args) {
+        const confirmMsg = this.calcMessage('confirm', action, args);
+        if (action.enableConfirm && confirmMsg) {
+            return ibiz.modal.confirm({ title: confirmMsg });
         }
         return true;
     }
@@ -192,4 +193,53 @@ export class UIActionProviderBase {
         const resultParams = convertNavData(navParams, isMultiData ? formatMultiData(navParams, data) : data[0] || {}, params, resultContext);
         return { resultContext, resultData, resultParams };
     }
+    /**
+     * 计算消息信息（动态，多语言资源）
+     * @author lxm
+     * @date 2023-09-25 03:03:01
+     * @protected
+     * @param {('confirm' | 'success')} type
+     * @param {IAppDEUIAction} action
+     * @param {IUILogicParams} args
+     * @return {*}
+     */
+    calcMessage(type, action, args) {
+        let msg;
+        let msgRes;
+        const { confirmMsg, cmlanguageRes, successMsg, smlanguageRes } = action;
+        switch (type) {
+            case 'confirm':
+                msg = confirmMsg;
+                msgRes = cmlanguageRes;
+                break;
+            case 'success':
+                msg = successMsg;
+                msgRes = smlanguageRes;
+                break;
+            default:
+        }
+        // 多语言资源转换
+        if (msgRes) {
+            const msgResContent = ibiz.i18n.t(msgRes.lanResTag, msgRes.defaultContent || msg);
+            if (msgResContent !== msgRes.lanResTag) {
+                msg = msgResContent;
+            }
+        }
+        if (msg) {
+            const { data } = args;
+            const scriptParams = Object.assign({}, args);
+            if (data.length === 1) {
+                // 单数据
+                [scriptParams.data] = data;
+            }
+            else if (data.length === 0) {
+                // 无数据
+                delete scriptParams.data;
+            }
+            return ScriptFactory.execScriptFn(scriptParams, `\`${msg}\``, {
+                isAsync: false,
+                singleRowReturn: true,
+            });
+        }
+    }
 }

package/out/ui-logic/ui-logic-context.d.ts

@@ -110,5 +110,13 @@ export declare class UILogicContext {
      * @param {string} tag
      */
     initLastReturnParam(tag: string): void;
+    /**
+     * 是否是实体参数变量（即后台数据对象）
+     * @author lxm
+     * @date 2023-09-22 03:40:30
+     * @param {string} paramId
+     * @return {*}  {boolean}
+     */
+    isEntityParam(paramId: string): boolean;
 }
 //# sourceMappingURL=ui-logic-context.d.ts.map

package/out/ui-logic/ui-logic-context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ui-logic-context.d.ts","sourceRoot":"","sources":["../../src/ui-logic/ui-logic-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D;;;;;;;GAOG;AACH,qBAAa,cAAc;IAgDvB,OAAO,CAAC,aAAa;IACd,UAAU,EAAE,cAAc;IAhDnC;;;;;OAKG;IACH,UAAU,EAAE,OAAO,CAAC;IAEpB;;OAEG;IACH,IAAI,OAAO,IAAI,QAAQ,CAEtB;IAED;;OAEG;IACH,IAAI,IAAI,IAAI,KAAK,CAEhB;IAED;;OAEG;IACH,IAAI,UAAU,IAAI,OAAO,CAExB;IAED;;;;;;;;;OASG;IACH;;;;;;OAMG;gBAEO,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,EACzC,UAAU,EAAE,cAAc;IAGnC;;;;;;;OAOG;IAEH,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAM;IAEjC;;;;;;OAMG;IACH,MAAM,EAAE,OAAO,CAAQ;IAEvB;;;;;;OAMG;IACH,SAAS,EAAE,OAAO,CAAS;IAE3B;;;;;;;OAOG;IACH,gBAAgB,EAAE,MAAM,CAAa;IAErC;;;;;OAKG;IACH,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAI9B;;;;;OAKG;IACH,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAI9B;;;;;OAKG;IACH,aAAa,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI;IAInC;;;;;OAKG;IACH,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;CAOvC"}
+{"version":3,"file":"ui-logic-context.d.ts","sourceRoot":"","sources":["../../src/ui-logic/ui-logic-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D;;;;;;;GAOG;AACH,qBAAa,cAAc;IAgDvB,OAAO,CAAC,aAAa;IACd,UAAU,EAAE,cAAc;IAhDnC;;;;;OAKG;IACH,UAAU,EAAE,OAAO,CAAC;IAEpB;;OAEG;IACH,IAAI,OAAO,IAAI,QAAQ,CAEtB;IAED;;OAEG;IACH,IAAI,IAAI,IAAI,KAAK,CAEhB;IAED;;OAEG;IACH,IAAI,UAAU,IAAI,OAAO,CAExB;IAED;;;;;;;;;OASG;IACH;;;;;;OAMG;gBAEO,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,EACzC,UAAU,EAAE,cAAc;IAGnC;;;;;;;OAOG;IAEH,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAM;IAEjC;;;;;;OAMG;IACH,MAAM,EAAE,OAAO,CAAQ;IAEvB;;;;;;OAMG;IACH,SAAS,EAAE,OAAO,CAAS;IAE3B;;;;;;;OAOG;IACH,gBAAgB,EAAE,MAAM,CAAa;IAErC;;;;;OAKG;IACH,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAI9B;;;;;OAKG;IACH,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAI9B;;;;;OAKG;IACH,aAAa,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI;IAInC;;;;;OAKG;IACH,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAQtC;;;;;;OAMG;IACH,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;CAIxC"}

package/out/ui-logic/ui-logic-context.js

@@ -123,4 +123,15 @@ export class UILogicContext {
             get: () => this.lastReturn,
         });
     }
+    /**
+     * 是否是实体参数变量（即后台数据对象）
+     * @author lxm
+     * @date 2023-09-22 03:40:30
+     * @param {string} paramId
+     * @return {*}  {boolean}
+     */
+    isEntityParam(paramId) {
+        const deLogicParams = this.deLogicParams.get(paramId);
+        return !!(deLogicParams && deLogicParams.model.entityParam);
+    }
 }

package/out/ui-logic/ui-logic-link/ui-logic-link.js

@@ -43,7 +43,7 @@ export class UILogicLink {
          */
         this.groupCond = null;
         const { linkMode, deuilogicLinkGroupCond } = this.model;
-        if (linkMode === 0) {
+        if ((linkMode || 0) === 0) {
             if (deuilogicLinkGroupCond) {
                 this.groupCond = new UILogicLinkGroupCond(deuilogicLinkGroupCond);
             }

package/out/ui-logic/ui-logic-node/prepare-js-param-node/prepare-js-param-node.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prepare-js-param-node.d.ts","sourceRoot":"","sources":["../../../../src/ui-logic/ui-logic-node/prepare-js-param-node/prepare-js-param-node.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAEvD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAExD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C;;;;;;;;GAQG;AACH,qBAAa,kBAAmB,SAAQ,WAAW;IAC3C,IAAI,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IA4C9C;;;;;;;OAOG;IACH,SAAS,CAAC,aAAa,CACrB,SAAS,EAAE,mBAAmB,EAC9B,GAAG,EAAE,cAAc,GAClB,IAAI;IAaP;;;;;;;;OAQG;IACH,SAAS,CAAC,SAAS,CACjB,SAAS,EAAE,mBAAmB,EAC9B,GAAG,EAAE,cAAc,GAClB,IAAI;IAMP;;;;;;;OAOG;IACH,SAAS,CAAC,SAAS,CACjB,SAAS,EAAE,mBAAmB,EAC9B,GAAG,EAAE,cAAc,GAClB,IAAI;IAKP;;;;;;;OAOG;IACH,SAAS,CAAC,UAAU,CAClB,SAAS,EAAE,mBAAmB,EAC9B,GAAG,EAAE,cAAc,GAClB,IAAI;IAKP;;;;;;;OAOG;IACH,SAAS,CAAC,UAAU,CAClB,SAAS,EAAE,mBAAmB,EAC9B,GAAG,EAAE,cAAc,GAClB,IAAI;IAKP;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,CACnB,SAAS,EAAE,mBAAmB,EAC9B,GAAG,EAAE,cAAc,GAClB,IAAI;IAaP;;;;;;;OAOG;IACH,SAAS,CAAC,SAAS,CACjB,SAAS,EAAE,mBAAmB,EAC9B,GAAG,EAAE,cAAc,GAClB,IAAI;CAQR"}
+{"version":3,"file":"prepare-js-param-node.d.ts","sourceRoot":"","sources":["../../../../src/ui-logic/ui-logic-node/prepare-js-param-node/prepare-js-param-node.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAEvD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAExD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C;;;;;;;;GAQG;AACH,qBAAa,kBAAmB,SAAQ,WAAW;IAC3C,IAAI,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IA4C9C;;;;;;;OAOG;IACH,SAAS,CAAC,aAAa,CACrB,SAAS,EAAE,mBAAmB,EAC9B,GAAG,EAAE,cAAc,GAClB,IAAI;IAmBP;;;;;;;;OAQG;IACH,SAAS,CAAC,SAAS,CACjB,SAAS,EAAE,mBAAmB,EAC9B,GAAG,EAAE,cAAc,GAClB,IAAI;IAMP;;;;;;;OAOG;IACH,SAAS,CAAC,SAAS,CACjB,SAAS,EAAE,mBAAmB,EAC9B,GAAG,EAAE,cAAc,GAClB,IAAI;IAKP;;;;;;;OAOG;IACH,SAAS,CAAC,UAAU,CAClB,SAAS,EAAE,mBAAmB,EAC9B,GAAG,EAAE,cAAc,GAClB,IAAI;IAKP;;;;;;;OAOG;IACH,SAAS,CAAC,UAAU,CAClB,SAAS,EAAE,mBAAmB,EAC9B,GAAG,EAAE,cAAc,GAClB,IAAI;IAKP;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,CACnB,SAAS,EAAE,mBAAmB,EAC9B,GAAG,EAAE,cAAc,GAClB,IAAI;IAaP;;;;;;;OAOG;IACH,SAAS,CAAC,SAAS,CACjB,SAAS,EAAE,mBAAmB,EAC9B,GAAG,EAAE,cAAc,GAClB,IAAI;CAQR"}

package/out/ui-logic/ui-logic-node/prepare-js-param-node/prepare-js-param-node.js

@@ -64,7 +64,11 @@ export class PrepareJSParamNode extends UILogicNode {
     setParamValue(nodeParam, ctx) {
         const { dstFieldName, dstDEUILogicParamId } = nodeParam;
         // 目标参数
-        const dstField = dstFieldName;
+        let dstField = dstFieldName;
+        // 实体参数对象转小写
+        if (ctx.isEntityParam(dstDEUILogicParamId)) {
+            dstField = dstField === null || dstField === void 0 ? void 0 : dstField.toLowerCase();
+        }
         // 源参数
         const srcVal = handleSrcVal(ctx, nodeParam);
         if (dstField) {

package/out/ui-logic/utils/handle-src-val.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"handle-src-val.d.ts","sourceRoot":"","sources":["../../../src/ui-logic/utils/handle-src-val.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD,KAAK,YAAY,GAAG;IAClB;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B,CAAC;AAEF;;;;;;;;GAQG;AACH,wBAAgB,YAAY,CAC1B,GAAG,EAAE,cAAc,EACnB,YAAY,EAAE,YAAY,GACzB,OAAO,CA8CT"}
+{"version":3,"file":"handle-src-val.d.ts","sourceRoot":"","sources":["../../../src/ui-logic/utils/handle-src-val.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD,KAAK,YAAY,GAAG;IAClB;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B,CAAC;AAEF;;;;;;;;GAQG;AACH,wBAAgB,YAAY,CAC1B,GAAG,EAAE,cAAc,EACnB,YAAY,EAAE,YAAY,GACzB,OAAO,CA6DT"}

package/out/ui-logic/utils/handle-src-val.js

@@ -1,5 +1,6 @@
 import { ModelError } from '@ibiz-template/core';
 import { clone } from 'ramda';
+import { ScriptFactory } from '../../utils';
 /**
  * 解析模型并获取源参数或其中的某个属性
  * @author lxm
@@ -13,11 +14,17 @@ export function handleSrcVal(ctx, srcValParams) {
     const { srcDEUILogicParamId, srcFieldName, srcValue } = srcValParams;
     // 没有源值类型就是逻辑参数
     const srcValueType = srcValParams.srcValueType || 'SRCDLPARAM';
+    // 取属性值
+    let srcField = srcFieldName;
     let value;
     switch (srcValueType) {
         // 源逻辑参数
         case 'SRCDLPARAM':
             value = ctx.params[srcDEUILogicParamId];
+            // 如果是实体参数对象则转换成小写。
+            if (ctx.isEntityParam(srcDEUILogicParamId)) {
+                srcField = srcField === null || srcField === void 0 ? void 0 : srcField.toLowerCase();
+            }
             break;
         // 空值类型
         case 'NULLVALUE':
@@ -45,11 +52,17 @@ export function handleSrcVal(ctx, srcValParams) {
         default:
             throw new ModelError(srcValParams, `暂未支持源值类型${srcValueType}`);
     }
-    // 取属性值
-    const srcField = srcFieldName;
     if (value && srcField) {
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        value = value[srcField];
+        try {
+            value = ScriptFactory.execScriptFn({ srcValue: value }, `srcValue.${srcField}`, {
+                singleRowReturn: true,
+                isAsync: false,
+            });
+        }
+        catch (error) {
+            ibiz.log.error(`从源参数取属性${srcField}报错，源参数：`, value);
+            throw error;
+        }
     }
     return value;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.1.28",
+  "version": "0.1.29-dev.0",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -57,5 +57,5 @@
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
-  "gitHead": "143f856b53d9767d9ce655551148ab6d6abd2482"
+  "gitHead": "d3a7353b58db8101b0f237ae3f7b759b270c650c"
 }

package/src/app-hub.ts

@@ -4,6 +4,7 @@ import { Application } from './application';
 import { IAppHubService, ModelLoaderProvider } from './interface';
 import { AppConfigService, Convert } from './hub';
 import { HubController } from './controller';
+import { ConfigService } from './service';
 
 /**
  * 运行时总集
@@ -31,6 +32,15 @@ export class AppHub implements IAppHubService {
    */
   readonly controller = new HubController();
 
+  /**
+   * 基座级配置存储服务
+   *
+   * @author chitanda
+   * @date 2023-09-22 10:09:25
+   * @type {ConfigService}
+   */
+  configCache!: ConfigService;
+
   /**
    * 应用总集
    *
@@ -303,6 +313,13 @@ export class AppHub implements IAppHubService {
     const app = new Application(appModel);
     this.appMap.set(id, app);
     await app.init();
+    if (!this.configCache) {
+      this.configCache = new ConfigService(
+        ibiz.env.appId,
+        'PSSysHub',
+        'Global',
+      );
+    }
     return app;
   }
 

package/src/application.ts

@@ -6,7 +6,12 @@ import {
   IDEOPPriv,
   IDEUILogic,
 } from '@ibiz/model-core';
-import { AuthorityService, CodeListService, DEServiceUtil } from './service';
+import {
+  AuthorityService,
+  CodeListService,
+  ConfigService,
+  DEServiceUtil,
+} from './service';
 import { IAppService } from './interface';
 
 /**
@@ -49,6 +54,15 @@ export class Application implements IAppService {
    */
   readonly net: Net;
 
+  /**
+   * 应用级配置存储服务
+   *
+   * @author chitanda
+   * @date 2023-09-22 10:09:58
+   * @type {ConfigService}
+   */
+  readonly configCache: ConfigService;
+
   /**
    * 应用实体服务工具对象
    *
@@ -86,6 +100,11 @@ export class Application implements IAppService {
     this.net = new Net({
       baseURL: `${ibiz.env.baseUrl}/${model.appId}`,
     });
+    this.configCache = new ConfigService(
+      model.appId!,
+      'PSSysApp',
+      model.codeName!,
+    );
     this.deService = new DEServiceUtil(model);
     this.codeList = new CodeListService(model);
     this.authority = new AuthorityService(model);

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

@@ -181,6 +181,9 @@ export class MDControlController<
    * @date 2022-08-19 14:08:50
    */
   async load(args: MDCtrlLoadParams = {}): Promise<IData[]> {
+    if (this.state.isSimple) {
+      return [];
+    }
     await this.startLoading();
     try {
       // *初始加载需要重置分页

package/src/controller/common/view/view.controller.ts

@@ -14,6 +14,8 @@ import {
   IUIActionResult,
   IUILogicParams,
   IViewEngine,
+  IViewMessage,
+  ModalParams,
 } from '../../../interface';
 import { SysUIActionTag } from '../../../constant';
 import { convertNavData, Modal } from '../../../utils';
@@ -29,6 +31,7 @@ import {
   getViewLogics,
 } from '../../../model';
 import { ViewLogicScheduler } from '../../../logic-scheduler';
+import { ViewMsgController } from '../../utils/view-msg';
 
 /**
  * 视图控制器
@@ -107,6 +110,14 @@ export class ViewController<
 
   layoutPanel?: IViewLayoutPanelController;
 
+  /**
+   * 视图消息控制器
+   * @author lxm
+   * @date 2023-09-20 08:20:23
+   * @type {ViewMsgController}
+   */
+  viewMsgController?: ViewMsgController;
+
   /**
    * Creates an instance of ViewController.
    * @author lxm
@@ -210,6 +221,7 @@ export class ViewController<
     this.state.isLoading = false;
     this.state.caption = this.model.caption!;
     this.state.srfactiveviewdata = null;
+    this.state.viewMessages = {};
   }
 
   protected async onCreated(): Promise<void> {
@@ -267,6 +279,9 @@ export class ViewController<
       }
     }
 
+    // 初始化视图消息
+    this.initViewMsg();
+
     // 执行视图引擎的doCreated
     if (this.engines.length) {
       await Promise.all(this.engines.map(engine => engine.onCreated()));
@@ -404,4 +419,56 @@ export class ViewController<
       });
     }
   }
+
+  /**
+   * 初始化视图消息
+   * @author lxm
+   * @date 2023-09-20 09:19:20
+   */
+  async initViewMsg(): Promise<void> {
+    const { appViewMsgGroupId } = this.model;
+    if (appViewMsgGroupId) {
+      this.state.viewMessages = { TOP: [], BOTTOM: [], BODY: [], POPUP: [] };
+      this.viewMsgController = new ViewMsgController(appViewMsgGroupId);
+      await this.viewMsgController.init(this.context);
+      const messages = await this.viewMsgController.calcViewMessages(
+        this.context,
+        this.params,
+      );
+      messages.forEach(message => {
+        if (['TOP', 'BOTTOM', 'BODY', 'POPUP'].includes(message.position!)) {
+          this.state.viewMessages[message.position!].push(message);
+        }
+      });
+
+      if (this.state.viewMessages.POPUP.length) {
+        this.alertViewMessage(this.state.viewMessages.POPUP);
+      }
+    }
+  }
+
+  /**
+   * 弹出视图消息,一个接一个弹
+   * @author lxm
+   * @date 2023-09-20 10:17:42
+   * @param {ViewMessage[]} messages
+   * @return {*}  {Promise<void>}
+   */
+  async alertViewMessage(messages: IViewMessage[]): Promise<void> {
+    const [message, ...rest] = messages;
+    const modalParams: ModalParams = {
+      title: message.title!,
+      desc: message.message,
+    };
+    if (message.messageType === 'WARN') {
+      await ibiz.modal.warning(modalParams);
+    } else if (message.messageType === 'ERROR') {
+      await ibiz.modal.error(modalParams);
+    } else {
+      await ibiz.modal.info(modalParams);
+    }
+    if (rest.length) {
+      this.alertViewMessage(rest);
+    }
+  }
 }

package/src/controller/control/dashboard/custom-dashboard.controller.ts

@@ -0,0 +1,107 @@
+import { IDashboard } from '@ibiz/model-core';
+import { ConfigService } from '../../../service';
+
+/**
+ * 自定义数据看板部件控制器
+ * @author lxm
+ * @date 2023-07-07 03:27:29
+ * @export
+ * @class CustomDashboardController
+ */
+export class CustomDashboardController {
+  /**
+   * 自定义布局模型数据
+   *
+   * @author: zhujiamin
+   * @Date: 2023-09-20 16:42:36
+   */
+  customModelData: IData[] = [];
+
+  /**
+   * 动态设计水平列数
+   *
+   * @author: zhujiamin
+   * @Date: 2023-09-20 16:43:39
+   */
+  layoutColNum: number = 12;
+
+  /**
+   * 动态设计单元格高度，80px
+   *
+   * @author: zhujiamin
+   * @Date: 2023-09-20 16:43:39
+   */
+  layoutRowH: number = 80;
+
+  /**
+   * 看板模型
+   *
+   * @author: zhujiamin
+   * @Date: 2023-09-20 16:43:39
+   */
+  model: IDashboard | null = null;
+
+  /**
+   * 应用配置存储服务
+   *
+   * @return {*}
+   * @author: zhujiamin
+   * @Date: 2023-09-22 18:07:42
+   */
+  config: ConfigService;
+
+  /**
+   * Creates an instance of BaseController.
+   * @author lxm
+   * @date 2023-04-26 06:46:21
+   * @param {CTX} ctx 跨组件上下文环境，内部机制不暴露
+   */
+  constructor(model: IDashboard) {
+    this.model = model;
+    this.config = new ConfigService(
+      model.appId!,
+      'dynadashboard',
+      `dashboard_${
+        this.model.appDataEntityId?.toLowerCase() || 'app'
+      }_${this.model.codeName?.toLowerCase()}`,
+    );
+  }
+
+  /**
+   * 加载自定义布局模型数据
+   *
+   * @author: zhujiamin
+   * @Date: 2023-09-20 16:22:49
+   */
+  async loadCustomModelData(): Promise<IData[]> {
+    const res = await this.config.load();
+    if (res.model) {
+      this.customModelData = res.model;
+    }
+    if (res.colNum) {
+      this.layoutColNum = res.colNum;
+    }
+    if (res.rowH) {
+      this.layoutRowH = res.rowH;
+    }
+    return this.customModelData;
+  }
+
+  /**
+   * 保存自定义布局模型数据
+   *
+   * @author: zhujiamin
+   * @Date: 2023-09-20 16:22:49
+   */
+  async saveCustomModelData(model: IData[]): Promise<IData[]> {
+    const res = await this.config.save({
+      model,
+      colNum: this.layoutColNum,
+      rowH: this.layoutRowH,
+    });
+    if (res) {
+      this.customModelData = model;
+    }
+    return model;
+  }
+}

package/src/controller/control/dashboard/index.ts

@@ -1,2 +1,3 @@
 export * from './dashboard.controller';
+export * from './custom-dashboard.controller';
 export * from './portlet/index';