@ibiz-template/runtime 0.2.6 → 0.2.8

package/dist/index.esm.js

@@ -19220,7 +19220,12 @@ var ScriptFunction = class {
     this.calcArgKeys(argKeys, options);
     const fn = new Function(...this.argKeys, code);
     this.scriptFn = function callBack(...args) {
-      return fn.apply({}, args);
+      try {
+        return fn.apply({}, args);
+      } catch (error) {
+        console.log("\u62A5\u9519\u811A\u672C", code);
+        throw error;
+      }
     };
   }
   /**
@@ -25339,10 +25344,10 @@ var ControlVO = class _ControlVO {
       if (Object.prototype.hasOwnProperty.call(this.$origin, key)) {
         Object.defineProperty(this, key, {
           get() {
-            return this.$origin.srfkey;
+            return this.$origin[key];
           },
           set(val) {
-            this.$origin.srfkey = val;
+            this.$origin[key] = val;
           },
           enumerable: false,
           configurable: true
@@ -26240,6 +26245,99 @@ var CalendarItemData = class {
   }
 };
 
+// src/service/vo/map-data/map-data.ts
+function updateKeyDefine(target, keys) {
+  keys.forEach((key) => {
+    if (!Object.prototype.hasOwnProperty.call(target, key)) {
+      Object.defineProperty(target, key, {
+        enumerable: true,
+        configurable: true,
+        writable: true,
+        value: void 0
+      });
+    }
+  });
+}
+var MapData = class {
+  constructor(deData, mapItem) {
+    this._longitude = void 0;
+    this._latitude = void 0;
+    this._areaCode = void 0;
+    this._tooltip = void 0;
+    this._value = void 0;
+    this._text = void 0;
+    this._symbol = void 0;
+    const {
+      id,
+      itemType,
+      longitudeAppDEFieldId,
+      latitudeAppDEFieldId,
+      textAppDEFieldId,
+      dataAppDEFieldId,
+      tipsAppDEFieldId,
+      sysImage
+    } = mapItem;
+    const keyMap = /* @__PURE__ */ new Map();
+    this._id = id + deData.srfkey;
+    this._type = itemType;
+    this._mapItemId = id;
+    if (itemType === "area") {
+      if (longitudeAppDEFieldId) {
+        keyMap.set("_areaCode", longitudeAppDEFieldId);
+      }
+    } else {
+      if (longitudeAppDEFieldId) {
+        keyMap.set("_longitude", longitudeAppDEFieldId);
+      }
+      if (latitudeAppDEFieldId) {
+        keyMap.set("_latitude", latitudeAppDEFieldId);
+      }
+    }
+    if (tipsAppDEFieldId) {
+      keyMap.set("_tooltip", tipsAppDEFieldId);
+    }
+    if (textAppDEFieldId) {
+      keyMap.set("_text", textAppDEFieldId);
+    }
+    if (dataAppDEFieldId) {
+      keyMap.set("_value", dataAppDEFieldId);
+    }
+    if (sysImage) {
+      this._symbol = sysImage.rawContent || sysImage.imagePath;
+    }
+    return new Proxy(this, {
+      set(target, p, value) {
+        if (Object.prototype.hasOwnProperty.call(deData, p)) {
+          deData[p] = value;
+        } else if (keyMap.has(p)) {
+          deData[keyMap.get(p)] = value;
+        } else {
+          target[p] = value;
+        }
+        return true;
+      },
+      get(target, p, _receiver) {
+        if (target[p] !== void 0) {
+          return target[p];
+        }
+        if (keyMap.has(p)) {
+          return deData[keyMap.get(p)];
+        }
+        if (deData[p] !== void 0) {
+          return deData[p];
+        }
+      },
+      ownKeys(target) {
+        const allKeys = [
+          .../* @__PURE__ */ new Set([...Object.keys(target), ...Object.keys(deData)])
+        ];
+        updateKeyDefine(target, allKeys);
+        return allKeys;
+      }
+    });
+  }
+};
+
 // src/service/mqtt/mqtt.service.ts
 import { QXEvent as QXEvent2, createUUID as createUUID4, isNilOrEmpty as isNilOrEmpty6 } from "qx-util";
 var MqttService = class {
@@ -26253,6 +26351,8 @@ var MqttService = class {
    * @param {string} appId
    */
   constructor(mqttTopic, token, appId) {
+    this.mqttTopic = mqttTopic;
+    this.token = token;
     this.appId = appId;
     /**
      * 接受消息通知
@@ -26302,6 +26402,7 @@ var MqttService = class {
       this.options
     );
     this.client.on("connect", () => {
+      this.client.subscribe(this.mqttTopic);
       ibiz.log.debug("mqtt connect");
     });
     this.client.on("error", (error) => {
@@ -29060,6 +29161,7 @@ var ControlController = class extends BaseController {
 
 // src/controller/common/control/md-control.controller.ts
 import { isElementSame, RuntimeError as RuntimeError26 } from "@ibiz-template/core";
+import { debounce } from "lodash-es";
 var MDControlController = class extends ControlController {
   constructor() {
     super(...arguments);
@@ -29098,7 +29200,10 @@ var MDControlController = class extends ControlController {
     (_a = this.dataEntity.appDEFields) == null ? void 0 : _a.forEach((field) => {
       this.fieldIdNameMap.set(field.id, field.name);
     });
-    this.onDataChange = this.onDataChange.bind(this);
+    const fn = this.onDataChange.bind(this);
+    this.onDataChange = debounce((msg) => {
+      fn(msg);
+    }, 300);
     ibiz.mc.command.change.on(this.onDataChange);
     this.setSort();
   }
@@ -29211,6 +29316,9 @@ var MDControlController = class extends ControlController {
     } finally {
       await this.endLoading();
     }
+    this.state.items.forEach((item, index) => {
+      item.srfserialnum = index + 1;
+    });
     this.actionNotification("FETCHSUCCESS");
     return this.state.items;
   }
@@ -30281,11 +30389,15 @@ var FunnelSeriesGenerator = class extends BaseSeriesGenerator {
     return options;
   }
   calcSeriesData(catalogData) {
-    return Object.keys(catalogData).map((catalog) => {
+    const temData = [];
+    catalogData.forEach((catalog, key) => {
       var _a;
-      const data = catalogData.get(catalog);
-      return { name: catalog, value: [data.value, (_a = data.deData) == null ? void 0 : _a.srfkey] };
+      temData.push({
+        name: key,
+        value: [catalog.value, (_a = catalog.deData) == null ? void 0 : _a.srfkey]
+      });
     });
+    return temData;
   }
   getSrfkeyByParams(params) {
     return params.value[1];
@@ -30301,11 +30413,15 @@ var PieSeriesGenerator = class extends BaseSeriesGenerator {
     return options;
   }
   calcSeriesData(catalogData) {
-    return Object.keys(catalogData).map((catalog) => {
+    const temData = [];
+    catalogData.forEach((catalog, key) => {
       var _a;
-      const data = catalogData.get(catalog);
-      return { name: catalog, value: [data.value, (_a = data.deData) == null ? void 0 : _a.srfkey] };
+      temData.push({
+        name: key,
+        value: [catalog.value, (_a = catalog.deData) == null ? void 0 : _a.srfkey]
+      });
     });
+    return temData;
   }
   getSrfkeyByParams(params) {
     return params.value[1];
@@ -30414,8 +30530,8 @@ var RadarSeriesGenerator = class extends BaseSeriesGenerator {
     }
     const radar = this.chartGenerator.radarMap.get(this.catalogField);
     Object.values(groupData).forEach((catalogData) => {
-      Object.keys(catalogData).forEach((catalog) => {
-        radar.updateIndicator(catalog, catalogData.get(catalog).value);
+      catalogData.forEach((catalog, key) => {
+        radar.updateIndicator(key, catalog.value);
       });
     });
   }
@@ -30584,13 +30700,9 @@ var ChartOptionsGenerator2 = class {
     return titleOption;
   }
   calcLegendOption(chartLegend) {
-    var _a;
     const { showLegend, legendPos } = chartLegend;
     const legendOption = {};
     legendOption.show = showLegend;
-    if (((_a = this.model.dechartSerieses) == null ? void 0 : _a.length) === 1) {
-      legendOption.show = false;
-    }
     const position = legendPos == null ? void 0 : legendPos.toLowerCase();
     if (position === "left" || position === "right") {
       legendOption.left = position;
@@ -30725,6 +30837,9 @@ var ChartOptionsGenerator2 = class {
       }
     });
     this.options.series = seriesOption;
+    if (this.seriesGenerators.length === 1 && this.seriesGenerators[0].groupData && Object.keys(this.seriesGenerators[0].groupData).length === 1 && seriesOption[0].type && ["bar", "line", "scatter"].includes(seriesOption[0].type) && this.staticOptions.legend) {
+      this.staticOptions.legend.show = false;
+    }
     this.options = mergeDeepRight3(
       this.staticOptions,
       this.options
@@ -36010,7 +36125,7 @@ import {
   RuntimeError as RuntimeError43,
   mergeDefaultInLeft as mergeDefaultInLeft2
 } from "@ibiz-template/core";
-import { debounce } from "lodash-es";
+import { debounce as debounce2 } from "lodash-es";
 import { createUUID as createUUID8 } from "qx-util";
 import { clone as clone18 } from "ramda";
 
@@ -36309,7 +36424,7 @@ var EditFormController = class extends FormController {
     await super.onCreated();
     this.service = new EditFormService(this.model);
     await this.service.init(this.context);
-    this.autoSave = debounce(this.autoSave.bind(this), 500, {
+    this.autoSave = debounce2(this.autoSave.bind(this), 500, {
       trailing: true
     });
   }
@@ -36615,6 +36730,9 @@ var EditFormController = class extends FormController {
     const { context, params } = this.handlerAbilityParams(args);
     try {
       await this.service.wfStart(context, params, this.data);
+      if (this.view.modal.mode === "ROUTE") {
+        ibiz.mc.command.send(this.data.$origin, "OBJECTUPDATED");
+      }
     } catch (error) {
       this.actionNotification("WFSTARTERROR", {
         error
@@ -36642,6 +36760,9 @@ var EditFormController = class extends FormController {
     const { context, params } = this.handlerAbilityParams(args);
     try {
       await this.service.wfSubmit(context, params, this.data);
+      if (this.view.modal.mode === "ROUTE") {
+        ibiz.mc.command.send(this.data.$origin, "OBJECTUPDATED");
+      }
     } catch (error) {
       this.actionNotification("WFSUBMITERROR", {
         error
@@ -38127,10 +38248,6 @@ var GridController = class extends MDControlController {
     this.state.items.splice(index, 1, res.data);
     rowState.data = res.data;
     rowState.modified = false;
-    this.actionNotification("".concat(isCreate ? "CREATE" : "UPDATE", "SUCCESS"), {
-      default: "".concat(res.data.srfmajortext || "", "\u4FDD\u5B58\u6210\u529F"),
-      data: res.data
-    });
     this.gridStateNotify(rowState, "SAVE" /* SAVE */);
     await this.evt.emit("onSaveSuccess", void 0);
   }
@@ -38596,7 +38713,7 @@ var GridController = class extends MDControlController {
 // src/controller/control/grid/grid-column/grid-field-column/grid-field-column.controller.ts
 import { DataTypes as DataTypes3, ModelError as ModelError26 } from "@ibiz-template/core";
 import dayjs4 from "dayjs";
-import { debounce as debounce2 } from "lodash-es";
+import { debounce as debounce3 } from "lodash-es";
 import { clone as clone20, isNil as isNil21 } from "ramda";
 var GridFieldColumnController = class extends GridColumnController {
   constructor() {
@@ -38632,7 +38749,7 @@ var GridFieldColumnController = class extends GridColumnController {
   }
   async onInit() {
     await super.onInit();
-    this.loadCodeList = debounce2(this.loadCodeList, 300, {
+    this.loadCodeList = debounce3(this.loadCodeList, 300, {
       leading: true,
       trailing: false
     });
@@ -38832,7 +38949,11 @@ var GridFieldColumnController = class extends GridColumnController {
     }
     const isDate = DataTypes3.isDate(this.dataType);
     if (isDate) {
-      return dayjs4(strVal).format(this.valueFormat);
+      const formatVal = dayjs4(strVal).format(this.valueFormat);
+      if (formatVal !== "Invalid Date") {
+        return formatVal;
+      }
+      return strVal;
     }
     return ibiz.util.text.format(strVal, this.valueFormat);
   }
@@ -39728,9 +39849,9 @@ var PanelItemController = class {
      * @protected
      */
     this.dynaLogicResult = {
-      visible: true,
-      disabled: false,
-      required: false
+      visible: void 0,
+      disabled: void 0,
+      required: void 0
     };
     this.state = this.createState();
   }
@@ -39844,8 +39965,8 @@ var PanelItemController = class {
    * @param {IData} data
    */
   calcItemDisabled(data) {
-    let enable = !this.dynaLogicResult.disabled;
-    if (enable && this.panel.scheduler) {
+    let { disabled } = this.dynaLogicResult;
+    if (disabled !== true && this.panel.scheduler) {
       const itemEnable = this.panel.scheduler.triggerItemEnable(
         this.model.id,
         {
@@ -39853,10 +39974,12 @@ var PanelItemController = class {
         }
       );
       if (itemEnable !== void 0) {
-        enable = itemEnable;
+        disabled = !itemEnable;
       }
     }
-    this.state.disabled = !enable;
+    if (disabled !== void 0) {
+      this.state.disabled = disabled;
+    }
   }
   /**
    * 计算项的显示状态
@@ -39866,7 +39989,7 @@ var PanelItemController = class {
    */
   calcItemVisible(data) {
     let { visible } = this.dynaLogicResult;
-    if (visible && this.panel.scheduler) {
+    if (visible !== false && this.panel.scheduler) {
       const itemVIsible = this.panel.scheduler.triggerItemVisible(
         this.model.id,
         {
@@ -39877,7 +40000,9 @@ var PanelItemController = class {
         visible = itemVIsible;
       }
     }
-    this.state.visible = visible;
+    if (visible !== void 0) {
+      this.state.visible = visible;
+    }
   }
   /**
    * 计算项的必填状态
@@ -39886,8 +40011,8 @@ var PanelItemController = class {
    * @param {IData} data
    */
   calcItemRequired(data) {
-    let allowEmpty = !this.dynaLogicResult.required;
-    if (allowEmpty && this.panel.scheduler) {
+    let { required } = this.dynaLogicResult;
+    if (required !== true && this.panel.scheduler) {
       const itemAllowEmpty = this.panel.scheduler.triggerItemBlank(
         this.model.id,
         {
@@ -39895,10 +40020,12 @@ var PanelItemController = class {
         }
       );
       if (itemAllowEmpty !== void 0) {
-        allowEmpty = itemAllowEmpty;
+        required = !itemAllowEmpty;
       }
     }
-    this.state.required = !allowEmpty;
+    if (required !== void 0) {
+      this.state.required = required;
+    }
   }
   /**
    * 计算动态逻辑
@@ -40001,6 +40128,9 @@ var PickupViewPanelController = class extends ControlController {
   async onCreated() {
     await super.onCreated();
     this.mountCounter.enroll(this.model.embeddedAppDEViewId);
+  }
+  updateContextParams(opts) {
+    super.updateContextParams(opts);
     this.initNavParam();
   }
   /**
@@ -42560,6 +42690,161 @@ var MEditViewPanelController = class extends MDControlController {
   }
 };
 
+// src/controller/control/map/map.service.ts
+import { HttpResponse as HttpResponse6 } from "@ibiz-template/core";
+var MapService = class extends MDControlService {
+  async init(context) {
+    await super.init(context);
+  }
+  /**
+   * 加载所有地图项的数据
+   * @author lxm
+   * @date 2023-10-30 06:27:32
+   * @param {IParams} context
+   * @param {IParams} [params={}]
+   * @return {*}  {Promise<IHttpResponse<IMapData[]>>}
+   */
+  async fetchAll(context, params = {}) {
+    var _a;
+    const allData = [];
+    if ((_a = this.model.sysMapItems) == null ? void 0 : _a.length) {
+      const app = ibiz.hub.getApp(context.srfappid);
+      await Promise.all(
+        this.model.sysMapItems.map(async (mapItem) => {
+          const { appDataEntityId, appDEDataSetId, customCond } = mapItem;
+          const _context = context.clone();
+          const _params = { ...params };
+          if (customCond) {
+            const customParams = ScriptFactory.execSingleLine(
+              customCond
+            );
+            if (customParams) {
+              const { navigateContexts, navigateParams } = parseUserParams(customParams);
+              if (navigateContexts) {
+                Object.assign(
+                  _context,
+                  convertNavData(navigateContexts, params, context)
+                );
+              }
+              if (navigateParams) {
+                Object.assign(
+                  _params,
+                  convertNavData(navigateContexts, params, context)
+                );
+              }
+            }
+          }
+          const res = await app.deService.exec(
+            appDataEntityId,
+            appDEDataSetId,
+            _context,
+            _params
+          );
+          if (res.data) {
+            allData.push(...res.data.map((item) => new MapData(item, mapItem)));
+          }
+        })
+      );
+    }
+    return new HttpResponse6(allData, 200);
+  }
+};
+
+// src/controller/control/map/map.controller.ts
+var MapController = class extends MDControlController {
+  initState() {
+    super.initState();
+    this.state.size = 1e3;
+    this.state.pointData = [];
+    this.state.areaData = [];
+    this.state.areaCode = 32e4;
+  }
+  async onCreated() {
+    await super.onCreated();
+    this.service = new MapService(this.model);
+    await this.service.init(this.context);
+  }
+  /**
+   * 部件加载数据行为
+   *
+   * @author lxm
+   * @date 2022-08-19 14:08:50
+   */
+  async load(args = {}) {
+    if (this.state.isSimple) {
+      return [];
+    }
+    await this.startLoading();
+    try {
+      const isInitialLoad = args.isInitialLoad === true;
+      const { context } = this.handlerAbilityParams(args);
+      const params = await this.getFetchParams(args == null ? void 0 : args.viewParam);
+      context.srfareacode = this.state.areaCode;
+      const res = await this.service.fetchAll(context, params);
+      this.state.items = res.data;
+      await this.afterLoad(args, res.data);
+      this.state.isLoaded = true;
+      await this._evt.emit("onLoadSuccess", {
+        isInitialLoad
+      });
+    } catch (error) {
+      await this._evt.emit("onLoadError", void 0);
+      this.actionNotification("FETCHERROR", {
+        error
+      });
+      throw error;
+    } finally {
+      await this.endLoading();
+    }
+    this.actionNotification("FETCHSUCCESS");
+    return this.state.items;
+  }
+  async afterLoad(args, items) {
+    const result = await super.afterLoad(args, items);
+    const tempareaData = [];
+    const temppointData = [];
+    result.forEach((item) => {
+      if (item._type === "area") {
+        tempareaData.push(item);
+      } else if (item._type === "point") {
+        temppointData.push(item);
+      }
+    });
+    this.state.pointData = temppointData;
+    this.state.areaData = tempareaData;
+    return result;
+  }
+  /**
+   * 地图变更事件处理
+   * @author lxm
+   * @date 2023-10-31 05:28:36
+   * @param {(string | number)} areaCode
+   */
+  onMapChange(areaCode) {
+    this.state.areaCode = areaCode;
+    this.load({});
+    this.evt.emit("onMapChange", { areaCode });
+  }
+  /**
+   * 地图区域点击事件处理
+   * @author lxm
+   * @date 2023-10-31 05:30:54
+   * @param {IMapData} mapData
+   */
+  onAreaClick(mapData) {
+    this.evt.emit("onAreaClick", { data: [mapData] });
+  }
+  /**
+   * 地图散点点击事件处理
+   * @author lxm
+   * @date 2023-10-31 05:30:58
+   * @param {IMapData} mapData
+   */
+  onPointClick(mapData) {
+    this.evt.emit("onPointClick", { data: [mapData] });
+  }
+};
+
 // src/controller/hub.controller.ts
 var HubController = class {
   constructor() {
@@ -44837,6 +45122,9 @@ export {
   MDViewEngine,
   MEditViewPanelController,
   MEditViewPanelService,
+  MapController,
+  MapData,
+  MapService,
   MenuPortletController,
   MethodDto,
   MobMDCtrlRowState,