@riil-frontend/component-topology 9.0.10 → 9.0.12

package/es/core/editor/components/Toolbar/widgets/EdgeTypeButton/EdgeType.js

@@ -1,4 +1,3 @@
-import _Checkbox from "@alifd/next/es/checkbox";
 import _Field from "@alifd/next/es/field";
 import _Select from "@alifd/next/es/select";
 import _Form from "@alifd/next/es/form";
@@ -149,13 +148,8 @@ function EdgeType(props) {
     inline: true,
     labelAlign: "top"
   }, /*#__PURE__*/React.createElement(FormItem, null, /*#__PURE__*/React.createElement(LineType, {
-    name: "lineButton",
-    disable: !!field.getValue('baseAgreement')
-  })), /*#__PURE__*/React.createElement(FormItem, null, /*#__PURE__*/React.createElement(_Checkbox, {
-    name: "baseAgreement",
-    onChange: _onChange,
-    disabled: disable
-  }, "\u81EA\u52A8\u8C03\u6574")), /*#__PURE__*/React.createElement(FormItem, {
+    name: "lineButton"
+  })), /*#__PURE__*/React.createElement(FormItem, {
     label: "\u8D77\u70B9"
   }, /*#__PURE__*/React.createElement(_Select, {
     name: "startPoint",

package/es/core/editor/components/Toolbar/widgets/EdgeTypeButton/EdgeType.module.scss

@@ -14,11 +14,11 @@
       margin-top: 7px;
       margin-bottom: 7px;
     }
-    .#{$css-prefix}form-item:nth-child(2){
-      display: block !important;
-      margin-top: 7px;
-      margin-bottom: 0px;
-    }
+    // .#{$css-prefix}form-item:nth-child(2){
+    //   display: block !important;
+    //   margin-top: 7px;
+    //   margin-bottom: 0px;
+    // }
     .#{$css-prefix}form.#{$css-prefix}inline .#{$css-prefix}form-item:not(:last-child) {
       margin-right: 8px;
       .#{$css-prefix}select-trigger {

package/es/core/editor/components/Toolbar/widgets/EdgeTypeButton/LineType.js

@@ -28,11 +28,12 @@ var LINE_TYPE_OPTIONS = [{
   value: 'doublearc',
   label: '双弧线',
   icon: 'topo_linear_icon_arcline'
-}, {
-  value: 'points',
-  label: '自由线形',
-  icon: 'topo_linear_icon_pointsline'
-}];
+} // {
+//   value: 'points',
+//   label: '自由线形',
+//   icon: 'topo_linear_icon_pointsline',
+// },
+];
 var LineType = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var value = props.value,
       onChange = props.onChange,

package/es/core/editor/components/Toolbar/widgets/EdgeTypeButton/LineType.module.scss

@@ -7,7 +7,8 @@
     border: none !important;
     color: #4D6277;
     padding: 0;
-    margin-right: 10px;
+    // margin-right: 10px;
+    margin-right: 17px;
     text-align: center;
   }
   .redioBtn {
@@ -17,7 +18,7 @@
     border: none !important;
     color: #4D6277;
     padding: 0;
-    margin-right: 10px;
+    margin-right: 17px;
     text-align: center;
   
     .iconImg {

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

package/es/core/upgrade/v140UpgradeSerializeNodeImageSize.js

@@ -0,0 +1,39 @@
+/**
+ * v1.4.0 升级历史保存的拓扑图图标大小为48。
+ * 序列化中节点（除自定义上传图片节点）未设置大小时，设置成48
+ * @param {*} serializeStr 
+ * @returns 
+ */
+function v140UpgradeSerializeNodeImageSize(serializeStr) {
+  var serialize = parseSerialize(serializeStr);
+
+  if (!serialize) {
+    return serialize;
+  }
+
+  serialize.d.filter(function (item) {
+    return ['ht.Group', 'ht.Node'].includes(item.c);
+  }).filter(function (item) {
+    return ['point', 'container'].includes(item.p.layer);
+  }).filter(function (item) {
+    return !!item.p.image;
+  }).filter(function (item) {
+    return item.p.image === 'editor.icon.cloud.medium' || item.p.image.startsWith('ciType.');
+  }).filter(function (item) {
+    return item.p.width === undefined;
+  }).forEach(function (node) {
+    node.p.width = 48;
+    node.p.height = 48;
+  });
+  return serialize;
+}
+
+function parseSerialize(serialize) {
+  if (serialize && typeof serialize === 'string') {
+    return JSON.parse(serialize);
+  }
+
+  return serialize;
+}
+
+export default v140UpgradeSerializeNodeImageSize;

package/es/utils/topoData.js

@@ -10,6 +10,7 @@ import { getEditorIcons } from "../core/common/icons/icon";
 import { getBackgroundImageUrl } from "../core/utils/backgroundUtil";
 import { isClusterHtElement, processCluster } from "./clusterUtil";
 import { isGroup } from "./htElementUtils";
+import v140UpgradeSerializeNodeImageSize from "../core/upgrade/v140UpgradeSerializeNodeImageSize";
 /**
  * 查找数组中对应key的值为value的元素并返回,只查找第一个符合的元素
  * @param {Array} arr 数组
@@ -278,7 +279,7 @@ export var combTopoData = function combTopoData(_ref3) {
     nodes: nodes,
     linkGroups: linkGroups,
     links: links,
-    serialize: result.serialize
+    serialize: v140UpgradeSerializeNodeImageSize(result.serialize)
   }; // 所有资源
 
   var allCis = [].concat(data.nodes, data.links, data.linkGroups);

package/lib/core/editor/components/Toolbar/widgets/EdgeTypeButton/EdgeType.js

@@ -5,8 +5,6 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports["default"] = void 0;
 
-var _checkbox = _interopRequireDefault(require("@alifd/next/lib/checkbox"));
-
 var _field = _interopRequireDefault(require("@alifd/next/lib/field"));
 
 var _select = _interopRequireDefault(require("@alifd/next/lib/select"));
@@ -168,13 +166,8 @@ function EdgeType(props) {
     inline: true,
     labelAlign: "top"
   }, /*#__PURE__*/_react["default"].createElement(FormItem, null, /*#__PURE__*/_react["default"].createElement(_LineType["default"], {
-    name: "lineButton",
-    disable: !!field.getValue('baseAgreement')
-  })), /*#__PURE__*/_react["default"].createElement(FormItem, null, /*#__PURE__*/_react["default"].createElement(_checkbox["default"], {
-    name: "baseAgreement",
-    onChange: _onChange,
-    disabled: disable
-  }, "\u81EA\u52A8\u8C03\u6574")), /*#__PURE__*/_react["default"].createElement(FormItem, {
+    name: "lineButton"
+  })), /*#__PURE__*/_react["default"].createElement(FormItem, {
     label: "\u8D77\u70B9"
   }, /*#__PURE__*/_react["default"].createElement(_select["default"], {
     name: "startPoint",

package/lib/core/editor/components/Toolbar/widgets/EdgeTypeButton/EdgeType.module.scss

@@ -14,11 +14,11 @@
       margin-top: 7px;
       margin-bottom: 7px;
     }
-    .#{$css-prefix}form-item:nth-child(2){
-      display: block !important;
-      margin-top: 7px;
-      margin-bottom: 0px;
-    }
+    // .#{$css-prefix}form-item:nth-child(2){
+    //   display: block !important;
+    //   margin-top: 7px;
+    //   margin-bottom: 0px;
+    // }
     .#{$css-prefix}form.#{$css-prefix}inline .#{$css-prefix}form-item:not(:last-child) {
       margin-right: 8px;
       .#{$css-prefix}select-trigger {

package/lib/core/editor/components/Toolbar/widgets/EdgeTypeButton/LineType.js

@@ -44,11 +44,12 @@ var LINE_TYPE_OPTIONS = [{
   value: 'doublearc',
   label: '双弧线',
   icon: 'topo_linear_icon_arcline'
-}, {
-  value: 'points',
-  label: '自由线形',
-  icon: 'topo_linear_icon_pointsline'
-}];
+} // {
+//   value: 'points',
+//   label: '自由线形',
+//   icon: 'topo_linear_icon_pointsline',
+// },
+];
 
 var LineType = /*#__PURE__*/_react["default"].forwardRef(function (props, ref) {
   var value = props.value,

package/lib/core/editor/components/Toolbar/widgets/EdgeTypeButton/LineType.module.scss

@@ -7,7 +7,8 @@
     border: none !important;
     color: #4D6277;
     padding: 0;
-    margin-right: 10px;
+    // margin-right: 10px;
+    margin-right: 17px;
     text-align: center;
   }
   .redioBtn {
@@ -17,7 +18,7 @@
     border: none !important;
     color: #4D6277;
     padding: 0;
-    margin-right: 10px;
+    margin-right: 17px;
     text-align: center;
   
     .iconImg {

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

package/lib/core/upgrade/v140UpgradeSerializeNodeImageSize.js

@@ -0,0 +1,45 @@
+"use strict";
+
+exports.__esModule = true;
+exports["default"] = void 0;
+
+/**
+ * v1.4.0 升级历史保存的拓扑图图标大小为48。
+ * 序列化中节点（除自定义上传图片节点）未设置大小时，设置成48
+ * @param {*} serializeStr 
+ * @returns 
+ */
+function v140UpgradeSerializeNodeImageSize(serializeStr) {
+  var serialize = parseSerialize(serializeStr);
+
+  if (!serialize) {
+    return serialize;
+  }
+
+  serialize.d.filter(function (item) {
+    return ['ht.Group', 'ht.Node'].includes(item.c);
+  }).filter(function (item) {
+    return ['point', 'container'].includes(item.p.layer);
+  }).filter(function (item) {
+    return !!item.p.image;
+  }).filter(function (item) {
+    return item.p.image === 'editor.icon.cloud.medium' || item.p.image.startsWith('ciType.');
+  }).filter(function (item) {
+    return item.p.width === undefined;
+  }).forEach(function (node) {
+    node.p.width = 48;
+    node.p.height = 48;
+  });
+  return serialize;
+}
+
+function parseSerialize(serialize) {
+  if (serialize && typeof serialize === 'string') {
+    return JSON.parse(serialize);
+  }
+
+  return serialize;
+}
+
+var _default = v140UpgradeSerializeNodeImageSize;
+exports["default"] = _default;

package/lib/utils/topoData.js

@@ -38,6 +38,8 @@ var _clusterUtil = require("./clusterUtil");
 
 var _htElementUtils = require("./htElementUtils");
 
+var _v140UpgradeSerializeNodeImageSize = _interopRequireDefault(require("../core/upgrade/v140UpgradeSerializeNodeImageSize"));
+
 var _excluded = ["extraConfig"];
 
 /**
@@ -319,7 +321,7 @@ var combTopoData = function combTopoData(_ref3) {
     nodes: nodes,
     linkGroups: linkGroups,
     links: links,
-    serialize: result.serialize
+    serialize: (0, _v140UpgradeSerializeNodeImageSize["default"])(result.serialize)
   }; // 所有资源
 
   var allCis = [].concat(data.nodes, data.links, data.linkGroups);

package/package.json

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