@ibiz-template/runtime 0.2.1 → 0.2.4

package/dist/index.esm.js

@@ -18904,7 +18904,15 @@ function getViewEngines(view) {
   if (viewLayoutPanel) {
     appViewEngines.push(...viewLayoutPanel.appViewEngines || []);
   }
-  return appViewEngines;
+  return appViewEngines.filter((engine) => {
+    switch (engine.engineCat) {
+      case "CTRL":
+        ibiz.log.warn("\u672A\u652F\u6301\u7684\u5F15\u64CE\u5206\u7C7B\uFF1A".concat(engine.engineType));
+        return false;
+      default:
+        return true;
+    }
+  });
 }
 
 // src/model/panel/data-container.ts
@@ -22936,6 +22944,7 @@ import { isArray as isArray3 } from "lodash-es";
 // src/service/app-data-entity/app-data-entity.ts
 import { clone as clone4, isNil as isNil7 } from "ramda";
 import { DataTypes } from "@ibiz-template/core";
+import { createUUID as createUUID2 } from "qx-util";
 
 // src/service/constant/srfuf.ts
 var Srfuf = /* @__PURE__ */ ((Srfuf2) => {
@@ -22947,7 +22956,7 @@ var Srfuf = /* @__PURE__ */ ((Srfuf2) => {
 // src/service/app-data-entity/app-data-entity.ts
 var AppDataEntity = class _AppDataEntity {
   get srfuf() {
-    return this.srfkey ? 1 /* UPDATE */ : 0 /* CREATE */;
+    return this.srfkey === this.tempsrfkey ? 1 /* UPDATE */ : 0 /* CREATE */;
   }
   /**
    * Creates an instance of AppDataEntity.
@@ -22958,7 +22967,6 @@ var AppDataEntity = class _AppDataEntity {
    * @param {(IData | AppDataEntity)} data
    */
   constructor(entity, data) {
-    let _srfkey;
     Object.defineProperty(this, "_entity", {
       enumerable: false,
       configurable: true,
@@ -22985,20 +22993,12 @@ var AppDataEntity = class _AppDataEntity {
     );
     if (keyAppField) {
       const key = keyAppField.codeName.toLowerCase();
-      Object.defineProperty(this, "srfkeyfile", {
+      Object.defineProperty(this, "srfkeyfield", {
         get() {
           return key;
         }
       });
       Object.defineProperty(this, "srfkey", {
-        set(val) {
-          _srfkey = val;
-        },
-        get() {
-          return this._data[key] || _srfkey;
-        }
-      });
-      Object.defineProperty(this, "srfsourcekey", {
         set(val) {
           this._data[key] = val;
         },
@@ -23015,7 +23015,7 @@ var AppDataEntity = class _AppDataEntity {
     );
     if (majorAppField) {
       const major = majorAppField.codeName.toLowerCase();
-      Object.defineProperty(this, "srfmajorfile", {
+      Object.defineProperty(this, "srfmajorfield", {
         get() {
           return major;
         }
@@ -23031,6 +23031,12 @@ var AppDataEntity = class _AppDataEntity {
     } else {
       ibiz.log.warn("\u5B9E\u4F53[".concat(entity.codeName, "]\u672A\u914D\u7F6E\u4E3B\u6587\u672C\u5B57\u6BB5"));
     }
+    Object.defineProperty(this, "tempsrfkey", {
+      enumerable: false,
+      configurable: true,
+      writable: true,
+      value: isNil7(this.srfkey) ? createUUID2() : this.srfkey
+    });
     this.defineProperties();
   }
   /**
@@ -25260,27 +25266,54 @@ var DEService = class {
     });
   }
   /**
-   * 计算请求路径
+   * 获取 AI 聊天会话历史记录
    *
    * @author chitanda
-   * @date 2023-10-12 11:10:56
+   * @date 2023-10-26 14:10:58
+   * @param {IParams} context
+   * @param {IParams} [params={}]
+   * @param {IData} [data={}]
+   * @return {*}  {Promise<IHttpResponse>}
+   */
+  aiChatHistory(context, params = {}, data = {}) {
+    const app = ibiz.hub.getApp(this.model.appId);
+    const path2 = this.calcSsePath(context, true);
+    return app.net.post(path2, data, { srfactag: "AIChat", ...params });
+  }
+  /**
+   * 计算 AI 请求路径
+   *
+   * @author chitanda
+   * @date 2023-10-26 14:10:25
    * @protected
    * @param {IParams} context
+   * @param {boolean} [isHistories=false]
    * @return {*}  {string}
    */
-  calcSsePath(context) {
+  calcSsePath(context, isHistories = false) {
     const srfkey = context[this.model.codeName.toLowerCase()];
-    const curPath = "/".concat(this.model.codeName2.toLowerCase(), "/ssechatcompletion").concat(srfkey ? "/".concat(srfkey) : "");
+    const curPath = "/".concat(this.model.codeName2.toLowerCase(), "/ssechatcompletion").concat(isHistories ? "/histories" : "").concat(srfkey ? "/".concat(srfkey) : "");
     const resPath = calcResPath(context, this.model);
     return resPath + curPath;
   }
 };
 
 // src/service/service/control/control.service.ts
-import { clone as clone12 } from "ramda";
+import { clone as clone12 } from "@ibiz-template/core";
 
 // src/service/vo/control.vo.ts
+import { createUUID as createUUID3 } from "qx-util";
 import { clone as clone11, isNil as isNil10 } from "ramda";
+var BuildInKeys = [
+  "srfkey",
+  "srfmajortext",
+  "srfmajorfield",
+  "srfkeyfield",
+  "tempsrfkey",
+  "srfuf",
+  "srfdeid",
+  "srfdecodename"
+];
 var ControlVO = class _ControlVO {
   /**
    * Creates an instance of ControlVO.
@@ -25300,58 +25333,79 @@ var ControlVO = class _ControlVO {
       configurable: true,
       value: $dataUIMap || /* @__PURE__ */ new Map()
     });
+    ["srfkey", "srfmajortext"].forEach((key) => {
+      if (Object.prototype.hasOwnProperty.call(this.$origin, key)) {
+        Object.defineProperty(this, key, {
+          get() {
+            return this.$origin.srfkey;
+          },
+          set(val) {
+            this.$origin.srfkey = val;
+          },
+          enumerable: false,
+          configurable: true
+        });
+      } else if (this.$dataUIMap.has(key)) {
+        const { dataKey } = this.$dataUIMap.get(key);
+        Object.defineProperty(this, key, {
+          get() {
+            return this.$origin[dataKey];
+          },
+          set(val) {
+            this.$origin[dataKey] = val;
+          },
+          enumerable: false,
+          configurable: true
+        });
+      } else {
+        Object.defineProperty(this, key, {
+          enumerable: false,
+          configurable: true,
+          writable: true,
+          value: null
+        });
+      }
+    });
+    if (Object.prototype.hasOwnProperty.call(this.$origin, "tempsrfkey")) {
+      Object.defineProperty(this, "tempsrfkey", {
+        get() {
+          return this.$origin.tempsrfkey;
+        },
+        set(val) {
+          this.$origin.tempsrfkey = val;
+        },
+        enumerable: false,
+        configurable: true
+      });
+    } else {
+      Object.defineProperty(this, "tempsrfkey", {
+        enumerable: false,
+        configurable: true,
+        writable: true,
+        value: isNil10(this.srfkey) ? createUUID3() : this.srfkey
+      });
+    }
     Object.defineProperty(this, "srfuf", {
       get() {
-        if (isNil10(this.$origin.srfuf)) {
-          return this.srfkey ? 1 /* UPDATE */ : 0 /* CREATE */;
+        if (Object.prototype.hasOwnProperty.call(this.$origin, "srfuf")) {
+          return this.$origin.srfuf;
         }
-        return this.$origin.srfuf;
-      },
-      enumerable: false,
-      configurable: true
-    });
-    Object.defineProperty(this, "srfkey", {
-      get() {
-        return this.$origin.srfkey;
-      },
-      enumerable: false,
-      configurable: true
-    });
-    Object.defineProperty(this, "srfmajortext", {
-      get() {
-        return this.$origin.srfmajortext;
-      },
-      enumerable: false,
-      configurable: true
-    });
-    Object.defineProperty(this, "srfdeid", {
-      get() {
-        return this.$origin.srfdeid;
-      },
-      enumerable: false,
-      configurable: true
-    });
-    Object.defineProperty(this, "srfdecodename", {
-      get() {
-        return this.$origin.srfdecodename;
-      },
-      enumerable: false,
-      configurable: true
-    });
-    Object.defineProperty(this, "srfkeyfile", {
-      get() {
-        return this.$origin.srfkeyfile;
-      },
-      enumerable: false,
-      configurable: true
-    });
-    Object.defineProperty(this, "srfmajorfile", {
-      get() {
-        return this.$origin.srfmajorfile;
+        return this.srfkey === this.tempsrfkey ? 1 /* UPDATE */ : 0 /* CREATE */;
       },
       enumerable: false,
       configurable: true
     });
+    ["srfdeid", "srfdecodename", "srfkeyfield", "srfmajorfield"].forEach(
+      (key) => {
+        Object.defineProperty(this, key, {
+          get() {
+            return this.$origin[key];
+          },
+          enumerable: false,
+          configurable: true
+        });
+      }
+    );
     this.$dataUIMap.forEach((mapField, key) => {
       const value = mapField.dataKey;
       this.linkProperty(key, value, mapField);
@@ -25376,7 +25430,7 @@ var ControlVO = class _ControlVO {
    */
   linkProperty(uiKey, dataKey, mapField) {
     const isOriginField = mapField ? mapField.isOriginField : true;
-    if (uiKey === "srfuf") {
+    if (BuildInKeys.includes(uiKey)) {
       return;
     }
     if (isOriginField || Object.prototype.hasOwnProperty.call(this.$origin, uiKey)) {
@@ -25384,7 +25438,7 @@ var ControlVO = class _ControlVO {
         enumerable: true,
         configurable: true,
         get() {
-          return uiKey === "srfkey" ? this.$origin[dataKey] || this.$origin[uiKey] : this.$origin[dataKey];
+          return this.$origin[dataKey];
         },
         set(val) {
           this.$origin[dataKey] = val;
@@ -26185,7 +26239,7 @@ var CalendarItemData = class {
 };
 
 // src/service/mqtt/mqtt.service.ts
-import { QXEvent as QXEvent2, createUUID as createUUID2, isNilOrEmpty as isNilOrEmpty6 } from "qx-util";
+import { QXEvent as QXEvent2, createUUID as createUUID4, isNilOrEmpty as isNilOrEmpty6 } from "qx-util";
 var MqttService = class {
   /**
    * Creates an instance of MqttService.
@@ -26217,7 +26271,7 @@ var MqttService = class {
       // 超时时间
       connectTimeout: 6e3,
       // 认证信息
-      clientId: createUUID2(),
+      clientId: createUUID4(),
       username: "",
       password: "",
       // 心跳时间
@@ -26921,7 +26975,7 @@ var PanelNotifyState = /* @__PURE__ */ ((PanelNotifyState2) => {
 })(PanelNotifyState || {});
 
 // src/controller/common/view/view.controller.ts
-import { createUUID as createUUID4, notNilEmpty as notNilEmpty6 } from "qx-util";
+import { createUUID as createUUID6, notNilEmpty as notNilEmpty6 } from "qx-util";
 import { IBizContext as IBizContext2, RuntimeError as RuntimeError25 } from "@ibiz-template/core";
 import { isEmpty as isEmpty8, isNil as isNil17, isNotNil as isNotNil2 } from "ramda";
 
@@ -27716,7 +27770,7 @@ var ValueExUtil = class {
 // src/controller/utils/value-default/value-default.ts
 import { RuntimeError as RuntimeError23, ModelError as ModelError16 } from "@ibiz-template/core";
 import dayjs from "dayjs";
-import { createUUID as createUUID3 } from "qx-util";
+import { createUUID as createUUID5 } from "qx-util";
 import { isNil as isNil15, isNotNil } from "ramda";
 function getDefaultValue(opts, origins) {
   var _a;
@@ -27761,7 +27815,7 @@ function getDefaultValue(opts, origins) {
     case "CONTEXT":
       return params[defaultValue];
     case "UNIQUEID":
-      return createUUID3();
+      return createUUID5();
     default:
       throw new ModelError16({}, "\u9ED8\u8BA4\u503C\u7C7B\u578B[".concat(valueType, "]\u672A\u652F\u6301"));
   }
@@ -27861,12 +27915,12 @@ var BaseController = class {
   async created() {
     this.mountCounter.enroll(SELF_KEY);
     await this.onCreated();
-    this.state.isCreated = true;
     this.force(() => {
       this.mountSelf();
     });
+    await this._evt.emit("onCreated", void 0);
+    this.state.isCreated = true;
     ibiz.log.debug("".concat(this.constructor.name, ":").concat(this.name, " onCreated"));
-    this._evt.emit("onCreated", void 0);
   }
   /**
    * 生命周期-创建完成，实际执行逻辑，子类重写用这个
@@ -27908,9 +27962,9 @@ var BaseController = class {
    */
   async mounted() {
     await this.onMounted();
+    await this._evt.emit("onMounted", void 0);
     this.state.isMounted = true;
     ibiz.log.debug("".concat(this.constructor.name, ":").concat(this.name, " onMounted"));
-    this._evt.emit("onMounted", void 0);
   }
   /**
    * 生命周期-加载完成，实际执行逻辑，子类重写用这个
@@ -27927,9 +27981,9 @@ var BaseController = class {
    */
   async destroyed() {
     await this.onDestroyed();
+    await this._evt.emit("onDestroyed", void 0);
     this.state.isDestroyed = true;
     ibiz.log.debug("".concat(this.constructor.name, ":").concat(this.name, " onDestroyed"));
-    await this._evt.emit("onDestroyed", void 0);
     this.evt.destroy();
   }
   /**
@@ -28265,6 +28319,8 @@ var ViewController = class extends BaseController {
         const ins = ibiz.engine.getEngine(engine, this);
         if (ins) {
           this.engines.push(ins);
+        } else {
+          ibiz.log.warn("\u672A\u627E\u5230\u89C6\u56FE\u5F15\u64CE\u5B9E\u73B0\uFF1A", engine);
         }
       });
     } else {
@@ -28384,7 +28440,7 @@ var ViewController = class extends BaseController {
   handleContextParams() {
     this.context.srfappid = this.model.appId;
     if (isNil17(this.context.srfsessionid) || isEmpty8(this.context.srfsessionid)) {
-      this.context.srfsessionid = createUUID4();
+      this.context.srfsessionid = createUUID6();
     }
     const navContexts = this.model.appViewNavContexts;
     let context = {};
@@ -28770,6 +28826,7 @@ var ControlController = class extends BaseController {
     this.state.isLoading = false;
   }
   async onCreated() {
+    var _a;
     await super.onCreated();
     if (this.controlPanel) {
       this.childNames.push(this.controlPanel.name);
@@ -28778,6 +28835,15 @@ var ControlController = class extends BaseController {
     }
     this.handleControlParams();
     this.initControlScheduler(this.model.controlLogics);
+    if ((_a = this.scheduler) == null ? void 0 : _a.hasControlEventTrigger) {
+      this._evt.onAll((eventName, event) => {
+        this.scheduler.triggerControlEvent(
+          event.targetName,
+          event.eventName,
+          event
+        );
+      });
+    }
   }
   async onMounted() {
     var _a;
@@ -34268,7 +34334,7 @@ var ChartExpBarController = class extends ExpBarControlController {
 import { mergeDefaultInLeft } from "@ibiz-template/core";
 
 // src/controller/control/form/form/form.controller.ts
-import { debounceAndAsyncMerge } from "@ibiz-template/core";
+import { debounceAndAsyncMerge, recursiveIterate as recursiveIterate2 } from "@ibiz-template/core";
 var FormController = class extends ControlController {
   constructor() {
     super(...arguments);
@@ -34458,10 +34524,32 @@ var FormController = class extends ControlController {
   actionNotification(tag, opts) {
     super.actionNotification(tag, { data: this.data, ...opts || {} });
   }
+  /**
+   * 初始化部件逻辑调度器
+   * @author lxm
+   * @date 2023-08-21 11:53:37
+   * @param {IControlLogic[]} logics
+   * @return {*}  {void}
+   */
+  initControlScheduler(logics = []) {
+    const actualLogics = [...logics];
+    recursiveIterate2(
+      this.model,
+      (item) => {
+        if (item.controlLogics) {
+          actualLogics.push(...item.controlLogics);
+        }
+      },
+      {
+        childrenFields: ["deformPages", "deformTabPages", "deformDetails"]
+      }
+    );
+    super.initControlScheduler(actualLogics);
+  }
 };
 
 // src/controller/control/form/search-form/search-form.service.ts
-import { recursiveIterate as recursiveIterate2 } from "@ibiz-template/core";
+import { recursiveIterate as recursiveIterate3 } from "@ibiz-template/core";
 var SearchFormService = class extends ControlService {
   /**
    * 执行获取草稿方法
@@ -34485,7 +34573,7 @@ var SearchFormService = class extends ControlService {
    * @date 2022-08-31 18:08:37
    */
   initUIDataMap() {
-    recursiveIterate2(
+    recursiveIterate3(
       this.model,
       (item) => {
         if (item.detailType === "FORMITEM") {
@@ -34723,6 +34811,29 @@ var FormDetailState = class {
 // src/controller/control/form/form-detail/form-detail/form-detail.controller.ts
 import { isOverlap } from "@ibiz-template/core";
 var FormDetailController = class {
+  /**
+   * Creates an instance of FormDetailController.
+   * @author lxm
+   * @date 2022-08-24 20:08:22
+   * @param {T} model
+   */
+  constructor(model, form, parent) {
+    /**
+     * 动态逻辑结果
+     * @author lxm
+     * @date 2023-09-21 03:36:37
+     * @protected
+     */
+    this.dynaLogicResult = {
+      visible: true,
+      disabled: false,
+      required: false
+    };
+    this.model = model;
+    this.form = form;
+    this.parent = parent;
+    this.state = this.createState();
+  }
   /**
    * 表单数据
    *
@@ -34753,18 +34864,6 @@ var FormDetailController = class {
   get labelClass() {
     return [...this.state.class.label, ...this.state.class.labelDyna];
   }
-  /**
-   * Creates an instance of FormDetailController.
-   * @author lxm
-   * @date 2022-08-24 20:08:22
-   * @param {T} model
-   */
-  constructor(model, form, parent) {
-    this.model = model;
-    this.form = form;
-    this.parent = parent;
-    this.state = this.createState();
-  }
   /**
    * 子类不可覆盖或重写此方法，在 init 时需要重写的使用 onInit 方法。
    *
@@ -34811,6 +34910,9 @@ var FormDetailController = class {
    */
   async dataChangeNotify(names) {
     this.calcDynamicLogic(names);
+    this.calcDetailDisabled(this.data);
+    this.calcDetailVisible(this.data);
+    this.calcDetailRequired(this.data);
     this.calcDynaClass(this.data);
   }
   /**
@@ -34819,8 +34921,11 @@ var FormDetailController = class {
    * @author lxm
    * @date 2022-09-20 18:09:07
    */
-  async formStateNotify(state) {
-    this.calcDynamicLogic([], state);
+  async formStateNotify(_state) {
+    this.calcDynamicLogic([], true);
+    this.calcDetailDisabled(this.data);
+    this.calcDetailVisible(this.data);
+    this.calcDetailRequired(this.data);
     this.calcDynaClass(this.data);
   }
   /**
@@ -34830,28 +34935,28 @@ var FormDetailController = class {
    * @date 2022-09-20 19:09:20
    * @protected
    * @param {string[]} names 变更的属性集合
-   * @param {FormNotifyState} [state] 表单通知状态
+   * @param {boolean} [mustCalc=false] 是否强制计算一遍动态逻辑
    * @returns {*}  {void}
    */
-  calcDynamicLogic(names, state) {
+  calcDynamicLogic(names, mustCalc = false) {
     var _a;
     if (this.parent && !this.parent.state.visible) {
       return;
     }
     (_a = this.model.defdgroupLogics) == null ? void 0 : _a.forEach((logic) => {
       const relatedNames = logic.relatedDetailNames || [];
-      if (state || isOverlap(relatedNames, names)) {
+      if (mustCalc || isOverlap(relatedNames, names)) {
         try {
           const ok = verifyFormGroupLogic(this.form.data, logic);
           switch (logic.logicCat) {
             case "ITEMBLANK":
-              this.state.required = !ok;
+              this.dynaLogicResult.required = !ok;
               break;
             case "ITEMENABLE":
-              this.state.disabled = !ok;
+              this.dynaLogicResult.disabled = !ok;
               break;
             case "PANELVISIBLE":
-              this.state.visible = ok;
+              this.dynaLogicResult.visible = ok;
               break;
             default:
           }
@@ -34890,6 +34995,63 @@ var FormDetailController = class {
       }
     }
   }
+  /**
+   * 计算项的禁用状态
+   *
+   * @param {IData} data
+   */
+  calcDetailDisabled(data) {
+    let enable = !this.dynaLogicResult.disabled;
+    if (enable && this.form.scheduler) {
+      const itemEnable = this.form.scheduler.triggerItemEnable(this.model.id, {
+        data: [data]
+      });
+      if (itemEnable !== void 0) {
+        enable = itemEnable;
+      }
+    }
+    this.state.disabled = !enable;
+  }
+  /**
+   * 计算项的显示状态
+   *
+   * @param {IData} data
+   */
+  calcDetailVisible(data) {
+    let { visible } = this.dynaLogicResult;
+    if (visible && this.form.scheduler) {
+      const itemVIsible = this.form.scheduler.triggerItemVisible(
+        this.model.id,
+        {
+          data: [data]
+        }
+      );
+      if (itemVIsible !== void 0) {
+        visible = itemVIsible;
+      }
+    }
+    this.state.visible = visible;
+  }
+  /**
+   * 计算项的必填状态
+   *
+   * @param {IData} data
+   */
+  calcDetailRequired(data) {
+    let allowEmpty = !this.dynaLogicResult.required;
+    if (allowEmpty && this.form.scheduler) {
+      const itemAllowEmpty = this.form.scheduler.triggerItemBlank(
+        this.model.id,
+        {
+          data: [data]
+        }
+      );
+      if (itemAllowEmpty !== void 0) {
+        allowEmpty = itemAllowEmpty;
+      }
+    }
+    this.state.required = !allowEmpty;
+  }
 };
 
 // src/controller/control/form/form-detail/form-button/form-button.state.ts
@@ -34978,7 +35140,7 @@ var FormButtonController = class extends FormDetailController {
 
 // src/controller/control/form/form-detail/form-druipart/form-druipart.controller.ts
 import { isOverlap as isOverlap2 } from "@ibiz-template/core";
-import { createUUID as createUUID5, notNilEmpty as notNilEmpty8 } from "qx-util";
+import { createUUID as createUUID7, notNilEmpty as notNilEmpty8 } from "qx-util";
 
 // src/controller/control/form/form-detail/form-druipart/form-druipart.state.ts
 var FormDruipartState = class extends FormDetailState {
@@ -35091,7 +35253,7 @@ var FormDRUIPartController = class extends FormDetailController {
       this.form.context
     );
     if (!this.state.viewComponentKey) {
-      this.state.viewComponentKey = createUUID5();
+      this.state.viewComponentKey = createUUID7();
       this.navContext = newContext;
       this.navParams = newParams;
     } else if (JSON.stringify(this.navContext) !== JSON.stringify(newContext) || JSON.stringify(this.navParams) !== JSON.stringify(newParams)) {
@@ -35187,8 +35349,8 @@ var FormGroupPanelController = class extends FormDetailController {
     super.onInit();
     await this.initActionStates();
   }
-  async formStateNotify(state) {
-    super.calcDynamicLogic([], state);
+  async formStateNotify(_state) {
+    super.calcDynamicLogic([], true);
     if (this.state.actionGroupState) {
       this.state.actionGroupState.update(this.form.data.getOrigin());
     }
@@ -35470,9 +35632,9 @@ var FormItemController = class extends FormDetailController {
       this.setDefaultValue(false);
     }
   }
-  calcDynamicLogic(names, state) {
+  calcDynamicLogic(names, mustCalc = false) {
     if (!this.model.hidden) {
-      super.calcDynamicLogic(names, state);
+      super.calcDynamicLogic(names, mustCalc);
     }
   }
   /**
@@ -35778,11 +35940,12 @@ import {
   mergeDefaultInLeft as mergeDefaultInLeft2
 } from "@ibiz-template/core";
 import { debounce } from "lodash-es";
+import { createUUID as createUUID8 } from "qx-util";
 import { clone as clone18 } from "ramda";
 
 // src/controller/control/form/edit-form/edit-form.service.ts
 import {
-  recursiveIterate as recursiveIterate3,
+  recursiveIterate as recursiveIterate4,
   RuntimeModelError as RuntimeModelError52
 } from "@ibiz-template/core";
 var EditFormService = class extends ControlService {
@@ -35998,7 +36161,7 @@ var EditFormService = class extends ControlService {
       // 向导预置
       "srfnextform"
     ];
-    recursiveIterate3(
+    recursiveIterate4(
       this.model,
       (item) => {
         if (item.detailType === "FORMITEM" || item.detailType === "MDCTRL") {
@@ -36153,7 +36316,8 @@ var EditFormController = class extends FormController {
     } finally {
       await this.endLoading();
     }
-    res.data.$origin.srfsourcekey = void 0;
+    res.data.srfkey = void 0;
+    res.data.tempsrfkey = createUUID8();
     this.state.modified = false;
     this.state.data = res.data;
     this.formStateNotify("LOAD" /* LOAD */);
@@ -36238,6 +36402,7 @@ var EditFormController = class extends FormController {
     }
     if (res.data) {
       mergeInLeft(this.data, res.data);
+      this.data.tempsrfkey = this.data.srfkey;
     }
     this.state.modified = false;
     await this.evt.emit("onSaveSuccess", void 0);
@@ -37441,7 +37606,7 @@ import {
   awaitTimeout as awaitTimeout2,
   debounceAndAsyncMerge as debounceAndAsyncMerge2,
   mergeDefaultInLeft as mergeDefaultInLeft3,
-  recursiveIterate as recursiveIterate4,
+  recursiveIterate as recursiveIterate5,
   RuntimeError as RuntimeError45,
   RuntimeModelError as RuntimeModelError53
 } from "@ibiz-template/core";
@@ -37951,7 +38116,7 @@ var GridController = class extends MDControlController {
    * @return {*}  {Promise<void>}
    */
   initColumnStates() {
-    recursiveIterate4(
+    recursiveIterate5(
       this.model,
       (column) => {
         if (column.columnType !== "GROUPGRIDCOLUMN") {
@@ -39129,7 +39294,7 @@ var ListController = class extends MDControlController {
 };
 
 // src/controller/control/panel/panel/panel.controller.ts
-import { recursiveIterate as recursiveIterate5, RuntimeError as RuntimeError47 } from "@ibiz-template/core";
+import { recursiveIterate as recursiveIterate6, RuntimeError as RuntimeError47 } from "@ibiz-template/core";
 var PanelController = class extends ControlController {
   constructor() {
     super(...arguments);
@@ -39320,7 +39485,7 @@ var PanelController = class extends ControlController {
   }
   initControlScheduler(logics = []) {
     const actualLogics = [...logics];
-    recursiveIterate5(
+    recursiveIterate6(
       this.model,
       (item) => {
         if (item.controlLogics) {
@@ -39819,7 +39984,7 @@ var PickupViewPanelController = class extends ControlController {
 };
 
 // src/controller/control/search-bar/search-bar.controller.ts
-import { recursiveIterate as recursiveIterate6 } from "@ibiz-template/core";
+import { recursiveIterate as recursiveIterate7 } from "@ibiz-template/core";
 import { isNil as isNil22 } from "ramda";
 
 // src/controller/control/search-bar/search-bar-filter.controller.ts
@@ -40025,7 +40190,7 @@ var SearchBarController = class extends ControlController {
     }
     let hasFilter = false;
     let hasError = false;
-    recursiveIterate6(this.state.filterNodes[0], (node) => {
+    recursiveIterate7(this.state.filterNodes[0], (node) => {
       if (node.leaf) {
         if (node.field && node.valueOP && !isNil22(node.value)) {
           hasFilter = true;
@@ -40285,7 +40450,7 @@ var TabExpPanelController = class extends ControlController {
 };
 
 // src/controller/control/tree/tree.controller.ts
-import { recursiveIterate as recursiveIterate7 } from "@ibiz-template/core";
+import { recursiveIterate as recursiveIterate8 } from "@ibiz-template/core";
 
 // src/controller/control/tree/tree.service.ts
 import { ModelError as ModelError27 } from "@ibiz-template/core";
@@ -40655,7 +40820,7 @@ var TreeController = class extends MDControlController {
       this.state.rootNodes = nodes;
     }
     this.state.items = [];
-    recursiveIterate7(
+    recursiveIterate8(
       { children: this.state.rootNodes },
       (node) => {
         this.state.items.push(node);
@@ -40797,7 +40962,7 @@ var TreeController = class extends MDControlController {
    */
   calcExpandedKeys(nodes) {
     let expandedKeys = [...this.state.expandedKeys];
-    recursiveIterate7({ children: nodes }, (node) => {
+    recursiveIterate8({ children: nodes }, (node) => {
       var _a;
       if ((_a = node.children) == null ? void 0 : _a.length) {
         expandedKeys.push(node.id);
@@ -41687,7 +41852,7 @@ var KanbanController = class extends DataViewControlController {
 };
 
 // src/controller/control/tree-grid-ex/tree-grid-ex.controller.ts
-import { recursiveIterate as recursiveIterate8 } from "@ibiz-template/core";
+import { recursiveIterate as recursiveIterate9 } from "@ibiz-template/core";
 
 // src/controller/control/tree-grid-ex/tree-grid-ex.service.ts
 import { isArray as isArray11 } from "qx-util";
@@ -41927,7 +42092,7 @@ var TreeGridExController = class extends MDControlController {
    * @memberof TreeGridExController
    */
   initColumnStates() {
-    recursiveIterate8(
+    recursiveIterate9(
       this.model,
       (column) => {
         if (column.columnType !== "GROUPGRIDCOLUMN") {
@@ -42015,7 +42180,7 @@ var TreeGridExController = class extends MDControlController {
       this.state.rootNodes = nodes;
     }
     this.state.items = [];
-    recursiveIterate8(
+    recursiveIterate9(
       { children: this.state.rootNodes },
       (node) => {
         this.state.items.push(node);
@@ -42034,7 +42199,7 @@ var TreeGridExController = class extends MDControlController {
    */
   calcExpandedKeys(nodes) {
     let expandedKeys = [];
-    recursiveIterate8({ children: nodes }, (node) => {
+    recursiveIterate9({ children: nodes }, (node) => {
       var _a;
       if ((_a = node.children) == null ? void 0 : _a.length) {
         expandedKeys.push(node.id);
@@ -42058,7 +42223,7 @@ var TreeGridService = class extends GridService {
 
 // src/controller/control/medit-view-panel/medit-view-panel.controller.ts
 import { RuntimeError as RuntimeError50 } from "@ibiz-template/core";
-import { createUUID as createUUID6 } from "qx-util";
+import { createUUID as createUUID9 } from "qx-util";
 
 // src/controller/control/medit-view-panel/medit-view-panel.service.ts
 var MEditViewPanelService = class extends MDControlService {
@@ -42145,7 +42310,7 @@ var MEditViewPanelController = class extends MDControlController {
    */
   handlePanelItemParams(arg) {
     const [{ parameterName }] = this.parameters;
-    const id = arg[parameterName] ? arg[parameterName] : "mockId:".concat(createUUID6());
+    const id = arg[parameterName] ? arg[parameterName] : "mockId:".concat(createUUID9());
     const item = {
       id,
       context: this.context.clone(),
@@ -43702,7 +43867,7 @@ var ControlLogicScheduler = class extends LogicScheduler {
     );
     filterLogics.forEach((logic) => {
       if (logic.triggerType === "CTRLEVENT") {
-        logic.ctrlName = logic.itemName;
+        logic.ctrlName = logic.itemName || logic.logicTag;
       }
     });
     super(filterLogics);
@@ -43930,13 +44095,16 @@ var ItemDynaLogicTrigger = class extends LogicTrigger {
 };
 
 // src/logic-scheduler/trigger/timer-trigger.ts
-import { RuntimeError as RuntimeError57 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError57, RuntimeModelError as RuntimeModelError61 } from "@ibiz-template/core";
 var TimerTrigger = class extends LogicTrigger {
   constructor() {
     super(...arguments);
     this.timer = null;
   }
   start() {
+    if (!this.logic.timer) {
+      throw new RuntimeModelError61(this.logic, "\u5B9A\u65F6\u5668\u7F3A\u5C11\u5B9A\u65F6\u95F4\u9694");
+    }
     this.timer = setInterval(() => {
       if (!this.scheduler.defaultParamsCb) {
         throw new RuntimeError57("\u5B9A\u65F6\u5668\u7F3A\u5C11\u9ED8\u8BA4\u53C2\u6570\u56DE\u8C03");
@@ -43957,7 +44125,7 @@ var TimerTrigger = class extends LogicTrigger {
 import {
   ModelError as ModelError31,
   RuntimeError as RuntimeError58,
-  RuntimeModelError as RuntimeModelError61
+  RuntimeModelError as RuntimeModelError62
 } from "@ibiz-template/core";
 import { notNilEmpty as notNilEmpty9 } from "qx-util";
 var AppUILogicExecutor = class extends LogicExecutor {
@@ -44001,7 +44169,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
     } else {
       openViewRef = appUILogic.openDataAppView;
       if (!openViewRef) {
-        throw new RuntimeModelError61(
+        throw new RuntimeModelError62(
           appUILogic,
           "opendata\u89C6\u56FE\u903B\u8F91\u6CA1\u6709\u914D\u7F6E\u9ED8\u8BA4\u6253\u5F00\u89C6\u56FE"
         );
@@ -44009,7 +44177,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
     }
     const openView = openViewRef.refAppViewId;
     if (!openView) {
-      throw new RuntimeModelError61(
+      throw new RuntimeModelError62(
         appUILogic,
         "opendata\u89C6\u56FE\u903B\u8F91\u7684\u9ED8\u8BA4\u6253\u5F00\u89C6\u56FE\u6CA1\u6709\u5B9E\u9645\u5F15\u7528\u89C6\u56FE"
       );
@@ -44036,7 +44204,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
     const appDataEntityId = parameters.view.model.appDataEntityId;
     const formTypeName = await getFormTypeFieldName(appDataEntityId);
     if (!formTypeName) {
-      throw new RuntimeModelError61(
+      throw new RuntimeModelError62(
         appUILogic,
         "".concat(appDataEntityId, "\u5B9E\u4F53\u7F3A\u5C11\u8868\u5355\u7C7B\u578B\u5E94\u7528\u5B9E\u4F53\u5C5E\u6027")
       );
@@ -44044,7 +44212,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
     const { data } = parameters;
     const formTypeValue = data[0][formTypeName];
     if (!formTypeValue) {
-      throw new RuntimeModelError61(appUILogic, "\u6570\u636E\u6E90\u65E0\u8868\u5355\u7C7B\u578B\u5E94\u7528\u5B9E\u4F53\u5C5E\u6027\u503C");
+      throw new RuntimeModelError62(appUILogic, "\u6570\u636E\u6E90\u65E0\u8868\u5355\u7C7B\u578B\u5E94\u7528\u5B9E\u4F53\u5C5E\u6027\u503C");
     }
     const openViewRefs = appUILogic.openDataAppViews;
     const findView = openViewRefs == null ? void 0 : openViewRefs.find((item) => item.refMode === formTypeValue);
@@ -44086,7 +44254,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
         return viewRef.refMode.toLowerCase() !== parentDeName;
       });
       if (!newViewRef) {
-        throw new RuntimeModelError61(
+        throw new RuntimeModelError62(
           appUILogic,
           "\u6CA1\u6709\u627E\u5230\u6279\u6DFB\u52A0\u9700\u8981\u6253\u5F00\u7684\u9009\u62E9\u89C6\u56FE"
         );
@@ -44096,7 +44264,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
     } else {
       newViewRef = newDataAppView;
       if (!newViewRef || !newViewRef.refAppViewId) {
-        throw new RuntimeModelError61(
+        throw new RuntimeModelError62(
           appUILogic,
           "newdata\u89C6\u56FE\u903B\u8F91\u6CA1\u6709\u914D\u7F6E\u9ED8\u8BA4\u65B0\u5EFA\u6570\u636E\u89C6\u56FE"
         );
@@ -44153,7 +44321,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
     const { wizardAppView, newDataAppViews } = appUILogic;
     const { context, params, ...rest } = parameters;
     if (!wizardAppView || !wizardAppView.refAppViewId) {
-      throw new RuntimeModelError61(appUILogic, "\u7F3A\u5C11\u9ED8\u8BA4\u7D22\u5F15\u5B9E\u4F53\u9009\u62E9\u89C6\u56FE");
+      throw new RuntimeModelError62(appUILogic, "\u7F3A\u5C11\u9ED8\u8BA4\u7D22\u5F15\u5B9E\u4F53\u9009\u62E9\u89C6\u56FE");
     }
     const result = await ibiz.commands.execute(
       OpenAppViewCommand.TAG,
@@ -44199,7 +44367,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
       const minorDERs = selfDe.minorAppDERSs;
       const pickParentDeName = newViewRef.refMode.toLowerCase();
       if (!minorDERs) {
-        throw new RuntimeModelError61(selfDe, "\u5B9E\u4F53\u6CA1\u6709\u4ECE\u5173\u7CFB\u96C6\u5408\uFF01");
+        throw new RuntimeModelError62(selfDe, "\u5B9E\u4F53\u6CA1\u6709\u4ECE\u5173\u7CFB\u96C6\u5408\uFF01");
       }
       let pickParentFieldName;
       minorDERs == null ? void 0 : minorDERs.forEach((item) => {