@riil-frontend/component-topology 10.0.12 → 10.0.15

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

@@ -15,7 +15,6 @@
     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: [1, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
+    list: [0, 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: 20,
+    max: 10,
     onChange: leftInputChange
   }), /*#__PURE__*/React.createElement("span", {
     className: styles.backOpacityLable
@@ -228,7 +228,7 @@ function BoxBackgroundSetting(props) {
     className: styles.rightInput,
     value: rightInputVal,
     min: 0,
-    max: 20,
+    max: 10,
     onChange: rightInputChange
   })), /*#__PURE__*/React.createElement("div", {
     style: {

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

@@ -1,8 +1,5 @@
-@import "@alifd/next/variables";
-
 .content {
     margin: 4px 0px 0px 6px;
-    color:$color-text1-4;
    .fontColor{
     width: 100%;
     margin-bottom: 16px;
@@ -14,6 +11,7 @@
       font-size: 12px;
       font-family: PingFangSC-Regular, PingFang SC;
       font-weight: 400;
+      color: #4D6277;
       line-height: 17px;
      }
      
@@ -27,8 +25,10 @@
     }
     &>span{
       font-size: 12px;
+      color: black;
       font-family: PingFangSC-Regular, PingFang SC;
       font-weight: 400;
+      color: #4D6277;
       line-height: 17px;
      }
      .backOpacity{
@@ -49,8 +49,10 @@
     }
     &>span{
       font-size: 12px;
+      color: black;
       font-family: PingFangSC-Regular, PingFang SC;
       font-weight: 400;
+      color: #4D6277;
       line-height: 17px;
      }
      .borderWidth{
@@ -70,7 +72,6 @@
         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.a('edge.type.name') || edge.s('edge.type'),
+        lineButton: edge.s('edge.type'),
         startPoint: getStartPoint(edge),
         endPoint: getEndPoint(edge),
         lineMold: edge.a('lineMode') || 'solidLine'

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

@@ -7,7 +7,7 @@ function FontSizeSelect(props) {
   var value = props.value,
       disabled = props.disabled,
       onChange = props.onChange;
-  var items = [9, 10, 11, 12, 14, 16, 18, 20, 24, 30, 36];
+  var items = [12, 14, 16, 18, 20, 24, 30, 36, 48, 60, 80];
   return /*#__PURE__*/React.createElement(DropdownMenu, {
     value: "" + (value || ''),
     valueRender: function valueRender(val) {

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

@@ -93,7 +93,7 @@ var TopoIconSelect = function TopoIconSelect(props, ref) {
   return /*#__PURE__*/React.createElement("div", {
     className: styles.TopoIconSelect
   }, /*#__PURE__*/React.createElement(_Select, {
-    placeholder: "\u8BF7\u9009\u62E9",
+    placeholder: "\u8BF7\u9009\u62E92",
     visible: visible,
     className: styles.iconSelect,
     onVisibleChange: onVisibleChange,

package/es/core/editor/components/Toolbar/widgets/IconSelect/index.module.scss

@@ -10,8 +10,9 @@
 }
 
 .iconCollapse {
-  width: 240px;
-  max-height: 218px;
+  width: 292px;
+  height: 365px;
+  max-height: 365px;
   overflow-y: auto;
   border: none;
 
@@ -55,9 +56,9 @@
 
     .iconImgWrapper {
       display: inline-block;
-      width: 18px;
-      height: 18px;
-      line-height: 18px;
+      width: 32px;
+      height: 32px;
+      line-height: 32px;
       text-align: center;
       // vertical-align: middle;
     }
@@ -66,8 +67,8 @@
       display: inline-block;
       width: auto;
       height: auto;
-      max-width: 18px;
-      max-height: 18px;
+      max-width: 32px;
+      max-height: 32px;
       vertical-align: middle;
     }
 
@@ -102,7 +103,7 @@
 
 
 .iconli {
-  width: 52px;
+  width: 64px;
   height: 68px;
   text-align: center;
   //border: 2px solid #FFF;
@@ -114,7 +115,7 @@
     height: 32px;
     line-height: 32px;
     text-align: center;
-    margin: 5px 8px 5px 8px;
+    margin: 5px 16px 5px 16px;
   }
 
   .iconImg {
@@ -127,8 +128,8 @@
   }
 
   .icontitle {
-    width: 48px;
-    max-width: 50px;
+    width: 64px;
+    max-width: 64px;
     text-align: center;
     font-size: 12px;
     -webkit-text-size-adjust: none;

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

@@ -1,4 +1,3 @@
-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";
@@ -62,21 +61,19 @@ var AlignTypeList = function AlignTypeList(props) {
     return item.value === 'divide' ? /*#__PURE__*/React.createElement(_Divider, {
       key: index,
       direction: "ver"
-    }) : /*#__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);
+    }) : /*#__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
+    }));
   }));
 };
 

package/es/core/editor/components/settings/propertyViews/node/NodeIconSelect.js

@@ -1,5 +1,6 @@
 import React, { forwardRef, useImperativeHandle } from 'react';
-import IconSelect from '@riil-frontend/component-topo-icon-select';
+import IconSelect from '@riil-frontend/component-topo-icon-select'; // import IconSelect from '@/core/editor/components/Toolbar/widgets/IconSelect;
+
 import { useNodeIcons } from "../../../../../common/icons/useIcons";
 
 function NodeIconSelect(props, ref) {

package/es/core/editor/components/settings/propertyViews/node/Setting/BasicSetting.js

@@ -38,12 +38,18 @@ export default function BasicSetting(props) {
     field: field,
     labelAlign: "top",
     style: {
-      margin: '12px 16px 0 32px'
+      margin: "12px 16px 0 32px"
     }
   }, /*#__PURE__*/React.createElement(_Form.Item, {
     label: "\u56FE\u7247\u540D\u79F0"
   }, /*#__PURE__*/React.createElement(NameInput, {
     name: "attrObject.customName",
     topo: topo
-  })));
+  }), /*#__PURE__*/React.createElement("span", {
+    style: {
+      color: "#638DB7",
+      marginTop: '2px',
+      display: 'block'
+    }
+  }, "\u70B9\u51FB\u56DE\u8F66\u952E\u53EF\u624B\u52A8\u6298\u884C")));
 }

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

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

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

@@ -15,7 +15,6 @@
     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: [1, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
+    list: [0, 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: 20,
+    max: 10,
     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: 20,
+    max: 10,
     onChange: rightInputChange
   })), /*#__PURE__*/_react["default"].createElement("div", {
     style: {

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

@@ -1,8 +1,5 @@
-@import "@alifd/next/variables";
-
 .content {
     margin: 4px 0px 0px 6px;
-    color:$color-text1-4;
    .fontColor{
     width: 100%;
     margin-bottom: 16px;
@@ -14,6 +11,7 @@
       font-size: 12px;
       font-family: PingFangSC-Regular, PingFang SC;
       font-weight: 400;
+      color: #4D6277;
       line-height: 17px;
      }
      
@@ -27,8 +25,10 @@
     }
     &>span{
       font-size: 12px;
+      color: black;
       font-family: PingFangSC-Regular, PingFang SC;
       font-weight: 400;
+      color: #4D6277;
       line-height: 17px;
      }
      .backOpacity{
@@ -49,8 +49,10 @@
     }
     &>span{
       font-size: 12px;
+      color: black;
       font-family: PingFangSC-Regular, PingFang SC;
       font-weight: 400;
+      color: #4D6277;
       line-height: 17px;
      }
      .borderWidth{
@@ -70,7 +72,6 @@
         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.a('edge.type.name') || edge.s('edge.type'),
+        lineButton: edge.s('edge.type'),
         startPoint: getStartPoint(edge),
         endPoint: getEndPoint(edge),
         lineMold: edge.a('lineMode') || 'solidLine'

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

@@ -21,7 +21,7 @@ function FontSizeSelect(props) {
   var value = props.value,
       disabled = props.disabled,
       onChange = props.onChange;
-  var items = [9, 10, 11, 12, 14, 16, 18, 20, 24, 30, 36];
+  var items = [12, 14, 16, 18, 20, 24, 30, 36, 48, 60, 80];
   return /*#__PURE__*/_react["default"].createElement(_DropdownMenu["default"], {
     value: "" + (value || ''),
     valueRender: function valueRender(val) {

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

@@ -108,7 +108,7 @@ var TopoIconSelect = function TopoIconSelect(props, ref) {
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: _indexModule["default"].TopoIconSelect
   }, /*#__PURE__*/_react["default"].createElement(_select["default"], {
-    placeholder: "\u8BF7\u9009\u62E9",
+    placeholder: "\u8BF7\u9009\u62E92",
     visible: visible,
     className: _indexModule["default"].iconSelect,
     onVisibleChange: onVisibleChange,

package/lib/core/editor/components/Toolbar/widgets/IconSelect/index.module.scss

@@ -10,8 +10,9 @@
 }
 
 .iconCollapse {
-  width: 240px;
-  max-height: 218px;
+  width: 292px;
+  height: 365px;
+  max-height: 365px;
   overflow-y: auto;
   border: none;
 
@@ -55,9 +56,9 @@
 
     .iconImgWrapper {
       display: inline-block;
-      width: 18px;
-      height: 18px;
-      line-height: 18px;
+      width: 32px;
+      height: 32px;
+      line-height: 32px;
       text-align: center;
       // vertical-align: middle;
     }
@@ -66,8 +67,8 @@
       display: inline-block;
       width: auto;
       height: auto;
-      max-width: 18px;
-      max-height: 18px;
+      max-width: 32px;
+      max-height: 32px;
       vertical-align: middle;
     }
 
@@ -102,7 +103,7 @@
 
 
 .iconli {
-  width: 52px;
+  width: 64px;
   height: 68px;
   text-align: center;
   //border: 2px solid #FFF;
@@ -114,7 +115,7 @@
     height: 32px;
     line-height: 32px;
     text-align: center;
-    margin: 5px 8px 5px 8px;
+    margin: 5px 16px 5px 16px;
   }
 
   .iconImg {
@@ -127,8 +128,8 @@
   }
 
   .icontitle {
-    width: 48px;
-    max-width: 50px;
+    width: 64px;
+    max-width: 64px;
     text-align: center;
     font-size: 12px;
     -webkit-text-size-adjust: none;

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

@@ -5,8 +5,6 @@ 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"));
@@ -79,21 +77,19 @@ var AlignTypeList = function AlignTypeList(props) {
     return item.value === 'divide' ? /*#__PURE__*/_react["default"].createElement(_divider["default"], {
       key: index,
       direction: "ver"
-    }) : /*#__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);
+    }) : /*#__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
+    }));
   }));
 };
 

package/lib/core/editor/components/settings/propertyViews/node/NodeIconSelect.js

@@ -15,6 +15,7 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
+// import IconSelect from '@/core/editor/components/Toolbar/widgets/IconSelect;
 function NodeIconSelect(props, ref) {
   var value = props.value,
       onChange = props.onChange,

package/lib/core/editor/components/settings/propertyViews/node/Setting/BasicSetting.js

@@ -53,12 +53,18 @@ function BasicSetting(props) {
     field: field,
     labelAlign: "top",
     style: {
-      margin: '12px 16px 0 32px'
+      margin: "12px 16px 0 32px"
     }
   }, /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
     label: "\u56FE\u7247\u540D\u79F0"
   }, /*#__PURE__*/_react["default"].createElement(_NameInput["default"], {
     name: "attrObject.customName",
     topo: topo
-  })));
+  }), /*#__PURE__*/_react["default"].createElement("span", {
+    style: {
+      color: "#638DB7",
+      marginTop: '2px',
+      display: 'block'
+    }
+  }, "\u70B9\u51FB\u56DE\u8F66\u952E\u53EF\u624B\u52A8\u6298\u884C")));
 }

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

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

package/package.json

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