@riil-frontend/component-topology 6.0.18 → 6.0.20

package/es/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/elements/edgeTag.js

@@ -34,12 +34,16 @@ export function setTextStyle(element, style, topo) {
     tagStyle.fontItalic = italic;
   }
 
-  if ('background' in style || 'opacity' in style) {
+  if ('background' in style) {
     // 背景颜色
     var prevStyle = getTextStyle(element);
     tagStyle.background = formatBackgroundRgbaColor(prevStyle, style);
   }
 
+  if ('opacity' in style) {
+    tagStyle.opacity = opacity;
+  }
+
   if (Object.keys(tagStyle).length) {
     topo.getHtTopo().setEdgeLabelStyle(element, tagStyle);
   }

package/es/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/elements/nodeTag.js

@@ -33,12 +33,16 @@ export function setTextStyle(element, style, topo) {
     tagStyle.fontItalic = italic;
   }
 
-  if ('background' in style || 'opacity' in style) {
+  if ('background' in style) {
     // 背景颜色
     var prevStyle = getTextStyle(element);
     tagStyle.background = formatBackgroundRgbaColor(prevStyle, style);
   }
 
+  if ('opacity' in style) {
+    tagStyle.opacity = opacity;
+  }
+
   if (Object.keys(tagStyle).length) {
     topo.getHtTopo().setNodeLabelStyle(element, tagStyle);
   }

package/es/core/editor/components/settings/propertyViews/index.js

@@ -3,8 +3,9 @@ import LayerPropertyView from "./layer/LayerPropertyView";
 import TextPropertyView from "./text/TextPropertyView";
 import GroupPropertyView from "./group/GroupPropertyView";
 import BoxPropertyView from "./box/BoxPropertyView";
+import ViewPropertyView from "./view/ViewPropertyViewV2";
 var propertyPanelMap = {
-  // view: ViewPropertyView,
+  view: ViewPropertyView,
   group: GroupPropertyView,
   node: NodePropertyView,
   // edge: EdgePropertyView,

package/es/core/editor/components/settings/propertyViews/view/ViewPropertyViewV2.js

@@ -0,0 +1,53 @@
+import _Form from "@alifd/next/es/form";
+import _Collapse from "@alifd/next/es/collapse";
+import React from 'react';
+import useBackgroundConfig from "./hooks/useBackgroundConfig";
+import BackgroundSize from "./BackgroundSize";
+var CollapsePanel = _Collapse.Panel;
+export default function ViewPropertyView(props) {
+  var topo = props.topo,
+      topoShowType = props.topoShowType,
+      editorProps = props.editorProps,
+      settingRuntimeState = props.settingRuntimeState;
+  var backgroundConfig = useBackgroundConfig({
+    topo: topo
+  });
+  var collapsePanels = [{
+    key: '背景',
+    visible: !!backgroundConfig.current,
+    createCollapsePanel: function createCollapsePanel() {
+      return /*#__PURE__*/React.createElement(CollapsePanel, {
+        key: "\u80CC\u666F",
+        title: "\u80CC\u666F"
+      }, /*#__PURE__*/React.createElement(_Form.Item, {
+        label: "\u80CC\u666F\u5C3A\u5BF8",
+        style: {
+          marginBottom: 0
+        }
+      }, /*#__PURE__*/React.createElement(BackgroundSize, {
+        topo: topo,
+        backgroundConfig: backgroundConfig,
+        settingRuntimeState: settingRuntimeState
+      })));
+    }
+  }];
+  var visibleCollapsePanels = collapsePanels.filter(function (panel) {
+    return panel.visible;
+  });
+  return /*#__PURE__*/React.createElement("div", {
+    style: {
+      paddingTop: 4
+    }
+  }, /*#__PURE__*/React.createElement(_Form, {
+    labelAlign: "top"
+  }, /*#__PURE__*/React.createElement(_Form.Item, null, !!collapsePanels.length && /*#__PURE__*/React.createElement(_Collapse, {
+    defaultExpandedKeys: collapsePanels.map(function (panel) {
+      return panel.key;
+    }),
+    style: {
+      border: 'none'
+    }
+  }, visibleCollapsePanels.map(function (panel) {
+    return panel.createCollapsePanel();
+  })))));
+}

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

package/lib/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/elements/edgeTag.js

@@ -51,12 +51,16 @@ function setTextStyle(element, style, topo) {
     tagStyle.fontItalic = italic;
   }
 
-  if ('background' in style || 'opacity' in style) {
+  if ('background' in style) {
     // 背景颜色
     var prevStyle = getTextStyle(element);
     tagStyle.background = (0, _colorUtil.formatBackgroundRgbaColor)(prevStyle, style);
   }
 
+  if ('opacity' in style) {
+    tagStyle.opacity = opacity;
+  }
+
   if (Object.keys(tagStyle).length) {
     topo.getHtTopo().setEdgeLabelStyle(element, tagStyle);
   }

package/lib/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/elements/nodeTag.js

@@ -50,12 +50,16 @@ function setTextStyle(element, style, topo) {
     tagStyle.fontItalic = italic;
   }
 
-  if ('background' in style || 'opacity' in style) {
+  if ('background' in style) {
     // 背景颜色
     var prevStyle = getTextStyle(element);
     tagStyle.background = (0, _colorUtil.formatBackgroundRgbaColor)(prevStyle, style);
   }
 
+  if ('opacity' in style) {
+    tagStyle.opacity = opacity;
+  }
+
   if (Object.keys(tagStyle).length) {
     topo.getHtTopo().setNodeLabelStyle(element, tagStyle);
   }

package/lib/core/editor/components/settings/propertyViews/index.js

@@ -15,8 +15,10 @@ var _GroupPropertyView = _interopRequireDefault(require("./group/GroupPropertyVi
 
 var _BoxPropertyView = _interopRequireDefault(require("./box/BoxPropertyView"));
 
+var _ViewPropertyViewV = _interopRequireDefault(require("./view/ViewPropertyViewV2"));
+
 var propertyPanelMap = {
-  // view: ViewPropertyView,
+  view: _ViewPropertyViewV["default"],
   group: _GroupPropertyView["default"],
   node: _NodePropertyView["default"],
   // edge: EdgePropertyView,

package/lib/core/editor/components/settings/propertyViews/view/ViewPropertyViewV2.js

@@ -0,0 +1,66 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = ViewPropertyView;
+
+var _form = _interopRequireDefault(require("@alifd/next/lib/form"));
+
+var _collapse = _interopRequireDefault(require("@alifd/next/lib/collapse"));
+
+var _react = _interopRequireDefault(require("react"));
+
+var _useBackgroundConfig = _interopRequireDefault(require("./hooks/useBackgroundConfig"));
+
+var _BackgroundSize = _interopRequireDefault(require("./BackgroundSize"));
+
+var CollapsePanel = _collapse["default"].Panel;
+
+function ViewPropertyView(props) {
+  var topo = props.topo,
+      topoShowType = props.topoShowType,
+      editorProps = props.editorProps,
+      settingRuntimeState = props.settingRuntimeState;
+  var backgroundConfig = (0, _useBackgroundConfig["default"])({
+    topo: topo
+  });
+  var collapsePanels = [{
+    key: '背景',
+    visible: !!backgroundConfig.current,
+    createCollapsePanel: function createCollapsePanel() {
+      return /*#__PURE__*/_react["default"].createElement(CollapsePanel, {
+        key: "\u80CC\u666F",
+        title: "\u80CC\u666F"
+      }, /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
+        label: "\u80CC\u666F\u5C3A\u5BF8",
+        style: {
+          marginBottom: 0
+        }
+      }, /*#__PURE__*/_react["default"].createElement(_BackgroundSize["default"], {
+        topo: topo,
+        backgroundConfig: backgroundConfig,
+        settingRuntimeState: settingRuntimeState
+      })));
+    }
+  }];
+  var visibleCollapsePanels = collapsePanels.filter(function (panel) {
+    return panel.visible;
+  });
+  return /*#__PURE__*/_react["default"].createElement("div", {
+    style: {
+      paddingTop: 4
+    }
+  }, /*#__PURE__*/_react["default"].createElement(_form["default"], {
+    labelAlign: "top"
+  }, /*#__PURE__*/_react["default"].createElement(_form["default"].Item, null, !!collapsePanels.length && /*#__PURE__*/_react["default"].createElement(_collapse["default"], {
+    defaultExpandedKeys: collapsePanels.map(function (panel) {
+      return panel.key;
+    }),
+    style: {
+      border: 'none'
+    }
+  }, visibleCollapsePanels.map(function (panel) {
+    return panel.createCollapsePanel();
+  })))));
+}

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

package/package.json

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