@riil-frontend/component-topology 10.0.2 → 10.0.3

package/es/core/editor/components/BackgroundView/index.js

@@ -286,7 +286,7 @@ export default function BackgroundView(props) {
   return /*#__PURE__*/React.createElement("div", {
     className: styles['background-view']
   }, /*#__PURE__*/React.createElement("div", {
-    className: styles.option
+    className: styles.header
   }, /*#__PURE__*/React.createElement(_Button, {
     title: "\u6062\u590D\u9ED8\u8BA4",
     onClick: resetDefault
@@ -299,6 +299,8 @@ export default function BackgroundView(props) {
   }, /*#__PURE__*/React.createElement(_Icon, {
     type: "topo_button_icon_export"
   })))), /*#__PURE__*/React.createElement("div", {
+    className: styles.content
+  }, /*#__PURE__*/React.createElement("div", {
     className: styles.list
   }, /*#__PURE__*/React.createElement(List, {
     selected: (current === null || current === void 0 ? void 0 : current.id) || '',
@@ -328,7 +330,7 @@ export default function BackgroundView(props) {
       setUploadDialogVisible(false);
       getBackground();
     }
-  }), /*#__PURE__*/React.createElement(_Loading, {
+  })), /*#__PURE__*/React.createElement(_Loading, {
     visible: loadingBackground,
     fullScreen: true
   }));

package/es/core/editor/components/BackgroundView/index.module.scss

@@ -2,18 +2,27 @@
 
 .background-view {
   width: 260px;
-  padding: 16px;
   background: #fff;
   height: 100%;
   overflow: auto;
-  .option {
+  display: flex;
+  flex-direction: column;
+
+  .header {
+    padding: 16px 16px 12px 16px;
     text-align: right;
     button {
       margin-left: 8px;
     }
   }
+
+  .content {
+    flex: 1;
+    overflow: auto;
+    padding: 0 16px 16px 16px;
+  }
+
   .list {
-    margin-top: 8px;
     .tag {
       width: 100%;
       height: 129px;

package/es/core/editor/components/Sidebar/panes.js

@@ -28,7 +28,7 @@ var panes = [{
   icon: '/img/topo/editor/sidebar/icon/背景.svg',
   content: BackgroundPanel
 }, {
-  title: '画布',
+  title: '主题',
   key: 'canvas',
   titleTootip: '拓扑图画布底图',
   icon: '/img/topo/editor/sidebar/icon/画布.svg',

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

@@ -40,7 +40,7 @@ function FontSizeWidget(props) {
   useEffect(function () {}, [selection]);
   return /*#__PURE__*/React.createElement(WidgetBox, {
     label: "\u5B57\u53F7",
-    tooltip: "\u9009\u53D6\u6587\u5B57\u7684\u65B0\u5B57\u4F53",
+    tooltip: "\u66F4\u6539\u6587\u5B57\u5927\u5C0F",
     showLabel: showLabel,
     disabled: disabled
   }, /*#__PURE__*/React.createElement(FontSizeSelect, {

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

@@ -74,7 +74,7 @@ function NodeSizeButton(props) {
   return /*#__PURE__*/React.createElement(WidgetBox, {
     label: "\u56FE\u7247\u5C3A\u5BF8",
     disabled: disabled,
-    tooltip: "\u56FE\u7247\u5C3A\u5BF8",
+    tooltip: "\u5C3A\u5BF8\u8BBE\u7F6E",
     showLabel: showLabel
   }, /*#__PURE__*/React.createElement("div", {
     className: styles.toolbarNodeSizeSetting

package/es/core/models/AttributeMetricDisplay.js

@@ -612,12 +612,11 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
   ;
 
   _proto.buildTagsTips = function buildTagsTips() {
-    var _this6 = this;
-
     var data = this.getData(); // 获取标注、悬浮框配置
 
     var ciConfigs = this.getResourceTagTipConfig(); // console.log("buildTagsTips---ciConfigs", ciConfigs);
 
+    var formatter = new AttributeFormatter(this.topo);
     var ciTagsAndTips = ciConfigs.map(function (ciConfig) {
       var ciDataItem = findItem(data, "id", ciConfig.id); // console.log("buildTagsTips-ciDataItem", ciDataItem);
 
@@ -630,13 +629,17 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
       } // 获取ci数据
 
 
-      var ciData = _extends({}, findItem(data, "id", ciConfig.id), {
+      var ciData = _extends({}, ciDataItem, {
         ciType: ciConfig.ciType
-      });
+      }); // console.log("AttributeFormatter-----", ciData, ciConfig);
 
-      var formatter = new AttributeFormatter(_this6.topo); // console.log("AttributeFormatter-----", ciData, ciConfig);
 
-      var tags = formatter.formatAttrs(ciConfig.tags, ciData); // 链路标注箭头
+      var tags = formatter.formatAttrs(ciConfig.tags, ciData) // 展示的所有标注不带对应的名字（包括属性和指标）
+      .map(function (item) {
+        return _extends({}, item, {
+          name: ''
+        });
+      }); // 链路标注箭头
 
       if (ciConfig.type === "edge") {
         tags = {
@@ -653,8 +656,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
       };
     }); // console.log("ciTagsAndTips", ciTagsAndTips);
 
-    var elementTagsAndTips = [].concat(ciTagsAndTips, this.extElementTagTipBuilder ? this.extElementTagTipBuilder.getExtElementTagsAndTips() : []);
-    console.log("ciTagsAndTips", elementTagsAndTips); // 刷新标注、浮层
+    var elementTagsAndTips = [].concat(ciTagsAndTips, this.extElementTagTipBuilder ? this.extElementTagTipBuilder.getExtElementTagsAndTips() : []); // 刷新标注、浮层
     // rlog.debug('AttributeMetricDisplay.buildTagsTips', {tagsAndTips: elementTagsAndTips, ciConfigs});
 
     return elementTagsAndTips;

package/es/core/models/TopoApp.js

@@ -24,7 +24,7 @@ import ElementTagTipConfig from "./tagstips/ElementTagTipConfig";
 import SelectionModel from "./SelectionModel";
 import CiCache from "./cache/CiCache"; // eslint-disable-next-line no-undef
 
-var version = typeof "10.0.2" === 'string' ? "10.0.2" : null;
+var version = typeof "10.0.3" === 'string' ? "10.0.3" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑
@@ -570,8 +570,11 @@ var Topo = /*#__PURE__*/function () {
               return this.options.onSwitchToEditMode(this);
 
             case 13:
-              // 更新节点名称显示隐藏
-              this.attributeMetricDisplay.updateNodesNameVisible(); // 加载自定义上传的图标
+              if (this.getDataModel()) {
+                // 更新节点名称显示隐藏
+                this.attributeMetricDisplay.updateNodesNameVisible();
+              } // 加载自定义上传的图标
+
 
               iconManageDispatchers = this.store.getModelDispatchers('customIcon');
               iconManageDispatchers.loadEditorIcons();

package/lib/core/editor/components/BackgroundView/index.js

@@ -315,7 +315,7 @@ function BackgroundView(props) {
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: _indexModule["default"]['background-view']
   }, /*#__PURE__*/_react["default"].createElement("div", {
-    className: _indexModule["default"].option
+    className: _indexModule["default"].header
   }, /*#__PURE__*/_react["default"].createElement(_button["default"], {
     title: "\u6062\u590D\u9ED8\u8BA4",
     onClick: resetDefault
@@ -328,6 +328,8 @@ function BackgroundView(props) {
   }, /*#__PURE__*/_react["default"].createElement(_icon["default"], {
     type: "topo_button_icon_export"
   })))), /*#__PURE__*/_react["default"].createElement("div", {
+    className: _indexModule["default"].content
+  }, /*#__PURE__*/_react["default"].createElement("div", {
     className: _indexModule["default"].list
   }, /*#__PURE__*/_react["default"].createElement(List, {
     selected: (current === null || current === void 0 ? void 0 : current.id) || '',
@@ -357,7 +359,7 @@ function BackgroundView(props) {
       setUploadDialogVisible(false);
       getBackground();
     }
-  }), /*#__PURE__*/_react["default"].createElement(_loading["default"], {
+  })), /*#__PURE__*/_react["default"].createElement(_loading["default"], {
     visible: loadingBackground,
     fullScreen: true
   }));

package/lib/core/editor/components/BackgroundView/index.module.scss

@@ -2,18 +2,27 @@
 
 .background-view {
   width: 260px;
-  padding: 16px;
   background: #fff;
   height: 100%;
   overflow: auto;
-  .option {
+  display: flex;
+  flex-direction: column;
+
+  .header {
+    padding: 16px 16px 12px 16px;
     text-align: right;
     button {
       margin-left: 8px;
     }
   }
+
+  .content {
+    flex: 1;
+    overflow: auto;
+    padding: 0 16px 16px 16px;
+  }
+
   .list {
-    margin-top: 8px;
     .tag {
       width: 100%;
       height: 129px;

package/lib/core/editor/components/Sidebar/panes.js

@@ -40,7 +40,7 @@ var panes = [{
   icon: '/img/topo/editor/sidebar/icon/背景.svg',
   content: _BackgroundPanel["default"]
 }, {
-  title: '画布',
+  title: '主题',
   key: 'canvas',
   titleTootip: '拓扑图画布底图',
   icon: '/img/topo/editor/sidebar/icon/画布.svg',

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

@@ -54,7 +54,7 @@ function FontSizeWidget(props) {
   (0, _react.useEffect)(function () {}, [selection]);
   return /*#__PURE__*/_react["default"].createElement(_WidgetBox["default"], {
     label: "\u5B57\u53F7",
-    tooltip: "\u9009\u53D6\u6587\u5B57\u7684\u65B0\u5B57\u4F53",
+    tooltip: "\u66F4\u6539\u6587\u5B57\u5927\u5C0F",
     showLabel: showLabel,
     disabled: disabled
   }, /*#__PURE__*/_react["default"].createElement(FontSizeSelect, {

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

@@ -92,7 +92,7 @@ function NodeSizeButton(props) {
   return /*#__PURE__*/_react["default"].createElement(_WidgetBox["default"], {
     label: "\u56FE\u7247\u5C3A\u5BF8",
     disabled: disabled,
-    tooltip: "\u56FE\u7247\u5C3A\u5BF8",
+    tooltip: "\u5C3A\u5BF8\u8BBE\u7F6E",
     showLabel: showLabel
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: _NodeSizeButtonModule["default"].toolbarNodeSizeSetting

package/lib/core/models/AttributeMetricDisplay.js

@@ -628,12 +628,11 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
   ;
 
   _proto.buildTagsTips = function buildTagsTips() {
-    var _this6 = this;
-
     var data = this.getData(); // 获取标注、悬浮框配置
 
     var ciConfigs = this.getResourceTagTipConfig(); // console.log("buildTagsTips---ciConfigs", ciConfigs);
 
+    var formatter = new _attributeFormatter["default"](this.topo);
     var ciTagsAndTips = ciConfigs.map(function (ciConfig) {
       var ciDataItem = (0, _topoData.findItem)(data, "id", ciConfig.id); // console.log("buildTagsTips-ciDataItem", ciDataItem);
 
@@ -646,12 +645,16 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
       } // 获取ci数据
 
 
-      var ciData = (0, _extends2["default"])({}, (0, _topoData.findItem)(data, "id", ciConfig.id), {
+      var ciData = (0, _extends2["default"])({}, ciDataItem, {
         ciType: ciConfig.ciType
-      });
-      var formatter = new _attributeFormatter["default"](_this6.topo); // console.log("AttributeFormatter-----", ciData, ciConfig);
+      }); // console.log("AttributeFormatter-----", ciData, ciConfig);
 
-      var tags = formatter.formatAttrs(ciConfig.tags, ciData); // 链路标注箭头
+      var tags = formatter.formatAttrs(ciConfig.tags, ciData) // 展示的所有标注不带对应的名字（包括属性和指标）
+      .map(function (item) {
+        return (0, _extends2["default"])({}, item, {
+          name: ''
+        });
+      }); // 链路标注箭头
 
       if (ciConfig.type === "edge") {
         tags = {
@@ -668,8 +671,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
       };
     }); // console.log("ciTagsAndTips", ciTagsAndTips);
 
-    var elementTagsAndTips = [].concat(ciTagsAndTips, this.extElementTagTipBuilder ? this.extElementTagTipBuilder.getExtElementTagsAndTips() : []);
-    console.log("ciTagsAndTips", elementTagsAndTips); // 刷新标注、浮层
+    var elementTagsAndTips = [].concat(ciTagsAndTips, this.extElementTagTipBuilder ? this.extElementTagTipBuilder.getExtElementTagsAndTips() : []); // 刷新标注、浮层
     // rlog.debug('AttributeMetricDisplay.buildTagsTips', {tagsAndTips: elementTagsAndTips, ciConfigs});
 
     return elementTagsAndTips;

package/lib/core/models/TopoApp.js

@@ -56,7 +56,7 @@ var _SelectionModel = _interopRequireDefault(require("./SelectionModel"));
 var _CiCache = _interopRequireDefault(require("./cache/CiCache"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "10.0.2" === 'string' ? "10.0.2" : null;
+var version = typeof "10.0.3" === 'string' ? "10.0.3" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑
@@ -602,8 +602,11 @@ var Topo = /*#__PURE__*/function () {
               return this.options.onSwitchToEditMode(this);
 
             case 13:
-              // 更新节点名称显示隐藏
-              this.attributeMetricDisplay.updateNodesNameVisible(); // 加载自定义上传的图标
+              if (this.getDataModel()) {
+                // 更新节点名称显示隐藏
+                this.attributeMetricDisplay.updateNodesNameVisible();
+              } // 加载自定义上传的图标
+
 
               iconManageDispatchers = this.store.getModelDispatchers('customIcon');
               iconManageDispatchers.loadEditorIcons();

package/package.json

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