@riil-frontend/component-topology 2.15.43 → 2.15.46

package/es/core/editor/components/settings/propertyViews/group/SettingTab/GroupExpandSetting.js

@@ -1,6 +1,6 @@
 import _Form from "@alifd/next/es/form";
 import _Collapse from "@alifd/next/es/collapse";
-import React, { useState, useEffect, useRef, useCallback } from 'react';
+import React, { useState, useEffect, useRef, useCallback } from "react";
 import GroupExpandStatus from "./GroupExpandStatus";
 import AlignSetting from "../../../common/AlignSetting";
 import LayoutSettings from "../../../common/LayoutSettings"; // import NodeIconSelect from '../../node/NodeIconSelect';
@@ -12,6 +12,7 @@ export default function GroupExpandSetting(props) {
       group = props.group,
       expanded = props.expanded,
       onChange = props.onChange,
+      id = props.id,
       settingRuntimeState = props.settingRuntimeState;
 
   var _useState = useState(),
@@ -19,22 +20,26 @@ export default function GroupExpandSetting(props) {
       setLayout = _useState[1];
 
   var alignOnChange = function alignOnChange(v) {
-    console.log('setAlignmentBySelectionNodes', v); // topo.view.topoClient.htTopoClient.setAlignmentBySelectionNodes(v);
-
-    onChange('groupAlign', v); // topoEditApi.setAlignmentBySelectionNodes(v);
+    // console.log("setAlignmentBySelectionNodes", v);
+    // topo.view.topoClient.htTopoClient.setAlignmentBySelectionNodes(v);
+    onChange("groupAlign", v); // topoEditApi.setAlignmentBySelectionNodes(v);
   };
 
   var layoutOnChange = function layoutOnChange(v) {
-    console.log('layoutOnChange', v);
+    // console.log("layoutOnChange", v);
     setLayout(v); // topo.view.topoClient.htTopoClient.setAlignmentBySelectionNodes(v);
 
-    onChange('layout', v); // topoEditApi.setAlignmentBySelectionNodes(v);
+    onChange("layout", v); // topoEditApi.setAlignmentBySelectionNodes(v);
   };
 
+  useEffect(function () {
+    // console.log("GroupExpandSetting-id-layout", id, layout);
+    setLayout({}); // onChange("layout", {});
+  }, [id]);
   return /*#__PURE__*/React.createElement(_Collapse, {
-    defaultExpandedKeys: ['布局', '显示设置', '对齐方式'],
+    defaultExpandedKeys: ["布局", "显示设置", "对齐方式"],
     style: {
-      border: 'none'
+      border: "none"
     }
   }, /*#__PURE__*/React.createElement(CollapsePanel, {
     key: "\u5E03\u5C40",

package/es/core/editor/components/settings/propertyViews/group/SettingTab/Setting.js

@@ -19,6 +19,7 @@ export default function GroupSetting(props) {
       editorProps = props.editorProps,
       group = props.group;
   var expanded = values.expanded;
+  var id = values.id;
 
   var field = _Field.useField({
     autoUnmount: false,
@@ -93,6 +94,7 @@ export default function GroupSetting(props) {
     maxLength: 30,
     placeholder: "\u8BF7\u8F93\u5165"
   })), expanded ? /*#__PURE__*/React.createElement(GroupExpandSetting, {
+    id: id,
     group: group,
     expanded: expanded,
     topo: topo,

package/es/core/models/TopoApp.js

@@ -20,7 +20,7 @@ import { updateEdgeExpanded } from "../utils/edgeUtil";
 import PluginManager from "./PluginManager";
 import topoFactory from "./topoFactory"; // eslint-disable-next-line no-undef
 
-var version = typeof "2.15.43" === 'string' ? "2.15.43" : null;
+var version = typeof "2.15.46" === 'string' ? "2.15.46" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑
@@ -75,6 +75,10 @@ var Topo = /*#__PURE__*/function () {
 
     this.test = new Test(this);
     this.uid = topoFactory.add(options.name, this);
+  };
+
+  _proto.destroy = function destroy() {
+    topoFactory.remove(this.uid);
   }
   /**
    * TODO 移除
@@ -95,7 +99,7 @@ var Topo = /*#__PURE__*/function () {
               return topoDispatchers.exit();
 
             case 3:
-              topoFactory.remove(this.uid);
+              this.destroy();
 
             case 4:
             case "end":
@@ -543,7 +547,7 @@ var Topo = /*#__PURE__*/function () {
 
             case 7:
               updateEdgeExpanded(this);
-              editDispatchers = this.store.getModelDispatchers('topoCreateMod');
+              editDispatchers = this.store.getModelDispatchers('topoConfig');
               editDispatchers.switchToEditMode();
 
               if (this.options.onSwitchToEditMode) {
@@ -551,7 +555,7 @@ var Topo = /*#__PURE__*/function () {
               } // 加载自定义上传的图标
 
 
-              iconManageDispatchers = this.store.getModelDispatchers('iconManage');
+              iconManageDispatchers = this.store.getModelDispatchers('customIcon');
               iconManageDispatchers.loadEditorIcons();
 
             case 13:
@@ -580,7 +584,7 @@ var Topo = /*#__PURE__*/function () {
               return this.view.switchToViewMode();
 
             case 2:
-              editDispatchers = this.store.getModelDispatchers('topoCreateMod');
+              editDispatchers = this.store.getModelDispatchers('topoConfig');
               editDispatchers.switchToViewMode(this.id);
 
               if (this.options.onSwitchToViewMode) {

package/es/core/services/background.js

@@ -107,5 +107,30 @@ export default {
   /**
    * 背景图导出
    */
-  EXPORT_BG_ZIP: EXPORT_BG_ZIP
+  EXPORT_BG_ZIP: EXPORT_BG_ZIP,
+
+  /**
+   * 校验背景图是否被占用
+   * @param {*} params id
+   */
+  canDeleteBackground: function canDeleteBackground(id) {
+    return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
+      return _regeneratorRuntime.wrap(function _callee4$(_context4) {
+        while (1) {
+          switch (_context4.prev = _context4.next) {
+            case 0:
+              _context4.next = 2;
+              return getRequest()("/topo/v1/api/background/" + id);
+
+            case 2:
+              return _context4.abrupt("return", _context4.sent);
+
+            case 3:
+            case "end":
+              return _context4.stop();
+          }
+        }
+      }, _callee4);
+    }))();
+  }
 };

package/es/core/store/coreModels.js

@@ -1,32 +1,38 @@
-import topoMod from "./models/topoMod";
-import iconManage from "./models/iconManage";
-import ciModel from "./models/ciModel";
-import functionAuth from "./models/functionAuth";
-import linkDynamicStyle from "./models/linkDynamicStyle";
-import linkDynamicStyleConfig from "./models/linkDynamicStyleConfig";
-import permissionSetting from "./models/permissionSetting";
-import resourceWebControllUrlSetting from "./models/resourceWebControllUrlSetting";
-import topoBizMod from "./models/topoBizMod";
-import topoCenter from "./models/topoCenter";
-import topoCreate from "./models/topoCreate";
-import topoCreateMod from "./models/topoCreateMod";
-import topoEdit from "./models/topoEdit";
-import topoTreeMod from "./models/topoTreeMod";
-import topoView from "./models/topoView";
+import topoMod from "../../models/topoMod";
+import customIcon from "../../models/customIcon";
+import ciModel from "../../models/ciModel";
+import selection from "../../models/selection";
+import topoBizMod from "../../models/topoBizMod";
+import topoConfig from "../../models/topoConfig";
+import topoEdit from "../../models/topoEdit";
+import topoView from "../../models/topoView";
+import topoAlarm from "../../models/topoAlarm";
+import topoGraphView from "../../models/topoGraphView";
+import background from "../../models/background";
+import displayConfig from "../../models/displayConfig";
+import resourceWebControllUrlSetting from "../../models/resourceWebControllUrlSetting";
+import topoBaseInfoOverview from "../../models/topoBaseInfoOverview";
+import topoCenter from "../../topoCenter/store/topoCenter";
+import functionAuth from "../../topoCenter/store/functionAuth";
+import topoLinkMod from "../../topoCenter/store/topoLinkMod";
+import topoTreeMod from "../../topoCenter/store/topoTreeMod";
 export default {
   topoMod: topoMod,
-  iconManage: iconManage,
-  ciModel: ciModel,
-  functionAuth: functionAuth,
-  linkDynamicStyle: linkDynamicStyle,
-  linkDynamicStyleConfig: linkDynamicStyleConfig,
-  permissionSetting: permissionSetting,
+  customIcon: customIcon,
+  selection: selection,
   resourceWebControllUrlSetting: resourceWebControllUrlSetting,
   topoBizMod: topoBizMod,
-  topoCenter: topoCenter,
-  topoCreate: topoCreate,
-  topoCreateMod: topoCreateMod,
+  topoConfig: topoConfig,
+  topoLinkMod: topoLinkMod,
+  topoView: topoView,
+  background: background,
+  topoGraphView: topoGraphView,
+  topoAlarm: topoAlarm,
+  displayConfig: displayConfig,
+  topoBaseInfoOverview: topoBaseInfoOverview,
+  ciModel: ciModel,
+  functionAuth: functionAuth,
   topoEdit: topoEdit,
-  topoTreeMod: topoTreeMod,
-  topoView: topoView
+  topoCenter: topoCenter,
+  topoTreeMod: topoTreeMod
 };

package/es/core/store/createStore.js

@@ -1,6 +1,6 @@
 import _extends from "@babel/runtime/helpers/extends";
 import { createStore } from '@ice/store';
-import coreModels from "./getStoreModels";
+import coreModels from "./coreModels";
 export default function (engine, extModels) {
   if (extModels === void 0) {
     extModels = {};

package/es/core/test/Test.js

@@ -8,9 +8,11 @@ var Test = /*#__PURE__*/function () {
   var _proto = Test.prototype;
 
   _proto.init = function init() {
+    var _this = this;
+
     this.iconManage = {
       openUpload: function openUpload(type) {
-        topo.store.getModelDispatchers('iconManage').open({
+        _this.topo.store.getModelDispatchers('customIcon').open({
           type: type || 'node'
         });
       }

package/es/core/viewer/contextmenu/buildNodeContextmenu.js

@@ -6,70 +6,71 @@ export default function buildNodeContextmenu(topoApp) {
   return {
     enable: true,
     items: [// {
-    //   label: '概览',
-    //   id: 'Resource.detail',
-    //   icon: '/img/topo/contextmenu/Topology_resources_menu_icon_overview.svg',
-    //   visible: (data) => {
-    //     return isResource(data) && !!data.operation;
-    //   }
-    // },
-    {
-      label: 'Web控制台',
-      icon: '/img/topo/contextmenu/Topology_resources_menu_icon_webconsole.svg',
-      visible: function visible(data) {
-        return isResource(data) && !!data.operation;
-      },
-      items: [{
-        label: '访问',
-        id: 'Resource.WebConsole.open',
-        disable: function disable(data) {
-          var resourceWebControllUrl = topoApp.pluginManager.pluginMap.resourceWebControllUrl;
-          return !resourceWebControllUrl.getResourceUrl(data.id);
-        }
-      }, {
-        label: '设置',
-        id: 'Resource.WebConsole.setting'
-      }]
-    } // {
-    //   label: '资源操作',
-    //   id: 'Resource.Operate',
-    //   icon: '/img/topo/contextmenu/Topology_resources_menu_icon_operands.svg',
-    //   visible: (data) => {
-    //     if (!isResource(data)) {
-    //       return false;
-    //     }
-    //     const {ciType} = data;
-    //     const ciMeta = topoApp.ciTyeCache.getCiType(ciType);
-    //     if (!ciMeta) {
-    //       return false;
-    //     }
-    //     const {domain} = ciMeta;
-    //     // 是否有该页签，与资源详情保持一致
-    //     const hasTab = domain === 'network' || domain === 'server';
-    //     return !!data.operation && hasTab;
-    //   }
-    // },
-    // {
-    //   label: 'Syslog',
-    //   id: 'Resource.Syslog',
-    //   icon: '/img/topo/contextmenu/Topology_resources_menu_icon_syslog.svg',
-    //   visible: (data) => {
-    //     if (!isResource(data)) {
-    //       return false;
-    //     }
-    //     const {ciType} = data;
-    //     const ciMeta = topoApp.ciTyeCache.getCiType(ciType);
-    //     if (!ciMeta) {
-    //       return false;
-    //     }
-    //     const {domain} = ciMeta;
-    //     // 是否有该页签，与资源详情保持一致
-    //     const hasTab = domain === 'network' || domain === 'server';
-    //     return !!data.operation && hasTab;
-    //   }
-    // },
-    // { label: '打开属性设置', id: 'openSet' },
-    // { label: '打开全局属性设置', id: 'openAllSet' },
+      //   label: '概览',
+      //   id: 'Resource.detail',
+      //   icon: '/img/topo/contextmenu/Topology_resources_menu_icon_overview.svg',
+      //   visible: (data) => {
+      //     return isResource(data) && !!data.operation;
+      //   }
+      // },
+      // {
+      //   label: 'Web控制台',
+      //   icon: '/img/topo/contextmenu/Topology_resources_menu_icon_webconsole.svg',
+      //   visible: (data) => {
+      //     return isResource(data) && !!data.operation;
+      //   },
+      //   items: [
+      //     {
+      //       label: '访问',
+      //       id: 'Resource.WebConsole.open',
+      //       disable: (data) => {
+      //         const {resourceWebControllUrl} = topoApp.pluginManager.pluginMap;
+      //         return !resourceWebControllUrl.getResourceUrl(data.id)
+      //       },
+      //     },
+      //     { label: '设置', id: 'Resource.WebConsole.setting' },
+      //   ]
+      // },
+      // {
+      //   label: '资源操作',
+      //   id: 'Resource.Operate',
+      //   icon: '/img/topo/contextmenu/Topology_resources_menu_icon_operands.svg',
+      //   visible: (data) => {
+      //     if (!isResource(data)) {
+      //       return false;
+      //     }
+      //     const {ciType} = data;
+      //     const ciMeta = topoApp.ciTyeCache.getCiType(ciType);
+      //     if (!ciMeta) {
+      //       return false;
+      //     }
+      //     const {domain} = ciMeta;
+      //     // 是否有该页签，与资源详情保持一致
+      //     const hasTab = domain === 'network' || domain === 'server';
+      //     return !!data.operation && hasTab;
+      //   }
+      // },
+      // {
+      //   label: 'Syslog',
+      //   id: 'Resource.Syslog',
+      //   icon: '/img/topo/contextmenu/Topology_resources_menu_icon_syslog.svg',
+      //   visible: (data) => {
+      //     if (!isResource(data)) {
+      //       return false;
+      //     }
+      //     const {ciType} = data;
+      //     const ciMeta = topoApp.ciTyeCache.getCiType(ciType);
+      //     if (!ciMeta) {
+      //       return false;
+      //     }
+      //     const {domain} = ciMeta;
+      //     // 是否有该页签，与资源详情保持一致
+      //     const hasTab = domain === 'network' || domain === 'server';
+      //     return !!data.operation && hasTab;
+      //   }
+      // },
+      // { label: '打开属性设置', id: 'openSet' },
+      // { label: '打开全局属性设置', id: 'openAllSet' },
     ]
   };
 }

package/es/createTopo.js

@@ -1,5 +1,5 @@
 import _extends from "@babel/runtime/helpers/extends";
-import { createTopoApp } from "./core/models/createTopoApp";
+import { createTopoApp } from "./core/createTopoApp";
 import createMenuCommands from "./contextmenu/createMenuCommands";
 import getTopoData from "./topoCenter/getTopoData";
 export function createTopo(options) {

package/es/hooks/useAlarm.js

@@ -26,9 +26,7 @@ export default function useAlarm(options) {
 
   var _store$useModel2 = store.useModel("topoBizMod"),
       bizState = _store$useModel2[0],
-      bizDispatchers = _store$useModel2[1];
-
-  var linkDynamicStyleDispatcher = store.getModel("linkDynamicStyle")[1]; // rlog.debug(
+      bizDispatchers = _store$useModel2[1]; // rlog.debug(
   //   "useAlarm.useEffect 获取初始化告警----------init",
   //   topo,
   //   allData,
@@ -63,6 +61,7 @@ export default function useAlarm(options) {
   //   };
   // }, [alarmIsOpened]);
 
+
   function getAlarmByEE(_x) {
     return _getAlarmByEE.apply(this, arguments);
   }
@@ -110,9 +109,7 @@ export default function useAlarm(options) {
               rlog.debug("useAlarm.getAlarmByEE 推送告警到ht", alarmList, bizState);
 
               if (alarmIsOpened) {
-                topo.loadAlarm(alarmList); // 告警变化后，刷新链路动态样式
-
-                linkDynamicStyleDispatcher.execute();
+                topo.loadAlarm(alarmList);
               }
 
             case 12:

package/es/hooks/useResourceConfig.js

@@ -9,7 +9,7 @@ import { getEdges, getNodes } from "../utils/htElementUtils";
 export default function (props) {
   var topo = props.topo;
   var store = topo.store;
-  var editDispatchers = store.useModelDispatchers('topoCreateMod');
+  var editDispatchers = store.useModelDispatchers('topoConfig');
 
   var loadConfig = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {

package/es/hooks/useTopoEdit.js

@@ -39,7 +39,7 @@ var useTopoEdit = function useTopoEdit(params) {
       topoEditState = _store$useModel[0],
       topoEditDispatchers = _store$useModel[1];
 
-  var _store$useModel2 = store.useModel('topoCreateMod'),
+  var _store$useModel2 = store.useModel('topoConfig'),
       editState = _store$useModel2[0],
       editDispatchers = _store$useModel2[1];
 
@@ -105,9 +105,7 @@ var useTopoEdit = function useTopoEdit(params) {
     }); // 如果非分层拓扑且有分层，切换到分层模板，设置方向
 
     if (!isLayerTopo && config.layers.length) {
-      topoDispatchers.update({
-        type: TPL_TREE
-      });
+      topoDispatchers.setTopoType(TPL_TREE);
     } // 更新配置
 
 
@@ -125,9 +123,7 @@ var useTopoEdit = function useTopoEdit(params) {
     }); // 如果没有分层，将拓扑类型切换为空白模板
 
     if (!config.layers.length) {
-      topoDispatchers.update({
-        type: TPL_BLANK
-      });
+      topoDispatchers.setTopoType(TPL_BLANK);
     } // 更新配置
 
 
@@ -921,7 +917,7 @@ var useTopoEdit = function useTopoEdit(params) {
     }
   };
 
-  var effectsState = store.useModelEffectsState('topoCreateMod');
+  var effectsState = store.useModelEffectsState('topoConfig');
   var topoLoading = effectsState.getTopoByConditions.isLoading;
   return {
     resourceConfig: resourceConfig,

package/es/models/{iconManage.js → customIcon.js}

@@ -163,7 +163,7 @@ export default function (engine) {
                     _this3.update({
                       visible: false,
                       icons: {
-                        node: [].concat(rootState.iconManage.icons.node, data.map(addIconUrlData)),
+                        node: [].concat(rootState.customIcon.icons.node, data.map(addIconUrlData)),
                         container: []
                       }
                     });

package/es/models/topoBizMod.js

@@ -67,105 +67,75 @@ export default function (engine) {
             }, _callee);
           }))();
         },
-        getCiInfo: function getCiInfo(conditions, state) {
-          var _this2 = this;
-
-          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-            var result;
-            return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-              while (1) {
-                switch (_context2.prev = _context2.next) {
-                  case 0:
-                    _context2.next = 2;
-                    return getCiMeta(conditions);
-
-                  case 2:
-                    result = _context2.sent;
-
-                    // rlog.debug('getCiInfo', result);
-                    _this2.update({
-                      // alarmList: result.datas,
-                      currentCiInfo: result // drawerAlarmPageInfo,
-
-                    });
-
-                  case 4:
-                  case "end":
-                    return _context2.stop();
-                }
-              }
-            }, _callee2);
-          }))();
-        },
         // 根据ci的id获取属性的值
         getCiArrByIds: function getCiArrByIds(conditions, state) {
-          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
+          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
             var resIdsList, result;
-            return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+            return _regeneratorRuntime.wrap(function _callee2$(_context2) {
               while (1) {
-                switch (_context3.prev = _context3.next) {
+                switch (_context2.prev = _context2.next) {
                   case 0:
                     resIdsList = state.topoBizMod.resAndMetrics.resIdsList; // rlog.debug('根据ci的id获取属性的值-getCiArrByIds', resIdsList);
                     // const ciIds = encodeURIComponent(resIdsList);
 
-                    _context3.prev = 1;
-                    _context3.next = 4;
+                    _context2.prev = 1;
+                    _context2.next = 4;
                     return topoServer.getBatchCiArr({
                       ids: resIdsList
                     });
 
                   case 4:
-                    result = _context3.sent;
-                    return _context3.abrupt("return", result.content);
+                    result = _context2.sent;
+                    return _context2.abrupt("return", result.content);
 
                   case 8:
-                    _context3.prev = 8;
-                    _context3.t0 = _context3["catch"](1);
-                    return _context3.abrupt("return", null);
+                    _context2.prev = 8;
+                    _context2.t0 = _context2["catch"](1);
+                    return _context2.abrupt("return", null);
 
                   case 11:
                   case "end":
-                    return _context3.stop();
+                    return _context2.stop();
                 }
               }
-            }, _callee3, null, [[1, 8]]);
+            }, _callee2, null, [[1, 8]]);
           }))();
         },
         // 初始化，统一获取指标和属性
         getCiBizByIds: function getCiBizByIds(conditions, state) {
-          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
+          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
             var _conditions$ciIds, _conditions$codes;
 
             var _state$topoBizMod$res, resIdsList, metrics, ciIds, codes, metricResult, arrResult;
 
-            return _regeneratorRuntime.wrap(function _callee4$(_context4) {
+            return _regeneratorRuntime.wrap(function _callee3$(_context3) {
               while (1) {
-                switch (_context4.prev = _context4.next) {
+                switch (_context3.prev = _context3.next) {
                   case 0:
                     _state$topoBizMod$res = state.topoBizMod.resAndMetrics, resIdsList = _state$topoBizMod$res.resIdsList, metrics = _state$topoBizMod$res.metrics;
                     ciIds = encodeURIComponent((_conditions$ciIds = conditions === null || conditions === void 0 ? void 0 : conditions.ciIds) !== null && _conditions$ciIds !== void 0 ? _conditions$ciIds : resIdsList);
                     codes = encodeURIComponent((_conditions$codes = conditions === null || conditions === void 0 ? void 0 : conditions.codes) !== null && _conditions$codes !== void 0 ? _conditions$codes : metrics);
-                    _context4.next = 5;
+                    _context3.next = 5;
                     return getLatestMetrics(ciIds, codes);
 
                   case 5:
-                    metricResult = _context4.sent;
-                    _context4.next = 8;
+                    metricResult = _context3.sent;
+                    _context3.next = 8;
                     return topoServer.getBatchCiArr(ciIds);
 
                   case 8:
-                    arrResult = _context4.sent;
-                    return _context4.abrupt("return", {
+                    arrResult = _context3.sent;
+                    return _context3.abrupt("return", {
                       metricResult: metricResult,
                       arrResult: arrResult
                     });
 
                   case 10:
                   case "end":
-                    return _context4.stop();
+                    return _context3.stop();
                 }
               }
-            }, _callee4);
+            }, _callee3);
           }))();
         },