@riil-frontend/component-topology 12.0.0-dev.10 → 12.0.0-dev.13

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

@@ -1,3 +1,4 @@
+import _Box from "@alifd/next/es/box";
 import _Field from "@alifd/next/es/field";
 import _Select from "@alifd/next/es/select";
 import _Form from "@alifd/next/es/form";
@@ -142,12 +143,19 @@ function EdgeType(props) {
     className: styles.lineBox
   }, /*#__PURE__*/React.createElement(_Form, {
     field: field,
-    inline: true,
     labelAlign: "top"
   }, /*#__PURE__*/React.createElement(FormItem, null, /*#__PURE__*/React.createElement(LineType, {
     name: "lineButton"
-  })), /*#__PURE__*/React.createElement(FormItem, {
-    label: "\u8D77\u70B9"
+  })), /*#__PURE__*/React.createElement(_Form.Item, null, /*#__PURE__*/React.createElement(_Box, {
+    direction: "row",
+    style: {
+      gap: 8
+    }
+  }, /*#__PURE__*/React.createElement(FormItem, {
+    label: "\u8D77\u70B9",
+    style: {
+      margin: 0
+    }
   }, /*#__PURE__*/React.createElement(_Select, {
     name: "startPoint",
     placeholder: " ",
@@ -155,7 +163,8 @@ function EdgeType(props) {
       container: function container(trigger) {
         return trigger.parentNode;
       }
-    }
+    },
+    className: styles.endPointSelect
   }, START_TYPE_OPTIONS.map(function (item, index) {
     return /*#__PURE__*/React.createElement(Option, {
       value: item.value,
@@ -168,7 +177,10 @@ function EdgeType(props) {
       className: styles.iconImg
     }));
   }))), /*#__PURE__*/React.createElement(FormItem, {
-    label: "\u7EC8\u70B9"
+    label: "\u7EC8\u70B9",
+    style: {
+      margin: 0
+    }
   }, /*#__PURE__*/React.createElement(_Select, {
     name: "endPoint",
     placeholder: " ",
@@ -176,7 +188,8 @@ function EdgeType(props) {
       container: function container(trigger) {
         return trigger.parentNode;
       }
-    }
+    },
+    className: styles.endPointSelect
   }, END_TYPE_OPTIONS.map(function (item, index) {
     return /*#__PURE__*/React.createElement(Option, {
       value: item.value,
@@ -189,7 +202,10 @@ function EdgeType(props) {
       className: styles.iconImg
     }));
   }))), /*#__PURE__*/React.createElement(FormItem, {
-    label: "\u7C7B\u578B"
+    label: "\u7C7B\u578B",
+    style: {
+      margin: 0
+    }
   }, /*#__PURE__*/React.createElement(_Select, {
     name: "lineMold",
     popupProps: {
@@ -197,7 +213,8 @@ function EdgeType(props) {
         return trigger.parentNode;
       }
     },
-    placeholder: " "
+    placeholder: " ",
+    className: styles.lineMoldSelect
   }, LINE_MOLD_OPTIONS.map(function (item, index) {
     return /*#__PURE__*/React.createElement(Option, {
       value: item.value,
@@ -209,7 +226,7 @@ function EdgeType(props) {
       alt: "",
       className: styles.iconImg
     }));
-  })))));
+  })))))));
 }
 
 EdgeType.defaultProps = {

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

@@ -1,10 +1,30 @@
 @import '~@alifd/next/variables.scss';
 
 .lineBox{
-  width: 236px;
   background: #FFFFFF;
   border-radius: 4px;
   margin-bottom: -7px;
+
+  .endPointSelect {
+    min-width: 0;
+    width: 64px;
+    :global {
+      .#{$css-prefix}select-inner {
+        min-width:0 !important;
+      }
+    }
+  }
+
+  .lineMoldSelect {
+    min-width: 0;
+    width: 88px;
+    :global {
+      .#{$css-prefix}select-inner {
+        min-width:0 !important;
+      }
+    }
+  }
+
   :global {
     .#{$css-prefix}form-item:first-child{
       margin-top: 0;

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

@@ -38,6 +38,15 @@ var LINE_TYPE_OPTIONS = [{
 //   icon: 'topo_linear_icon_pointsline',
 // },
 ];
+
+if (localStorage.getItem('topo.test.edge.customType') === 'true') {
+  LINE_TYPE_OPTIONS.push({
+    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/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 "12.0.0-dev.10" === 'string' ? "12.0.0-dev.10" : null;
+var version = typeof "12.0.0-dev.13" === 'string' ? "12.0.0-dev.13" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/es/networkTopo/components/TopoView.js

@@ -2,7 +2,7 @@ import _Loading from "@alifd/next/es/loading";
 import _extends from "@babel/runtime/helpers/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
 var _excluded = ["topo", "viewerProps", "titleBar", "nodataPage", "notfoundPageProps", "noPermissionPageProps"];
-import React, { useState, useEffect, useRef, useCallback } from "react";
+import React from "react";
 import NodataPage from "@riil-frontend/component-topology-common/es/components/NoDataPage/index";
 import BasicTopoView from "../../core/components/TopoView";
 import topoPermissonUtil from "../../utils/topoPermissionUtil";
@@ -11,8 +11,8 @@ import TopoNoPermission from "./TopoNoPermission";
 import styles from "../../components/index.module.scss";
 import useLinkDynamicStyle from "../hooks/useLinkDynamicStyle";
 import useRelateTopo from "../hooks/viewer/useRelateTopo";
-import useEdgeFlow from "../hooks/viewer/useEdgeFlow";
-import useEdgeExpand from "../hooks/useEdgeExpand";
+import useEdgeFlow from "../hooks/viewer/useEdgeFlow"; // import useEdgeExpand from "../hooks/useEdgeExpand";
+
 /**
  * 拓扑组件。变化无权限、无数据显示
  */
@@ -36,10 +36,8 @@ function NetworkTopologyCore(props) {
   });
   useEdgeFlow({
     topo: topo
-  });
-  useEdgeExpand({
-    topo: topo
-  });
+  }); // useEdgeExpand({ topo })
+
   var relateTopo = useRelateTopo({
     topo: topo
   });
@@ -68,10 +66,7 @@ function NetworkTopologyCore(props) {
       });
     } else if (!topoId) {
       return null;
-    } // if (loading) {
-    //   return null;
-    // }
-
+    }
 
     if (!loading) {
       // 加载完成后

package/es/networkTopo/hooks/useEdgeExpand.js

@@ -15,9 +15,8 @@ export default function useEdgeExpand(props) {
           data = e.data;
 
       if (data instanceof ht.Group && property === 'expanded') {
-        updateEdgeExpanded(topo);
-        setTimeout(function () {
-          updateEdgeExpanded(topo);
+        // updateEdgeExpanded(topo)
+        setTimeout(function () {// updateEdgeExpanded(topo)
         }, 100);
       }
     }

package/es/utils/topoData.js

@@ -97,7 +97,7 @@ var tfLink = function tfLink(engine, link) {
 export function getCiTypesFromCiElements(allCi) {
   var ciTypes = [];
   allCi.forEach(function (element) {
-    var typeCode = element.typeCode || element.ciType;
+    var typeCode = element.ciType || element.typeCode;
 
     if (typeCode && ciTypes.indexOf(typeCode) < 0) {
       ciTypes.push(typeCode);

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

@@ -5,6 +5,8 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports["default"] = void 0;
 
+var _box = _interopRequireDefault(require("@alifd/next/lib/box"));
+
 var _field = _interopRequireDefault(require("@alifd/next/lib/field"));
 
 var _select = _interopRequireDefault(require("@alifd/next/lib/select"));
@@ -160,12 +162,19 @@ function EdgeType(props) {
     className: _EdgeTypeModule["default"].lineBox
   }, /*#__PURE__*/_react["default"].createElement(_form["default"], {
     field: field,
-    inline: true,
     labelAlign: "top"
   }, /*#__PURE__*/_react["default"].createElement(FormItem, null, /*#__PURE__*/_react["default"].createElement(_LineType["default"], {
     name: "lineButton"
-  })), /*#__PURE__*/_react["default"].createElement(FormItem, {
-    label: "\u8D77\u70B9"
+  })), /*#__PURE__*/_react["default"].createElement(_form["default"].Item, null, /*#__PURE__*/_react["default"].createElement(_box["default"], {
+    direction: "row",
+    style: {
+      gap: 8
+    }
+  }, /*#__PURE__*/_react["default"].createElement(FormItem, {
+    label: "\u8D77\u70B9",
+    style: {
+      margin: 0
+    }
   }, /*#__PURE__*/_react["default"].createElement(_select["default"], {
     name: "startPoint",
     placeholder: " ",
@@ -173,7 +182,8 @@ function EdgeType(props) {
       container: function container(trigger) {
         return trigger.parentNode;
       }
-    }
+    },
+    className: _EdgeTypeModule["default"].endPointSelect
   }, START_TYPE_OPTIONS.map(function (item, index) {
     return /*#__PURE__*/_react["default"].createElement(Option, {
       value: item.value,
@@ -186,7 +196,10 @@ function EdgeType(props) {
       className: _EdgeTypeModule["default"].iconImg
     }));
   }))), /*#__PURE__*/_react["default"].createElement(FormItem, {
-    label: "\u7EC8\u70B9"
+    label: "\u7EC8\u70B9",
+    style: {
+      margin: 0
+    }
   }, /*#__PURE__*/_react["default"].createElement(_select["default"], {
     name: "endPoint",
     placeholder: " ",
@@ -194,7 +207,8 @@ function EdgeType(props) {
       container: function container(trigger) {
         return trigger.parentNode;
       }
-    }
+    },
+    className: _EdgeTypeModule["default"].endPointSelect
   }, END_TYPE_OPTIONS.map(function (item, index) {
     return /*#__PURE__*/_react["default"].createElement(Option, {
       value: item.value,
@@ -207,7 +221,10 @@ function EdgeType(props) {
       className: _EdgeTypeModule["default"].iconImg
     }));
   }))), /*#__PURE__*/_react["default"].createElement(FormItem, {
-    label: "\u7C7B\u578B"
+    label: "\u7C7B\u578B",
+    style: {
+      margin: 0
+    }
   }, /*#__PURE__*/_react["default"].createElement(_select["default"], {
     name: "lineMold",
     popupProps: {
@@ -215,7 +232,8 @@ function EdgeType(props) {
         return trigger.parentNode;
       }
     },
-    placeholder: " "
+    placeholder: " ",
+    className: _EdgeTypeModule["default"].lineMoldSelect
   }, LINE_MOLD_OPTIONS.map(function (item, index) {
     return /*#__PURE__*/_react["default"].createElement(Option, {
       value: item.value,
@@ -227,7 +245,7 @@ function EdgeType(props) {
       alt: "",
       className: _EdgeTypeModule["default"].iconImg
     }));
-  })))));
+  })))))));
 }
 
 EdgeType.defaultProps = {

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

@@ -1,10 +1,30 @@
 @import '~@alifd/next/variables.scss';
 
 .lineBox{
-  width: 236px;
   background: #FFFFFF;
   border-radius: 4px;
   margin-bottom: -7px;
+
+  .endPointSelect {
+    min-width: 0;
+    width: 64px;
+    :global {
+      .#{$css-prefix}select-inner {
+        min-width:0 !important;
+      }
+    }
+  }
+
+  .lineMoldSelect {
+    min-width: 0;
+    width: 88px;
+    :global {
+      .#{$css-prefix}select-inner {
+        min-width:0 !important;
+      }
+    }
+  }
+
   :global {
     .#{$css-prefix}form-item:first-child{
       margin-top: 0;

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

@@ -55,6 +55,14 @@ var LINE_TYPE_OPTIONS = [{
 // },
 ];
 
+if (localStorage.getItem('topo.test.edge.customType') === 'true') {
+  LINE_TYPE_OPTIONS.push({
+    value: 'points',
+    label: '自由线形',
+    icon: 'topo_linear_icon_pointsline'
+  });
+}
+
 var LineType = /*#__PURE__*/_react["default"].forwardRef(function (props, ref) {
   var value = props.value,
       onChange = props.onChange,

package/lib/core/models/TopoApp.js

@@ -54,7 +54,7 @@ var _SelectionModel = _interopRequireDefault(require("./SelectionModel"));
 var _CiCache = _interopRequireDefault(require("./cache/CiCache"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "12.0.0-dev.10" === 'string' ? "12.0.0-dev.10" : null;
+var version = typeof "12.0.0-dev.13" === 'string' ? "12.0.0-dev.13" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/lib/networkTopo/components/TopoView.js

@@ -11,7 +11,7 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 
 var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
 
-var _react = _interopRequireWildcard(require("react"));
+var _react = _interopRequireDefault(require("react"));
 
 var _index = _interopRequireDefault(require("@riil-frontend/component-topology-common/es/components/NoDataPage/index"));
 
@@ -31,13 +31,9 @@ var _useRelateTopo = _interopRequireDefault(require("../hooks/viewer/useRelateTo
 
 var _useEdgeFlow = _interopRequireDefault(require("../hooks/viewer/useEdgeFlow"));
 
-var _useEdgeExpand = _interopRequireDefault(require("../hooks/useEdgeExpand"));
-
 var _excluded = ["topo", "viewerProps", "titleBar", "nodataPage", "notfoundPageProps", "noPermissionPageProps"];
 
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-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 useEdgeExpand from "../hooks/useEdgeExpand";
 
 /**
  * 拓扑组件。变化无权限、无数据显示
@@ -60,10 +56,8 @@ function NetworkTopologyCore(props) {
   });
   (0, _useEdgeFlow["default"])({
     topo: topo
-  });
-  (0, _useEdgeExpand["default"])({
-    topo: topo
-  });
+  }); // useEdgeExpand({ topo })
+
   var relateTopo = (0, _useRelateTopo["default"])({
     topo: topo
   });
@@ -92,10 +86,7 @@ function NetworkTopologyCore(props) {
       });
     } else if (!topoId) {
       return null;
-    } // if (loading) {
-    //   return null;
-    // }
-
+    }
 
     if (!loading) {
       // 加载完成后

package/lib/networkTopo/hooks/useEdgeExpand.js

@@ -23,9 +23,8 @@ function useEdgeExpand(props) {
           data = e.data;
 
       if (data instanceof ht.Group && property === 'expanded') {
-        (0, _edgeUtil.updateEdgeExpanded)(topo);
-        setTimeout(function () {
-          (0, _edgeUtil.updateEdgeExpanded)(topo);
+        // updateEdgeExpanded(topo)
+        setTimeout(function () {// updateEdgeExpanded(topo)
         }, 100);
       }
     }

package/lib/utils/topoData.js

@@ -135,7 +135,7 @@ var tfLink = function tfLink(engine, link) {
 function getCiTypesFromCiElements(allCi) {
   var ciTypes = [];
   allCi.forEach(function (element) {
-    var typeCode = element.typeCode || element.ciType;
+    var typeCode = element.ciType || element.typeCode;
 
     if (typeCode && ciTypes.indexOf(typeCode) < 0) {
       ciTypes.push(typeCode);

package/package.json

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