@ibiz-template/runtime 0.2.9 → 0.2.11

package/dist/index.esm.js

@@ -18810,10 +18810,6 @@ async function getDeACMode(appDEACModeId, entityId, srfappid) {
   });
   return deACMode;
 }
-async function getFormTypeFieldName(entityId) {
-  const appDataEntity = await ibiz.hub.getAppDataEntity(entityId);
-  return appDataEntity.formTypeAppDEFieldId;
-}
 function findDELogic(appDELogicId, entity) {
   var _a;
   return (_a = entity.appDELogics) == null ? void 0 : _a.find((item) => item.id === appDELogicId);
@@ -26325,6 +26321,7 @@ function updateKeyDefine(target, keys) {
     }
   });
 }
+var AreaItemStyles = ["REGION", "REGION2", "REGION3", "REGION4"];
 var MapData = class {
   constructor(deData, mapItem) {
     this._longitude = void 0;
@@ -26336,7 +26333,7 @@ var MapData = class {
     this._symbol = void 0;
     const {
       id,
-      itemType,
+      itemStyle,
       longitudeAppDEFieldId,
       latitudeAppDEFieldId,
       textAppDEFieldId,
@@ -26346,9 +26343,9 @@ var MapData = class {
     } = mapItem;
     const keyMap = /* @__PURE__ */ new Map();
     this._id = id + deData.srfkey;
-    this._type = itemType;
+    this._itemStyle = itemStyle;
     this._mapItemId = id;
-    if (itemType === "area") {
+    if (AreaItemStyles.includes(this._itemStyle)) {
       if (longitudeAppDEFieldId) {
         keyMap.set("_areaCode", longitudeAppDEFieldId);
       }
@@ -26406,6 +26403,7 @@ var MapData = class {
 };
 
 // src/service/vo/panel-data/panel-data.ts
+import { QXEvent as QXEvent2 } from "qx-util";
 function updateKeyDefine2(target, keys) {
   keys.forEach((key) => {
     if (!Object.prototype.hasOwnProperty.call(target, key)) {
@@ -26420,6 +26418,7 @@ function updateKeyDefine2(target, keys) {
 }
 var PanelData = class {
   constructor(fields, origin) {
+    const _evt = new QXEvent2();
     const keyMap = {};
     const reverseKeyMap = {};
     fields.forEach((field) => {
@@ -26438,11 +26437,21 @@ var PanelData = class {
             target[p] = value;
           }
         } else {
-          origin[keyMap[p]] = value;
+          origin[p] = value;
+        }
+        _evt.emit("change", p);
+        if (keyMap[p] && keyMap[p] !== p) {
+          _evt.emit("change", keyMap[p]);
+        }
+        if (reverseKeyMap[p] && reverseKeyMap[p] !== p) {
+          _evt.emit("change", reverseKeyMap[p]);
         }
         return true;
       },
       get(target, p, _receiver) {
+        if (p === "_evt") {
+          return _evt;
+        }
         if (keyMap[p]) {
           return origin[keyMap[p]];
         }
@@ -26458,10 +26467,13 @@ var PanelData = class {
       }
     });
   }
+  destroy() {
+    this._evt.reset();
+  }
 };
 
 // src/service/mqtt/mqtt.service.ts
-import { QXEvent as QXEvent2, createUUID as createUUID4, isNilOrEmpty as isNilOrEmpty6 } from "qx-util";
+import { QXEvent as QXEvent3, createUUID as createUUID4, isNilOrEmpty as isNilOrEmpty6 } from "qx-util";
 var MqttService = class {
   /**
    * Creates an instance of MqttService.
@@ -26482,7 +26494,7 @@ var MqttService = class {
      * @author chitanda
      * @date 2023-10-23 15:10:06
      */
-    this.evt = new QXEvent2();
+    this.evt = new QXEvent3();
     /**
      * 连接选项
      *
@@ -27340,7 +27352,7 @@ var LoadingState = class {
 };
 
 // src/controller/ctx/ctx.ts
-import { QXEvent as QXEvent3 } from "qx-util";
+import { QXEvent as QXEvent4 } from "qx-util";
 
 // src/controller/ctx/ctx.state.ts
 var CTXState = class {
@@ -27370,7 +27382,7 @@ var CTX = class {
      * @date 2023-04-26 07:54:46
      * @protected
      */
-    this.evt = new QXEvent3(3e3);
+    this.evt = new QXEvent4(3e3);
     /**
      * 当前视图控制器集合（包含自身视图控制器，部件控制器，和下一层级的视图的控制器）
      * @author lxm
@@ -27675,8 +27687,8 @@ var ButtonContainerState = class {
 };
 
 // src/controller/utils/event/qx-event-ex.ts
-import { clearAll, QXEvent as QXEvent4 } from "qx-util";
-var QXEventEx = class extends QXEvent4 {
+import { clearAll, QXEvent as QXEvent5 } from "qx-util";
+var QXEventEx = class extends QXEvent5 {
   constructor() {
     super(...arguments);
     this.anyEventFns = [];
@@ -35974,6 +35986,10 @@ var FormItemController = class extends FormDetailController {
   async onInit() {
     await super.onInit();
     this.state.required = !this.model.allowEmpty;
+    const { enableCond } = this.model;
+    if (!enableCond) {
+      this.state.enableCondDisabled = true;
+    }
     if (this.model.editor && this.model.editor.editorType !== "HIDDEN") {
       this.editorProvider = await getEditorProvider(this.model.editor);
       if (this.editorProvider) {
@@ -36022,9 +36038,7 @@ var FormItemController = class extends FormDetailController {
   calcEnableCond() {
     const { enableCond } = this.model;
     const isNew = this.data.srfuf === 0 /* CREATE */;
-    if (!enableCond) {
-      this.state.enableCondDisabled = true;
-    } else if (isNew && enableCond === 2 || !isNew && enableCond === 1) {
+    if (isNew && enableCond === 2 || !isNew && enableCond === 1) {
       this.state.enableCondDisabled = true;
     }
   }
@@ -36984,6 +36998,7 @@ var EditFormController = class extends FormController {
       await this.service.wfStart(context, params, this.data);
       if (this.view.modal.mode === "ROUTE") {
         ibiz.mc.command.send(this.data.$origin, "OBJECTUPDATED");
+        ibiz.mc.command.send({ srfdecodename: "SysTodo" }, "OBJECTUPDATED");
       }
     } catch (error) {
       this.actionNotification("WFSTARTERROR", {
@@ -37014,6 +37029,7 @@ var EditFormController = class extends FormController {
       await this.service.wfSubmit(context, params, this.data);
       if (this.view.modal.mode === "ROUTE") {
         ibiz.mc.command.send(this.data.$origin, "OBJECTUPDATED");
+        ibiz.mc.command.send({ srfdecodename: "SysTodo" }, "OBJECTUPDATED");
       }
     } catch (error) {
       this.actionNotification("WFSUBMITERROR", {
@@ -37805,8 +37821,10 @@ var FormMDCtrlController = class extends FormDetailController {
 
 // src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-repeater/form-mdctrl-repeater-form/form-mdctrl-repeater-form-item.controller.ts
 var FormMDCtrlItemController = class extends EditFormController {
-  constructor(model, context, params, ctx, data) {
-    super(model, context, params, ctx);
+  constructor(model, context, params, ctx, data, form) {
+    const { model: _model } = form;
+    Object.assign(_model, model);
+    super(_model, context, params, ctx);
     this.state.data = data;
     this.state.isSimple = true;
   }
@@ -39844,6 +39862,14 @@ var PanelController = class extends ControlController {
   async onMounted() {
     this.load();
   }
+  async onDestroyed() {
+    var _a, _b;
+    await super.onDestroyed();
+    (_b = (_a = this.data).destroy) == null ? void 0 : _b.call(_a);
+    Object.values(this.panelItems).forEach((item) => {
+      item.destroy();
+    });
+  }
   /**
    * 初始化面板成员控制器
    *
@@ -39894,11 +39920,13 @@ var PanelController = class extends ControlController {
    * @memberof PanelController
    */
   async load() {
+    var _a, _b;
     const data = await this.prepareData();
     if (!data) {
       throw new RuntimeError49("\u672A\u83B7\u53D6\u5230\u9762\u677F\u6570\u636E");
     }
     const panelData = this.convertData(data);
+    (_b = (_a = this.data).destroy) == null ? void 0 : _b.call(_a);
     this.state.data = panelData;
     this.panelStateNotify("LOAD" /* LOAD */);
   }
@@ -39934,7 +39962,14 @@ var PanelController = class extends ControlController {
    */
   convertData(data) {
     const fields = getAllPanelField(this.model);
-    return new PanelData(fields, data);
+    const fieldKeys = fields.map((item) => item.id);
+    const panelData = new PanelData(fields, data);
+    panelData._evt.on("change", (key) => {
+      if (fieldKeys.includes(key)) {
+        this.dataChangeNotify([key]);
+      }
+    });
+    return panelData;
   }
   /**
    * 通知所有面板成员面板操作过程中的数据变更
@@ -39970,7 +40005,6 @@ var PanelController = class extends ControlController {
       return;
     }
     this.state.data[name] = value;
-    this.dataChangeNotify([name]);
   }
   initControlScheduler(logics = []) {
     const actualLogics = [...logics];
@@ -40193,6 +40227,8 @@ var PanelItemController = class {
       this.state.class.label.push(labelSysCss.cssName);
     }
   }
+  destroy() {
+  }
   /**
    * 创建面板状态对象
    *
@@ -43078,9 +43114,9 @@ var MapController = class extends MDControlController {
     const tempareaData = [];
     const temppointData = [];
     result.forEach((item) => {
-      if (item._type === "area") {
+      if (item._itemStyle === "REGION") {
         tempareaData.push(item);
-      } else if (item._type === "point") {
+      } else if (item._itemStyle === "POINT") {
         temppointData.push(item);
       }
     });
@@ -44829,16 +44865,13 @@ var AppUILogicExecutor = class extends LogicExecutor {
     }
   }
   /**
-   * 执行应用预置界面逻辑opendata
+   * 执行应用预置界面逻辑 opendata
    *
-   * @author lxm
-   * @date 2022-08-22 14:08:03
-   * @export
-   * @param {IPSAppUIOpenDataLogic} appUILogic 应用预置界面逻辑opendata模型对象
-   * @param {IContext} context 上下文参数
-   * @param {(IData | null)} data 数据集合
-   * @param {IParams} params 视图参数
-   * @param {IData} [opts] 额外参数，event是js原生事件
+   * @author chitanda
+   * @date 2023-11-02 11:11:36
+   * @param {IAppUIOpenDataLogic} appUILogic 应用预置界面逻辑 opendata 模型对象
+   * @param {IUILogicParams} parameters
+   * @return {*}  {Promise<IModalData>}
    */
   async executeOpenDataAppUILogic(appUILogic, parameters) {
     const { context, params, ...rest } = parameters;
@@ -44885,16 +44918,18 @@ var AppUILogicExecutor = class extends LogicExecutor {
     );
   }
   async calcOpenViewRef(appUILogic, parameters) {
-    const appDataEntityId = parameters.view.model.appDataEntityId;
-    const formTypeName = await getFormTypeFieldName(appDataEntityId);
-    if (!formTypeName) {
+    const appDataEntity = await ibiz.hub.getAppDataEntity(
+      parameters.view.model.appDataEntityId
+    );
+    const typeFileName = appDataEntity.formTypeAppDEFieldId || appDataEntity.dataTypeAppDEFieldId;
+    if (!typeFileName) {
       throw new RuntimeModelError62(
         appUILogic,
-        "".concat(appDataEntityId, "\u5B9E\u4F53\u7F3A\u5C11\u8868\u5355\u7C7B\u578B\u5E94\u7528\u5B9E\u4F53\u5C5E\u6027")
+        "".concat(appDataEntity.codeName, "[\u591A\u8868\u5355\u5B9E\u4F53] or [\u7D22\u5F15\u5B9E\u4F53]\u7F3A\u5C11\u7C7B\u578B\u5C5E\u6027\u914D\u7F6E")
       );
     }
     const { data } = parameters;
-    const formTypeValue = data[0][formTypeName];
+    const formTypeValue = data[0][typeFileName];
     if (!formTypeValue) {
       throw new RuntimeModelError62(appUILogic, "\u6570\u636E\u6E90\u65E0\u8868\u5355\u7C7B\u578B\u5E94\u7528\u5B9E\u4F53\u5C5E\u6027\u503C");
     }
@@ -45543,7 +45578,6 @@ export {
   getDefaultValue,
   getEditorProvider,
   getFormDetailProvider,
-  getFormTypeFieldName,
   getGridColumnProvider,
   getMatchResPath,
   getOriginData,