@riil-frontend/component-topology 6.0.2 → 6.0.4

package/es/core/editor/components/EditorPlugin.js

@@ -6,27 +6,28 @@ import MultipleResourceSelectPlugin from "./plugins/MultipleResourceSelectPlugin
 import GroupAddResourceDrawerPlugin from "./GroupAddResourceDrawerPlugin";
 import MetricPollingPlugin from "../../viewer/components/plugins/MetricPollingPlugin";
 import AddElementThemePlugin from "./plugins/AddElementThemePlugin";
-import useKeyboardShortcut from "../hooks/useKeyboardShortcut";
-import useUpdateHtTopoDefaultTagStyle from "./Sidebar/views/CanvasPanel/hooks/useUpdateHtTopoDefaultTagStyle";
+import CorePlugin from "./plugins/CorePlugin";
 export default function TopoEditorPlugin(props) {
   var topo = props.topo,
       topoContext = props.topoContext,
       topoEdit = props.topoEdit,
       editorProps = props.editorProps;
   var store = topo.store;
+
+  var _topo$store$useModelS = topo.store.useModelState('topoMod'),
+      graphLoaded = _topo$store$useModelS.graphLoaded;
+
   useEffect(function () {
     return function () {
       topoEdit.reset();
     };
   }, []);
-  useKeyboardShortcut({
-    topo: topo,
-    topoEdit: topoEdit
-  });
-  useUpdateHtTopoDefaultTagStyle({
-    topo: topo
-  });
-  var plugins = [SaveLoading, GroupAddResourceDrawerPlugin, MultipleResourceSelectPlugin, AddElementThemePlugin, CustomIconPlugin, MetricPollingPlugin].concat((editorProps === null || editorProps === void 0 ? void 0 : editorProps.plugins) || []);
+
+  if (!graphLoaded) {
+    return null;
+  }
+
+  var plugins = [CorePlugin, SaveLoading, AddElementThemePlugin, CustomIconPlugin, GroupAddResourceDrawerPlugin, MultipleResourceSelectPlugin, MetricPollingPlugin].concat((editorProps === null || editorProps === void 0 ? void 0 : editorProps.plugins) || []);
   return /*#__PURE__*/React.createElement(React.Fragment, null, plugins.map(function (Plugin, index) {
     return /*#__PURE__*/React.createElement(Plugin, _extends({
       key: index,

package/es/core/editor/components/Toolbar/widgets/FontStyleButton.js

@@ -23,13 +23,22 @@ function buildValue(obj) {
   });
 }
 
+var fields = ['bold', 'italic', 'underline'];
+
+function getDisabled(fieldDisabled) {
+  return !fields.filter(function (field) {
+    return !fieldDisabled[field];
+  }).length;
+}
+
 function FontStyleButton(props) {
   var topo = props.topo,
       showLabel = props.showLabel,
       style = props.style,
-      setStyle = props.setStyle;
+      setStyle = props.setStyle,
+      fieldDisabled = props.fieldDisabled;
 
-  var _useState = useState(true),
+  var _useState = useState(getDisabled(fieldDisabled)),
       disabled = _useState[0],
       setDisabled = _useState[1];
 
@@ -60,6 +69,9 @@ function FontStyleButton(props) {
       underline: underline
     }));
   }, [bold, italic, underline]);
+  useEffect(function () {
+    setDisabled(getDisabled(fieldDisabled));
+  }, [fieldDisabled]);
   /**
    * 
    * @param {Array} selectedKeys 
@@ -93,17 +105,18 @@ function FontStyleButton(props) {
     onSelect: handleSelect
   }, items.map(function (item) {
     return /*#__PURE__*/React.createElement(DropdownMenu.Item, {
-      key: item.key
+      key: item.key,
+      disabled: fieldDisabled[item.key]
     }, /*#__PURE__*/React.createElement("div", {
       style: {
         display: 'flex',
         alignItems: 'center'
       }
     }, /*#__PURE__*/React.createElement("img", {
-      src: "/img/topo/editor/toolbar/" + item.icon + "/Normal.svg",
+      src: "/img/topo/editor/toolbar/" + item.icon + "/" + (fieldDisabled[item.key] ? 'Disable' : 'Normal') + ".svg",
       alt: ""
     }), /*#__PURE__*/React.createElement("span", {
-      style: {
+      style: fieldDisabled[item.key] ? {} : {
         color: '#4d6277'
       }
     }, item.label)));
@@ -111,5 +124,5 @@ function FontStyleButton(props) {
 }
 
 export default textStyleSettingRouter(FontStyleButton, {
-  names: ['bold', 'italic', 'underline']
+  names: fields
 });

package/es/core/editor/components/Toolbar/widgets/components/textStyleSetting/GlobalTagStyleSetting/GlobalTagStyleSetting.js

@@ -4,7 +4,10 @@ var _excluded = ["Component"];
 import React, { useMemo } from 'react';
 import { setGlobalTagStyle, useValues } from "./globalTag";
 var fieldDisabled = {
-  fontSize: true
+  fontSize: true,
+  bold: true,
+  italic: true,
+  underline: true
 };
 
 function GlobalTagStyleSetting(props) {

package/es/core/editor/components/plugins/CorePlugin.js

@@ -0,0 +1,20 @@
+import React from 'react';
+import useKeyboardShortcut from "../../hooks/useKeyboardShortcut";
+import useUpdateHtTopoDefaultTagStyle from "../../hooks/useUpdateHtTopoDefaultTagStyle";
+
+function CorePlugin(props) {
+  var topo = props.topo,
+      topoContext = props.topoContext,
+      topoEdit = props.topoEdit,
+      editorProps = props.editorProps;
+  useKeyboardShortcut({
+    topo: topo,
+    topoEdit: topoEdit
+  });
+  useUpdateHtTopoDefaultTagStyle({
+    topo: topo
+  });
+  return null;
+}
+
+export default CorePlugin;

package/es/core/hooks/useAlarm.js

@@ -71,7 +71,7 @@ export default function useAlarm(options) {
       risks: risks
     });
 
-    if (!alarmSwitch) {
+    if (alarmSwitch === false) {
       // 告警静默
       return;
     }

package/es/core/hooks/useGraphAlarmDisplay.js

@@ -39,11 +39,7 @@ export default function useGraphAlarmDisplay(options) {
   var topo = options.topo,
       alarmSwitch = options.alarmSwitch;
   var store = topo.store;
-
-  var _topo$store$useModel = topo.store.useModel('topoMod'),
-      topoState = _topo$store$useModel[0],
-      topoDispatchers = _topo$store$useModel[1];
-
+  var topoState = topo.store.useModelState('topoMod');
   var graphLoaded = topoState.graphLoaded,
       viewState = topoState.viewState;
   var isEditMode = viewState === 'edit';
@@ -84,7 +80,7 @@ export default function useGraphAlarmDisplay(options) {
         return;
       }
 
-      if (!alarmSwitch) {
+      if (alarmSwitch === false) {
         // 告警静默
         topo.view.loadAlarm([]);
         return;

package/es/core/models/TopoApp.js

@@ -23,7 +23,7 @@ import topoFactory from "./topoFactory";
 import ElementTagTipConfig from "./tagstips/ElementTagTipConfig";
 import SelectionModel from "./SelectionModel"; // eslint-disable-next-line no-undef
 
-var version = typeof "6.0.2" === 'string' ? "6.0.2" : null;
+var version = typeof "6.0.4" === 'string' ? "6.0.4" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/LinkTopo/services/index.js

@@ -82,7 +82,10 @@ function _queryLinkLatestMetrics() {
               break;
             }
 
-            return _context3.abrupt("return", []);
+            return _context3.abrupt("return", {
+              linkMetrics: [],
+              linkMetricsTs: undefined
+            });
 
           case 3:
             _context3.next = 5;

package/lib/core/editor/components/EditorPlugin.js

@@ -21,9 +21,7 @@ var _MetricPollingPlugin = _interopRequireDefault(require("../../viewer/componen
 
 var _AddElementThemePlugin = _interopRequireDefault(require("./plugins/AddElementThemePlugin"));
 
-var _useKeyboardShortcut = _interopRequireDefault(require("../hooks/useKeyboardShortcut"));
-
-var _useUpdateHtTopoDefaultTagStyle = _interopRequireDefault(require("./Sidebar/views/CanvasPanel/hooks/useUpdateHtTopoDefaultTagStyle"));
+var _CorePlugin = _interopRequireDefault(require("./plugins/CorePlugin"));
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
@@ -35,19 +33,21 @@ function TopoEditorPlugin(props) {
       topoEdit = props.topoEdit,
       editorProps = props.editorProps;
   var store = topo.store;
+
+  var _topo$store$useModelS = topo.store.useModelState('topoMod'),
+      graphLoaded = _topo$store$useModelS.graphLoaded;
+
   (0, _react.useEffect)(function () {
     return function () {
       topoEdit.reset();
     };
   }, []);
-  (0, _useKeyboardShortcut["default"])({
-    topo: topo,
-    topoEdit: topoEdit
-  });
-  (0, _useUpdateHtTopoDefaultTagStyle["default"])({
-    topo: topo
-  });
-  var plugins = [_SaveLoading["default"], _GroupAddResourceDrawerPlugin["default"], _MultipleResourceSelectPlugin["default"], _AddElementThemePlugin["default"], _CustomIconPlugin["default"], _MetricPollingPlugin["default"]].concat((editorProps === null || editorProps === void 0 ? void 0 : editorProps.plugins) || []);
+
+  if (!graphLoaded) {
+    return null;
+  }
+
+  var plugins = [_CorePlugin["default"], _SaveLoading["default"], _AddElementThemePlugin["default"], _CustomIconPlugin["default"], _GroupAddResourceDrawerPlugin["default"], _MultipleResourceSelectPlugin["default"], _MetricPollingPlugin["default"]].concat((editorProps === null || editorProps === void 0 ? void 0 : editorProps.plugins) || []);
   return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, plugins.map(function (Plugin, index) {
     return /*#__PURE__*/_react["default"].createElement(Plugin, (0, _extends2["default"])({
       key: index,

package/lib/core/editor/components/Toolbar/widgets/FontStyleButton.js

@@ -39,13 +39,22 @@ function buildValue(obj) {
   });
 }
 
+var fields = ['bold', 'italic', 'underline'];
+
+function getDisabled(fieldDisabled) {
+  return !fields.filter(function (field) {
+    return !fieldDisabled[field];
+  }).length;
+}
+
 function FontStyleButton(props) {
   var topo = props.topo,
       showLabel = props.showLabel,
       style = props.style,
-      setStyle = props.setStyle;
+      setStyle = props.setStyle,
+      fieldDisabled = props.fieldDisabled;
 
-  var _useState = (0, _react.useState)(true),
+  var _useState = (0, _react.useState)(getDisabled(fieldDisabled)),
       disabled = _useState[0],
       setDisabled = _useState[1];
 
@@ -76,6 +85,9 @@ function FontStyleButton(props) {
       underline: underline
     }));
   }, [bold, italic, underline]);
+  (0, _react.useEffect)(function () {
+    setDisabled(getDisabled(fieldDisabled));
+  }, [fieldDisabled]);
   /**
    * 
    * @param {Array} selectedKeys 
@@ -109,17 +121,18 @@ function FontStyleButton(props) {
     onSelect: handleSelect
   }, items.map(function (item) {
     return /*#__PURE__*/_react["default"].createElement(_DropdownMenu["default"].Item, {
-      key: item.key
+      key: item.key,
+      disabled: fieldDisabled[item.key]
     }, /*#__PURE__*/_react["default"].createElement("div", {
       style: {
         display: 'flex',
         alignItems: 'center'
       }
     }, /*#__PURE__*/_react["default"].createElement("img", {
-      src: "/img/topo/editor/toolbar/" + item.icon + "/Normal.svg",
+      src: "/img/topo/editor/toolbar/" + item.icon + "/" + (fieldDisabled[item.key] ? 'Disable' : 'Normal') + ".svg",
       alt: ""
     }), /*#__PURE__*/_react["default"].createElement("span", {
-      style: {
+      style: fieldDisabled[item.key] ? {} : {
         color: '#4d6277'
       }
     }, item.label)));
@@ -127,7 +140,7 @@ function FontStyleButton(props) {
 }
 
 var _default = (0, _textStyleSettingRouter["default"])(FontStyleButton, {
-  names: ['bold', 'italic', 'underline']
+  names: fields
 });
 
 exports["default"] = _default;

package/lib/core/editor/components/Toolbar/widgets/components/textStyleSetting/GlobalTagStyleSetting/GlobalTagStyleSetting.js

@@ -20,7 +20,10 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
 var fieldDisabled = {
-  fontSize: true
+  fontSize: true,
+  bold: true,
+  italic: true,
+  underline: true
 };
 
 function GlobalTagStyleSetting(props) {

package/lib/core/editor/components/plugins/CorePlugin.js

@@ -0,0 +1,30 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+var _useKeyboardShortcut = _interopRequireDefault(require("../../hooks/useKeyboardShortcut"));
+
+var _useUpdateHtTopoDefaultTagStyle = _interopRequireDefault(require("../../hooks/useUpdateHtTopoDefaultTagStyle"));
+
+function CorePlugin(props) {
+  var topo = props.topo,
+      topoContext = props.topoContext,
+      topoEdit = props.topoEdit,
+      editorProps = props.editorProps;
+  (0, _useKeyboardShortcut["default"])({
+    topo: topo,
+    topoEdit: topoEdit
+  });
+  (0, _useUpdateHtTopoDefaultTagStyle["default"])({
+    topo: topo
+  });
+  return null;
+}
+
+var _default = CorePlugin;
+exports["default"] = _default;

package/lib/core/hooks/useAlarm.js

@@ -84,7 +84,7 @@ function useAlarm(options) {
       risks: risks
     });
 
-    if (!alarmSwitch) {
+    if (alarmSwitch === false) {
       // 告警静默
       return;
     }

package/lib/core/hooks/useGraphAlarmDisplay.js

@@ -49,11 +49,7 @@ function useGraphAlarmDisplay(options) {
   var topo = options.topo,
       alarmSwitch = options.alarmSwitch;
   var store = topo.store;
-
-  var _topo$store$useModel = topo.store.useModel('topoMod'),
-      topoState = _topo$store$useModel[0],
-      topoDispatchers = _topo$store$useModel[1];
-
+  var topoState = topo.store.useModelState('topoMod');
   var graphLoaded = topoState.graphLoaded,
       viewState = topoState.viewState;
   var isEditMode = viewState === 'edit';
@@ -94,7 +90,7 @@ function useGraphAlarmDisplay(options) {
         return;
       }
 
-      if (!alarmSwitch) {
+      if (alarmSwitch === false) {
         // 告警静默
         topo.view.loadAlarm([]);
         return;

package/lib/core/models/TopoApp.js

@@ -54,7 +54,7 @@ var _ElementTagTipConfig = _interopRequireDefault(require("./tagstips/ElementTag
 var _SelectionModel = _interopRequireDefault(require("./SelectionModel"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "6.0.2" === 'string' ? "6.0.2" : null;
+var version = typeof "6.0.4" === 'string' ? "6.0.4" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/LinkTopo/services/index.js

@@ -100,7 +100,10 @@ function _queryLinkLatestMetrics() {
               break;
             }
 
-            return _context3.abrupt("return", []);
+            return _context3.abrupt("return", {
+              linkMetrics: [],
+              linkMetricsTs: undefined
+            });
 
           case 3:
             _context3.next = 5;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "6.0.2",
+  "version": "6.0.4",
   "description": "拓扑",
   "scripts": {
     "start": "build-scripts start",
@@ -116,6 +116,6 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@riil-frontend/component-topology@6.0.2/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@6.0.4/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }