@riil-frontend/component-topology 12.0.0-dev.2 → 12.0.0-dev.21

package/lib/components/ResourceSelectDrawer/ResourceSelectDrawer.js

@@ -13,7 +13,7 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/lib/rlog"));
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 var _Drawer = _interopRequireDefault(require("../Drawer"));
 
@@ -83,7 +83,7 @@ function ResourceSelectDrawer(props) {
             _context.t0 = _context["catch"](1);
             setLoading(false);
 
-            _rlog["default"].error('ResourceSelectDrawer.handleOk', _context.t0);
+            _componentTopologyUtils.rlog.error('ResourceSelectDrawer.handleOk', _context.t0);
 
           case 13:
           case "end":

package/lib/core/components/AlarmListPanel/components/AlarmListItem.js

@@ -5,6 +5,10 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports["default"] = void 0;
 
+var _balloon = _interopRequireDefault(require("@alifd/next/lib/balloon"));
+
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
 var _list = _interopRequireDefault(require("@alifd/next/lib/list"));
 
 var _icon = _interopRequireDefault(require("@alifd/next/lib/icon"));
@@ -47,6 +51,7 @@ function AlarmListItem(props) {
   var topo = props.topo,
       alarmInfo = props.alarmInfo,
       onClick = props.onClick;
+  console.log("AlarmListPanel", topo, alarmInfo);
   return /*#__PURE__*/_react["default"].createElement(_list["default"].Item, {
     className: _indexModule["default"].AlarmListItem,
     media: /*#__PURE__*/_react["default"].createElement(_icon["default"], {
@@ -101,10 +106,62 @@ function RiskListItem(props) {
   }, "\u67E5\u770B\u8BE6\u60C5"))));
 }
 
+function SubListItem(props) {
+  // 传入参数
+  var topo = props.topo,
+      alarmInfo = props.alarmInfo,
+      onClick = props.onClick;
+  var creatAlarmTips = topo.viewProps.creatAlarmTips;
+  var subNode = topo.getData().nodes.find(function (node) {
+    return node.ciId === alarmInfo.mainCiId;
+  });
+  var plarm = alarmInfo.cmpCode ? "\u3010" + (subNode === null || subNode === void 0 ? void 0 : subNode.sourceName) + "\u3011" : "【本级平台】";
+  return /*#__PURE__*/_react["default"].createElement(_list["default"].Item, {
+    className: _indexModule["default"].AlarmListItem,
+    media: /*#__PURE__*/_react["default"].createElement(_icon["default"], {
+      type: "gaojing-3",
+      size: "xs",
+      className: _indexModule["default"]["alarm-color-icon"] + " alarm-color-icon-lv" + alarmInfo.alertLevel
+    })
+  }, /*#__PURE__*/_react["default"].createElement("span", {
+    className: _indexModule["default"].content
+  }, /*#__PURE__*/_react["default"].createElement("div", {
+    className: _indexModule["default"].list,
+    onClick: function onClick() {
+      getNode(topo, alarmInfo);
+    }
+  }, "" + plarm + alarmInfo.alertObject + alarmInfo.alertTitle), alarmInfo.cmpCode ? /*#__PURE__*/_react["default"].createElement(_balloon["default"], {
+    trigger: /*#__PURE__*/_react["default"].createElement("span", {
+      className: _indexModule["default"].listLink
+    }, "\u67E5\u770B\u8BE6\u60C5"),
+    closable: true,
+    triggerType: "click",
+    align: "bl",
+    popupClassName: _indexModule["default"]["enjoydata-alarm-table-balloon"],
+    popupStyle: {
+      maxWidth: "700px",
+      width: 530
+    }
+  }, creatAlarmTips((0, _extends2["default"])({}, alarmInfo, {
+    sourceName: plarm
+  }))) : /*#__PURE__*/_react["default"].createElement("div", {
+    className: _indexModule["default"].listLink
+  }, /*#__PURE__*/_react["default"].createElement(_Link["default"], {
+    onClick: onClick,
+    to: alarmLink(alarmInfo)
+  }, "\u67E5\u770B\u8BE6\u60C5"))));
+}
+
 function ListItem(props) {
-  var alarmInfo = props.alarmInfo;
-  var ListItemWidget = alarmInfo.eventType === 'risk' ? RiskListItem : AlarmListItem;
-  return /*#__PURE__*/_react["default"].createElement(ListItemWidget, props);
+  var topo = props.topo,
+      alarmInfo = props.alarmInfo;
+
+  if (topo.isCMPTopo) {
+    return /*#__PURE__*/_react["default"].createElement(SubListItem, props);
+  } else {
+    var ListItemWidget = alarmInfo.eventType === "risk" ? RiskListItem : AlarmListItem;
+    return /*#__PURE__*/_react["default"].createElement(ListItemWidget, props);
+  }
 }
 
 var _default = ListItem;

package/lib/core/components/AlarmListPanel/index.js

@@ -15,7 +15,7 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _componentNoDataPage = _interopRequireDefault(require("@riil-frontend/component-no-data-page"));
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 var _AlarmListItem = _interopRequireDefault(require("./components/AlarmListItem"));
 

package/lib/core/components/DisplaySettingDrawer/DisplaySetting.js

@@ -15,7 +15,7 @@ var _field = _interopRequireDefault(require("@alifd/next/lib/field"));
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 var _NodeTag = _interopRequireDefault(require("./NodeTag"));
 
@@ -66,7 +66,7 @@ function DisplaySetting(props, ref) {
       edgeFlowDirection: displayConfig.edgeFlowDirection
     },
     onChange: function onChange(name, value) {
-      _rlog["default"].debug('DisplaySetting-onChange', name, value); // 告警静默设置
+      _componentTopologyUtils.rlog.debug('DisplaySetting-onChange', name, value); // 告警静默设置
 
 
       if (name === 'alarmSwitch') {

package/lib/core/components/DisplaySettingDrawer/DisplaySettingDrawer.js

@@ -15,7 +15,7 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/lib/rlog"));
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 var _Drawer = _interopRequireDefault(require("../../../components/Drawer"));
 
@@ -71,7 +71,7 @@ function DisplaySettingDrawer(props) {
             _context.t0 = _context["catch"](1);
             setLoading(false);
 
-            _rlog["default"].error('DisplaySettingDrawer.handleOk', _context.t0);
+            _componentTopologyUtils.rlog.error('DisplaySettingDrawer.handleOk', _context.t0);
 
             _message["default"].warning('保存失败');
 

package/lib/core/components/DisplaySettingDrawer/ResourceDisplay/BasicConfig.js

@@ -13,7 +13,7 @@ var _radio = _interopRequireDefault(require("@alifd/next/lib/radio"));
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 var _ResourceInfoDisplay = require("../../../../constants/ResourceInfoDisplay");
 
@@ -65,7 +65,7 @@ function BasicConfig(props, ref) {
 
 
   var handleCommonCheckboxGroupChange = function handleCommonCheckboxGroupChange(selected) {
-    _rlog["default"].debug('handleCommonCheckboxGroupChange', selected);
+    _componentTopologyUtils.rlog.debug('handleCommonCheckboxGroupChange', selected);
 
     onChange({
       isCustom: isCustom,
@@ -80,7 +80,7 @@ function BasicConfig(props, ref) {
 
 
   var handleCustomChange = function handleCustomChange(parm) {
-    _rlog["default"].debug('handleCustomChange', parm);
+    _componentTopologyUtils.rlog.debug('handleCustomChange', parm);
 
     onChange(parm);
   }; // 渲染自定义配置抽屉

package/lib/core/components/DisplaySettingDrawer/components/NodeAttrSettingDrawer.js

@@ -13,7 +13,7 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/lib/rlog"));
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 var _ModelAttrSelectDrawer = _interopRequireDefault(require("../../../../components/ModelAttrSelectDrawer"));
 
@@ -39,7 +39,7 @@ var NodeAttrSettingDrawer = /*#__PURE__*/(0, _react.forwardRef)(function (props,
       setData = _useState[1];
 
   var queryData = function queryData() {
-    _rlog["default"].info('属性配置：加载数据');
+    _componentTopologyUtils.rlog.info('属性配置：加载数据');
 
     var items = (0, _nodeCiTypeAttrUtil.getNodeModels)(topo);
     setData(items);

package/lib/core/components/ResourceViewAttributeSetting/Setting.js

@@ -11,7 +11,7 @@ var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runt
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/lib/rlog"));
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 var _nodeCiTypeAttrUtil = require("./nodeCiTypeAttrUtil");
 
@@ -38,7 +38,7 @@ var AttrSettingDrawer = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref
       setData = _useState[1];
 
   var queryData = function queryData() {
-    _rlog["default"].info('属性配置：加载数据');
+    _componentTopologyUtils.rlog.info('属性配置：加载数据');
 
     if (elementType === 'node') {
       var items = (0, _nodeCiTypeAttrUtil.getNodeModels)(topo);

package/lib/core/components/TopoView/topoView.js

@@ -19,7 +19,7 @@ var _componentTopologyGraph = _interopRequireWildcard(require("@riil-frontend/co
 
 var _PortalContainer = _interopRequireDefault(require("@riil-frontend/component-topology-graph/es/components/PortalContainer"));
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 var _showMessage = _interopRequireDefault(require("../../utils/showMessage"));
 
@@ -138,7 +138,7 @@ var Topology = function Topology(props) {
   (0, _react.useEffect)(function () {
     // 拓扑退出注销
     return function () {
-      _rlog["default"].info('TopoView 退出');
+      _componentTopologyUtils.rlog.info('TopoView 退出');
 
       topo.selectionModel.destroy();
       topoDispatchers.reset();
@@ -147,14 +147,14 @@ var Topology = function Topology(props) {
   var onGraphCreated = (0, _react.useCallback)(function (topoClient) {
     topo.view.onCreatedView(topoClient);
 
-    _rlog["default"].info('TopoView.onGraphCreated');
+    _componentTopologyUtils.rlog.info('TopoView.onGraphCreated');
 
     if (onReady) {
       onReady();
     }
   }, []);
   var handleGraphDataLoaded = (0, _react.useCallback)(function () {
-    _rlog["default"].info('TopoView.handleGraphDataLoaded', new Date().toString(), {
+    _componentTopologyUtils.rlog.info('TopoView.handleGraphDataLoaded', new Date().toString(), {
       topoMod: topo.store.getState().topoMod,
       topoData: topoData,
       htElements: topo.getDataModel().getDatas().toArray()
@@ -181,7 +181,7 @@ var Topology = function Topology(props) {
     }
   }, [topoData]);
   var handleGraphLoaded = (0, _react.useCallback)(function () {
-    _rlog["default"].info('TopoView.handleGraphLoaded', new Date().toString(), {
+    _componentTopologyUtils.rlog.info('TopoView.handleGraphLoaded', new Date().toString(), {
       topoMod: topo.store.getState().topoMod,
       topoData: topoData,
       htElements: topo.getDataModel().getDatas().toArray()
@@ -202,7 +202,11 @@ var Topology = function Topology(props) {
 
     if (initSelectionId) {
       var ele = topo.getHtTopo().getGraphView().dm().getDataByTag(initSelectionId);
-      topo.getHtTopo().getGraphView().sm().setSelection([ele]);
+
+      if (ele) {
+        topo.getHtTopo().getGraphView().sm().setSelection([ele]);
+      }
+
       var selectionDispatchers = topo.store.getModelDispatchers('selection');
       selectionDispatchers.update({
         initSelectionId: null
@@ -219,7 +223,7 @@ var Topology = function Topology(props) {
   }, [topoData]);
 
   var rightEventHandle = function rightEventHandle(event) {
-    _rlog["default"].debug('右键事件', event);
+    _componentTopologyUtils.rlog.debug('右键事件', event);
 
     var contextMenu = topo.view.contextMenu;
 
@@ -229,7 +233,7 @@ var Topology = function Topology(props) {
   };
 
   var onRefresh = function onRefresh(e) {
-    _rlog["default"].debug('TopoView:onRefresh', e);
+    _componentTopologyUtils.rlog.debug('TopoView:onRefresh', e);
 
     onRefreshTopo ? onRefreshTopo() : topoDispatchers.refreshTopo();
   };
@@ -240,7 +244,7 @@ var Topology = function Topology(props) {
 
 
   var handleEvent = function handleEvent(event) {
-    _rlog["default"].debug('TopoView:onEvent', event);
+    _componentTopologyUtils.rlog.debug('TopoView:onEvent', event);
 
     onEvent && onEvent(event);
     topoEdit.onEvent(event);
@@ -268,7 +272,7 @@ var Topology = function Topology(props) {
         break;
 
       case _componentTopologyGraph.TopoEvent.EVENT_CONTEXT_TOOL:
-        _rlog["default"].debug('自定义工具栏事件', event);
+        _componentTopologyUtils.rlog.debug('自定义工具栏事件', event);
 
         break;
 

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

@@ -35,7 +35,7 @@ var _backgroundUtil = require("../../../utils/backgroundUtil");
 
 var _imageUtil = require("../../../utils/imageUtil");
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 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); }
 
@@ -245,7 +245,7 @@ function BackgroundView(props) {
           case 7:
             size = _context2.sent;
 
-            _rlog["default"].debug('获取图片大小', size);
+            _componentTopologyUtils.rlog.debug('获取图片大小', size);
 
             _context2.next = 11;
             return setBackground((0, _extends2["default"])({}, currentBg, size));
@@ -259,7 +259,7 @@ function BackgroundView(props) {
             _context2.prev = 14;
             _context2.t0 = _context2["catch"](4);
 
-            _rlog["default"].error('设置背景失败', _context2.t0);
+            _componentTopologyUtils.rlog.error('设置背景失败', _context2.t0);
 
           case 17:
             topo.historyManager.endTransaction();

package/lib/core/editor/components/CustomIconPlugin/UploadIconDialog.js

@@ -31,7 +31,7 @@ var _lodash = _interopRequireDefault(require("lodash"));
 
 var _utils = require("@riil-frontend/utils");
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 var _SpecialCharacterValidateUtil = require("../../../../utils/SpecialCharacterValidateUtil");
 
@@ -250,7 +250,7 @@ var UploadIconDialog = /*#__PURE__*/function (_React$Component) {
     };
 
     _this.handleUploadError = function () {
-      _rlog["default"].error('上传失败');
+      _componentTopologyUtils.rlog.error('上传失败');
 
       _this.handleError();
     };

package/lib/core/editor/components/EditorPlugin.js

@@ -9,7 +9,7 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 var _CustomIconPlugin = _interopRequireDefault(require("./CustomIconPlugin"));
 
@@ -38,10 +38,10 @@ function TopoEditorPlugin(props) {
       graphLoaded = _topo$store$useModelS.graphLoaded;
 
   (0, _react.useEffect)(function () {
-    _rlog["default"].debug('TopoEditorPlugin 进来了');
+    _componentTopologyUtils.rlog.debug('TopoEditorPlugin 进来了');
 
     return function () {
-      _rlog["default"].debug('TopoEditorPlugin 进来了');
+      _componentTopologyUtils.rlog.debug('TopoEditorPlugin 进来了');
 
       topoEdit.reset();
     };

package/lib/core/editor/components/Sidebar/views/ComponentPanel.js

@@ -1,13 +1,11 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 exports.__esModule = true;
 exports["default"] = ComponentPanel;
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 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); }
 
@@ -32,7 +30,7 @@ function ComponentPanel(props) {
     try {
       viewRef.current = htTopo.createBasicPalette(container);
     } catch (error) {
-      _rlog["default"].error('初始化资源面板失败', error);
+      _componentTopologyUtils.rlog.error('初始化资源面板失败', error);
     } // 注销组件
 
 

package/lib/core/editor/components/Sidebar/views/ImagePanel/CiTypeImagePanel.js

@@ -7,7 +7,7 @@ exports["default"] = CiTypeImagePanel;
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 var _HtImagePalette = _interopRequireDefault(require("./HtImagePalette"));
 

package/lib/core/editor/components/Sidebar/views/ImagePanel/CustomImagePanel.js

@@ -7,7 +7,7 @@ exports["default"] = CustomImagePanel;
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 var _icon = require("../../../../../common/icons/icon");
 

package/lib/core/editor/components/Sidebar/views/ImagePanel/HtCustomImagePanel.js

@@ -9,7 +9,7 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _resizeObserverPolyfill = _interopRequireDefault(require("resize-observer-polyfill"));
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 var _HtImagePaletteModule = _interopRequireDefault(require("./HtImagePalette.module.scss"));
 
@@ -39,7 +39,7 @@ function HtCustomImagePanel(props) {
         icons: icons
       });
     } catch (error) {
-      _rlog["default"].error('初始化资源面板失败', error);
+      _componentTopologyUtils.rlog.error('初始化资源面板失败', error);
     }
 
     var hanleResize = function hanleResize() {

package/lib/core/editor/components/Sidebar/views/ImagePanel/HtImagePalette.js

@@ -7,7 +7,7 @@ exports["default"] = HtImagePalette;
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 var _resizeObserverPolyfill = _interopRequireDefault(require("resize-observer-polyfill"));
 
@@ -39,7 +39,7 @@ function HtImagePalette(props) {
         icons: icons
       });
     } catch (error) {
-      _rlog["default"].error('初始化资源面板失败', error);
+      _componentTopologyUtils.rlog.error('初始化资源面板失败', error);
     }
 
     var hanleResize = function hanleResize() {

package/lib/core/editor/components/Sidebar/views/ImagePanel/ImagePalette.js

@@ -1,13 +1,11 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 exports.__esModule = true;
 exports["default"] = ImagePalette;
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 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); }
 
@@ -35,7 +33,7 @@ function ImagePalette(props) {
         icons: icons
       });
     } catch (error) {
-      _rlog["default"].error('初始化资源面板失败', error);
+      _componentTopologyUtils.rlog.error('初始化资源面板失败', error);
     } // 注销组件
 
 

package/lib/core/editor/components/Sidebar/views/LinkPanel.js

@@ -1,13 +1,11 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 exports.__esModule = true;
 exports["default"] = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 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); }
 
@@ -32,7 +30,7 @@ function LinkPanel(props) {
     try {
       viewRef.current = htTopo.createLinkPalette(container);
     } catch (error) {
-      _rlog["default"].error('初始化资源面板失败', error);
+      _componentTopologyUtils.rlog.error('初始化资源面板失败', error);
     } // 注销组件
 
 

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

@@ -11,6 +11,8 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _edgeTypeStyleUtil = require("../../../../utils/edgeTypeStyleUtil");
 
+var _edgeUtil = require("../../../../../utils/edgeUtil");
+
 var _DropdownButton = _interopRequireDefault(require("../components/DropdownButton"));
 
 var _WidgetBox = _interopRequireDefault(require("../WidgetBox"));
@@ -52,15 +54,7 @@ function EdgeColorButton(props) {
   };
 
   var getLines = function getLines(list) {
-    // eslint-disable-next-line prefer-const
-    var arr = [];
-    loopEdges(list, function (edge) {
-      // eslint-disable-next-line eqeqeq
-      if (edge.getAttrObject().type == 'line') {
-        arr.push(edge);
-      }
-    });
-    return arr;
+    return list.filter(_edgeUtil.isCustomEdge);
   };
 
   (0, _react.useEffect)(function () {
@@ -69,7 +63,7 @@ function EdgeColorButton(props) {
       var list = getLines(edges);
       setLineWidth(1); // eslint-disable-next-line eqeqeq
 
-      if (selection.length == 1 && selection[0].a('type') == 'line') {
+      if (selection.length == 1 && list.length === 1) {
         setLineWidth(list[0] && (list[0].a('styles') && list[0].a('styles').width || list[0].getStyleMap()['edge.width']) || 2);
       }
 
@@ -83,7 +77,7 @@ function EdgeColorButton(props) {
     var edges = (0, _edgeTypeStyleUtil.getEdgesBySelection)(topo);
     loopEdges(edges, function (edge) {
       // eslint-disable-next-line eqeqeq
-      if (edge.getAttrObject().type == 'line') {
+      if ((0, _edgeUtil.isCustomEdge)(edge)) {
         var color = colors.hex;
         edge.s('edge.color', color);
         edge.s('edge.dash.color', color);
@@ -111,7 +105,7 @@ function EdgeColorButton(props) {
     topo.historyManager.beginTransaction();
     loopEdges(edges, function (edge) {
       // eslint-disable-next-line eqeqeq
-      if (edge.getAttrObject().type == 'line') {
+      if ((0, _edgeUtil.isCustomEdge)(edge)) {
         edge.s('edge.dash.width', width);
         edge.s('edge.width', width);
         var style = edge.a('styles') || {};

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 = {