@riil-frontend/component-topology 6.0.7 → 6.0.8

package/es/core/components/TopoView/GraphViewPanel.js

@@ -9,14 +9,15 @@ export default function GraphViewPanel(props) {
 
   var _useCanvasTheme = useCanvasTheme({
     topo: topo,
-    themeName: themeName
+    themeName: themeName,
+    hideBackgroundColor: hideBackgroundColor
   }),
       canvasColor = _useCanvasTheme.canvasColor;
 
   return /*#__PURE__*/React.createElement("div", {
     className: styles.viewPanel,
     style: {
-      background: hideBackgroundColor ? null : canvasColor
+      background: canvasColor
     }
   }, props.children);
 }

package/es/core/hooks/useCanvasTheme.js

@@ -30,15 +30,16 @@ var themeMap = [{
 }, {});
 export default function useCanvasTheme(props) {
   var topo = props.topo,
-      themeName = props.themeName; // 拓扑图是否加载
+      themeName = props.themeName,
+      hideBackgroundColor = props.hideBackgroundColor; // 拓扑图是否加载
 
   var _topo$store$useModelS = topo.store.useModelState('topoMod'),
       graphLoaded = _topo$store$useModelS.graphLoaded;
 
+  var themeConfig = themeMap[themeName || 'white'];
+  var canvasColor = hideBackgroundColor ? null : themeConfig.color;
   useEffect(function () {
     // 设置
-    var themeConfig = themeMap[themeName || 'white'];
-
     if (graphLoaded && themeConfig) {
       try {
         topo.getHtTopo().setTheme(themeName);
@@ -47,8 +48,18 @@ export default function useCanvasTheme(props) {
         console.error('切换主题失败', error);
       }
     }
-  }, [themeName, graphLoaded]);
+  }, [graphLoaded, themeName]);
+  useEffect(function () {
+    // 设置
+    if (graphLoaded) {
+      try {
+        topo.getHtTopo().getGraphView().dm().setBackground(canvasColor);
+      } catch (error) {
+        console.error('切换主题失败', error);
+      }
+    }
+  }, [graphLoaded, canvasColor]);
   return {
-    canvasColor: themeMap[themeName].color
+    canvasColor: canvasColor
   };
 }

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.7" === 'string' ? "6.0.7" : null;
+var version = typeof "6.0.8" === 'string' ? "6.0.8" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/lib/core/components/TopoView/GraphViewPanel.js

@@ -19,14 +19,15 @@ function GraphViewPanel(props) {
 
   var _useCanvasTheme = (0, _useCanvasTheme2["default"])({
     topo: topo,
-    themeName: themeName
+    themeName: themeName,
+    hideBackgroundColor: hideBackgroundColor
   }),
       canvasColor = _useCanvasTheme.canvasColor;
 
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: _TopoViewModule["default"].viewPanel,
     style: {
-      background: hideBackgroundColor ? null : canvasColor
+      background: canvasColor
     }
   }, props.children);
 }

package/lib/core/hooks/useCanvasTheme.js

@@ -44,15 +44,16 @@ var themeMap = [{
 
 function useCanvasTheme(props) {
   var topo = props.topo,
-      themeName = props.themeName; // 拓扑图是否加载
+      themeName = props.themeName,
+      hideBackgroundColor = props.hideBackgroundColor; // 拓扑图是否加载
 
   var _topo$store$useModelS = topo.store.useModelState('topoMod'),
       graphLoaded = _topo$store$useModelS.graphLoaded;
 
+  var themeConfig = themeMap[themeName || 'white'];
+  var canvasColor = hideBackgroundColor ? null : themeConfig.color;
   (0, _react.useEffect)(function () {
     // 设置
-    var themeConfig = themeMap[themeName || 'white'];
-
     if (graphLoaded && themeConfig) {
       try {
         topo.getHtTopo().setTheme(themeName);
@@ -61,8 +62,18 @@ function useCanvasTheme(props) {
         console.error('切换主题失败', error);
       }
     }
-  }, [themeName, graphLoaded]);
+  }, [graphLoaded, themeName]);
+  (0, _react.useEffect)(function () {
+    // 设置
+    if (graphLoaded) {
+      try {
+        topo.getHtTopo().getGraphView().dm().setBackground(canvasColor);
+      } catch (error) {
+        console.error('切换主题失败', error);
+      }
+    }
+  }, [graphLoaded, canvasColor]);
   return {
-    canvasColor: themeMap[themeName].color
+    canvasColor: canvasColor
   };
 }

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.7" === 'string' ? "6.0.7" : null;
+var version = typeof "6.0.8" === 'string' ? "6.0.8" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/package.json

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