@ibiz-template/runtime 0.1.23 → 0.1.25

package/out/service/dto/method.dto.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"method.dto.d.ts","sourceRoot":"","sources":["../../../src/service/dto/method.dto.ts"],"names":[],"mappings":"AACA,OAAO,EACL,cAAc,EACd,eAAe,EACf,oBAAoB,EACrB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AAGnE;;;;;;;GAOG;AACH,qBAAa,SAAS;IAQlB,SAAS,CAAC,MAAM,EAAE,cAAc;IAChC,SAAS,CAAC,WAAW,CAAC;IACtB,SAAS,CAAC,GAAG,CAAC;IAThB,SAAS,CAAC,GAAG,CAAC,EAAE,WAAW,CAAC;IAE5B,SAAS,CAAC,MAAM,EAAG,oBAAoB,EAAE,CAAC;IAE1C,SAAS,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAa;gBAGzC,MAAM,EAAE,cAAc,EACtB,WAAW,CAAC,qBAAS,EACrB,GAAG,CAAC,6BAAiB;IAUjC;;;;;;;;OAQG;IACG,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;IA6CxD;;;;;;;;OAQG;IACG,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IAiCrE;;;;;;;;OAQG;cACa,WAAW,CAAC,KAAK,EAAE,oBAAoB,GAAG,OAAO,CAAC,SAAS,CAAC;CAgB7E"}
+{"version":3,"file":"method.dto.d.ts","sourceRoot":"","sources":["../../../src/service/dto/method.dto.ts"],"names":[],"mappings":"AACA,OAAO,EACL,cAAc,EACd,eAAe,EACf,oBAAoB,EACrB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AAGnE;;;;;;;GAOG;AACH,qBAAa,SAAS;IAQlB,SAAS,CAAC,MAAM,EAAE,cAAc;IAChC,SAAS,CAAC,WAAW,CAAC;IACtB,SAAS,CAAC,GAAG,CAAC;IAThB,SAAS,CAAC,GAAG,CAAC,EAAE,WAAW,CAAC;IAE5B,SAAS,CAAC,MAAM,EAAG,oBAAoB,EAAE,CAAC;IAE1C,SAAS,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAa;gBAGzC,MAAM,EAAE,cAAc,EACtB,WAAW,CAAC,qBAAS,EACrB,GAAG,CAAC,6BAAiB;IAUjC;;;;;;;;OAQG;IACG,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;IA2CxD;;;;;;;;OAQG;IACG,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IAmCrE;;;;;;;;OAQG;cACa,WAAW,CAAC,KAAK,EAAE,oBAAoB,GAAG,OAAO,CAAC,SAAS,CAAC;CAgB7E"}

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

@@ -58,9 +58,7 @@ export class MethodDto {
                         for (let j = 0; j < items.length; j++) {
                             arr.push(await dto.get(context, items[j]));
                         }
-                        if (arr.length > 0) {
-                            params[key] = arr;
-                        }
+                        params[key] = arr;
                     }
                     break;
                 }
@@ -99,6 +97,9 @@ export class MethodDto {
                 if (items) {
                     await dto.sets(context, items);
                 }
+                else {
+                    await dto.sets(context, []);
+                }
             });
             for (let i = 0; i < all.length; i++) {
                 await all[i];

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;IAyC7B;;;;;;;;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"}
+{"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;IAwC7B;;;;;;;;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

@@ -56,7 +56,6 @@ export class Method {
                     break;
                 case 'PUT': {
                     res = await this.app.net.put(`${path}/${methodName}`, notNilEmpty(data) ? data : params);
-                    const entity = this.createEntity(data);
                     break;
                 }
                 case 'DELETE':

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":"AAEA,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;IAiCjD;;;;;;;;;;;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;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"}

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

@@ -1,4 +1,3 @@
-import { DataTypes } from '@ibiz-template/core';
 import { clone, isNil } from 'ramda';
 import { Srfuf } from '../constant';
 /**
@@ -105,9 +104,7 @@ export class ControlVO {
         this.$dataUIMap.forEach((mapField, key) => {
             const value = mapField.dataKey;
             // 关联映射属性
-            const forceNumber = mapField.dataType !== undefined &&
-                DataTypes.isNumber(mapField.dataType);
-            this.linkProperty(key, value, mapField.isOriginField, forceNumber);
+            this.linkProperty(key, value, mapField);
         });
         // 映射属性里没有涉及到的建立直接关联，用于使用实体属性也要取到值的场景。
         Object.keys($origin).forEach(value => {
@@ -129,7 +126,8 @@ export class ControlVO {
      * @param {boolean} [forceNumber=false] 是否强制转换成数值，是的话set的时候转成数值
      * @returns {*}
      */
-    linkProperty(uiKey, dataKey, isOriginField = true, forceNumber = false) {
+    linkProperty(uiKey, dataKey, mapField) {
+        const isOriginField = mapField ? mapField.isOriginField : true;
         // srfuf和srfkey不做处理
         if (uiKey === 'srfuf') {
             return;
@@ -147,15 +145,14 @@ export class ControlVO {
                         : this.$origin[dataKey];
                 },
                 set(val) {
-                    // 非空且强制转数值时，转换值的类型
-                    let val2 = forceNumber && !isNil(val) ? Number(val) : val;
-                    if (Number.isNaN(val2)) {
-                        val2 = val; // NaN时还原值
-                        ibiz.log.error(`${val}不能转换成数字`);
-                    }
-                    this.$origin[dataKey] = val2;
+                    // 有mapField的走它的转换
+                    this.$origin[dataKey] = mapField ? mapField.convertVal(val) : val;
                 },
             });
+            // 一开始初始化的时候先把值转换一下。
+            if (mapField) {
+                this[uiKey] = mapField.convertVal(this.$origin[dataKey]);
+            }
         }
         else {
             Object.defineProperty(this, uiKey, {

package/out/service/vo/ui-map-field.d.ts

@@ -50,5 +50,12 @@ export declare class UIMapField {
         isOriginField?: boolean;
         dataType?: number;
     });
+    /**
+     * 值转换
+     * @author lxm
+     * @date 2023-09-14 06:45:44
+     * @param {unknown} value 原值
+     */
+    convertVal(value: unknown): unknown;
 }
 //# sourceMappingURL=ui-map-field.d.ts.map

package/out/service/vo/ui-map-field.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ui-map-field.d.ts","sourceRoot":"","sources":["../../../src/service/vo/ui-map-field.ts"],"names":[],"mappings":"AAEA;;;;;;;GAOG;AACH,qBAAa,UAAU;IACrB;;;;;;OAMG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;;;;;OAMG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;;;;;OAMG;IACH,aAAa,EAAE,OAAO,CAAS;IAE/B;;;;;;OAMG;IACH,aAAa,EAAE,OAAO,CAAQ;gBAG5B,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,EACf,IAAI,GAAE;QACJ,aAAa,CAAC,EAAE,OAAO,CAAC;QACxB,QAAQ,CAAC,EAAE,MAAM,CAAC;KACd;CAWT"}
+{"version":3,"file":"ui-map-field.d.ts","sourceRoot":"","sources":["../../../src/service/vo/ui-map-field.ts"],"names":[],"mappings":"AAGA;;;;;;;GAOG;AACH,qBAAa,UAAU;IACrB;;;;;;OAMG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;;;;;OAMG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;;;;;OAMG;IACH,aAAa,EAAE,OAAO,CAAS;IAE/B;;;;;;OAMG;IACH,aAAa,EAAE,OAAO,CAAQ;gBAG5B,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,EACf,IAAI,GAAE;QACJ,aAAa,CAAC,EAAE,OAAO,CAAC;QACxB,QAAQ,CAAC,EAAE,MAAM,CAAC;KACd;IAYR;;;;;OAKG;IACH,UAAU,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO;CAoBpC"}

package/out/service/vo/ui-map-field.js

@@ -1,3 +1,4 @@
+import { DataTypes } from '@ibiz-template/core';
 import { isNil } from 'ramda';
 /**
  * 界面映射字段信息
@@ -34,4 +35,27 @@ export class UIMapField {
             this.dataType = opts.dataType;
         }
     }
+    /**
+     * 值转换
+     * @author lxm
+     * @date 2023-09-14 06:45:44
+     * @param {unknown} value 原值
+     */
+    convertVal(value) {
+        // 没有数据类型的给原值
+        if (!this.dataType) {
+            return value;
+        }
+        // 数值转换
+        if (DataTypes.isNumber(this.dataType)) {
+            const numVal = !isNil(value) && value !== '' ? Number(value) : value;
+            if (Number.isNaN(numVal)) {
+                // 不能转换的给原值
+                ibiz.log.debug(`${value}不能转换成数字`);
+                return value;
+            }
+            return numVal;
+        }
+        return value;
+    }
 }

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

@@ -185,11 +185,11 @@ export class UIActionProviderBase {
         const isMultiData = ['MULTIKEY', 'MULTIDATA'].includes(action.actionTarget) &&
             data.length > 0;
         // 处理自定义导航上下文
-        const tempContext = convertNavData(navContexts, context, params, isMultiData ? formatMultiData(navContexts, data) : data[0] || {});
+        const tempContext = convertNavData(navContexts, isMultiData ? formatMultiData(navContexts, data) : data[0] || {}, params, context);
         Object.assign(resultContext, tempContext);
         // 处理自定义导航视图参数
         const navParams = action.navigateParams;
-        const resultParams = convertNavData(navParams, resultContext, params, isMultiData ? formatMultiData(navParams, data) : data[0] || {});
+        const resultParams = convertNavData(navParams, isMultiData ? formatMultiData(navParams, data) : data[0] || {}, params, resultContext);
         return { resultContext, resultData, resultParams };
     }
 }

package/out/utils/nav-params/calc-nav-params.js

@@ -37,8 +37,8 @@ export function calcNavParams(model, originParams) {
         }
     }
     // 自定义导航视图参数和上下文
-    const tempContext = convertNavData(navContexts, context, params, data);
-    const tempParams = convertNavData(navParams, context, params, data);
+    const tempContext = convertNavData(navContexts, data, params, context);
+    const tempParams = convertNavData(navParams, data, params, context);
     Object.assign(resultContext, tempContext);
     Object.assign(resultParams, tempParams);
     return {

package/out/utils/nav-params/nav-params.d.ts

@@ -1,4 +1,13 @@
 import { INavigateParam } from '@ibiz/model-core';
+/**
+ * 把对象格式的导航参数转换成数组格式的导航参数
+ * @author lxm
+ * @date 2023-07-10 03:33:14
+ * @export
+ * @param {IData} navParams
+ * @return {*}  {IPSNavigateParam[]}
+ */
+export declare function convertObjectToNavParams(navParams: IData): INavigateParam[];
 /**
  * 转换导航数据(如导航上下文，导航视图参数)
  * - 把%xxx%,转换成origins元素里对应叫xxx的值
@@ -9,10 +18,10 @@ import { INavigateParam } from '@ibiz/model-core';
  * @author lxm
  * @date 2022-08-22 11:08:18
  * @export
- * @param {INavigateParam[]} naviDatas 导航参数
+ * @param {INavigateParam[]} navParams 导航参数
  * @param {...IData[]} origins 转换数据来源集合
  */
-export declare function convertNavData(naviDatas: INavigateParam[] | IData | undefined | null, ...origins: IData[]): IData;
+export declare function convertNavData(navParams: INavigateParam[] | IData | undefined | null, ...origins: IData[]): IData;
 /**
  * 通过模型中的导航数组 转换导航数据(如导航上下文，导航视图参数)
  * - 把%xxx%,转换成origins元素里对应叫xxx的值
@@ -27,29 +36,6 @@ export declare function convertNavData(naviDatas: INavigateParam[] | IData | und
  * @param {...IData[]} origins 转换数据来源集合
  */
 export declare function convertNavDataByArray(naviDatas: INavigateParam[], ...origins: IData[]): IData;
-/**
- * 通过对象 转换导航数据(如导航上下文，导航视图参数)
- * - 把%xxx%,转换成origins元素里对应叫xxx的值
- * - 按顺序查找origins的元素，且只要有xxx的属性就算找到，不管值是否为空。
- * - naviData里{a:%xxx%}，origins里找不到xxx则返回值里不存在a属性
- * - naviData里非%xxx%形式的，都当成直接值原样返回，包括空值。
- *
- * @author lxm
- * @date 2022-08-22 11:08:18
- * @export
- * @param {IData} naviData
- * @param {...IData[]} origins
- */
-export declare function convertNavDataByObject(naviData: IData, ...origins: IData[]): IData;
-/**
- * 把对象格式的导航参数转换成数组格式的导航参数
- * @author lxm
- * @date 2023-07-10 03:33:14
- * @export
- * @param {IData} naviData
- * @return {*}  {IPSNavigateParam[]}
- */
-export declare function convertObjectToNavParams(naviData: IData): INavigateParam[];
 /**
  * 根据导航参数把多条数据转换成单条数据，用；分隔
  * @author lxm

package/out/utils/nav-params/nav-params.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nav-params.d.ts","sourceRoot":"","sources":["../../../src/utils/nav-params/nav-params.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAIlD;;;;;;;;;;;;GAYG;AACH,wBAAgB,cAAc,CAC5B,SAAS,EAAE,cAAc,EAAE,GAAG,KAAK,GAAG,SAAS,GAAG,IAAI,EACtD,GAAG,OAAO,EAAE,KAAK,EAAE,GAClB,KAAK,CAaP;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,qBAAqB,CACnC,SAAS,EAAE,cAAc,EAAE,EAC3B,GAAG,OAAO,EAAE,KAAK,EAAE,GAClB,KAAK,CAwBP;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,sBAAsB,CACpC,QAAQ,EAAE,KAAK,EACf,GAAG,OAAO,EAAE,KAAK,EAAE,GAClB,KAAK,CAoBP;AAED;;;;;;;GAOG;AACH,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,KAAK,GAAG,cAAc,EAAE,CAmB1E;AAED;;;;;;;;GAQG;AACH,wBAAgB,eAAe,CAC7B,SAAS,EAAE,cAAc,EAAE,GAAG,KAAK,GAAG,SAAS,GAAG,IAAI,EACtD,OAAO,EAAE,KAAK,EAAE,GACf,KAAK,CAsBP"}
+{"version":3,"file":"nav-params.d.ts","sourceRoot":"","sources":["../../../src/utils/nav-params/nav-params.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAIlD;;;;;;;GAOG;AACH,wBAAgB,wBAAwB,CAAC,SAAS,EAAE,KAAK,GAAG,cAAc,EAAE,CAmB3E;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,cAAc,CAC5B,SAAS,EAAE,cAAc,EAAE,GAAG,KAAK,GAAG,SAAS,GAAG,IAAI,EACtD,GAAG,OAAO,EAAE,KAAK,EAAE,GAClB,KAAK,CAYP;AA8BD;;;;;;;;;;;;GAYG;AACH,wBAAgB,qBAAqB,CACnC,SAAS,EAAE,cAAc,EAAE,EAC3B,GAAG,OAAO,EAAE,KAAK,EAAE,GAClB,KAAK,CA8BP;AAED;;;;;;;;GAQG;AACH,wBAAgB,eAAe,CAC7B,SAAS,EAAE,cAAc,EAAE,GAAG,KAAK,GAAG,SAAS,GAAG,IAAI,EACtD,OAAO,EAAE,KAAK,EAAE,GACf,KAAK,CAsBP"}

package/out/utils/nav-params/nav-params.js

@@ -1,5 +1,32 @@
 import { isEmpty } from 'lodash-es';
 import { isNilOrEmpty, notNilEmpty } from 'qx-util';
+/**
+ * 把对象格式的导航参数转换成数组格式的导航参数
+ * @author lxm
+ * @date 2023-07-10 03:33:14
+ * @export
+ * @param {IData} navParams
+ * @return {*}  {IPSNavigateParam[]}
+ */
+export function convertObjectToNavParams(navParams) {
+    const result = [];
+    const reg = /^%(.+)%$/;
+    // eslint-disable-next-line guard-for-in
+    for (const key in navParams) {
+        let rawValue = true;
+        let value = navParams[key];
+        if (notNilEmpty(navParams[key]) && reg.test(navParams[key])) {
+            rawValue = false;
+            value = navParams[key].substring(1, navParams[key].length - 1);
+        }
+        result.push({
+            key: key.toLowerCase(),
+            rawValue,
+            value,
+        });
+    }
+    return result;
+}
 /**
  * 转换导航数据(如导航上下文，导航视图参数)
  * - 把%xxx%,转换成origins元素里对应叫xxx的值
@@ -10,21 +37,42 @@ import { isNilOrEmpty, notNilEmpty } from 'qx-util';
  * @author lxm
  * @date 2022-08-22 11:08:18
  * @export
- * @param {INavigateParam[]} naviDatas 导航参数
+ * @param {INavigateParam[]} navParams 导航参数
  * @param {...IData[]} origins 转换数据来源集合
  */
-export function convertNavData(naviDatas, ...origins) {
+export function convertNavData(navParams, ...origins) {
     // 如果导航参数不存在或者为空对象，返回{}
-    if (!naviDatas || isEmpty(naviDatas)) {
+    if (!navParams || isEmpty(navParams)) {
         return {};
     }
-    if (Object.prototype.toString.call(naviDatas) === '[object Array]') {
-        return convertNavDataByArray(naviDatas, ...origins);
-    }
-    if (Object.prototype.toString.call(naviDatas) === '[object Object]') {
-        return convertNavDataByObject(naviDatas, ...origins);
-    }
-    return {};
+    // 把对象形式的导航参数转换成INavigateParam[]形式
+    const navParamsArr = Array.isArray(navParams)
+        ? navParams
+        : convertObjectToNavParams(navParams);
+    return convertNavDataByArray(navParamsArr, ...origins);
+}
+/**
+ * 从origins每个元素里找到对应属性key的值
+ * 如果都找不到抛异常。
+ * @author lxm
+ * @date 2023-09-13 11:38:43
+ * @param {IData[]} origins 来源数据集合
+ * @param {string} key 属性标识
+ * @return {*}  {{ find: boolean; value: unknown }} 返回find是否找到值，value为找到的值，可以是空值
+ */
+function getVal(origins, key) {
+    // 找到origins里第一个有该属性的的项
+    const findOrigin = origins.find(item => {
+        if (isNilOrEmpty(item)) {
+            return false;
+        }
+        return (
+        // proxy数据判断是否能拿到值
+        item[key] ||
+            // 上下文等判断是否有这个属性，如果有且值为空，则赋该空值
+            Object.prototype.hasOwnProperty.call(item, key));
+    });
+    return { find: !!findOrigin, value: findOrigin === null || findOrigin === void 0 ? void 0 : findOrigin[key] };
 }
 /**
  * 通过模型中的导航数组 转换导航数据(如导航上下文，导航视图参数)
@@ -40,91 +88,38 @@ export function convertNavData(naviDatas, ...origins) {
  * @param {...IData[]} origins 转换数据来源集合
  */
 export function convertNavDataByArray(naviDatas, ...origins) {
+    const regex = /\$\{[^}]*\}/g; // 匹配${xxx}格式字符串
     const result = {};
     for (const naviData of naviDatas) {
-        if (notNilEmpty(naviData.value) && !naviData.rawValue) {
-            // 找到origins里第一个有该属性的的项
-            const findOrigin = origins.find(item => {
-                if (isNilOrEmpty(item)) {
-                    return false;
+        if (!naviData.rawValue) {
+            const matchArr = naviData.value.match(regex);
+            if (matchArr !== null) {
+                // 有${xxx}的找每一个xxx的值，替换原始字符串里的值，最后赋值处理过的字符串
+                let valueStr = naviData.value;
+                matchArr.forEach(key => {
+                    // 没有${xxx}
+                    const { find, value } = getVal(origins, key.slice(2, -1));
+                    if (find) {
+                        valueStr = valueStr.replace(key, `${value}`);
+                    }
+                });
+                result[naviData.key.toLowerCase()] = valueStr;
+            }
+            else {
+                // 没有${xxx}
+                const { find, value } = getVal(origins, naviData.value);
+                if (find) {
+                    result[naviData.key.toLowerCase()] = value;
                 }
-                return (
-                // proxy数据判断是否能拿到值
-                item[naviData.value] ||
-                    // 上下文等判断是否有这个属性，如果有且值为空，则赋该空值
-                    Object.prototype.hasOwnProperty.call(item, naviData.value));
-            });
-            if (findOrigin) {
-                result[naviData.key.toLowerCase()] = findOrigin[naviData.value];
             }
         }
         else {
+            // 直接值，空值时赋null
             result[naviData.key.toLowerCase()] = naviData.value || null;
         }
     }
     return result;
 }
-/**
- * 通过对象 转换导航数据(如导航上下文，导航视图参数)
- * - 把%xxx%,转换成origins元素里对应叫xxx的值
- * - 按顺序查找origins的元素，且只要有xxx的属性就算找到，不管值是否为空。
- * - naviData里{a:%xxx%}，origins里找不到xxx则返回值里不存在a属性
- * - naviData里非%xxx%形式的，都当成直接值原样返回，包括空值。
- *
- * @author lxm
- * @date 2022-08-22 11:08:18
- * @export
- * @param {IData} naviData
- * @param {...IData[]} origins
- */
-export function convertNavDataByObject(naviData, ...origins) {
-    const result = {};
-    const reg = /^%(.+)%$/;
-    for (const key in naviData) {
-        if (notNilEmpty(naviData[key]) && reg.test(naviData[key])) {
-            // 获取值的属性名称
-            const valueKey = naviData[key].substring(1, naviData[key].length - 1);
-            // 找到origins里第一个有该属性的的项
-            const findOrigin = origins.find(item => {
-                return Object.prototype.hasOwnProperty.call(item, valueKey);
-            });
-            if (findOrigin) {
-                result[key.toLowerCase()] = findOrigin[valueKey];
-            }
-        }
-        else {
-            result[key.toLowerCase()] = naviData[key] || null;
-        }
-    }
-    return result;
-}
-/**
- * 把对象格式的导航参数转换成数组格式的导航参数
- * @author lxm
- * @date 2023-07-10 03:33:14
- * @export
- * @param {IData} naviData
- * @return {*}  {IPSNavigateParam[]}
- */
-export function convertObjectToNavParams(naviData) {
-    const result = [];
-    const reg = /^%(.+)%$/;
-    // eslint-disable-next-line guard-for-in
-    for (const key in naviData) {
-        let rawValue = true;
-        let value = naviData[key];
-        if (notNilEmpty(naviData[key]) && reg.test(naviData[key])) {
-            rawValue = false;
-            value = naviData[key].substring(1, naviData[key].length - 1);
-        }
-        result.push({
-            key: key.toLowerCase(),
-            rawValue,
-            value,
-        });
-    }
-    return result;
-}
 /**
  * 根据导航参数把多条数据转换成单条数据，用；分隔
  * @author lxm

package/out/utils/open-redirect-view/open-redirect-view.js

@@ -83,11 +83,11 @@ export async function openDERedirectView(appView, context, params = {}, opts = {
     var _a;
     // 计算重定向视图上下文参数转换
     const navContext = appView.appViewNavContexts || [];
-    const navContextData = convertNavData(navContext, context, params);
+    const navContextData = convertNavData(navContext, params, context);
     context = Object.assign(context.clone(), navContextData);
     // 计算重定向视图视图参数转换
     const navParams = appView.appViewNavParams || [];
-    const navParamsData = convertNavData(navParams, context, params);
+    const navParamsData = convertNavData(navParams, params, context);
     Object.assign(params, navParamsData);
     // 重定向视图对应应用实体
     const entityId = appView.appDataEntityId;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.1.23",
+  "version": "0.1.25",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -29,7 +29,7 @@
   "author": "chitanda",
   "license": "MIT",
   "devDependencies": {
-    "@ibiz-template/core": "^0.1.23",
+    "@ibiz-template/core": "^0.1.24",
     "@ibiz/model-core": "^0.0.16",
     "@types/path-browserify": "^1.0.0",
     "@types/qs": "^6.9.8",
@@ -57,5 +57,5 @@
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
-  "gitHead": "7a5c053d7e48ffc3f6e38d84ef07f2aa1df007a4"
+  "gitHead": "bfc52e088d9eb1548c4c22cd783ec22d76499ee1"
 }

package/src/command/app/app-func/app-func.ts

@@ -52,8 +52,8 @@ export class AppFuncCommand {
     // 导航参数转换
     const { navigateContexts, navigateParams, appFuncType } = appFunc;
     const _context = context.clone();
-    Object.assign(_context, convertNavData(navigateContexts, context, params));
-    const _params = convertNavData(navigateParams, context, params);
+    Object.assign(_context, convertNavData(navigateContexts, params, context));
+    const _params = convertNavData(navigateParams, params, context);
 
     switch (appFuncType) {
       case 'APPVIEW':

package/src/config/global-config.ts

@@ -19,6 +19,7 @@ export class GlobalConfig implements IGlobalConfig {
   // 全局视图配置
   view: IGlobalViewConfig = {
     enableDataInfoBar: true,
+    enableExpCache: true,
   };
 
   // 全局表格配置

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

@@ -13,8 +13,8 @@ import {
 } from '../../../interface/controller';
 import { ControllerEvent } from '../../utils';
 import {
-  IControlProvider,
   IDataAbilityParams,
+  IProvider,
   IUILogicParams,
 } from '../../../interface';
 import { ControlLogicScheduler } from '../../../logic-scheduler';
@@ -64,12 +64,12 @@ export class ControlController<
   layoutPanel?: IViewLayoutPanelController;
 
   /**
-   * 子部件适配器
+   * 子适配器
    * @author lxm
    * @date 2023-07-19 04:14:50
-   * @type {{ [key: string]: IControlProvider }}
+   * @type {{ [key: string]: IProvider }}
    */
-  providers: { [key: string]: IControlProvider } = {};
+  providers: { [key: string]: IProvider } = {};
 
   /**
    * Creates an instance of ControlController.
@@ -296,6 +296,7 @@ export class ControlController<
     }
 
     if (opts?.error) {
+      ibiz.log.error(opts.error);
       // 报错时抛错误
       throw new NoticeError(message, duration);
     } else {

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

@@ -1,6 +1,6 @@
 /* eslint-disable max-classes-per-file */
 import { isElementSame, RuntimeError } from '@ibiz-template/core';
-import { IMDControl } from '@ibiz/model-core';
+import { IAppDataEntity, IMDControl } from '@ibiz/model-core';
 import {
   IMDControlController,
   IMDControlEvent,
@@ -68,21 +68,52 @@ export class MDControlController<
    */
   protected fieldIdNameMap = new Map<string, string>();
 
+  /**
+   * 当前多数据部件对应的应用实体对象
+   *
+   * @author chitanda
+   * @date 2023-09-13 17:09:32
+   * @protected
+   * @type {IAppDataEntity}
+   */
+  protected dataEntity!: IAppDataEntity;
+
   protected async onCreated(): Promise<void> {
     await super.onCreated();
 
     // 初始化实体属性id和name的映射
-    const dataEntity = await ibiz.hub.getAppDataEntity(
+    this.dataEntity = await ibiz.hub.getAppDataEntity(
       this.model.appDataEntityId!,
     );
-    dataEntity.appDEFields?.forEach(field => {
+    this.dataEntity.appDEFields?.forEach(field => {
       this.fieldIdNameMap.set(field.id!, field.name!);
     });
+    this.onDataChange = this.onDataChange.bind(this);
+    ibiz.mc.command.change.on(this.onDataChange);
 
     // 设置默认排序
     this.setSort();
   }
 
+  protected onDestroyed(): Promise<void> {
+    ibiz.mc.command.change.off(this.onDataChange);
+    return super.onDestroyed();
+  }
+
+  /**
+   * 当数据放生变更时，若为当前应用实体数据。则多数据部件进行刷新
+   *
+   * @author chitanda
+   * @date 2023-09-13 17:09:04
+   * @protected
+   * @param {IData} msg
+   */
+  protected onDataChange(msg: IData): void {
+    if (msg.data && msg.data.srfdecodename === this.dataEntity.codeName) {
+      this.refresh();
+    }
+  }
+
   /**
    * 设置排序
    * 无参数时设置的是默认排序。

package/src/controller/common/editor/editor.controller.ts

@@ -156,13 +156,13 @@ export class EditorController<T extends IEditor = IEditor>
       .model as INavigateParamContainer;
     let selfContext = {};
     if (navigateContexts && data) {
-      selfContext = convertNavData(navigateContexts!, context, params, data);
+      selfContext = convertNavData(navigateContexts!, data, params, context);
     }
     const _context = Object.assign(context.clone(), selfContext);
 
     let selfParams = {};
     if (navigateParams && data) {
-      selfParams = convertNavData(navigateParams!, context, params, data);
+      selfParams = convertNavData(navigateParams!, data, params, context);
     }
     const _params: IParams = { ...params, ...selfParams };
     return { context: _context, params: _params };

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

@@ -321,7 +321,7 @@ export class ViewController<
     const navContexts = this.model.appViewNavContexts;
     let context = {};
     if (notNilEmpty(navContexts)) {
-      context = convertNavData(navContexts!, this.context, this.params);
+      context = convertNavData(navContexts!, this.params, this.context);
     }
     Object.assign(this.context, context);
 
@@ -329,7 +329,7 @@ export class ViewController<
     const navParams = this.model.appViewNavParams;
     let params = {};
     if (notNilEmpty(navParams)) {
-      params = convertNavData(navParams!, this.context, this.params);
+      params = convertNavData(navParams!, this.params, this.context);
     }
     Object.assign(this.params, params);
 

package/src/controller/control/exp-bar/calendar-exp-bar.controller.ts

@@ -92,6 +92,7 @@ export class CalendarExpBarController
         this.params,
       );
       context.currentSrfNav = item.navId;
+      this.state.srfnav = item.navId;
       return {
         key: item.navId,
         context,