@riil-frontend/component-topology 5.0.6 → 5.0.8

package/es/core/components/titlebar/TitleBar.module.scss

@@ -12,7 +12,7 @@
   }
 
   &.titlebarViewMode {
-    padding: 16px;
+    padding: 16px 16px 0 16px;
   }
 
   &.titlebarEditMode {

package/es/core/editor/components/settings/propertyViews/multipleElements/BatchSetNodeIcon.js

@@ -2,16 +2,20 @@ import React from 'react';
 import { isGroup, isNode } from "../../../../../../utils/htElementUtils";
 import NodeIconSelect from "../node/NodeIconSelect";
 export default function BatchSetNodeIcon(props) {
-  var topo = props.topo;
+  var topo = props.topo; // 节点及折叠的区域可设置图标
 
   var setNodeIcon = function setNodeIcon(iconId) {
     topo.historyManager.beginTransaction();
     var selection = topo.getSelectionModel().getSelection().toArray();
     var nodes = selection.filter(function (element) {
-      return isNode(element) && !isGroup(element);
+      return isNode(element);
     });
     nodes.forEach(function (node) {
-      node.setImage(iconId);
+      if (isGroup(node) && !node.isExpanded()) {
+        node.setImage(iconId);
+      } else if (!isGroup(node)) {
+        node.setImage(iconId);
+      }
     });
     topo.historyManager.endTransaction();
   };

package/es/core/models/TopoApp.js

@@ -21,7 +21,7 @@ import PluginManager from "./PluginManager";
 import topoFactory from "./topoFactory";
 import ElementTagTipConfig from "./tagstips/ElementTagTipConfig"; // eslint-disable-next-line no-undef
 
-var version = typeof "5.0.6" === 'string' ? "5.0.6" : null;
+var version = typeof "5.0.8" === 'string' ? "5.0.8" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/es/core/viewer/components/titlebar/widgets/AlarmListShowButton.js

@@ -4,6 +4,7 @@ import _Icon from "@alifd/next/es/icon";
 import _Overlay from "@alifd/next/es/overlay";
 import React, { useEffect, useRef, useState } from "react";
 import AlarmListPanel from "../../../../components/AlarmListPanel";
+import styles from "./AlarmListShowButton.module.scss";
 var Popup = _Overlay.Popup;
 /**
  * 元素拖拽开关
@@ -14,8 +15,7 @@ var Popup = _Overlay.Popup;
 export default function AlarmListShowButton(props) {
   var topo = props.topo,
       style = props.style,
-      _props$offSetLeft = props.offSetLeft,
-      offSetLeft = _props$offSetLeft === void 0 ? 112 : _props$offSetLeft,
+      offSetLeft = props.offSetLeft,
       alarmPanelIsOpen = props.alarmPanelIsOpen,
       alarmData = props.alarmData; // const { AlarmListPanel } = viewerProps;
 
@@ -39,6 +39,33 @@ export default function AlarmListShowButton(props) {
     setVisible(false);
   };
 
+  if (offSetLeft) {
+    // FIXME 临时兼容业务拓扑
+    return /*#__PURE__*/React.createElement(Popup, {
+      trigger: /*#__PURE__*/React.createElement(_Button, {
+        style: style,
+        ref: alarmBtn,
+        title: "\u544A\u8B66"
+      }, /*#__PURE__*/React.createElement(_Icon, {
+        type: "warning"
+      })),
+      cache: true,
+      defaultVisible: true,
+      canCloseByOutSideClick: false,
+      canCloseByTrigger: false,
+      visible: visible,
+      onVisibleChange: onVisibleChange,
+      offset: [offSetLeft, 5],
+      triggerType: "click",
+      safeNode: function safeNode() {
+        return alarmBtn;
+      }
+    }, /*#__PURE__*/React.createElement(AlarmListPanel, _extends({}, props, {
+      alarmData: alarmData,
+      onClose: onClose
+    })));
+  }
+
   return /*#__PURE__*/React.createElement(Popup, {
     trigger: /*#__PURE__*/React.createElement(_Button, {
       style: style,
@@ -52,12 +79,17 @@ export default function AlarmListShowButton(props) {
     canCloseByOutSideClick: false,
     canCloseByTrigger: false,
     visible: visible,
-    onVisibleChange: onVisibleChange,
-    offset: [offSetLeft, 5],
+    onVisibleChange: onVisibleChange // offset={[0, 5]}
+    ,
     triggerType: "click",
     safeNode: function safeNode() {
       return alarmBtn;
-    }
+    },
+    align: false,
+    container: function container(trigger) {
+      return trigger.parentNode.parentNode.parentNode.parentNode;
+    },
+    className: styles.popup
   }, /*#__PURE__*/React.createElement(AlarmListPanel, _extends({}, props, {
     alarmData: alarmData,
     onClose: onClose

package/es/core/viewer/components/titlebar/widgets/AlarmListShowButton.module.scss

@@ -0,0 +1,5 @@
+.popup {
+  position: absolute;
+  top: 49px;
+  right: 16px;
+}

package/lib/core/components/titlebar/TitleBar.module.scss

@@ -12,7 +12,7 @@
   }
 
   &.titlebarViewMode {
-    padding: 16px;
+    padding: 16px 16px 0 16px;
   }
 
   &.titlebarEditMode {

package/lib/core/editor/components/settings/propertyViews/multipleElements/BatchSetNodeIcon.js

@@ -12,16 +12,20 @@ var _htElementUtils = require("../../../../../../utils/htElementUtils");
 var _NodeIconSelect = _interopRequireDefault(require("../node/NodeIconSelect"));
 
 function BatchSetNodeIcon(props) {
-  var topo = props.topo;
+  var topo = props.topo; // 节点及折叠的区域可设置图标
 
   var setNodeIcon = function setNodeIcon(iconId) {
     topo.historyManager.beginTransaction();
     var selection = topo.getSelectionModel().getSelection().toArray();
     var nodes = selection.filter(function (element) {
-      return (0, _htElementUtils.isNode)(element) && !(0, _htElementUtils.isGroup)(element);
+      return (0, _htElementUtils.isNode)(element);
     });
     nodes.forEach(function (node) {
-      node.setImage(iconId);
+      if ((0, _htElementUtils.isGroup)(node) && !node.isExpanded()) {
+        node.setImage(iconId);
+      } else if (!(0, _htElementUtils.isGroup)(node)) {
+        node.setImage(iconId);
+      }
     });
     topo.historyManager.endTransaction();
   };

package/lib/core/models/TopoApp.js

@@ -50,7 +50,7 @@ var _topoFactory = _interopRequireDefault(require("./topoFactory"));
 var _ElementTagTipConfig = _interopRequireDefault(require("./tagstips/ElementTagTipConfig"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "5.0.6" === 'string' ? "5.0.6" : null;
+var version = typeof "5.0.8" === 'string' ? "5.0.8" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/lib/core/viewer/components/titlebar/widgets/AlarmListShowButton.js

@@ -17,6 +17,8 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _AlarmListPanel = _interopRequireDefault(require("../../../../components/AlarmListPanel"));
 
+var _AlarmListShowButtonModule = _interopRequireDefault(require("./AlarmListShowButton.module.scss"));
+
 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; }
@@ -31,8 +33,7 @@ var Popup = _overlay["default"].Popup;
 function AlarmListShowButton(props) {
   var topo = props.topo,
       style = props.style,
-      _props$offSetLeft = props.offSetLeft,
-      offSetLeft = _props$offSetLeft === void 0 ? 112 : _props$offSetLeft,
+      offSetLeft = props.offSetLeft,
       alarmPanelIsOpen = props.alarmPanelIsOpen,
       alarmData = props.alarmData; // const { AlarmListPanel } = viewerProps;
 
@@ -56,6 +57,33 @@ function AlarmListShowButton(props) {
     setVisible(false);
   };
 
+  if (offSetLeft) {
+    // FIXME 临时兼容业务拓扑
+    return /*#__PURE__*/_react["default"].createElement(Popup, {
+      trigger: /*#__PURE__*/_react["default"].createElement(_button["default"], {
+        style: style,
+        ref: alarmBtn,
+        title: "\u544A\u8B66"
+      }, /*#__PURE__*/_react["default"].createElement(_icon["default"], {
+        type: "warning"
+      })),
+      cache: true,
+      defaultVisible: true,
+      canCloseByOutSideClick: false,
+      canCloseByTrigger: false,
+      visible: visible,
+      onVisibleChange: onVisibleChange,
+      offset: [offSetLeft, 5],
+      triggerType: "click",
+      safeNode: function safeNode() {
+        return alarmBtn;
+      }
+    }, /*#__PURE__*/_react["default"].createElement(_AlarmListPanel["default"], (0, _extends2["default"])({}, props, {
+      alarmData: alarmData,
+      onClose: onClose
+    })));
+  }
+
   return /*#__PURE__*/_react["default"].createElement(Popup, {
     trigger: /*#__PURE__*/_react["default"].createElement(_button["default"], {
       style: style,
@@ -69,12 +97,17 @@ function AlarmListShowButton(props) {
     canCloseByOutSideClick: false,
     canCloseByTrigger: false,
     visible: visible,
-    onVisibleChange: onVisibleChange,
-    offset: [offSetLeft, 5],
+    onVisibleChange: onVisibleChange // offset={[0, 5]}
+    ,
     triggerType: "click",
     safeNode: function safeNode() {
       return alarmBtn;
-    }
+    },
+    align: false,
+    container: function container(trigger) {
+      return trigger.parentNode.parentNode.parentNode.parentNode;
+    },
+    className: _AlarmListShowButtonModule["default"].popup
   }, /*#__PURE__*/_react["default"].createElement(_AlarmListPanel["default"], (0, _extends2["default"])({}, props, {
     alarmData: alarmData,
     onClose: onClose

package/lib/core/viewer/components/titlebar/widgets/AlarmListShowButton.module.scss

@@ -0,0 +1,5 @@
+.popup {
+  position: absolute;
+  top: 49px;
+  right: 16px;
+}

package/package.json

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