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

package/dist/index.esm.js

@@ -1501,7 +1501,7 @@ var ScriptFunction = class {
       try {
         return fn.apply({}, args);
       } catch (error) {
-        console.log("\u62A5\u9519\u811A\u672C", code);
+        ibiz.log.error("\u62A5\u9519\u811A\u672C", code);
         throw error;
       }
     };
@@ -2935,7 +2935,6 @@ var UIDomain = class {
         this.rs2Map.get(major).push(config);
       });
     });
-    console.log(Array.from(this.rs2Map.values()));
   }
   /**
    * 界面域销毁
@@ -6014,14 +6013,12 @@ var MethodDto = class {
    * @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 = /* @__PURE__ */ new Map();
     if (dto) {
       this.app = ibiz.hub.getApp(entity.appId);
@@ -6151,9 +6148,6 @@ var MethodDto = class {
    * @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);
@@ -6253,12 +6247,10 @@ var MethodDto = class {
       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
+      isLocalMode: true
     });
     this.dtoMap.set(field.codeName, dto);
     return dto;
@@ -6504,13 +6496,7 @@ var DEService = class {
     this.local.clear();
   }
   createMethodDto(dto, opts) {
-    return new MethodDto(
-      this,
-      this.model,
-      opts == null ? void 0 : opts.isLocalMode,
-      dto,
-      opts == null ? void 0 : opts.inSelfLoop
-    );
+    return new MethodDto(this, this.model, opts == null ? void 0 : opts.isLocalMode, dto);
   }
 };
 
@@ -7230,6 +7216,8 @@ var V7AuthService = class {
       clearCookie(CoreConst.TOKEN_EXPIRES);
       clearCookie(CoreConst.TOKEN_REMEMBER);
       clearCookie(CoreConst.IS_ANONYMOUS);
+      ibiz.appData = void 0;
+      ibiz.orgData = void 0;
       return true;
     } catch (err) {
       ibiz.notification.error({
@@ -7407,6 +7395,11 @@ var MethodReturn = class {
    */
   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];
     }
@@ -7962,7 +7955,7 @@ import { clone as clone10 } from "ramda";
 import { ModelError as ModelError10 } from "@ibiz-template/core";
 import { clone as clone9 } from "ramda";
 function handleSrcVal(ctx, srcValParams) {
-  const { srcDELogicParamId, srcFieldName, srcValue } = srcValParams;
+  const { srcDELogicParamId, srcFieldName, srcValue, expression } = srcValParams;
   const srcValueType = srcValParams.srcValueType || "SRCDLPARAM";
   let srcField = srcFieldName;
   let value;
@@ -7992,6 +7985,15 @@ function handleSrcVal(ctx, srcValParams) {
     case "ENVPARAM":
       value = clone9(ibiz.env);
       break;
+    case "EXPRESSION":
+      if (!expression) {
+        throw new ModelError10(srcValParams, "\u8868\u8FBE\u5F0F\u4E3A\u7A7A");
+      }
+      value = ScriptFactory.execScriptFn(ctx, expression, {
+        singleRowReturn: true,
+        isAsync: false
+      });
+      break;
     default:
       throw new ModelError10(srcValParams, "\u6682\u672A\u652F\u6301\u6E90\u503C\u7C7B\u578B".concat(srcValueType));
   }
@@ -9964,10 +9966,10 @@ var MqttService = class {
       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");
     });
   }
   /**
@@ -10455,7 +10457,7 @@ var Application = class {
   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(),
@@ -16017,7 +16019,7 @@ var DebugParamNode = class extends UILogicNode {
       throw new RuntimeModelError38(this.model, "\u7F3A\u5C11\u76EE\u6807\u53C2\u6570\u5BF9\u8C61\u914D\u7F6E");
     }
     const param = ctx.params[dstDEUILogicParamId];
-    console.log("\u903B\u8F91\u8282\u70B9".concat(name, "\u64CD\u4F5C\u53C2\u6570\u503C:"), param);
+    ibiz.log.debug("\u903B\u8F91\u8282\u70B9".concat(name, "\u64CD\u4F5C\u53C2\u6570\u503C:"), param);
   }
 };
 
@@ -16209,7 +16211,6 @@ var ExecuteDELogicNode = class extends UILogicNode {
 // src/ui-logic/ui-logic-node/raw-js-code-node/raw-js-code-node.ts
 var RawJSCodeNode = class extends UILogicNode {
   async exec(ctx) {
-    console.log(ctx);
     ScriptFactory.execScriptFn(
       {
         view: ctx.view,