@riil-frontend/component-topology 6.0.0-alpha.30 → 6.0.0-alpha.32

package/lib/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/textStyleUtil.js

@@ -0,0 +1,58 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports.getElementTextStyle = getElementTextStyle;
+exports.getTextStyle = getTextStyle;
+exports.setTextStyle = setTextStyle;
+
+var _htElementUtils = require("../../../../../../../../utils/htElementUtils");
+
+var _elements = _interopRequireDefault(require("./elements"));
+
+function getElementType(element) {
+  if ((0, _htElementUtils.isText)(element)) {
+    return 'text';
+  } else if ((0, _htElementUtils.isGroup)(element)) {
+    return 'groupTitle';
+  } else if ((0, _htElementUtils.isNode)(element)) {
+    return 'nodeTag';
+  } else if ((0, _htElementUtils.isEdge)(element)) {
+    return 'edgeTag';
+  } else if ((0, _htElementUtils.isLayer)(element)) {
+    return 'layerTitle';
+  }
+
+  return null;
+}
+
+function getElementTextStyle(element) {
+  var type = getElementType(element);
+  var handler = _elements["default"][type];
+
+  if (handler) {
+    return handler.getTextStyle(element);
+  }
+
+  return null;
+}
+
+function getTextStyle(htSelection) {
+  if (htSelection.length === 1) {
+    var element = htSelection[0];
+    return getElementTextStyle(element);
+  } // 多选时值相同返回？
+
+
+  return null;
+}
+
+function setTextStyle(element, style) {
+  var type = getElementType(element);
+  var handler = _elements["default"][type];
+
+  if (handler) {
+    handler.setTextStyle(element, style);
+  }
+}

package/lib/core/editor/components/Toolbar/widgets/components/textStyleSetting/GlobalTagStyleSetting/GlobalTagStyleSetting.js

@@ -0,0 +1,39 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = void 0;
+
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
+var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _globalTag = require("./globalTag");
+
+var _excluded = ["Component"];
+
+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; }
+
+function GlobalTagStyleSetting(props) {
+  var topo = props.topo;
+  var Component = props.Component,
+      widgetProps = (0, _objectWithoutPropertiesLoose2["default"])(props, _excluded);
+  var values = (0, _globalTag.useValues)(topo);
+  var setStyle = (0, _react.useMemo)(function () {
+    return function (style) {
+      return (0, _globalTag.setGlobalTagStyle)(topo, style);
+    };
+  }, []);
+  return /*#__PURE__*/_react["default"].createElement(Component, (0, _extends2["default"])({
+    style: values,
+    setStyle: setStyle
+  }, widgetProps));
+}
+
+var _default = GlobalTagStyleSetting;
+exports["default"] = _default;

package/lib/core/editor/components/Toolbar/widgets/components/textStyleSetting/GlobalTagStyleSetting/globalTag.js

@@ -0,0 +1,47 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports.setGlobalTagStyle = void 0;
+exports.setStyle = setStyle;
+exports.useValues = useValues;
+
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
+var defaultStyle = {
+  color: '#AFB9C2',
+  fontFamily: '微软雅黑'
+};
+
+function useValues(topo) {
+  var displayConfigState = topo.store.useModelState('displayConfig');
+  var nodeLabelStyle = displayConfigState.nodeLabelStyle,
+      defaultEdgeLabelStyle = displayConfigState.defaultEdgeLabelStyle;
+  return {
+    color: (nodeLabelStyle === null || nodeLabelStyle === void 0 ? void 0 : nodeLabelStyle.color) || defaultStyle.color,
+    fontFamily: (nodeLabelStyle === null || nodeLabelStyle === void 0 ? void 0 : nodeLabelStyle.fontFamily) || defaultStyle.fontFamily,
+    fontSize: nodeLabelStyle === null || nodeLabelStyle === void 0 ? void 0 : nodeLabelStyle.fontSize
+  };
+}
+
+var setGlobalTagStyle = function setGlobalTagStyle(topo, styleData) {
+  var _topo$store$getModel = topo.store.getModel('displayConfig'),
+      displayConfigState = _topo$store$getModel[0],
+      displayConfigDispatchers = _topo$store$getModel[1];
+
+  var nodeLabelStyle = displayConfigState.nodeLabelStyle,
+      defaultEdgeLabelStyle = displayConfigState.defaultEdgeLabelStyle;
+  var globalNodeLabelStyle = (0, _extends2["default"])({}, nodeLabelStyle, styleData);
+  topo.getHtTopo().setGlobalNodeLabelStyle(globalNodeLabelStyle);
+  var globalEdgeTagStyle = (0, _extends2["default"])({}, defaultEdgeLabelStyle, styleData);
+  topo.getHtTopo().setGlobalEdgeTagStyle(globalEdgeTagStyle);
+  displayConfigDispatchers.update({
+    nodeLabelStyle: globalNodeLabelStyle,
+    defaultEdgeLabelStyle: globalEdgeTagStyle
+  });
+};
+
+exports.setGlobalTagStyle = setGlobalTagStyle;
+
+function setStyle() {}

package/lib/core/editor/components/Toolbar/widgets/components/textStyleSetting/textStyleSettingRouter.js

@@ -0,0 +1,28 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = void 0;
+
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
+var _react = _interopRequireDefault(require("react"));
+
+var _ElementTextStyleSetting = _interopRequireDefault(require("./ElementTextStyleSetting/ElementTextStyleSetting"));
+
+var _GlobalTagStyleSetting = _interopRequireDefault(require("./GlobalTagStyleSetting/GlobalTagStyleSetting"));
+
+function textStyleSettingRouter(Component, options) {
+  return function TextStyleSettingButton(props) {
+    var topo = props.topo;
+    var selection = topo.selectionManager.useHtSelection();
+    var Widget = !selection.length ? _GlobalTagStyleSetting["default"] : _ElementTextStyleSetting["default"];
+    return /*#__PURE__*/_react["default"].createElement(Widget, (0, _extends2["default"])({
+      Component: Component
+    }, props));
+  };
+}
+
+var _default = textStyleSettingRouter;
+exports["default"] = _default;

package/lib/core/editor/components/settings/CloseablePanel.js

@@ -11,12 +11,16 @@ var _icon = _interopRequireDefault(require("@alifd/next/lib/icon"));
 
 var _react = _interopRequireDefault(require("react"));
 
+var _CloseablePanelModule = _interopRequireDefault(require("./CloseablePanel.module.scss"));
+
 function CloseablePanel(props) {
   var prefix = props.prefix,
       title = props.title,
       onClose = props.onClose,
       children = props.children;
-  return /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement("div", {
+  return /*#__PURE__*/_react["default"].createElement("div", {
+    className: _CloseablePanelModule["default"].panel
+  }, /*#__PURE__*/_react["default"].createElement("div", {
     className: prefix + "drawer-header",
     role: "heading",
     "aria-level": "1"
@@ -28,7 +32,9 @@ function CloseablePanel(props) {
   }, /*#__PURE__*/_react["default"].createElement(_icon["default"], {
     type: "close",
     className: "next-drawer-close-icon"
-  }))), /*#__PURE__*/_react["default"].createElement("div", null, children));
+  }))), /*#__PURE__*/_react["default"].createElement("div", {
+    className: _CloseablePanelModule["default"].body
+  }, children));
 }
 
 CloseablePanel.defaultProps = {

package/lib/core/editor/components/settings/CloseablePanel.module.scss

@@ -0,0 +1,9 @@
+.panel {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  background: #FFFFFF;
+}
+.body {
+  flex: 1;
+}

package/lib/core/editor/components/settings/PropertyView.js

@@ -5,17 +5,17 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports["default"] = PropertyView;
 
-var _react = _interopRequireDefault(require("react"));
-
 var _classnames = _interopRequireDefault(require("classnames"));
 
-var _Settings = _interopRequireDefault(require("./Settings"));
+var _react = _interopRequireDefault(require("react"));
 
-var _SettingsModule = _interopRequireDefault(require("./Settings.module.scss"));
+var _CloseablePanel = _interopRequireDefault(require("./CloseablePanel"));
 
 var _OpenPropertyPanelListener = _interopRequireDefault(require("./OpenPropertyPanelListener"));
 
-var _CloseablePanel = _interopRequireDefault(require("./CloseablePanel"));
+var _Settings = _interopRequireDefault(require("./Settings"));
+
+var _SettingsModule = _interopRequireDefault(require("./Settings.module.scss"));
 
 function PropertyView(props) {
   var _classNames;
@@ -41,7 +41,7 @@ function PropertyView(props) {
   }
 
   var renderContent = function renderContent() {
-    if (!graphLoaded) {
+    if (!propertyPanelVisible) {
       return null;
     }
 
@@ -65,5 +65,7 @@ function PropertyView(props) {
         propertyPanelVisible: false
       });
     }
-  }), renderContent());
+  }, /*#__PURE__*/_react["default"].createElement(_OpenPropertyPanelListener["default"], {
+    topo: topo
+  }, renderContent())));
 }

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

@@ -23,8 +23,7 @@ function AlignSetting(props) {
       return !(0, _htElementUtils.isLayer)(ele) && !(0, _htElementUtils.isEdge)(ele);
     }); // console.info("element--selectList", element, selectList);
 
-    topo.view.topoClient.htTopoClient.setAlignmentBySelectionNodes(type, nodes); // topo.view.topoClient.htTopoClient.setElementsSpace(nodes,'h',300)
-
+    topo.view.topoClient.htTopoClient.setAlignmentBySelectionNodes(type, nodes);
     topo.historyManager.endTransaction();
   };
 

package/lib/core/editor/components/settings/common/text/fontStyleUtil.js

@@ -12,7 +12,8 @@ var fontStyleUtil = {
     var arr = font.trim().split(' ');
     var bold = font.indexOf('bold') > -1;
     var italic = font.indexOf('italic') > -1;
-    var fontFamily, fontSize;
+    var fontFamily;
+    var fontSize;
 
     if (arr.length) {
       fontFamily = arr[arr.length - 1];
@@ -33,15 +34,15 @@ var fontStyleUtil = {
   build: function build(style) {
     var font = '';
 
-    if (style.font.bold) {
+    if (style.bold) {
       font += 'bold ';
     }
 
-    if (style.font.italic) {
+    if (style.italic) {
       font += 'italic ';
     }
 
-    return "" + font + style.font.fontSize + "px " + style.font.fontFamily;
+    return "" + font + style.fontSize + "px " + style.fontFamily;
   },
   getFontStyleMap: function getFontStyleMap(obj, prefix) {
     var map = {};

package/lib/core/editor/components/settings/propertyViews/edge/CommonEdgePropertyView.js

@@ -62,8 +62,10 @@ function CommonEdgePropertyView(props) {
   }, [values]);
 
   var setLineColor = function setLineColor(color) {
-    var style = edge.a("styles") || {};
+    // 同时修改实线、虚线
     edge.s("edge.color", color);
+    edge.s("edge.dash.color", color);
+    var style = edge.a("styles") || {};
     edge.a("styles", (0, _extends2["default"])({}, style, {
       color: color
     }));
@@ -114,6 +116,10 @@ function CommonEdgePropertyView(props) {
     style: {
       width: "100%"
     },
+    onChange: function onChange(val) {
+      // 同时修改实线、虚线的线宽
+      edge.s('edge.dash.width', val);
+    },
     onFocus: function onFocus() {
       topo.historyManager.beginTransaction();
     },

package/lib/core/editor/components/settings/propertyViews/text/TextPropertyView.js

@@ -56,7 +56,7 @@ function TextPropertyView(props) {
 
         _onChange('styleMap.label.color', value.color, newValues);
 
-        var font = _fontStyleUtil["default"].build(value);
+        var font = _fontStyleUtil["default"].build(value.font);
 
         _onChange('styleMap.text.font', font, newValues);
 

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

@@ -0,0 +1 @@
+"use strict";

package/lib/core/hooks/usePolling.js

@@ -74,11 +74,8 @@ var usePolling = function usePolling(props) {
 
 
   (0, _react.useEffect)(function () {
-    var isViewer = topoState.viewState === 'view';
-
-    if (topo.options.enableDefaultMetricLoader && isViewer) {
+    if (topo.options.enableDefaultMetricLoader) {
       _rlog["default"].debug('usePolling.useEffect: 开始轮询', {
-        isViewer: isViewer,
         pollingSwitch: pollingSwitch,
         resIdsList: resIdsList,
         resourceOverviewState: resourceOverviewState,
@@ -95,7 +92,7 @@ var usePolling = function usePolling(props) {
         stopPoll();
       }
     };
-  }, [topoState.viewState, pollingSwitch, resIdsList, displayConfig, resourceOverviewState.id, resourceOverviewState.metricCodes]);
+  }, [pollingSwitch, resIdsList, displayConfig, resourceOverviewState.id, resourceOverviewState.metricCodes]);
   /**
    * 
    * @returns {{id, attributes: object[], metrics: object[]}[]} 属性和指标

package/lib/core/models/AttributeMetricDisplay.js

@@ -668,7 +668,11 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
     var htTopo = topo.getHtTopo();
 
     if (htTopo) {
+      var _topo$historyManager, _topo$historyManager2;
+
+      (_topo$historyManager = topo.historyManager) === null || _topo$historyManager === void 0 ? void 0 : _topo$historyManager.setDisabled(true, '加载标注');
       htTopo.loadTagAndTip(JSON.parse(JSON.stringify(elementTagsAndTips)));
+      (_topo$historyManager2 = topo.historyManager) === null || _topo$historyManager2 === void 0 ? void 0 : _topo$historyManager2.setDisabled(false, '加载标注');
     }
   }
   /**

package/lib/core/models/TopoApp.js

@@ -52,7 +52,7 @@ var _ElementTagTipConfig = _interopRequireDefault(require("./tagstips/ElementTag
 var _SelectionManager = _interopRequireDefault(require("./SelectionManager"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "6.0.0-alpha.30" === 'string' ? "6.0.0-alpha.30" : null;
+var version = typeof "6.0.0-alpha.32" === 'string' ? "6.0.0-alpha.32" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/lib/utils/htElementUtils.js

@@ -31,6 +31,7 @@ exports.isExistedElement = isExistedElement;
 exports.isGroup = isGroup;
 exports.isLayer = isLayer;
 exports.isNode = isNode;
+exports.isText = isText;
 exports.isValidEdge = isValidEdge;
 exports.setElementRuntimeStyle = setElementRuntimeStyle;
 
@@ -95,6 +96,10 @@ function isLayer(element) {
   return element instanceof ht.Grid;
 }
 
+function isText(element) {
+  return element instanceof ht.Text && element.a('isText');
+}
+
 function getElements(dataModel) {
   // console.error(111, dataModel.getDatas().getArray())
   return dataModel.getDatas().getArray();

package/package.json

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