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

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

@@ -13,19 +13,26 @@ var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runt
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-var _fontStyleUtil = _interopRequireDefault(require("../../../../../../settings/common/text/fontStyleUtil"));
-
 var _colorUtil = require("../colorUtil");
 
 var _excluded = ["color", "background", "opacity", "bold", "italic"];
 
 function getTextStyle(element) {
+  var opacity = element.a('edge.tag.opacity');
+
+  if (opacity === null || opacity === undefined) {
+    opacity = 1;
+  }
+
   return (0, _extends2["default"])({
     color: (0, _colorUtil.parseColor)(element.a('edge.tag.color')),
     fontFamily: element.a('edge.tag.fontFamily') || '微软雅黑',
+    fontSize: element.a('edge.tag.fontSize'),
     bold: !!element.a('edge.tag.fontBold'),
-    itatic: !!element.a('edge.tag.fontItalic')
-  }, (0, _colorUtil.parseBackground)(element.a('edge.tag.background')));
+    italic: !!element.a('edge.tag.fontItalic')
+  }, (0, _colorUtil.parseBackground)(element.a('edge.tag.background')), {
+    opacity: opacity
+  });
 }
 
 function setTextStyle(element, style, topo) {

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

@@ -17,7 +17,7 @@ var _fontStyleUtil = _interopRequireDefault(require("../../../../../../settings/
 
 var _colorUtil = require("../colorUtil");
 
-var _excluded = ["color", "background", "opacity", "bold", "italic"];
+var _excluded = ["color", "background", "opacity", "bold", "italic", "underline"];
 
 function getTextStyle(element) {
   var underline = !!element.a('node.tag.fontUnderline');
@@ -33,6 +33,7 @@ function setTextStyle(element, style, topo) {
       opacity = style.opacity,
       bold = style.bold,
       italic = style.italic,
+      underline = style.underline,
       otherStyle = (0, _objectWithoutPropertiesLoose2["default"])(style, _excluded);
   var tagStyle = (0, _extends2["default"])({}, otherStyle);
 
@@ -48,6 +49,10 @@ function setTextStyle(element, style, topo) {
     tagStyle.fontItalic = italic;
   }
 
+  if ('underline' in style) {
+    tagStyle.fontUnderline = underline;
+  }
+
   if ('background' in style) {
     // 背景颜色
     var prevStyle = getTextStyle(element);

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

@@ -102,6 +102,11 @@ function getTextStyle(htSelection, styleNames) {
 
     var val = fieldValueList[0];
     var different = fieldValueList.filter(function (item) {
+      // 如果是颜色，特殊处理
+      if (item && val && item.rgb) {
+        return item.rgb.r + "," + item.rgb.g + "," + item.rgb.b + "," + item.rgb.a !== val.rgb.r + "," + val.rgb.g + "," + val.rgb.b + "," + val.rgb.a;
+      }
+
       return item !== val;
     });
 

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

@@ -23,8 +23,10 @@ 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; }
 
+function PropertyViewProvider(props) {}
+
 function PropertyPanel(props) {
-  var _classNames;
+  var _editorProps$property, _editorProps$property2, _classNames;
 
   var topo = props.topo,
       editorProps = props.editorProps;
@@ -36,21 +38,19 @@ function PropertyPanel(props) {
   var _store$useModelState = store.useModelState('selection'),
       selection = _store$useModelState.selection;
 
-  var _topo$store$useModel = topo.store.useModel('topoEdit'),
-      topoEditState = _topo$store$useModel[0],
-      topoEditDispatchers = _topo$store$useModel[1];
-
+  var topoEditState = topo.store.useModelState('topoEdit');
   var propertyPanelVisible = topoEditState.propertyPanelVisible;
   var propertyViewManager = (0, _react.useMemo)(function () {
     return new _PropertyViewManager["default"](topo);
-  }, []); // 临时适配连线属性面板类型，后期组件支持自定义适配
-
-  (0, _edgePropertyViewAdapter.addEdgePropertyViews)(propertyViewManager, editorProps);
+  }, []);
+  propertyViewManager.addViews((_editorProps$property = editorProps.propertyView) === null || _editorProps$property === void 0 ? void 0 : _editorProps$property.views);
 
-  propertyViewManager.customGetViewType = editorProps.getPropertyViewType || function (elements) {
+  propertyViewManager.customGetViewType = ((_editorProps$property2 = editorProps.propertyView) === null || _editorProps$property2 === void 0 ? void 0 : _editorProps$property2.getPropertyViewType) || function (elements) {
     return (0, _edgePropertyViewAdapter.adapterGetEdgePropertyViewType)(elements, editorProps);
-  };
+  }; // 临时适配连线属性面板类型，后期组件支持自定义适配
+
 
+  (0, _edgePropertyViewAdapter.addEdgePropertyViews)(propertyViewManager, editorProps);
   var PropertyView = propertyViewManager.getPropertyView();
   (0, _react.useEffect)(function () {
     if (graphLoaded) {

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

@@ -13,6 +13,8 @@ var _useSettingRuntimeState = _interopRequireDefault(require("./useSettingRuntim
 
 var _updateElementProperty = _interopRequireDefault(require("./core/updateElementProperty"));
 
+var _htElementUtils = require("../../../../utils/htElementUtils");
+
 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; }
@@ -46,10 +48,16 @@ function PropertyViewContainer(props) {
   var elementProps = {};
 
   if (selection.length === 1) {
+    var element = selectionElements[0];
     elementProps = {
-      selectionElement: selectionElements[0],
+      element: element,
+      selectionElement: element,
       values: singleElementValues
     };
+
+    if ((0, _htElementUtils.isEdge)(element)) {
+      elementProps.edge = element;
+    }
   }
 
   return /*#__PURE__*/_react["default"].createElement(PropertyView, (0, _extends2["default"])({

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

@@ -13,17 +13,18 @@ var _getPropertyViewType2 = _interopRequireDefault(require("./getPropertyViewTyp
 
 var PropertyViewManager = /*#__PURE__*/function () {
   function PropertyViewManager(topo) {
-    this.viewMap = _propertyViews["default"];
+    this.viewMap = (0, _extends2["default"])({}, _propertyViews["default"]);
     this.topo = void 0;
     this.customGetViewType = void 0;
     this.topo = topo;
+    this.topo.propertyViewManager = this;
     this.open = this.open.bind(this);
   }
 
   var _proto = PropertyViewManager.prototype;
 
-  _proto.updateViews = function updateViews(viewMap) {
-    this.viewMap = (0, _extends2["default"])({}, _propertyViews["default"], viewMap);
+  _proto.addViews = function addViews(viewMap) {
+    Object.assign(this.viewMap, viewMap);
   };
 
   _proto.init = function init() {

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

@@ -1,15 +1,11 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 exports.__esModule = true;
 exports.adapterGetEdgePropertyViewType = adapterGetEdgePropertyViewType;
 exports.addEdgePropertyViews = addEdgePropertyViews;
 
 var _htElementUtils = require("../../../../../utils/htElementUtils");
 
-var _addEdgeProps = _interopRequireDefault(require("../propertyViews/edge/addEdgeProps"));
-
 function adapterGetEdgePropertyViewType(selection, editorProps) {
   var fn = editorProps.getEdgePropertyViewType;
 
@@ -24,10 +20,5 @@ function adapterGetEdgePropertyViewType(selection, editorProps) {
 }
 
 function addEdgePropertyViews(propertyViewManager, editorProps) {
-  var oldMap = editorProps.edgePropertyViews || {};
-  var map = {};
-  Object.keys(oldMap).forEach(function (name) {
-    map[name] = (0, _addEdgeProps["default"])(oldMap[name]);
-  });
-  propertyViewManager.updateViews(map);
+  propertyViewManager.addViews(editorProps.edgePropertyViews || {});
 }

package/lib/core/editor/components/settings/propertyViews/node/data/Data.js

@@ -21,12 +21,12 @@ var _select = _interopRequireDefault(require("@alifd/next/lib/select"));
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _useHtElement = _interopRequireDefault(require("../../../../../../common/hooks/useHtElement"));
-
 var _textModule = _interopRequireDefault(require("../../../../../../common/text.module.scss"));
 
 var _NodeRelateResourceButton = _interopRequireDefault(require("./NodeRelateResourceButton"));
 
+var _PlatformDisplay = _interopRequireDefault(require("./PlatformDisplay"));
+
 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; }
@@ -164,12 +164,15 @@ function Data(props) {
     nodeElement: node,
     node: values,
     topo: topo,
-    topoEditApi: topoEditApi
+    topoEditApi: topoEditApi,
+    nodeBindResourceDrawerComponent: editorProps.nodeBindResourceDrawerComponent
   }))), bindType === "topo" && RelateTopoTree && /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
     label: "\u5173\u8054\u62D3\u6251"
   }, /*#__PURE__*/_react["default"].createElement(RelateTopoTree, {
     name: "attrObject.bindTopo",
     topo: topo,
     onChange: handleBindTopoChange
-  })))));
+  })), (editorProps === null || editorProps === void 0 ? void 0 : editorProps.topoType) === 'cmpTopo' && node.getTag() && /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
+    label: "\u6240\u5C5E\u5E73\u53F0"
+  }, /*#__PURE__*/_react["default"].createElement(_PlatformDisplay["default"], props)))));
 }

package/lib/core/editor/components/settings/propertyViews/node/data/NodeRelateResourceButton.js

@@ -28,7 +28,8 @@ function NodeRelateResourceButton(props) {
   var nodeElement = props.nodeElement,
       topo = props.topo,
       topoEditApi = props.topoEditApi,
-      node = props.node;
+      node = props.node,
+      nodeBindResourceDrawerComponent = props.nodeBindResourceDrawerComponent;
   var hide = (0, _clusterUtil.isClusterMemberHtElement)(nodeElement) || ((_node$attrObject$data = node.attrObject.data) === null || _node$attrObject$data === void 0 ? void 0 : _node$attrObject$data.relateResource) === false;
   var currentResId = node.tag;
 
@@ -36,6 +37,7 @@ function NodeRelateResourceButton(props) {
       visible = _useState[0],
       setVisible = _useState[1];
 
+  var BindResourceDrawer = nodeBindResourceDrawerComponent || _BindResourceDrawer["default"];
   return !hide ? /*#__PURE__*/_react["default"].createElement(_button["default"], {
     type: "primary",
     text: true,
@@ -43,7 +45,7 @@ function NodeRelateResourceButton(props) {
     onClick: function onClick() {
       setVisible(true);
     }
-  }, node.tag ? '切换资源' : '选择资源', /*#__PURE__*/_react["default"].createElement(_BindResourceDrawer["default"], (0, _extends2["default"])({
+  }, node.tag ? '切换资源' : '选择资源', /*#__PURE__*/_react["default"].createElement(BindResourceDrawer, (0, _extends2["default"])({
     visible: visible,
     currentResId: currentResId
   }, props, {

package/lib/core/editor/components/settings/propertyViews/node/data/PlatformDisplay.js

@@ -0,0 +1,18 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+function PlatformDisplay(props) {
+  var topo = props.topo,
+      node = props.node;
+  var data = topo.dataModel.useDataById(node.getTag());
+  return data.isSubResource ? data.attributes.platform : '本级平台';
+}
+
+var _default = PlatformDisplay;
+exports["default"] = _default;

package/lib/core/editor/hooks/useKeyboardShortcut.js

@@ -32,7 +32,7 @@ function useKeyboardShortcut(props) {
 
       }
 
-      if (e.keyCode === 32) {
+      if (e.keyCode === 32 && e.target.nodeName !== 'TEXTAREA') {
         // 空格
         var _topo$store$getModelS = topo.store.getModelState('topoEdit'),
             viewMouseMode = _topo$store$getModelS.viewMouseMode;

package/lib/core/hooks/usePolling.js

@@ -26,12 +26,7 @@ var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-ut
 var usePolling = function usePolling(props) {
   var topo = props.topo;
   var store = topo.store;
-  var topoState = store.useModelState('topoMod');
-
-  var _store$useModel = store.useModel('topoBizMod'),
-      bizState = _store$useModel[0],
-      bizDispatchers = _store$useModel[1];
-
+  var bizState = store.useModelState('topoBizMod');
   var resAndMetrics = bizState.resAndMetrics,
       pollingSwitch = bizState.pollingSwitch;
   var displayConfig = topo.store.useModelState('displayConfig');