@riil-frontend/component-topology 2.12.7-alpha.21 → 2.12.7-alpha.25

package/es/core/components/AlarmListPanel/components/AlarmListItem.js

@@ -1,7 +1,7 @@
 import _List from "@alifd/next/es/list";
 import _Icon from "@alifd/next/es/icon";
 import React, { useState, useEffect } from "react";
-import { Link } from 'react-router-dom';
+import { Link } from "react-router-dom";
 import styles from "./index.module.scss";
 import { PAGE_TYPE } from "../constants/uicbb";
 
@@ -9,11 +9,10 @@ function AlarmListItem(props) {
   // 传入参数
   var topo = props.topo,
       alarmInfo = props.alarmInfo;
-  console.log("AlarmListPanel-AlarmListItem", alarmInfo);
   return /*#__PURE__*/React.createElement(_List.Item, {
     className: styles.AlarmListItem,
     media: /*#__PURE__*/React.createElement(_Icon, {
-      type: "warning",
+      type: "gaojing-3",
       size: "xs",
       className: styles["alarm-color-icon"] + " alarm-color-icon-lv" + alarmInfo.alertLevel
     })

package/es/core/components/AlarmListPanel/index.js

@@ -2,7 +2,7 @@ import _Dialog from "@alifd/next/es/dialog";
 import _List from "@alifd/next/es/list";
 import React, { useState, useEffect } from "react";
 import AlarmListItem from "./components/AlarmListItem";
-import { Link } from 'react-router-dom';
+import { Link } from "react-router-dom";
 import styles from "./index.module.scss";
 import { alarmListDemo } from "./mocks";
 
@@ -11,27 +11,35 @@ function AlarmListPanel(props, ref) {
   var topo = props.topo,
       topoState = props.topoState,
       visible = props.visible;
-  var alarms = topo.alarms,
-      alarm = topo.alarm;
+  var alarm = topo.alarm;
+
+  var _alarm$getState = alarm.getState(),
+      alarmData = _alarm$getState.alarmData;
 
   var onClose = function onClose() {
     topo.switchAlarmPopPanel(false);
   };
 
-  var _useState = useState(alarms !== null && alarms !== void 0 ? alarms : alarmListDemo),
+  var _useState = useState(alarmListDemo),
       alarmList = _useState[0],
       setAlarmList = _useState[1];
 
   useEffect(function () {
-    topo.switchAlarmPopPanel(alarm.alarmSwitch && (alarmList === null || alarmList === void 0 ? void 0 : alarmList.length) > 0);
+    topo.switchAlarmPopPanel(alarm.alarmIsOpened && (alarmList === null || alarmList === void 0 ? void 0 : alarmList.length) > 0);
   }, []);
   useEffect(function () {
-    console.log("AlarmListPanel-useEffect", alarms);
+    console.log("AlarmListPanel-useEffect", topo, alarmData);
 
     if (alarm.alarmSwitch) {
-      setAlarmList(alarms.slice(0, 9));
+      if (alarmData) {
+        var _alarmData$slice;
+
+        setAlarmList((_alarmData$slice = alarmData === null || alarmData === void 0 ? void 0 : alarmData.slice(0, 9)) !== null && _alarmData$slice !== void 0 ? _alarmData$slice : []);
+      } else {
+        setAlarmList([]);
+      }
     }
-  }, [alarms]);
+  }, [alarmData]);
   return /*#__PURE__*/React.createElement(_Dialog, {
     className: styles.AlarmListPanel,
     id: "AlarmListPanel",

package/es/core/editor/components/settings/common/LayoutSettings.module.scss

@@ -22,10 +22,10 @@
 .card {
   display: flex;
   flex-direction: column;
-  width: 55px;
-  height: 60px;
+  width: 68px;
+  height: 76px;
   border: none;
-  padding-top: 6px;
+  padding-top: 12px;
   cursor: pointer;
 }
 

package/es/core/editor/components/settings/propertyViews/group/DataTab/hoooks/useGroupRelateResource.js

@@ -1,7 +1,7 @@
 import { useState } from "react";
 import rlog from "@riil-frontend/component-topology-utils/es/rlog";
 import sortBy from 'lodash/sortBy';
-import { getGroupChildrenNode, getNodeData } from "../../../../../../../../utils/htElementUtils";
+import { getGroupChildrenNodes, getNodeData } from "../../../../../../../../utils/htElementUtils";
 import { getIconById } from "../../../../common/GroupNodeList/icon";
 
 function sortResourcesByName(resources) {
@@ -14,7 +14,7 @@ export default function useGroupRelateResource(props) {
   var group = props.group,
       topo = props.topo; // const [resources, setResources] = useState([]);
 
-  var nodes = getGroupChildrenNode(group); // 过滤出资源
+  var nodes = getGroupChildrenNodes(group); // 过滤出资源
 
   var resourceNodes = nodes.filter(function (node) {
     return !!node.getTag();

package/es/core/editor/components/settings/propertyViews/layer/DataTab/NodeList.js

@@ -13,7 +13,7 @@ export default function LayerResourceList(props) {
   var _topo$store$useModelS = topo.store.useModelState('topoMod'),
       topoData = _topo$store$useModelS.data;
 
-  var nodes = getLayerChildrenNodes(topo.getDataModel(), layer.id);
+  var nodes = getLayerChildrenNodes(layer);
   var data = nodes.map(function (node) {
     return {
       title: node.a('name'),

package/es/core/editor/components/settings/propertyViews/layer/DataTab/RelateData.js

@@ -16,7 +16,7 @@ export default function LayerRelateData(props) {
       key: "\u5173\u8054\u8D44\u6E90",
       title: /*#__PURE__*/React.createElement("div", {
         style: {
-          display: "flex",
+          display: 'flex',
           paddingRight: 12
         }
       }, /*#__PURE__*/React.createElement("div", {
@@ -28,13 +28,13 @@ export default function LayerRelateData(props) {
         layer: values,
         topoEdit: topoEditApi,
         onAdd: function onAdd() {
-          /*TODO 刷新列表 refreshList*/
+          /* TODO 刷新列表 refreshList */
         },
         addResourceDrawer: editorProps === null || editorProps === void 0 ? void 0 : editorProps.layerResourceSelectComponent
       }))
     }, /*#__PURE__*/React.createElement(RelatedNodeList, {
       topo: topo,
-      layer: values
+      layer: layer
     }));
   };
 

package/es/core/editor/components/settings/propertyViews/node/NodePropertyView.js

@@ -12,12 +12,15 @@ import NodeIconSelect from "./NodeIconSelect";
 import NodeRelateResourceButton from "./data/NodeRelateResourceButton";
 import styles from "./NodePropertyView.module.scss";
 import TabView from "../../common/tab/TabView";
+import useHtElement from "../../../../../common/hooks/useHtElement";
 var Option = _Select.Option;
 var CollapsePanel = _Collapse.Panel;
 
 function parseValues(values) {
   return _extends({}, values, {
-    'attrObject.customName': values['attrObject.customName'] || values['attrObject.name']
+    'attrObject.customName': values['attrObject.customName'] || values['attrObject.name'],
+    'attrObject.bindTopo': values['attrObject.bindTopo'] || '' // 解决切换节点时关联拓扑选项未重置
+
   });
 }
 
@@ -43,6 +46,10 @@ export default function NodePropertyView(props) {
       editorProps = props.editorProps,
       settingRuntimeState = props.settingRuntimeState;
   var bindType = getBindType(values);
+  var node = useHtElement({
+    topo: topo,
+    id: values.id
+  });
 
   var field = _Field.useField({
     autoUnmount: false,
@@ -56,13 +63,20 @@ export default function NodePropertyView(props) {
     }
   });
 
+  useEffect(function () {
+    field.setValues(parseValues(values));
+  }, [values]);
+
   var setBindType = function setBindType(value) {
     _onChange('attrObject.bindType', value);
   };
 
-  useEffect(function () {
-    field.setValues(parseValues(values));
-  }, [values]);
+  var handleBindTopoChange = function handleBindTopoChange(value, data) {
+    // 清空自定义名称
+    // 设置名称为拓扑名称
+    node.a('name', data.label);
+    node.a('customName', null);
+  };
 
   var renderData = function renderData() {
     var RelateTopoTree = editorProps === null || editorProps === void 0 ? void 0 : editorProps.relateTopoTree;
@@ -115,7 +129,8 @@ export default function NodePropertyView(props) {
       label: "\u5173\u8054\u62D3\u6251"
     }, /*#__PURE__*/React.createElement(RelateTopoTree, {
       name: "attrObject.bindTopo",
-      topo: topo
+      topo: topo,
+      onChange: handleBindTopoChange
     })))));
   };
 

package/es/core/models/common/Alarm.js

@@ -1,7 +1,9 @@
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-import topoService from '@riil-frontend/component-topology-common/es/services/topo';
-import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import topoService from "@riil-frontend/component-topology-common/es/services/topo";
+import rlog from "@riil-frontend/component-topology-utils/es/rlog";
+import moment from "moment";
+import { alarmListDemo } from "./mocks";
 
 var Alarm = /*#__PURE__*/function () {
   function Alarm() {
@@ -54,12 +56,13 @@ var Alarm = /*#__PURE__*/function () {
               return _context.abrupt("return");
 
             case 5:
-              rlog.info('Alarm.open 打开告警通道', id); // 订阅告警推送
-              // 打开告警推送通道
+              rlog.info("Alarm.open 打开告警通道", id); // 订阅告警推送
+
+              this.hmGetTopoAlarm(id); // 打开告警推送通道
 
               this.openTopoAlarm(id);
 
-            case 7:
+            case 8:
             case "end":
               return _context.stop();
           }
@@ -87,7 +90,7 @@ var Alarm = /*#__PURE__*/function () {
 
 
     var id = this.topoApp.id;
-    rlog.info('关闭告警通道', id); // 取消订阅告警推送
+    rlog.info("关闭告警通道", id); // 取消订阅告警推送
     // 关闭告警推送通道
 
     this.closeTopoAlarm(id);
@@ -111,7 +114,59 @@ var Alarm = /*#__PURE__*/function () {
    */
   ;
 
-  _proto.removeAlarms = function removeAlarms() {}
+  _proto.removeAlarms = function removeAlarms() {};
+
+  _proto.hmGetTopoAlarm = /*#__PURE__*/function () {
+    var _hmGetTopoAlarm = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(id) {
+      var data, nodes, ids, endTime, startTime, parms, result;
+      return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+        while (1) {
+          switch (_context2.prev = _context2.next) {
+            case 0:
+              data = this.topoApp.store.getState().topoMod.data;
+              rlog.debug("获取告警列表", this.topoApp, data);
+              nodes = data.nodes;
+              ids = nodes.map(function (node, i) {
+                return node.id;
+              });
+              endTime = new Date().valueOf();
+              startTime = moment().subtract(1, "months").valueOf();
+              parms = {
+                ciIdList: ids,
+                alertStatusList: ["toDeal"],
+                pageNum: 1,
+                pageSize: 10,
+                sortField: "alertLevel",
+                sortOrder: "asc",
+                createTime: {
+                  startTime: startTime,
+                  endTime: endTime
+                }
+              };
+              _context2.next = 9;
+              return topoService.getAlarmByIds(parms);
+
+            case 9:
+              result = _context2.sent;
+              rlog.debug("getAlarmById-result", result);
+              this.updateState({
+                alarmData: result.datas.length > 0 ? result.datas : alarmListDemo
+              });
+
+            case 12:
+            case "end":
+              return _context2.stop();
+          }
+        }
+      }, _callee2, this);
+    }));
+
+    function hmGetTopoAlarm(_x) {
+      return _hmGetTopoAlarm.apply(this, arguments);
+    }
+
+    return hmGetTopoAlarm;
+  }()
   /**
    * 打开告警推送。
    *
@@ -122,29 +177,29 @@ var Alarm = /*#__PURE__*/function () {
   _proto.openTopoAlarm =
   /*#__PURE__*/
   function () {
-    var _openTopoAlarm = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(id) {
+    var _openTopoAlarm = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(id) {
       var _this$getState, alarmOpening, topoAlarmIsOpen;
 
-      return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+      return _regeneratorRuntime.wrap(function _callee3$(_context3) {
         while (1) {
-          switch (_context2.prev = _context2.next) {
+          switch (_context3.prev = _context3.next) {
             case 0:
               // 如果当前拓扑图开启中或已开启则退出
               _this$getState = this.getState(), alarmOpening = _this$getState.alarmOpening, topoAlarmIsOpen = _this$getState.topoAlarmIsOpen;
 
               if (!(this.currentTopoId === id && (topoAlarmIsOpen || alarmOpening))) {
-                _context2.next = 3;
+                _context3.next = 3;
                 break;
               }
 
-              return _context2.abrupt("return");
+              return _context3.abrupt("return");
 
             case 3:
               this.currentTopoId = id;
               this.updateState({
                 alarmOpening: true
               });
-              _context2.next = 7;
+              _context3.next = 7;
               return topoService.openTopoAlarm(id);
 
             case 7:
@@ -155,13 +210,13 @@ var Alarm = /*#__PURE__*/function () {
 
             case 8:
             case "end":
-              return _context2.stop();
+              return _context3.stop();
           }
         }
-      }, _callee2, this);
+      }, _callee3, this);
     }));
 
-    function openTopoAlarm(_x) {
+    function openTopoAlarm(_x2) {
       return _openTopoAlarm.apply(this, arguments);
     }
 
@@ -177,22 +232,22 @@ var Alarm = /*#__PURE__*/function () {
   _proto.closeTopoAlarm =
   /*#__PURE__*/
   function () {
-    var _closeTopoAlarm = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(id) {
+    var _closeTopoAlarm = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(id) {
       var _this$getState2, alarmIsOpened, alarmOpening;
 
-      return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+      return _regeneratorRuntime.wrap(function _callee4$(_context4) {
         while (1) {
-          switch (_context3.prev = _context3.next) {
+          switch (_context4.prev = _context4.next) {
             case 0:
               // 如果未开启则退出
               _this$getState2 = this.getState(), alarmIsOpened = _this$getState2.alarmIsOpened, alarmOpening = _this$getState2.alarmOpening;
 
               if (!(!alarmIsOpened && !alarmOpening)) {
-                _context3.next = 3;
+                _context4.next = 3;
                 break;
               }
 
-              return _context3.abrupt("return");
+              return _context4.abrupt("return");
 
             case 3:
               this.currentTopoId = null;
@@ -200,18 +255,18 @@ var Alarm = /*#__PURE__*/function () {
                 topoAlarmIsOpen: false,
                 alarmOpening: false
               });
-              _context3.next = 7;
+              _context4.next = 7;
               return topoService.closeTopoAlarm(id);
 
             case 7:
             case "end":
-              return _context3.stop();
+              return _context4.stop();
           }
         }
-      }, _callee3, this);
+      }, _callee4, this);
     }));
 
-    function closeTopoAlarm(_x2) {
+    function closeTopoAlarm(_x3) {
       return _closeTopoAlarm.apply(this, arguments);
     }
 
@@ -225,22 +280,22 @@ var Alarm = /*#__PURE__*/function () {
   _proto.restart =
   /*#__PURE__*/
   function () {
-    var _restart = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
+    var _restart = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5() {
       var id;
-      return _regeneratorRuntime.wrap(function _callee4$(_context4) {
+      return _regeneratorRuntime.wrap(function _callee5$(_context5) {
         while (1) {
-          switch (_context4.prev = _context4.next) {
+          switch (_context5.prev = _context5.next) {
             case 0:
               id = this.currentTopoId;
-              _context4.next = 3;
+              _context5.next = 3;
               return this.openTopoAlarm(id);
 
             case 3:
             case "end":
-              return _context4.stop();
+              return _context5.stop();
           }
         }
-      }, _callee4, this);
+      }, _callee5, this);
     }));
 
     function restart() {
@@ -255,16 +310,16 @@ var Alarm = /*#__PURE__*/function () {
   };
 
   _proto.getState = function getState() {
-    return this.topoApp.store.getModelState('topoAlarm');
+    return this.topoApp.store.getModelState("topoAlarm");
   };
 
   _proto.useState = function useState() {
-    var state = this.topoApp.store.useModelState('topoAlarm');
+    var state = this.topoApp.store.useModelState("topoAlarm");
     return state;
   };
 
   _proto.updateState = function updateState(state) {
-    return this.topoApp.store.getModelDispatchers('topoAlarm').update(state);
+    return this.topoApp.store.getModelDispatchers("topoAlarm").update(state);
   };
 
   return Alarm;

package/es/core/models/common/mocks/index.js

@@ -0,0 +1,39 @@
+export var alarmListDemo = [{
+  alertAggInfo: null,
+  alertId: 54,
+  alertLevel: 1,
+  alertObject: "Oracle实例ORCL(172.17.162.192)",
+  alertTitle: "数据库实例宕机",
+  alertType: "通断类告警",
+  changeTime: null,
+  ciId: "0000000019986715",
+  ciName: "ORCL",
+  ciType: "Oracle实例",
+  closeTime: 0,
+  createTime: 1640860800000,
+  duration: 422241000,
+  processTime: 0,
+  recoverTime: 0,
+  ruleId: "157",
+  status: "toDeal",
+  tags: null
+}, {
+  alertId: 53,
+  alertLevel: 2,
+  alertObject: "Oracle实例ORCL(172.17.160.119)",
+  alertTitle: "数据库实例宕机",
+  createTime: 1640860800000,
+  ruleId: "157",
+  alertType: "通断类告警",
+  duration: 422241000,
+  ciType: "Oracle实例",
+  ciId: "000000001abb92b6",
+  ciName: "ORCL",
+  processTime: 0,
+  changeTime: null,
+  recoverTime: 0,
+  closeTime: 0,
+  tags: null,
+  status: "toDeal",
+  alertAggInfo: null
+}];

package/es/hooks/useAlarm.js

@@ -1,9 +1,9 @@
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-import { useEffect } from 'react';
-import rlog from '@riil-frontend/component-topology-utils/es/rlog';
-import { EE } from '@riil-frontend/component-riil-event-emitter';
-import { isAvailableArray } from '@riil-frontend/utils';
+import { useEffect } from "react";
+import rlog from "@riil-frontend/component-topology-utils/es/rlog";
+import { EE } from "@riil-frontend/component-riil-event-emitter";
+import { isAvailableArray } from "@riil-frontend/utils";
 export default function useAlarm(options) {
   var topo = options.topo;
   var store = topo.store;
@@ -11,15 +11,31 @@ export default function useAlarm(options) {
   var _topo$alarm$useState = topo.alarm.useState(),
       alarmIsOpened = _topo$alarm$useState.alarmIsOpened;
 
-  var _store$useModel = store.useModel('topoBizMod'),
-      bizState = _store$useModel[0],
-      bizDispatchers = _store$useModel[1];
+  var allData = topo.store.getState().topoMod.data;
 
-  var linkDynamicStyleDispatcher = store.getModel('linkDynamicStyle')[1];
+  var _store$useModel = store.useModel("topoMod"),
+      state = _store$useModel[0],
+      dispatchers = _store$useModel[1];
+
+  var _store$useModel2 = store.useModel("topoBizMod"),
+      bizState = _store$useModel2[0],
+      bizDispatchers = _store$useModel2[1];
+
+  var linkDynamicStyleDispatcher = store.getModel("linkDynamicStyle")[1];
+  useEffect(function () {
+    rlog.debug("useAlarm.useEffect 获取初始化告警---开始", topo, allData, state, alarmIsOpened);
+
+    if (alarmIsOpened) {
+      var conditions = {
+        id: ""
+      };
+      dispatchers.getAlarmById(conditions);
+    }
+  }, []);
   useEffect(function () {
     if (alarmIsOpened) {
-      rlog.debug('useAlarm.useEffect 告警WebSocket 开始', alarmIsOpened);
-      EE.on('topo', 'topo', function (data, other, t) {
+      rlog.debug("useAlarm.useEffect 告警WebSocket 开始", alarmIsOpened);
+      EE.on("topo", "topo", function (data, other, t) {
         if (t === void 0) {
           t = alarmIsOpened;
         }
@@ -29,8 +45,8 @@ export default function useAlarm(options) {
     }
 
     return function () {
-      rlog.debug('useAlarm.useEffect 告警WebSocket 结束');
-      EE.removeListener('topo', 'topo');
+      rlog.debug("useAlarm.useEffect 告警WebSocket 结束");
+      EE.removeListener("topo", "topo");
     };
   }, [alarmIsOpened]);
 
@@ -46,16 +62,16 @@ export default function useAlarm(options) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
-              _store$getModelState = store.getModelState('topoMod'), viewState = _store$getModelState.viewState; // 添加事件
+              _store$getModelState = store.getModelState("topoMod"), viewState = _store$getModelState.viewState; // 添加事件
 
               type = data.type, alertData = data.data;
 
-              if (!(viewState === 'view' && type === 'alarm' && isAvailableArray(alertData))) {
+              if (!(viewState === "view" && type === "alarm" && isAvailableArray(alertData))) {
                 _context.next = 11;
                 break;
               }
 
-              rlog.debug('useAlarm.getAlarmByEE 告警原始数据', alertData);
+              rlog.debug("useAlarm.getAlarmByEE 告警原始数据", alertData);
               al = alertData.map(function (item, index) {
                 var _item$resourceId;
 
@@ -69,7 +85,7 @@ export default function useAlarm(options) {
                   info: item.alertType
                 };
               });
-              rlog.debug('before-combAlarmData', al, bizState);
+              rlog.debug("before-combAlarmData", al, bizState);
               _context.next = 8;
               return bizDispatchers.combAlarmData({
                 alarmdata: al
@@ -77,7 +93,7 @@ export default function useAlarm(options) {
 
             case 8:
               alarmList = _context.sent;
-              rlog.debug('useAlarm.getAlarmByEE 推送告警到ht', alarmList, bizState);
+              rlog.debug("useAlarm.getAlarmByEE 推送告警到ht", alarmList, bizState);
 
               if (alarmIsOpened) {
                 topo.loadAlarm(alarmList); // 告警变化后，刷新链路动态样式

package/es/hooks/useTopoEdit.js

@@ -10,7 +10,7 @@ import { TopoEvent } from '@riil-frontend/component-topology-graph';
 import { filterNode, filterGroupById, filterGroupByTag } from "../utils/format";
 import { DEFAULT_GROUP } from "../utils/template";
 import topoPermissonUtil from "../utils/topoPermissionUtil";
-import { getGroupChildrenNode, getGroupElementByTag } from "../utils/htElementUtils";
+import { getGroupChildrenNodes, getGroupElementByTag } from "../utils/htElementUtils";
 import useResourceConfig from "./useResourceConfig";
 
 var useTopoEdit = function useTopoEdit(params) {
@@ -273,7 +273,7 @@ var useTopoEdit = function useTopoEdit(params) {
       return;
     }
 
-    if (!getGroupChildrenNode(group).length) {
+    if (!getGroupChildrenNodes(group).length) {
       doDelete();
     } // 有子节点时需要确认
 

package/es/models/topoAlarm.js

@@ -5,13 +5,14 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 /**
  * 告警
  */
-import topoService from '@riil-frontend/component-topology-common/es/services/topo';
+import topoService from "@riil-frontend/component-topology-common/es/services/topo";
 export default {
   // 定义 model 的初始 state
   state: {
     currentTopoId: undefined,
     alarmOpening: false,
-    alarmIsOpened: false
+    alarmIsOpened: true,
+    alarmDatas: []
   },
   // 定义改变该模型状态的纯函数
   reducers: {

package/es/models/topoMod.js

@@ -571,8 +571,8 @@ export default function (topoApp) {
               while (1) {
                 switch (_context11.prev = _context11.next) {
                   case 0:
-                    endTime = conditions.endTime || new Date().valueOf();
-                    startTime = conditions.startTime || moment().subtract(1, "months").valueOf();
+                    endTime = (conditions === null || conditions === void 0 ? void 0 : conditions.endTime) || new Date().valueOf();
+                    startTime = (conditions === null || conditions === void 0 ? void 0 : conditions.startTime) || moment().subtract(1, "months").valueOf();
                     parms = {
                       ciIdList: [conditions.id],
                       alertStatusList: ["toDeal"],

package/es/topoCenter/components/editor/propertyViews/LayerRelatedResourceList.js

@@ -12,7 +12,7 @@ export default function LayerResourceList(props) {
   var groupResources = useGroupResources({
     topo: topo,
     group: {
-      id: layer.tag
+      id: layer.getTag()
     }
   });
   var data = groupResources.map(function (resource) {