@ibiz-template/runtime 0.1.24 → 0.1.26

package/out/service/service/entity/method/de-action.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"de-action.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/de-action.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,aAAa,EAEd,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAKpD;;;;;;;;GAQG;AACH,qBAAa,cAAe,SAAQ,MAAM;IAChC,MAAM,EAAE,YAAY,CAAC;IAE7B;;;;;;;;OAQG;IACH,SAAS,KAAK,WAAW,IAAI,OAAO,CAEnC;IAEK,IAAI,CACR,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,EACX,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;IAwE/B;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,EACX,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAUtC;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAYtC;;;;;;;;;OASG;IACG,MAAM,CACV,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,GAAG,WAAW,EACzB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IActC;;;;;;;;OAQG;IACG,GAAG,CACP,OAAO,EAAE,OAAO,EAChB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAatC;;;;;;;;OAQG;IACG,QAAQ,CACZ,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAUhC;;;;;;;;OAQG;IACG,UAAU,CACd,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,KAAK,GACZ,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAUtC;;;;;;;;OAQG;IACG,YAAY,CAChB,QAAQ,EAAE,OAAO,EACjB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAatC;;;;;;;;OAQG;IACG,UAAU,CACd,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAoBtC;;;;;;;;OAQG;IACG,UAAU,CACd,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,KAAK,GACZ,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAatC;;;;;;;;OAQG;IACG,OAAO,CACX,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAqBtC;;;;;;OAMG;IACG,eAAe,CACnB,QAAQ,EAAE,OAAO,EACjB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,aAAa,CAAC;CAc1B"}
+{"version":3,"file":"de-action.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/de-action.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,aAAa,EAEd,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAKpD;;;;;;;;GAQG;AACH,qBAAa,cAAe,SAAQ,MAAM;IAChC,MAAM,EAAE,YAAY,CAAC;IAE7B;;;;;;;;OAQG;IACH,SAAS,KAAK,WAAW,IAAI,OAAO,CAEnC;IAEK,IAAI,CACR,OAAO,EAAE,OAAO,EAChB,IAAI,CAAC,EAAE,KAAK,EACZ,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;IA8E/B;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,EACX,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAUtC;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAYtC;;;;;;;;;OASG;IACG,MAAM,CACV,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,GAAG,WAAW,EACzB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IActC;;;;;;;;OAQG;IACG,GAAG,CACP,OAAO,EAAE,OAAO,EAChB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAatC;;;;;;;;OAQG;IACG,QAAQ,CACZ,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAUhC;;;;;;;;OAQG;IACG,UAAU,CACd,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,KAAK,GACZ,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAUtC;;;;;;;;OAQG;IACG,YAAY,CAChB,QAAQ,EAAE,OAAO,EACjB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAatC;;;;;;;;OAQG;IACG,UAAU,CACd,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAoBtC;;;;;;;;OAQG;IACG,UAAU,CACd,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,KAAK,GACZ,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAatC;;;;;;;;OAQG;IACG,OAAO,CACX,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAqBtC;;;;;;OAMG;IACG,eAAe,CACnB,QAAQ,EAAE,OAAO,EACjB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,aAAa,CAAC;CAc1B"}

package/out/service/service/entity/method/de-action.js

@@ -32,19 +32,19 @@ export class DEActionMethod extends Method {
             if (!deLogic) {
                 throw new RuntimeModelError(this.method, '缺少实体处理逻辑');
             }
-            return execDELogicAction(deLogic, context, data, params);
+            return execDELogicAction(deLogic, context, data || {}, params || {});
         }
-        if (!this.isLocalMode) {
+        if (data && !this.isLocalMode) {
             data = await this.input.handle(context, data);
         }
         // 执行变更属性逻辑
-        if (!['READ', 'GETDRAFT'].includes(this.method.actionMode)) {
-            await execFieldLogics(this.entity, 'change', context, data, params);
+        if (data && !['READ', 'GETDRAFT'].includes(this.method.actionMode)) {
+            await execFieldLogics(this.entity, 'change', context, data, params || {});
         }
         let result;
         switch (this.method.codeName) {
             case 'Create':
-                result = await this.create(context, data, params);
+                result = await this.create(context, data, params || {});
                 break;
             case 'Get':
                 result = await this.get(context, params);
@@ -77,7 +77,7 @@ export class DEActionMethod extends Method {
                 let path = this.calcPath(context);
                 if (this.method.needResourceKey) {
                     path = `${path}/${context[this.entity.codeName.toLowerCase()] ||
-                        data[this.entity.keyAppDEFieldId]}`;
+                        (data === null || data === void 0 ? void 0 : data[this.entity.keyAppDEFieldId])}`;
                 }
                 const res = await this.request(path, context, data, params);
                 res.data = await this.result.handle(context, res.data);
@@ -85,7 +85,7 @@ export class DEActionMethod extends Method {
             }
         }
         // 计算属性逻辑
-        await execFieldLogics(this.entity, 'compute', context, result.data, params);
+        await execFieldLogics(this.entity, 'compute', context, result.data, params || {});
         return result;
     }
     /**

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

@@ -63,7 +63,7 @@ export declare abstract class Method {
      * @param {IParams} [params2={}]
      * @return {*}  {Promise<HttpResponse>}
      */
-    abstract exec(context: IParams, params: IData, params2: IParams): Promise<HttpResponse>;
+    abstract exec(context: IParams, params?: IData, params2?: IParams): Promise<HttpResponse>;
     /**
      * 发送请求
      *
@@ -76,7 +76,7 @@ export declare abstract class Method {
      * @param {IParams} params
      * @return {*}  {Promise<HttpResponse<any>>}
      */
-    protected request(path: string, context: IParams, data: IData, params: IParams): Promise<HttpResponse<any>>;
+    protected request(path: string, context: IParams, data?: IData, params?: IParams): Promise<HttpResponse<any>>;
     /**
      * 根据上下文计算当前请求路径
      *

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;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"}
+{"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,CAAC,EAAE,KAAK,EACd,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,YAAY,CAAC;IAExB;;;;;;;;;;;OAWG;cACa,OAAO,CACrB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,OAAO,EAChB,IAAI,CAAC,EAAE,KAAK,EACZ,MAAM,CAAC,EAAE,OAAO,GAEf,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/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;IA8CpB;;;;;;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) && 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/types.d.ts

@@ -138,5 +138,16 @@ declare module '@ibiz-template/core' {
          */
         scheduler: LogicSchedulerCenter;
     }
+    interface IEnvironment {
+        /**
+         * 全局提供的功能性配置
+         *
+         * @description 默认无值使用默认配置，可以使用 environment.js 中的 globalConfig 覆盖默认配置
+         * @author chitanda
+         * @date 2023-09-15 14:09:14
+         * @type {IGlobalConfig}
+         */
+        globalConfig?: IGlobalConfig;
+    }
 }
 //# sourceMappingURL=types.d.ts.map

package/out/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,mCAAmC,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AACtC,OAAO,EACL,YAAY,EACZ,iBAAiB,EACjB,aAAa,EACb,UAAU,EACV,YAAY,EACZ,YAAY,EACZ,cAAc,EACd,kBAAkB,EAClB,aAAa,EACb,cAAc,EACd,YAAY,EACb,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE5D,OAAO,QAAQ,qBAAqB,CAAC;IACnC,UAAU,OAAO;QACf;;;;;;WAMG;QACH,OAAO,EAAE,YAAY,CAAC;QAEtB;;;;;;WAMG;QACH,GAAG,EAAE,cAAc,CAAC;QAEpB;;;;;;;WAOG;QACH,KAAK,EAAE,UAAU,CAAC;QAElB;;;;;;;WAOG;QACH,OAAO,EAAE,YAAY,CAAC;QAEtB;;;;;;;WAOG;QACH,OAAO,EAAE,YAAY,CAAC;QAEtB;;;;;;;WAOG;QACH,YAAY,EAAE,iBAAiB,CAAC;QAEhC;;;;;;;WAOG;QACH,QAAQ,EAAE,aAAa,CAAC;QAExB;;;;;;WAMG;QACH,OAAO,EAAE,kBAAkB,CAAC;QAE5B;;;;;;WAMG;QACH,MAAM,EAAE,cAAc,CAAC;QAEvB;;;;;;WAMG;QACH,QAAQ,EAAE,cAAc,CAAC;QAEzB;;;;;;WAMG;QACH,MAAM,EAAE,aAAa,CAAC;QAEtB;;;;;;WAMG;QACH,IAAI,EAAE,YAAY,CAAC;QAEnB;;;;;WAKG;QACH,MAAM,EAAE,aAAa,CAAC;QAEtB;;;;;;WAMG;QACH,IAAI,EAAE,UAAU,CAAC;QAEjB;;;;;;WAMG;QACH,IAAI,EAAE,IAAI,CAAC;QAEX;;;;;WAKG;QACH,SAAS,EAAE,oBAAoB,CAAC;KACjC;CACF"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,mCAAmC,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AACtC,OAAO,EACL,YAAY,EACZ,iBAAiB,EACjB,aAAa,EACb,UAAU,EACV,YAAY,EACZ,YAAY,EACZ,cAAc,EACd,kBAAkB,EAClB,aAAa,EACb,cAAc,EACd,YAAY,EACb,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE5D,OAAO,QAAQ,qBAAqB,CAAC;IACnC,UAAU,OAAO;QACf;;;;;;WAMG;QACH,OAAO,EAAE,YAAY,CAAC;QAEtB;;;;;;WAMG;QACH,GAAG,EAAE,cAAc,CAAC;QAEpB;;;;;;;WAOG;QACH,KAAK,EAAE,UAAU,CAAC;QAElB;;;;;;;WAOG;QACH,OAAO,EAAE,YAAY,CAAC;QAEtB;;;;;;;WAOG;QACH,OAAO,EAAE,YAAY,CAAC;QAEtB;;;;;;;WAOG;QACH,YAAY,EAAE,iBAAiB,CAAC;QAEhC;;;;;;;WAOG;QACH,QAAQ,EAAE,aAAa,CAAC;QAExB;;;;;;WAMG;QACH,OAAO,EAAE,kBAAkB,CAAC;QAE5B;;;;;;WAMG;QACH,MAAM,EAAE,cAAc,CAAC;QAEvB;;;;;;WAMG;QACH,QAAQ,EAAE,cAAc,CAAC;QAEzB;;;;;;WAMG;QACH,MAAM,EAAE,aAAa,CAAC;QAEtB;;;;;;WAMG;QACH,IAAI,EAAE,YAAY,CAAC;QAEnB;;;;;WAKG;QACH,MAAM,EAAE,aAAa,CAAC;QAEtB;;;;;;WAMG;QACH,IAAI,EAAE,UAAU,CAAC;QAEjB;;;;;;WAMG;QACH,IAAI,EAAE,IAAI,CAAC;QAEX;;;;;WAKG;QACH,SAAS,EAAE,oBAAoB,CAAC;KACjC;IAED,UAAU,YAAY;QACpB;;;;;;;WAOG;QACH,YAAY,CAAC,EAAE,aAAa,CAAC;KAC9B;CACF"}

package/out/ui-logic/ui-logic-node/end-node/end-node.js

@@ -21,7 +21,7 @@ export class EndNode extends UILogicNode {
                 ctx.result = null;
                 break;
             case 'SRCVALUE': // 直接值
-                ctx.result = rawValue;
+                ctx.result = ibiz.util.rawValue.format(rawValue);
                 break;
             case 'LOGICPARAM': // 逻辑参数对象
                 ctx.result = ctx.params[returnParamId];

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

@@ -27,7 +27,7 @@ export function handleSrcVal(ctx, srcValParams) {
             return undefined;
         // 直接值
         case 'SRCVALUE':
-            return srcValue;
+            return ibiz.util.rawValue.format(srcValue);
         case 'WEBCONTEXT': // 网页请求上下文
         case 'VIEWPARAM': // 视图参数
             value = ctx.viewParams;

package/out/utils/index.d.ts

@@ -9,4 +9,5 @@ export * from './modal/modal';
 export * from './value-rule/value-rule';
 export * from './script/index';
 export { TextUtil } from './text-util/text-util';
+export { RawValueUtil } from './raw-value-util/raw-value-util';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC7D,cAAc,yBAAyB,CAAC;AACxC,OAAO,EACL,yBAAyB,EACzB,gBAAgB,GACjB,MAAM,yCAAyC,CAAC;AACjD,cAAc,UAAU,CAAC;AACzB,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AACxE,cAAc,uBAAuB,CAAC;AACtC,cAAc,eAAe,CAAC;AAC9B,cAAc,yBAAyB,CAAC;AACxC,cAAc,gBAAgB,CAAC;AAC/B,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC7D,cAAc,yBAAyB,CAAC;AACxC,OAAO,EACL,yBAAyB,EACzB,gBAAgB,GACjB,MAAM,yCAAyC,CAAC;AACjD,cAAc,UAAU,CAAC;AACzB,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AACxE,cAAc,uBAAuB,CAAC;AACtC,cAAc,eAAe,CAAC;AAC9B,cAAc,yBAAyB,CAAC;AACxC,cAAc,gBAAgB,CAAC;AAC/B,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC"}

package/out/utils/index.js

@@ -9,3 +9,4 @@ export * from './modal/modal';
 export * from './value-rule/value-rule';
 export * from './script/index';
 export { TextUtil } from './text-util/text-util';
+export { RawValueUtil } from './raw-value-util/raw-value-util';

package/out/utils/raw-value-util/raw-value-util.d.ts

@@ -0,0 +1,23 @@
+/**
+ * 直接值工具类
+ *
+ * @export
+ * @class RawValueUtil
+ */
+export declare class RawValueUtil {
+    /**
+     *  字符串是否完全由整数/浮点数组成
+     *
+     * @param {string} str
+     * @return {*}
+     */
+    isNumber(str: string): boolean;
+    /**
+     * 转换直接值
+     *
+     * @param {string} val
+     * @return {*}
+     */
+    format(val: string | undefined): number | boolean | string | undefined;
+}
+//# sourceMappingURL=raw-value-util.d.ts.map

package/out/utils/raw-value-util/raw-value-util.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"raw-value-util.d.ts","sourceRoot":"","sources":["../../../src/utils/raw-value-util/raw-value-util.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,qBAAa,YAAY;IACvB;;;;;OAKG;IACH,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;IAI9B;;;;;OAKG;IACH,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,GAAG,SAAS;CAavE"}

package/out/utils/raw-value-util/raw-value-util.js

@@ -0,0 +1,37 @@
+/**
+ * 直接值工具类
+ *
+ * @export
+ * @class RawValueUtil
+ */
+export class RawValueUtil {
+    /**
+     *  字符串是否完全由整数/浮点数组成
+     *
+     * @param {string} str
+     * @return {*}
+     */
+    isNumber(str) {
+        return /^-?\d+(\.\d+)?$/.test(str);
+    }
+    /**
+     * 转换直接值
+     *
+     * @param {string} val
+     * @return {*}
+     */
+    format(val) {
+        let tempVal = val;
+        if (val !== undefined) {
+            if (val === 'true' || val === 'false') {
+                // 布尔值处理
+                tempVal = val === 'true';
+            }
+            else if (this.isNumber(val)) {
+                // 数值处理
+                tempVal = parseFloat(val);
+            }
+        }
+        return tempVal;
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.1.24",
+  "version": "0.1.26",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -30,7 +30,7 @@
   "license": "MIT",
   "devDependencies": {
     "@ibiz-template/core": "^0.1.24",
-    "@ibiz/model-core": "^0.0.16",
+    "@ibiz/model-core": "^0.0.17",
     "@types/path-browserify": "^1.0.0",
     "@types/qs": "^6.9.8",
     "@types/systemjs": "^6.13.2",
@@ -46,7 +46,7 @@
   },
   "peerDependencies": {
     "@ibiz-template/core": "^0.1.0",
-    "@ibiz/model-core": "^0.0.16",
+    "@ibiz/model-core": "^0.0.17",
     "async-validator": "^4.2.5",
     "dayjs": "^1.11.7",
     "echarts": "^5.4.3",
@@ -57,5 +57,5 @@
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
-  "gitHead": "b1d394ad9b4d7e81e607054c31f056e8299855b9"
+  "gitHead": "47de26dd6360166d072d61af88da5bc1b3732b22"
 }

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.

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,

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

@@ -256,15 +256,28 @@ export class ExpBarControlController<
     const selectItem = this.xDataController?.state.items.find(
       item => item[this.navKeyName] === this.state.srfnav,
     );
-    if (selectItem) {
-      // 在多数据部件里面选项设置回显。
+
+    // 是否是路由模式且有子路由
+    const routeAndHasSub =
+      this.routeDepth &&
+      window.location.hash.split('/').length > this.routeDepth * 2 + 2;
+    console.log('routeAndHasSub', routeAndHasSub);
+
+    if (routeAndHasSub) {
+      if (selectItem) {
+        // 在多数据部件里面选项设置回显。
+        this.xDataController.setSelection([selectItem]);
+      }
+      // 此时不需要导航占位push路由，只要有个key触发绘制下级视图就行。
+      this._evt.emit('onNavViewChange', {
+        navViewMsg: { key: this.state.srfnav },
+        context: this.context,
+      });
+    } else if (selectItem) {
+      // 非路由模式,或者有路由模式下有srfnav没有子路由时，需要在多数据部件里面选项设置回显。
+      this.xDataController.setActive(selectItem);
       this.xDataController.setSelection([selectItem]);
     }
-    // 此时不需要导航占位push路由，只要有个key触发绘制下级视图就行。
-    this._evt.emit('onNavViewChange', {
-      navViewMsg: { key: this.state.srfnav },
-      context: this.context,
-    });
   }
 
   /**
@@ -279,6 +292,7 @@ export class ExpBarControlController<
     const data = this.xDataController.state.items[0];
     if (!data) {
       // 导航视图传空让他导航占位绘制空界面
+      this.state.srfnav = '';
       this._evt.emit('onNavViewChange', { navViewMsg: { key: '' } });
       return;
     }
@@ -340,6 +354,7 @@ export class ExpBarControlController<
     const tempContext = Object.assign(context.clone(), resultContext, {
       currentSrfNav: data[this.navKeyName],
     });
+    this.state.srfnav = data[this.navKeyName];
     const tempParams = { ...resultParams };
     return { context: tempContext, params: tempParams };
   }
@@ -420,4 +435,17 @@ export class ExpBarControlController<
       }
     });
   }
+
+  /**
+   * 路由变更处理回调
+   * @author lxm
+   * @date 2023-09-14 07:03:39
+   * @param {{ srfnav?: string; path: string }} info 当前系统的路由的从一级到最后一级的所有路径。
+   */
+  onRouterChange(info: { srfnav: string; path: string }): void {
+    if (this.state.srfnav !== info.srfnav) {
+      this.state.srfnav = info.srfnav;
+      this.defaultNavBySrfnav();
+    }
+  }
 }

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

@@ -119,6 +119,7 @@ export class TreeExpBarController
     }
     const result = this.prepareParams(nodeModel, deData, context, params);
     result.context.currentSrfNav = nodeId;
+    this.state.srfnav = nodeId;
     return {
       key: nodeId,
       viewId: nodeModel.navAppViewId,

package/src/de-logic/de-logic-node/end-node/end-node.ts

@@ -26,7 +26,7 @@ export class EndNode extends DELogicNode {
         ctx.result = null;
         break;
       case 'SRCVALUE': // 直接值
-        ctx.result = rawValue;
+        ctx.result = ibiz.util.rawValue.format(rawValue);
         break;
       case 'LOGICPARAM': // 逻辑参数对象
         ctx.result = ctx.params[returnParamId!];

package/src/de-logic/utils/handle-src-val.ts

@@ -55,7 +55,7 @@ export function handleSrcVal(
       return undefined;
     // 直接值
     case 'SRCVALUE':
-      return srcValue;
+      return ibiz.util.rawValue.format(srcValue);
     case 'WEBCONTEXT': // 网页请求上下文
     case 'VIEWPARAM': // 视图参数
       value = ctx.viewParams;

package/src/global/global-util/global-util.ts

@@ -1,5 +1,10 @@
 import { IExportExcelUtil } from '../../interface';
-import { TextUtil, LayoutPanelUtil, HandlebarsUtil } from '../../utils';
+import {
+  TextUtil,
+  LayoutPanelUtil,
+  HandlebarsUtil,
+  RawValueUtil,
+} from '../../utils';
 
 /**
  * 全局工具方法或对象
@@ -34,6 +39,14 @@ export class GlobalUtil {
    */
   readonly hbs = new HandlebarsUtil();
 
+  /**
+   * 直接值工具
+   *
+   * @author zhujiamin
+   * @date 2023-08-24 11:08:28
+   */
+  readonly rawValue = new RawValueUtil();
+
   /**
    * 获取导出Excel工具类对象
    * @author lxm

package/src/interface/common/i-global-config/i-global-view-config.ts

@@ -18,4 +18,13 @@ export interface IGlobalViewConfig {
    * @type {boolean}
    */
   enableDataInfoBar: boolean;
+
+  /**
+   * 全局导航是否启用缓存
+   *
+   * @author chitanda
+   * @date 2023-09-15 12:09:09
+   * @type {boolean}
+   */
+  enableExpCache: boolean;
 }

package/src/interface/controller/controller/control/i-exp-bar-control.controller.ts

@@ -57,4 +57,12 @@ export interface IExpBarControlController<
    * @memberof ITreeExpBarController
    */
   getNavViewMsg(data: IData, context: IContext, params: IParams): INavViewMsg;
+
+  /**
+   * 路由变更处理回调
+   * @author lxm
+   * @date 2023-09-14 07:03:39
+   * @param {{ srfnav?: string; path: string }} info 当前系统的路由的从一级到最后一级的所有路径。
+   */
+  onRouterChange(info: { srfnav: string; path: string }): void;
 }

package/src/interface/provider/i-control.provider.ts

@@ -1,3 +1,7 @@
+import { IControl } from '@ibiz/model-core';
+import { CTX } from '../../controller';
+import { IControlController } from '../controller';
+
 /**
  * 部件适配器的接口
  *
@@ -16,4 +20,22 @@ export interface IControlProvider {
    */
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   component: any;
+
+  /**
+   * 创建部件控制器
+   *
+   * @author lxm
+   * @date 2023-09-15 11:52:22
+   * @param {IControl} model 部件模型
+   * @param {IContext} context 上下文
+   * @param {IParams} [params] 视图参数
+   * @param {CTX} [ctx]
+   * @return {*}  {IControlController}
+   */
+  createController?(
+    model: IControl,
+    context: IContext,
+    params: IParams,
+    ctx: CTX,
+  ): IControlController;
 }

package/src/interface/provider/i-view.provider.ts

@@ -1,3 +1,7 @@
+import { IAppView } from '@ibiz/model-core';
+import { CTX } from '../../controller';
+import { IViewController } from '../controller';
+
 /**
  * 视图适配器的接口
  *
@@ -16,4 +20,22 @@ export interface IViewProvider {
    */
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   component: any;
+
+  /**
+   * 创建视图控制器
+   *
+   * @author lxm
+   * @date 2023-09-15 11:49:26
+   * @param {IAppView} model 视图模型
+   * @param {IContext} context 上下文
+   * @param {IParams} [params] 视图参数
+   * @param {CTX} [ctx]
+   * @return {*}  {IViewController}
+   */
+  createController?(
+    model: IAppView,
+    context: IContext,
+    params?: IParams,
+    ctx?: CTX,
+  ): IViewController;
 }