@riil-frontend/component-topology 10.0.15 → 10.0.16

package/es/components/ColorPanel/components/FontColorRange/index.module.scss

@@ -15,6 +15,7 @@
     margin-right: 8px;
     width: 32px;
     text-align: right;
+    color:$color-text1-6;
   }
 
   :global {

package/es/core/editor/components/Toolbar/widgets/BoxBackgroundButton/BoxBackgroundSetting.js

@@ -189,7 +189,7 @@ function BoxBackgroundSetting(props) {
     max: 10,
     min: 1,
     unit: "px",
-    list: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
+    list: [1, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
     onChange: borderWidthChange,
     defaultValue: width ? width : 0
   })), /*#__PURE__*/React.createElement("div", {
@@ -216,7 +216,7 @@ function BoxBackgroundSetting(props) {
     className: styles.leftInput,
     value: leftInputVal,
     min: 0,
-    max: 10,
+    max: 20,
     onChange: leftInputChange
   }), /*#__PURE__*/React.createElement("span", {
     className: styles.backOpacityLable
@@ -228,7 +228,7 @@ function BoxBackgroundSetting(props) {
     className: styles.rightInput,
     value: rightInputVal,
     min: 0,
-    max: 10,
+    max: 20,
     onChange: rightInputChange
   })), /*#__PURE__*/React.createElement("div", {
     style: {

package/es/core/editor/components/Toolbar/widgets/BoxBackgroundButton/BoxbackgroundSettings.module.scss

@@ -1,5 +1,8 @@
+@import "@alifd/next/variables";
+
 .content {
     margin: 4px 0px 0px 6px;
+    color:$color-text1-4;
    .fontColor{
     width: 100%;
     margin-bottom: 16px;
@@ -11,7 +14,6 @@
       font-size: 12px;
       font-family: PingFangSC-Regular, PingFang SC;
       font-weight: 400;
-      color: #4D6277;
       line-height: 17px;
      }
      
@@ -25,10 +27,8 @@
     }
     &>span{
       font-size: 12px;
-      color: black;
       font-family: PingFangSC-Regular, PingFang SC;
       font-weight: 400;
-      color: #4D6277;
       line-height: 17px;
      }
      .backOpacity{
@@ -49,10 +49,8 @@
     }
     &>span{
       font-size: 12px;
-      color: black;
       font-family: PingFangSC-Regular, PingFang SC;
       font-weight: 400;
-      color: #4D6277;
       line-height: 17px;
      }
      .borderWidth{
@@ -72,6 +70,7 @@
         margin-left: 16px;
         line-height: 22px;
         margin-right: 5px;
+        color:$color-text1-6;
       }
       :global{
         .next-number-picker-normal.next-small{

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

@@ -82,7 +82,7 @@ function getValuesByEdges(topo) {
       edgeValues.push({
         baseAgreement: false,
         //,
-        lineButton: edge.s('edge.type'),
+        lineButton: edge.a('edge.type.name') || edge.s('edge.type'),
         startPoint: getStartPoint(edge),
         endPoint: getEndPoint(edge),
         lineMold: edge.a('lineMode') || 'solidLine'

package/es/core/editor/components/settings/common/AlignSetting/AlignTypeList.js

@@ -1,3 +1,4 @@
+import _Balloon from "@alifd/next/es/balloon";
 import _Button from "@alifd/next/es/button";
 import _Icon from "@alifd/next/es/icon";
 import _Divider from "@alifd/next/es/divider";
@@ -61,19 +62,21 @@ var AlignTypeList = function AlignTypeList(props) {
     return item.value === 'divide' ? /*#__PURE__*/React.createElement(_Divider, {
       key: index,
       direction: "ver"
-    }) : /*#__PURE__*/React.createElement(_Button, {
-      key: index,
-      className: "" + styles.redioBtn,
-      text: true,
-      onClick: function onClick() {
-        handleChange(item);
-      },
-      title: item.label // eslint-disable-next-line no-unneeded-ternary
-      ,
-      disabled: (item.value === 'distributeHorizontal' || item.value === 'distributeVertical') && distributionDisabled
-    }, /*#__PURE__*/React.createElement(_Icon, {
-      type: item.icon
-    }));
+    }) : /*#__PURE__*/React.createElement(_Balloon.Tooltip, {
+      trigger: /*#__PURE__*/React.createElement(_Button, {
+        key: index,
+        className: "" + styles.redioBtn,
+        text: true,
+        onClick: function onClick() {
+          handleChange(item);
+        } // eslint-disable-next-line no-unneeded-ternary
+        ,
+        disabled: (item.value === 'distributeHorizontal' || item.value === 'distributeVertical') && distributionDisabled
+      }, /*#__PURE__*/React.createElement(_Icon, {
+        type: item.icon
+      })),
+      align: "b"
+    }, item.label);
   }));
 };
 

package/es/core/editor/utils/edgeTypeStyleUtil.js

@@ -129,5 +129,6 @@ export function setEdgesType(edges, type, topo) {
     htTopo.setGraphLinear(edge, {
       type: type
     });
+    edge.a('edge.type.name', type);
   });
 }

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

package/lib/components/ColorPanel/components/FontColorRange/index.module.scss

@@ -15,6 +15,7 @@
     margin-right: 8px;
     width: 32px;
     text-align: right;
+    color:$color-text1-6;
   }
 
   :global {

package/lib/core/editor/components/Toolbar/widgets/BoxBackgroundButton/BoxBackgroundSetting.js

@@ -206,7 +206,7 @@ function BoxBackgroundSetting(props) {
     max: 10,
     min: 1,
     unit: "px",
-    list: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
+    list: [1, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
     onChange: borderWidthChange,
     defaultValue: width ? width : 0
   })), /*#__PURE__*/_react["default"].createElement("div", {
@@ -233,7 +233,7 @@ function BoxBackgroundSetting(props) {
     className: _BoxbackgroundSettingsModule["default"].leftInput,
     value: leftInputVal,
     min: 0,
-    max: 10,
+    max: 20,
     onChange: leftInputChange
   }), /*#__PURE__*/_react["default"].createElement("span", {
     className: _BoxbackgroundSettingsModule["default"].backOpacityLable
@@ -245,7 +245,7 @@ function BoxBackgroundSetting(props) {
     className: _BoxbackgroundSettingsModule["default"].rightInput,
     value: rightInputVal,
     min: 0,
-    max: 10,
+    max: 20,
     onChange: rightInputChange
   })), /*#__PURE__*/_react["default"].createElement("div", {
     style: {

package/lib/core/editor/components/Toolbar/widgets/BoxBackgroundButton/BoxbackgroundSettings.module.scss

@@ -1,5 +1,8 @@
+@import "@alifd/next/variables";
+
 .content {
     margin: 4px 0px 0px 6px;
+    color:$color-text1-4;
    .fontColor{
     width: 100%;
     margin-bottom: 16px;
@@ -11,7 +14,6 @@
       font-size: 12px;
       font-family: PingFangSC-Regular, PingFang SC;
       font-weight: 400;
-      color: #4D6277;
       line-height: 17px;
      }
      
@@ -25,10 +27,8 @@
     }
     &>span{
       font-size: 12px;
-      color: black;
       font-family: PingFangSC-Regular, PingFang SC;
       font-weight: 400;
-      color: #4D6277;
       line-height: 17px;
      }
      .backOpacity{
@@ -49,10 +49,8 @@
     }
     &>span{
       font-size: 12px;
-      color: black;
       font-family: PingFangSC-Regular, PingFang SC;
       font-weight: 400;
-      color: #4D6277;
       line-height: 17px;
      }
      .borderWidth{
@@ -72,6 +70,7 @@
         margin-left: 16px;
         line-height: 22px;
         margin-right: 5px;
+        color:$color-text1-6;
       }
       :global{
         .next-number-picker-normal.next-small{

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

@@ -100,7 +100,7 @@ function getValuesByEdges(topo) {
       edgeValues.push({
         baseAgreement: false,
         //,
-        lineButton: edge.s('edge.type'),
+        lineButton: edge.a('edge.type.name') || edge.s('edge.type'),
         startPoint: getStartPoint(edge),
         endPoint: getEndPoint(edge),
         lineMold: edge.a('lineMode') || 'solidLine'

package/lib/core/editor/components/settings/common/AlignSetting/AlignTypeList.js

@@ -5,6 +5,8 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports["default"] = void 0;
 
+var _balloon = _interopRequireDefault(require("@alifd/next/lib/balloon"));
+
 var _button = _interopRequireDefault(require("@alifd/next/lib/button"));
 
 var _icon = _interopRequireDefault(require("@alifd/next/lib/icon"));
@@ -77,19 +79,21 @@ var AlignTypeList = function AlignTypeList(props) {
     return item.value === 'divide' ? /*#__PURE__*/_react["default"].createElement(_divider["default"], {
       key: index,
       direction: "ver"
-    }) : /*#__PURE__*/_react["default"].createElement(_button["default"], {
-      key: index,
-      className: "" + _AlignSettingModule["default"].redioBtn,
-      text: true,
-      onClick: function onClick() {
-        handleChange(item);
-      },
-      title: item.label // eslint-disable-next-line no-unneeded-ternary
-      ,
-      disabled: (item.value === 'distributeHorizontal' || item.value === 'distributeVertical') && distributionDisabled
-    }, /*#__PURE__*/_react["default"].createElement(_icon["default"], {
-      type: item.icon
-    }));
+    }) : /*#__PURE__*/_react["default"].createElement(_balloon["default"].Tooltip, {
+      trigger: /*#__PURE__*/_react["default"].createElement(_button["default"], {
+        key: index,
+        className: "" + _AlignSettingModule["default"].redioBtn,
+        text: true,
+        onClick: function onClick() {
+          handleChange(item);
+        } // eslint-disable-next-line no-unneeded-ternary
+        ,
+        disabled: (item.value === 'distributeHorizontal' || item.value === 'distributeVertical') && distributionDisabled
+      }, /*#__PURE__*/_react["default"].createElement(_icon["default"], {
+        type: item.icon
+      })),
+      align: "b"
+    }, item.label);
   }));
 };
 

package/lib/core/editor/utils/edgeTypeStyleUtil.js

@@ -143,5 +143,6 @@ function setEdgesType(edges, type, topo) {
     htTopo.setGraphLinear(edge, {
       type: type
     });
+    edge.a('edge.type.name', type);
   });
 }

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

package/package.json

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