@ibiz-template/runtime 0.5.3-beta.6 → 0.5.3-beta.8

package/out/application.js

@@ -56,7 +56,7 @@ export class Application {
     async init() {
         await this.authority.init();
         await this.loadAppModelStyle();
-        if (ibiz.env.enableMqtt && ibiz.appData) {
+        if (ibiz.env.enableMqtt && ibiz.appData && ibiz.auth.isAnonymous !== true) {
             this.mqtt = new MqttService(ibiz.appData.mqtttopic, getToken(), this.model.appId);
             this.mqtt.evt.on('message', message => {
                 ibiz.mc.command.asyncAction.next(message);

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

@@ -16,6 +16,21 @@ type SrcValParams = {
      * 源参数对象id
      */
     srcDELogicParamId?: string;
+    /**
+     * 目标逻辑参数
+     *
+     */
+    dstDELogicParamId?: string;
+    /**
+     * 目标属性名称
+     *
+     */
+    dstFieldName?: string;
+    /**
+     * 表达式
+     *
+     */
+    expression?: string;
 };
 /**
  * 解析模型并获取源参数或其中的某个属性

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

@@ -1 +1 @@
-{"version":3,"file":"handle-src-val.d.ts","sourceRoot":"","sources":["../../../src/de-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,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B,CAAC;AAEF;;;;;;;;GAQG;AACH,wBAAgB,YAAY,CAC1B,GAAG,EAAE,cAAc,EACnB,YAAY,EAAE,YAAY,GACzB,OAAO,CAiET"}
+{"version":3,"file":"handle-src-val.d.ts","sourceRoot":"","sources":["../../../src/de-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,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAE3B;;;OAGG;IACH,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAE3B;;;OAGG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF;;;;;;;;GAQG;AACH,wBAAgB,YAAY,CAC1B,GAAG,EAAE,cAAc,EACnB,YAAY,EAAE,YAAY,GACzB,OAAO,CA2ET"}

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

@@ -11,7 +11,7 @@ import { ScriptFactory } from '../../utils';
  * @return {*}
  */
 export function handleSrcVal(ctx, srcValParams) {
-    const { srcDELogicParamId, srcFieldName, srcValue } = srcValParams;
+    const { srcDELogicParamId, srcFieldName, srcValue, expression } = srcValParams;
     // 没有源值类型就是逻辑参数
     const srcValueType = srcValParams.srcValueType || 'SRCDLPARAM';
     // 取属性值
@@ -49,6 +49,15 @@ export function handleSrcVal(ctx, srcValParams) {
         case 'ENVPARAM':
             value = clone(ibiz.env);
             break;
+        case 'EXPRESSION':
+            if (!expression) {
+                throw new ModelError(srcValParams, `表达式为空`);
+            }
+            value = ScriptFactory.execScriptFn(ctx, expression, {
+                singleRowReturn: true,
+                isAsync: false,
+            });
+            break;
         default:
             throw new ModelError(srcValParams, `暂未支持源值类型${srcValueType}`);
     }

package/out/interface/service/service/i-app-de.service.d.ts

@@ -259,13 +259,11 @@ export interface IAppDEService {
      * @param {IAppDEMethodDTO} [dto] dto模型对象
      * @param {{
      *       isLocalMode?: boolean; 是否是临时模式
-     *       inSelfLoop?: boolean; 是否是自关系递归
      *     }} [opts]
      * @return {*}  {MethodDto}
      */
     createMethodDto(dto?: IAppDEMethodDTO, opts?: {
         isLocalMode?: boolean;
-        inSelfLoop?: boolean;
     }): MethodDto;
 }
 //# sourceMappingURL=i-app-de.service.d.ts.map

package/out/interface/service/service/i-app-de.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"i-app-de.service.d.ts","sourceRoot":"","sources":["../../../../src/interface/service/service/i-app-de.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"i-app-de.service.d.ts","sourceRoot":"","sources":["../../../../src/interface/service/service/i-app-de.service.ts"],"names":[],"mappings":"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"}

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

@@ -13,7 +13,6 @@ export declare class MethodDto {
     protected entity: IAppDataEntity;
     protected isLocalMode?: boolean | undefined;
     protected dto?: IAppDEMethodDTO | undefined;
-    protected inSelfLoop?: boolean | undefined;
     protected app?: IAppService;
     protected fields: IAppDEMethodDTOField[];
     protected dtoMap: Map<string, MethodDto>;
@@ -25,9 +24,8 @@ export declare class MethodDto {
      * @param {IAppDataEntity} entity
      * @param {boolean} [isLocalMode]
      * @param {IAppDEMethodDTO} [dto]
-     * @param {boolean} [inSelfLoop] 是否在自关系循环中
      */
-    constructor(service: IAppDEService, entity: IAppDataEntity, isLocalMode?: boolean | undefined, dto?: IAppDEMethodDTO | undefined, inSelfLoop?: boolean | undefined);
+    constructor(service: IAppDEService, entity: IAppDataEntity, isLocalMode?: boolean | undefined, dto?: IAppDEMethodDTO | undefined);
     /**
      * 转换数组成ListMap
      *

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;AAI1B,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAM1E;;;;;;;GAOG;AACH,qBAAa,SAAS;IAkBlB,SAAS,CAAC,OAAO,EAAE,aAAa;IAChC,SAAS,CAAC,MAAM,EAAE,cAAc;IAChC,SAAS,CAAC,WAAW,CAAC;IACtB,SAAS,CAAC,GAAG,CAAC;IACd,SAAS,CAAC,UAAU,CAAC;IArBvB,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;IAErD;;;;;;;;;OASG;gBAES,OAAO,EAAE,aAAa,EACtB,MAAM,EAAE,cAAc,EACtB,WAAW,CAAC,qBAAS,EACrB,GAAG,CAAC,6BAAiB,EACrB,UAAU,CAAC,qBAAS;IAUhC;;;;;OAKG;IACH,OAAO,CAAC,qBAAqB;IAQ7B;;;;;OAKG;IACH,OAAO,CAAC,qBAAqB;IAS7B;;;;;;;;OAQG;IACG,GAAG,CACP,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,KAAK,EACX,MAAM,GAAE,OAAe,GACtB,OAAO,CAAC,KAAK,CAAC;IA0FjB;;;;;;;;OAQG;IACG,IAAI,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;IAqDpE;;;;;;;;;OASG;cACa,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,KAAK,GAAE,MAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IA4B3E;;;;;;;;;OASG;cACa,WAAW,CACzB,OAAO,EAAE,QAAQ,EACjB,KAAK,EAAE,oBAAoB,GAC1B,OAAO,CAAC,SAAS,CAAC;CAsBtB"}
+{"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;AAI1B,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAM1E;;;;;;;GAOG;AACH,qBAAa,SAAS;IAiBlB,SAAS,CAAC,OAAO,EAAE,aAAa;IAChC,SAAS,CAAC,MAAM,EAAE,cAAc;IAChC,SAAS,CAAC,WAAW,CAAC;IACtB,SAAS,CAAC,GAAG,CAAC;IAnBhB,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;IAErD;;;;;;;;OAQG;gBAES,OAAO,EAAE,aAAa,EACtB,MAAM,EAAE,cAAc,EACtB,WAAW,CAAC,qBAAS,EACrB,GAAG,CAAC,6BAAiB;IAUjC;;;;;OAKG;IACH,OAAO,CAAC,qBAAqB;IAQ7B;;;;;OAKG;IACH,OAAO,CAAC,qBAAqB;IAS7B;;;;;;;;OAQG;IACG,GAAG,CACP,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,KAAK,EACX,MAAM,GAAE,OAAe,GACtB,OAAO,CAAC,KAAK,CAAC;IA0FjB;;;;;;;;OAQG;IACG,IAAI,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;IAkDpE;;;;;;;;;OASG;cACa,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,KAAK,GAAE,MAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IA4B3E;;;;;;;;;OASG;cACa,WAAW,CACzB,OAAO,EAAE,QAAQ,EACjB,KAAK,EAAE,oBAAoB,GAC1B,OAAO,CAAC,SAAS,CAAC;CAoBtB"}

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

@@ -18,14 +18,12 @@ export class MethodDto {
      * @param {IAppDataEntity} entity
      * @param {boolean} [isLocalMode]
      * @param {IAppDEMethodDTO} [dto]
-     * @param {boolean} [inSelfLoop] 是否在自关系循环中
      */
-    constructor(service, entity, isLocalMode, dto, inSelfLoop) {
+    constructor(service, entity, isLocalMode, dto) {
         this.service = service;
         this.entity = entity;
         this.isLocalMode = isLocalMode;
         this.dto = dto;
-        this.inSelfLoop = inSelfLoop;
         this.dtoMap = new Map();
         if (dto) {
             this.app = ibiz.hub.getApp(entity.appId);
@@ -156,9 +154,6 @@ export class MethodDto {
      * @return {*}  {Promise<IDataEntity[]>}
      */
     async sets(context, data) {
-        if (this.isLocalMode && !this.inSelfLoop) {
-            this.service.local.clear();
-        }
         const uiDomain = ibiz.uiDomainManager.get(context.srfsessionid);
         if (uiDomain && uiDomain.state.rsInit !== true) {
             await this.calcRs(context);
@@ -255,12 +250,10 @@ export class MethodDto {
         }
         const entity = await ibiz.hub.getAppDataEntity(field.refAppDataEntityId, this.entity.appId);
         const methodDto = findModelChild(entity.appDEMethodDTOs || [], field.refAppDEMethodDTOId);
-        const inSelfLoop = this.entity.codeName === entity.codeName;
         const service = await this.app.deService.getService(context, entity.id);
         service.isLocalMode = true;
         const dto = service.createMethodDto(methodDto, {
             isLocalMode: true,
-            inSelfLoop,
         });
         this.dtoMap.set(field.codeName, dto);
         return dto;

package/out/service/mqtt/mqtt.service.js

@@ -79,10 +79,10 @@ export class MqttService {
             ibiz.log.debug('mqtt message', topic, payload.toString());
         });
         this.client.on('reconnect', () => {
-            ibiz.log.debug('mqtt reconnect');
+            ibiz.log.warn('mqtt reconnect');
         });
         this.client.on('close', () => {
-            console.debug('mqtt close');
+            ibiz.log.warn('mqtt close');
         });
     }
     /**

package/out/service/service/auth/v7-auth.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"v7-auth.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/auth/v7-auth.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,mDAAmD,CAAC;AAE9E;;;;;;;GAOG;AACH,qBAAa,aAAc,YAAW,YAAY;IAChD,IAAI,WAAW,IAAI,OAAO,CAEzB;IAEK,cAAc,IAAI,OAAO,CAAC,OAAO,CAAC;IAqBlC,KAAK,CACT,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,QAAQ,CAAC,EAAE,OAAO,GACjB,OAAO,CAAC,OAAO,CAAC;IAkCb,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC;IAiB1B,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAiClC,WAAW,IAAI,SAAS,GAAG,SAAS;CAUrC"}
+{"version":3,"file":"v7-auth.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/auth/v7-auth.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,mDAAmD,CAAC;AAE9E;;;;;;;GAOG;AACH,qBAAa,aAAc,YAAW,YAAY;IAChD,IAAI,WAAW,IAAI,OAAO,CAEzB;IAEK,cAAc,IAAI,OAAO,CAAC,OAAO,CAAC;IAqBlC,KAAK,CACT,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,QAAQ,CAAC,EAAE,OAAO,GACjB,OAAO,CAAC,OAAO,CAAC;IAkCb,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC;IAmB1B,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAiClC,WAAW,IAAI,SAAS,GAAG,SAAS;CAUrC"}

package/out/service/service/auth/v7-auth.service.js

@@ -66,6 +66,8 @@ export class V7AuthService {
             clearCookie(CoreConst.TOKEN_EXPIRES);
             clearCookie(CoreConst.TOKEN_REMEMBER);
             clearCookie(CoreConst.IS_ANONYMOUS);
+            ibiz.appData = undefined;
+            ibiz.orgData = undefined;
             return true;
         }
         catch (err) {

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

@@ -177,7 +177,6 @@ export declare class DEService implements IAppDEService {
     destroy(): Promise<void>;
     createMethodDto(dto?: IAppDEMethodDTO, opts?: {
         isLocalMode?: boolean;
-        inSelfLoop?: boolean;
     }): MethodDto;
 }
 //# sourceMappingURL=de.service.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"de.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/entity/de.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"de.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/entity/de.service.ts"],"names":[],"mappings":"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"}

package/out/service/service/entity/de.service.js

@@ -246,6 +246,6 @@ export class DEService {
         this.local.clear();
     }
     createMethodDto(dto, opts) {
-        return new MethodDto(this, this.model, opts === null || opts === void 0 ? void 0 : opts.isLocalMode, dto, opts === null || opts === void 0 ? void 0 : opts.inSelfLoop);
+        return new MethodDto(this, this.model, opts === null || opts === void 0 ? void 0 : opts.isLocalMode, dto);
     }
 }

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

@@ -1 +1 @@
-{"version":3,"file":"method-renturn.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/method-renturn.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhE,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAGpD,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEnE;;;;;;;GAOG;AACH,qBAAa,YAAY;IAcrB,SAAS,CAAC,OAAO,EAAE,aAAa;IAChC,SAAS,CAAC,MAAM,EAAE,cAAc;IAChC,SAAS,CAAC,MAAM,EAAE,YAAY;IAC9B,SAAS,CAAC,WAAW,EAAE,OAAO;IAhBhC,SAAS,CAAC,GAAG,CAAC,EAAE,SAAS,CAAC;IAE1B;;;;;;;;;OASG;gBAES,OAAO,EAAE,aAAa,EACtB,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,YAAY,EACpB,WAAW,GAAE,OAAe;IAgBxC;;;;;;;;OAQG;IACG,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,WAAW,CAAC;CAUnE"}
+{"version":3,"file":"method-renturn.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/method-renturn.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhE,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAGpD,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEnE;;;;;;;GAOG;AACH,qBAAa,YAAY;IAcrB,SAAS,CAAC,OAAO,EAAE,aAAa;IAChC,SAAS,CAAC,MAAM,EAAE,cAAc;IAChC,SAAS,CAAC,MAAM,EAAE,YAAY;IAC9B,SAAS,CAAC,WAAW,EAAE,OAAO;IAhBhC,SAAS,CAAC,GAAG,CAAC,EAAE,SAAS,CAAC;IAE1B;;;;;;;;;OASG;gBAES,OAAO,EAAE,aAAa,EACtB,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,YAAY,EACpB,WAAW,GAAE,OAAe;IAgBxC;;;;;;;;OAQG;IACG,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,WAAW,CAAC;CAgBnE"}

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

@@ -46,6 +46,12 @@ export class MethodReturn {
      */
     async handle(context, data) {
         if (this.dto) {
+            const app = ibiz.hub.getApp(this.entity.appId);
+            // 设置之前清理掉当前界面域下的数据缓存
+            app.deService.clearTempCache({
+                srfappid: app.appId,
+                srfsessionid: context.srfsessionid,
+            });
             const items = await this.dto.sets(context, [data]);
             return items[0];
         }

package/out/service/utils/res-path/res-path.d.ts

@@ -8,11 +8,11 @@ import { IAppDataEntity } from '@ibiz/model-core';
  * @author lxm
  * @date 2023-07-12 07:02:52
  * @export
- * @param {IContext} context
+ * @param {IParams} context
  * @param {IAppDataEntity} entity
  * @return {*}  {({ path: string; keys: string[] } | undefined)}
  */
-export declare function getMatchResPath(context: IContext, entity: IAppDataEntity): {
+export declare function getMatchResPath(context: IParams, entity: IAppDataEntity): {
     path: string;
     keys: string[];
 } | undefined;

package/out/service/utils/res-path/res-path.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"res-path.d.ts","sourceRoot":"","sources":["../../../../src/service/utils/res-path/res-path.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAKlD;;;;;;;;;;;;GAYG;AACH,wBAAgB,eAAe,CAC7B,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,cAAc,GACrB;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,EAAE,CAAA;CAAE,GAAG,SAAS,CAkC9C;AAED;;;;;;;;;GASG;AACH,wBAAgB,WAAW,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,cAAc,GAAG,MAAM,CAkB7E"}
+{"version":3,"file":"res-path.d.ts","sourceRoot":"","sources":["../../../../src/service/utils/res-path/res-path.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAKlD;;;;;;;;;;;;GAYG;AACH,wBAAgB,eAAe,CAC7B,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,cAAc,GACrB;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,EAAE,CAAA;CAAE,GAAG,SAAS,CAkC9C;AAED;;;;;;;;;GASG;AACH,wBAAgB,WAAW,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,cAAc,GAAG,MAAM,CAkB7E"}

package/out/service/utils/res-path/res-path.js

@@ -9,7 +9,7 @@ const reg = /\$\{(.*?)\}/g;
  * @author lxm
  * @date 2023-07-12 07:02:52
  * @export
- * @param {IContext} context
+ * @param {IParams} context
  * @param {IAppDataEntity} entity
  * @return {*}  {({ path: string; keys: string[] } | undefined)}
  */

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

@@ -16,6 +16,6 @@ export class DebugParamNode extends UILogicNode {
             throw new RuntimeModelError(this.model, '缺少目标参数对象配置');
         }
         const param = ctx.params[dstDEUILogicParamId];
-        console.log(`逻辑节点${name}操作参数值:`, param);
+        ibiz.log.debug(`逻辑节点${name}操作参数值:`, param);
     }
 }

package/out/ui-logic/ui-logic-node/raw-js-code-node/raw-js-code-node.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"raw-js-code-node.d.ts","sourceRoot":"","sources":["../../../../src/ui-logic/ui-logic-node/raw-js-code-node/raw-js-code-node.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAErD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,qBAAa,aAAc,SAAQ,WAAW;IACpC,KAAK,EAAE,iBAAiB,CAAC;IAE3B,IAAI,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;CAa/C"}
+{"version":3,"file":"raw-js-code-node.d.ts","sourceRoot":"","sources":["../../../../src/ui-logic/ui-logic-node/raw-js-code-node/raw-js-code-node.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAErD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,qBAAa,aAAc,SAAQ,WAAW;IACpC,KAAK,EAAE,iBAAiB,CAAC;IAE3B,IAAI,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;CAY/C"}

package/out/ui-logic/ui-logic-node/raw-js-code-node/raw-js-code-node.js

@@ -2,7 +2,6 @@ import { ScriptFactory } from '../../../utils';
 import { UILogicNode } from '../ui-logic-node';
 export class RawJSCodeNode extends UILogicNode {
     async exec(ctx) {
-        console.log(ctx);
         ScriptFactory.execScriptFn({
             view: ctx.view,
             context: ctx.context,

package/out/utils/script/script-function.js

@@ -20,7 +20,7 @@ export class ScriptFunction {
                 return fn.apply({}, args);
             }
             catch (error) {
-                console.log('报错脚本', code);
+                ibiz.log.error('报错脚本', code);
                 throw error;
             }
         };

package/out/utils/ui-domain/ui-domain.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ui-domain.d.ts","sourceRoot":"","sources":["../../../src/utils/ui-domain/ui-domain.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAG5C;;;;;;;GAOG;AACH,qBAAa,QAAQ;IACnB;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IAEpB;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE;QAAE,MAAM,EAAE,OAAO,CAAA;KAAE,CAAqB;IAExD;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAa;IAErD;;;;;;;OAOG;IACH,SAAS,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAa;IAEtD;;;;;;;OAOG;gBACS,EAAE,CAAC,EAAE,MAAM;IAQvB;;;;;;;OAOG;IACH,YAAY,CAAC,eAAe,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,IAAI;IAIhE;;;;;;;OAOG;IACH,YAAY,CAAC,eAAe,EAAE,MAAM,GAAG,QAAQ,EAAE;IAOjD;;;;;OAKG;IACH,YAAY,IAAI,IAAI;IAepB;;;;;OAKG;IACH,OAAO,IAAI,IAAI;CAWhB"}
+{"version":3,"file":"ui-domain.d.ts","sourceRoot":"","sources":["../../../src/utils/ui-domain/ui-domain.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAG5C;;;;;;;GAOG;AACH,qBAAa,QAAQ;IACnB;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IAEpB;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE;QAAE,MAAM,EAAE,OAAO,CAAA;KAAE,CAAqB;IAExD;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAa;IAErD;;;;;;;OAOG;IACH,SAAS,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAa;IAEtD;;;;;;;OAOG;gBACS,EAAE,CAAC,EAAE,MAAM;IAQvB;;;;;;;OAOG;IACH,YAAY,CAAC,eAAe,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,IAAI;IAIhE;;;;;;;OAOG;IACH,YAAY,CAAC,eAAe,EAAE,MAAM,GAAG,QAAQ,EAAE;IAOjD;;;;;OAKG;IACH,YAAY,IAAI,IAAI;IAcpB;;;;;OAKG;IACH,OAAO,IAAI,IAAI;CAWhB"}

package/out/utils/ui-domain/ui-domain.js

@@ -93,7 +93,6 @@ export class UIDomain {
                 this.rs2Map.get(major).push(config);
             });
         });
-        console.log(Array.from(this.rs2Map.values()));
     }
     /**
      * 界面域销毁

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.5.3-beta.6",
+  "version": "0.5.3-beta.8",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -29,7 +29,7 @@
   "author": "chitanda",
   "license": "MIT",
   "devDependencies": {
-    "@ibiz-template/core": "^0.5.2",
+    "@ibiz-template/core": "^0.5.3-beta.7",
     "@ibiz/model-core": "^0.1.3",
     "@types/path-browserify": "^1.0.2",
     "@types/qs": "^6.9.11",
@@ -59,5 +59,5 @@
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
-  "gitHead": "fd9a03832183acb0fbdfc3592b1ff820257c2783"
+  "gitHead": "cb713ab80cb0e89e6fe89cddb752e774174f99d0"
 }

package/src/application.ts

@@ -130,7 +130,7 @@ export class Application implements IAppService {
   async init(): Promise<void> {
     await this.authority.init();
     await this.loadAppModelStyle();
-    if (ibiz.env.enableMqtt && ibiz.appData) {
+    if (ibiz.env.enableMqtt && ibiz.appData && ibiz.auth.isAnonymous !== true) {
       this.mqtt = new MqttService(
         ibiz.appData.mqtttopic,
         getToken()!,

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

@@ -20,6 +20,24 @@ type SrcValParams = {
    * 源参数对象id
    */
   srcDELogicParamId?: string;
+
+  /**
+   * 目标逻辑参数
+   *
+   */
+  dstDELogicParamId?: string;
+
+  /**
+   * 目标属性名称
+   *
+   */
+  dstFieldName?: string;
+
+  /**
+   * 表达式
+   *
+   */
+  expression?: string;
 };
 
 /**
@@ -35,7 +53,8 @@ export function handleSrcVal(
   ctx: DELogicContext,
   srcValParams: SrcValParams,
 ): unknown {
-  const { srcDELogicParamId, srcFieldName, srcValue } = srcValParams;
+  const { srcDELogicParamId, srcFieldName, srcValue, expression } =
+    srcValParams;
   // 没有源值类型就是逻辑参数
   const srcValueType = srcValParams.srcValueType || 'SRCDLPARAM';
   // 取属性值
@@ -74,6 +93,15 @@ export function handleSrcVal(
     case 'ENVPARAM':
       value = clone(ibiz.env);
       break;
+    case 'EXPRESSION':
+      if (!expression) {
+        throw new ModelError(srcValParams, `表达式为空`);
+      }
+      value = ScriptFactory.execScriptFn(ctx, expression!, {
+        singleRowReturn: true,
+        isAsync: false,
+      });
+      break;
     default:
       throw new ModelError(srcValParams, `暂未支持源值类型${srcValueType}`);
   }

package/src/interface/service/service/i-app-de.service.ts

@@ -352,7 +352,6 @@ export interface IAppDEService {
    * @param {IAppDEMethodDTO} [dto] dto模型对象
    * @param {{
    *       isLocalMode?: boolean; 是否是临时模式
-   *       inSelfLoop?: boolean; 是否是自关系递归
    *     }} [opts]
    * @return {*}  {MethodDto}
    */
@@ -360,7 +359,6 @@ export interface IAppDEService {
     dto?: IAppDEMethodDTO,
     opts?: {
       isLocalMode?: boolean;
-      inSelfLoop?: boolean;
     },
   ): MethodDto;
 }

package/src/service/dto/method.dto.ts

@@ -36,14 +36,12 @@ export class MethodDto {
    * @param {IAppDataEntity} entity
    * @param {boolean} [isLocalMode]
    * @param {IAppDEMethodDTO} [dto]
-   * @param {boolean} [inSelfLoop] 是否在自关系循环中
    */
   constructor(
     protected service: IAppDEService,
     protected entity: IAppDataEntity,
     protected isLocalMode?: boolean,
     protected dto?: IAppDEMethodDTO,
-    protected inSelfLoop?: boolean,
   ) {
     if (dto) {
       this.app = ibiz.hub.getApp(entity.appId);
@@ -195,9 +193,6 @@ export class MethodDto {
    * @return {*}  {Promise<IDataEntity[]>}
    */
   async sets(context: IContext, data: IData[]): Promise<IDataEntity[]> {
-    if (this.isLocalMode && !this.inSelfLoop) {
-      this.service.local.clear();
-    }
     const uiDomain = ibiz.uiDomainManager.get(context.srfsessionid);
     if (uiDomain && uiDomain.state.rsInit !== true) {
       await this.calcRs(context);
@@ -310,12 +305,10 @@ export class MethodDto {
       entity.appDEMethodDTOs || [],
       field.refAppDEMethodDTOId!,
     )!;
-    const inSelfLoop = this.entity.codeName === entity.codeName;
     const service = await this.app!.deService.getService(context, entity.id!);
     service.isLocalMode = true;
     const dto = service.createMethodDto(methodDto, {
       isLocalMode: true,
-      inSelfLoop,
     });
     this.dtoMap.set(field.codeName!, dto);
     return dto;

package/src/service/mqtt/mqtt.service.ts

@@ -99,10 +99,10 @@ export class MqttService {
       ibiz.log.debug('mqtt message', topic, payload.toString());
     });
     this.client.on('reconnect', () => {
-      ibiz.log.debug('mqtt reconnect');
+      ibiz.log.warn('mqtt reconnect');
     });
     this.client.on('close', () => {
-      console.debug('mqtt close');
+      ibiz.log.warn('mqtt close');
     });
   }
 

package/src/service/service/auth/v7-auth.service.ts

@@ -82,6 +82,8 @@ export class V7AuthService implements IAuthService {
       clearCookie(CoreConst.TOKEN_EXPIRES);
       clearCookie(CoreConst.TOKEN_REMEMBER);
       clearCookie(CoreConst.IS_ANONYMOUS);
+      ibiz.appData = undefined;
+      ibiz.orgData = undefined;
       return true;
     } catch (err: unknown) {
       ibiz.notification.error({

package/src/service/service/entity/de.service.ts

@@ -409,15 +409,8 @@ export class DEService implements IAppDEService {
     dto?: IAppDEMethodDTO,
     opts?: {
       isLocalMode?: boolean;
-      inSelfLoop?: boolean;
     },
   ): MethodDto {
-    return new MethodDto(
-      this,
-      this.model,
-      opts?.isLocalMode,
-      dto,
-      opts?.inSelfLoop,
-    );
+    return new MethodDto(this, this.model, opts?.isLocalMode, dto);
   }
 }

package/src/service/service/entity/method/method-renturn.ts

@@ -57,6 +57,12 @@ export class MethodReturn {
    */
   async handle(context: IContext, data: IData): Promise<IDataEntity> {
     if (this.dto) {
+      const app = ibiz.hub.getApp(this.entity.appId);
+      // 设置之前清理掉当前界面域下的数据缓存
+      app.deService.clearTempCache({
+        srfappid: app.appId,
+        srfsessionid: context.srfsessionid,
+      });
       const items = await this.dto.sets(context, [data]);
       return items[0];
     }

package/src/service/utils/res-path/res-path.ts

@@ -12,12 +12,12 @@ const reg = /\$\{(.*?)\}/g;
  * @author lxm
  * @date 2023-07-12 07:02:52
  * @export
- * @param {IContext} context
+ * @param {IParams} context
  * @param {IAppDataEntity} entity
  * @return {*}  {({ path: string; keys: string[] } | undefined)}
  */
 export function getMatchResPath(
-  context: IContext,
+  context: IParams,
   entity: IAppDataEntity,
 ): { path: string; keys: string[] } | undefined {
   const pathItems = entity.requestPaths || [];

package/src/ui-logic/ui-logic-node/debug-param-node/debug-param-node.ts

@@ -21,6 +21,6 @@ export class DebugParamNode extends UILogicNode {
       throw new RuntimeModelError(this.model, '缺少目标参数对象配置');
     }
     const param = ctx.params[dstDEUILogicParamId];
-    console.log(`逻辑节点${name}操作参数值:`, param);
+    ibiz.log.debug(`逻辑节点${name}操作参数值:`, param);
   }
 }

package/src/ui-logic/ui-logic-node/raw-js-code-node/raw-js-code-node.ts

@@ -7,7 +7,6 @@ export class RawJSCodeNode extends UILogicNode {
   declare model: IDEUIRawCodeLogic;
 
   async exec(ctx: UILogicContext): Promise<void> {
-    console.log(ctx);
     ScriptFactory.execScriptFn(
       {
         view: ctx.view,

package/src/utils/script/script-function.ts

@@ -31,7 +31,7 @@ export class ScriptFunction {
       try {
         return fn.apply({}, args);
       } catch (error) {
-        console.log('报错脚本', code);
+        ibiz.log.error('报错脚本', code);
         throw error;
       }
     };

package/src/utils/ui-domain/ui-domain.ts

@@ -109,7 +109,6 @@ export class UIDomain {
         this.rs2Map.get(major)!.push(config);
       });
     });
-    console.log(Array.from(this.rs2Map.values()));
   }
 
   /**