@riil-frontend/component-topology 6.0.0-alpha.40 → 6.0.0-alpha.41

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

@@ -37,8 +37,7 @@ function BoxBackgroundButton(props) {
 
 
   var selection = topo.selectionManager.useSelection();
-  (0, _react.useEffect)(function () {
-    setDisabled(false);
+  (0, _react.useEffect)(function () {// setDisabled(false)
   }, [selection]);
   var icon = disabled ? /*#__PURE__*/_react["default"].createElement("img", {
     src: "/img/topo/editor/toolbar/\u80CC\u666F\u586B\u5145\u53CA\u8FB9\u6846/Disable.svg",
@@ -50,6 +49,7 @@ function BoxBackgroundButton(props) {
   return /*#__PURE__*/_react["default"].createElement(_WidgetBox["default"], {
     label: "\u6846\u80CC\u666F",
     tooltip: "\u6846\u80CC\u666F",
+    disabled: disabled,
     showLabel: showLabel
   }, /*#__PURE__*/_react["default"].createElement(_DropdownButton["default"], {
     disabled: disabled,

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

@@ -138,7 +138,8 @@ function EdgeColorButton(props) {
   return /*#__PURE__*/_react["default"].createElement(_WidgetBox["default"], {
     label: "\u7EBF\u6761\u989C\u8272",
     tooltip: "\u7EBF\u6761\u989C\u8272",
-    showLabel: showLabel
+    showLabel: showLabel,
+    disabled: disabled
   }, /*#__PURE__*/_react["default"].createElement(_DropdownButton["default"], {
     disabled: disabled,
     trigger: icon

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

@@ -24,7 +24,7 @@ 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; }
 
 /* eslint-disable jsx-a11y/alt-text */
-function FontFamilySelect(props) {
+function FontColorDropdown(props) {
   var onChange = props.onChange,
       topo = props.topo,
       color = props.color,
@@ -37,25 +37,19 @@ function FontFamilySelect(props) {
 
   var backOpacityChange = function backOpacityChange(value) {
     onChange({
-      color: color,
-      background: background,
       opacity: value / 100
     });
   };
 
   var colorChang = function colorChang(value) {
     onChange({
-      color: value.hex,
-      background: background,
-      opacity: opacity
+      color: value
     });
   };
 
   var backgroundChang = function backgroundChang(value) {
     onChange({
-      color: color,
-      background: value.hex,
-      opacity: opacity
+      background: value
     });
   };
 
@@ -103,17 +97,13 @@ function FontColorButton(props) {
     label: "\u6587\u5B57\u989C\u8272",
     tooltip: "\u6587\u5B57\u989C\u8272",
     showLabel: showLabel
-  }, /*#__PURE__*/_react["default"].createElement(FontFamilySelect, {
+  }, /*#__PURE__*/_react["default"].createElement(FontColorDropdown, {
     color: style.color,
     background: style.background,
     opacity: style.opacity,
     onChange: function onChange(val) {
       topo.historyManager.beginTransaction();
-      setStyle({
-        color: val.color,
-        background: val.background,
-        opacity: val.opacity
-      });
+      setStyle(val);
       topo.historyManager.endTransaction();
     },
     topo: topo

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

@@ -35,13 +35,11 @@ function parseColor(colorStr) {
 }
 
 function parseBackground(colorStr) {
-  var _background$rgb;
-
   var background = parseColor(colorStr);
   return {
     background: background,
     // 背景颜色，格式: {rgba: {}, hex: ''} | null
-    opacity: background === null || background === void 0 ? void 0 : (_background$rgb = background.rgb) === null || _background$rgb === void 0 ? void 0 : _background$rgb.a // 背景透明度。值范围 0-1, null，null表示无
+    opacity: background ? background.rgb.a : 1 // 背景透明度。值范围 0-1, null，null表示无
 
   };
 }
@@ -70,5 +68,5 @@ function formatBackgroundRgbaColor(prevColor, currentColor) {
   }
 
   var rgb = background.rgb;
-  return "rgba(" + rgb.r + ", " + rgb.g + ", " + rgb.b + ", " + opacity + ")";
+  return "rgba(" + rgb.r + ", " + rgb.g + ", " + rgb.b + ", " + (opacity === null ? 1 : opacity) + ")";
 }

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

@@ -1,25 +1,37 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 exports.__esModule = true;
 exports["default"] = void 0;
 exports.getTextStyle = getTextStyle;
 exports.setTextStyle = setTextStyle;
 
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
+var _fontStyleUtil = _interopRequireDefault(require("../../../../../../settings/common/text/fontStyleUtil"));
+
+var _colorUtil = require("../colorUtil");
+
 function getTextStyle(element) {
-  return {
-    color: null,
-    // 文字颜色
-    fontFamily: null,
-    fontSize: null // fontBold: false, // 文字样式加粗 @V1.2
-    // fontItalic: false, // 文字样式斜体 @V1.2
-    // fontUnderline: false, // 文字样式下划线 @V1.2
-    // background: {rgb: {}, hex: ''}, // 背景颜色，rgba格式。null表示无
-    // opacity: 1, // 背景透明度。值范围 0-1, null，null表示无
-
-  };
+  var underline = null;
+  return (0, _extends2["default"])({
+    color: (0, _colorUtil.parseColor)(element.a('link_ind_left_color')),
+    underline: underline
+  }, _fontStyleUtil["default"].toMap(element.a('link_ind_left_font')), (0, _colorUtil.parseBackground)(element.a('link_ind_background')));
 }
 
-function setTextStyle(element, style) {}
+function setTextStyle(element, style, topo) {
+  if ('background' in style || 'opacity' in style) {
+    // 背景颜色
+    var prevStyle = getTextStyle(element);
+    topo.getHtTopo().setEdgeLabelStyle(element, {
+      background: (0, _colorUtil.formatBackgroundRgbaColor)(prevStyle, style)
+    });
+  } else {
+    topo.getHtTopo().setEdgeLabelStyle(element, style);
+  }
+}
 
 var _default = {
   getTextStyle: getTextStyle,

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

@@ -23,6 +23,8 @@ function setLabelStyle(element, style) {
   element.a('labelStyle', (0, _extends2["default"])({}, element.a('labelStyle'), style)); // eslint-disable-next-line no-underscore-dangle
 
   element.__labelNode.a(style);
+
+  console.error(element.__labelNode.getAttrObject());
 } // 分层标题文字样式
 
 

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

@@ -7,12 +7,16 @@ exports["default"] = void 0;
 exports.getTextStyle = getTextStyle;
 exports.setTextStyle = setTextStyle;
 
+var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
+
 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"];
+
 function getTextStyle(element) {
   var underline = null;
   return (0, _extends2["default"])({
@@ -22,15 +26,23 @@ function getTextStyle(element) {
 }
 
 function setTextStyle(element, style, topo) {
+  var color = style.color,
+      background = style.background,
+      opacity = style.opacity,
+      otherStyle = (0, _objectWithoutPropertiesLoose2["default"])(style, _excluded);
+  var tagStyle = (0, _extends2["default"])({}, otherStyle);
+
+  if ('color' in style) {
+    tagStyle.color = color.hex;
+  }
+
   if ('background' in style || 'opacity' in style) {
     // 背景颜色
     var prevStyle = getTextStyle(element);
-    topo.getHtTopo().setNodeLabelStyle(element, {
-      background: (0, _colorUtil.formatBackgroundRgbaColor)(prevStyle, style)
-    });
-  } else {
-    topo.getHtTopo().setNodeLabelStyle(element, style);
+    tagStyle.background = (0, _colorUtil.formatBackgroundRgbaColor)(prevStyle, style);
   }
+
+  topo.getHtTopo().setNodeLabelStyle(element, tagStyle);
 }
 
 var _default = {

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

@@ -9,6 +9,8 @@ exports.useValues = useValues;
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
+var _colorUtil = require("../ElementTextStyleSetting/colorUtil");
+
 var defaultStyle = {
   color: '#AFB9C2',
   fontFamily: '微软雅黑'
@@ -18,13 +20,11 @@ function useValues(topo) {
   var displayConfigState = topo.store.useModelState('displayConfig');
   var nodeLabelStyle = displayConfigState.nodeLabelStyle,
       defaultEdgeLabelStyle = displayConfigState.defaultEdgeLabelStyle;
-  return {
+  return (0, _extends2["default"])({
     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,
-    background: nodeLabelStyle === null || nodeLabelStyle === void 0 ? void 0 : nodeLabelStyle.background,
-    opacity: nodeLabelStyle === null || nodeLabelStyle === void 0 ? void 0 : nodeLabelStyle.opacity
-  };
+    fontSize: nodeLabelStyle === null || nodeLabelStyle === void 0 ? void 0 : nodeLabelStyle.fontSize
+  }, (0, _colorUtil.parseBackground)(nodeLabelStyle === null || nodeLabelStyle === void 0 ? void 0 : nodeLabelStyle.background));
 }
 
 var setGlobalTagStyle = function setGlobalTagStyle(topo, styleData) {
@@ -34,9 +34,10 @@ var setGlobalTagStyle = function setGlobalTagStyle(topo, styleData) {
 
   var nodeLabelStyle = displayConfigState.nodeLabelStyle,
       defaultEdgeLabelStyle = displayConfigState.defaultEdgeLabelStyle;
-  var globalNodeLabelStyle = (0, _extends2["default"])({}, nodeLabelStyle, styleData);
+  var style = buildStyle(styleData, nodeLabelStyle);
+  var globalNodeLabelStyle = (0, _extends2["default"])({}, nodeLabelStyle, style);
   topo.getHtTopo().setGlobalNodeLabelStyle(globalNodeLabelStyle);
-  var globalEdgeTagStyle = (0, _extends2["default"])({}, defaultEdgeLabelStyle, styleData);
+  var globalEdgeTagStyle = globalNodeLabelStyle;
   topo.getHtTopo().setGlobalEdgeTagStyle(globalEdgeTagStyle);
   displayConfigDispatchers.update({
     nodeLabelStyle: globalNodeLabelStyle,
@@ -46,4 +47,19 @@ var setGlobalTagStyle = function setGlobalTagStyle(topo, styleData) {
 
 exports.setGlobalTagStyle = setGlobalTagStyle;
 
+function buildStyle(styleData, prevTagStyle) {
+  var style = {};
+
+  if ('color' in styleData) {
+    style.color = styleData.color.hex;
+  }
+
+  if ('background' in styleData || 'opacity' in styleData) {
+    var prevBackgroundStyle = (0, _colorUtil.parseBackground)(prevTagStyle === null || prevTagStyle === void 0 ? void 0 : prevTagStyle.background);
+    style.background = (0, _colorUtil.formatBackgroundRgbaColor)(prevBackgroundStyle, styleData);
+  }
+
+  return style;
+}
+
 function setStyle() {}

package/lib/core/hooks/useCanvasTheme.js

@@ -54,7 +54,19 @@ function useCanvasTheme(props) {
     var themeConfig = themeMap[canvasTheme];
 
     if (graphLoaded && themeConfig) {
-      topo.getHtTopo().setToolsTheme(themeConfig.toolsTheme);
+      var _topo$historyManager2;
+
+      try {
+        var _topo$historyManager;
+
+        (_topo$historyManager = topo.historyManager) === null || _topo$historyManager === void 0 ? void 0 : _topo$historyManager.setDisabled(true, '切换主题');
+        topo.getHtTopo().setToolsTheme(themeConfig.toolsTheme);
+        topo.getHtTopo().setTheme(canvasTheme);
+      } catch (error) {
+        console.error('切换主题失败', error);
+      }
+
+      (_topo$historyManager2 = topo.historyManager) === null || _topo$historyManager2 === void 0 ? void 0 : _topo$historyManager2.setDisabled(false, '切换主题');
     }
   }, [canvasTheme, graphLoaded]);
   return {

package/lib/core/models/HistoryManager.js

@@ -18,6 +18,7 @@ var HistoryManager = /*#__PURE__*/function () {
     this.storeHistory = [];
     this.topo = topo;
     this.htHistoryManager = htHistoryManager;
+    htHistoryManager.clear();
 
     _rlog["default"].info('HistoryManager 初始化', htHistoryManager);
 

package/lib/core/models/SelectionManager.js

@@ -11,6 +11,8 @@ var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-ut
 
 var _useHtElements = _interopRequireDefault(require("../common/hooks/useHtElements"));
 
+var _ignoreList = _interopRequireDefault(require("./selection/ignoreList"));
+
 var SelectionManager = /*#__PURE__*/function () {
   function SelectionManager(topo) {
     var _this = this;
@@ -21,11 +23,12 @@ var SelectionManager = /*#__PURE__*/function () {
     this.setSelection = function (selection) {
       var selectionDispatchers = _this.topo.store.getModelDispatchers('selection');
 
+      _this.selectionIds = selection.map(function (item) {
+        return item.id;
+      });
       selectionDispatchers.update({
         selection: selection,
-        selectionIds: selection.map(function (item) {
-          return item.id;
-        })
+        selectionIds: _this.selectionIds
       });
     };
 
@@ -92,19 +95,21 @@ var SelectionManager = /*#__PURE__*/function () {
     var property = e.property,
         data = e.data;
 
-    if (['position', 'childChange', 'a:scale'].indexOf(property) !== -1) {
+    if (!this.selectionIds.includes(data.getId())) {
       return;
     }
 
-    var selectionModel = this.topo.getSelectionModel();
-    var selectionIds = selectionModel.getSelection().getArray().map(function (item) {
-      return item.getId();
-    });
+    if (_ignoreList["default"].indexOf(property) !== -1) {
+      return;
+    }
 
-    if (selectionIds.indexOf(data.getId()) > -1) {
-      // console.info('PropertyChangeListener', e);
-      this.updateSelection();
+    if (!window.aa) {
+      window.aa = [];
     }
+
+    window.aa.push(e); // console.info('PropertyChangeListener', e);
+
+    this.updateSelection();
   };
 
   _proto.initListener = function initListener() {

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.40" === 'string' ? "6.0.0-alpha.40" : null;
+var version = typeof "6.0.0-alpha.41" === 'string' ? "6.0.0-alpha.41" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/lib/core/models/selection/ignoreList.js

@@ -0,0 +1,6 @@
+"use strict";
+
+exports.__esModule = true;
+exports["default"] = void 0;
+var _default = ['position', 'childChange', 'a:scale', 'icons', 'a:dataSource', 'a:dataTipSource', 'agentChange', 'a:runtimeStyles', 'a:linkArrow', '*', 'a:link_ind_left_arrow', 'a:link_ind_right_arrow', 'a:link_ind_area', 'a:middle_area', 'a:areaRect', 'a:outAreaRect', 'a:link_ind_area_right'];
+exports["default"] = _default;

package/lib/core/models/utils/linkUtils.js

@@ -204,7 +204,7 @@ function _getLinksDetail() {
 function buildTopoLinkData() {}
 
 var compatibleWith = function compatibleWith(value) {
-  console.log("compatibleWith", value);
+  // console.log("compatibleWith",value);
   var pluralType = value !== null && value !== void 0 ? value : 2;
 
   if (value === false) {
@@ -232,8 +232,8 @@ var showLinkByConfig = function showLinkByConfig(props) {
   var _plurals$compatibleWi;
 
   var topo = props.topo,
-      showType = props.showType;
-  console.log("showLinkByConfig-----------------------------", props, showType); //const displayConfig = topo.store.getModelState("displayConfig");
+      showType = props.showType; // console.log("showLinkByConfig-----------------------------", props, showType);
+  //const displayConfig = topo.store.getModelState("displayConfig");
 
   var types = (_plurals$compatibleWi = plurals[compatibleWith(showType)]) !== null && _plurals$compatibleWi !== void 0 ? _plurals$compatibleWi : []; // 查询所有连线
 
@@ -242,8 +242,7 @@ var showLinkByConfig = function showLinkByConfig(props) {
   var edges = (0, _htElementUtils.getEdges)(dm); // console.log("edges", edges);
 
   var showPhy = types.indexOf("phy") >= 0;
-  var showAgg = types.indexOf("agg") >= 0;
-  console.log("edges----types", showType, types, showPhy, showAgg);
+  var showAgg = types.indexOf("agg") >= 0; // console.log("edges----types",showType, types,showPhy, showAgg);
 
   if (Array.isArray(edges) && edges.length > 0) {
     edges.map(function (edge) {

package/lib/core/store/models/topoConfig.js

@@ -336,8 +336,7 @@ function _default(topoApp) {
               while (1) {
                 switch (_context4.prev = _context4.next) {
                   case 0:
-                    _rlog["default"].debug("getTopoByConditions--------", params);
-
+                    // rlog.debug("getTopoByConditions--------", params);
                     topoId = params.id, resources = params.resources, groups = params.groups, exportLinkIdList = params.exportLinkIdList;
                     viewConditions = (0, _topoData2.resToConditions)(resources);
                     groupInfo = (0, _utils.isAvailableArray)(groups) && groups.map(function (group) {
@@ -345,30 +344,22 @@ function _default(topoApp) {
                         layout: (0, _topoData2.getLayoutId)(group.layout),
                         resources: (0, _topoData2.resToConditions)(group.resources)
                       });
-                    });
+                    }); // rlog.debug("getTopoByConditions--------", viewConditions, groupInfo);
 
-                    _rlog["default"].debug("getTopoByConditions--------", viewConditions, groupInfo);
-
-                    _context4.next = 7;
+                    _context4.next = 5;
                     return _topo["default"].getTopoDataByResource(topoId, viewConditions, groupInfo, exportLinkIdList);
 
-                  case 7:
+                  case 5:
                     data = _context4.sent;
-
-                    _rlog["default"].debug("getTopoByConditions--------data", data);
-
-                    _context4.next = 11;
+                    _context4.next = 8;
                     return (0, _getTopoData.buildData)(data);
 
-                  case 11:
+                  case 8:
                     data = _context4.sent;
-
-                    _rlog["default"].debug("getTopoByConditions--------", data, groupInfo);
-
-                    _context4.next = 15;
+                    _context4.next = 11;
                     return Promise.all([topoApp.ciTyeCache.getCiTypeMap((0, _topoData.getCiTypes)(data)), dispatch.customIcon.loadCustomIcons()]);
 
-                  case 15:
+                  case 11:
                     _yield$Promise$all = _context4.sent;
                     ciTypeMap = _yield$Promise$all[0];
                     _combTopoData = (0, _topoData.combTopoData)({
@@ -396,7 +387,7 @@ function _default(topoApp) {
                       topoDataTrans: topoDataTrans
                     });
 
-                  case 23:
+                  case 19:
                   case "end":
                     return _context4.stop();
                 }

package/lib/core/utils/edgeUtil.js

@@ -15,6 +15,8 @@ var _linkUtils = require("../models/utils/linkUtils");
  * @param {*} topo
  */
 var updateEdgeExpanded = function updateEdgeExpanded(topo) {
+  var _topo$historyManager, _topo$historyManager2;
+
   var _topo$store$getModelS = topo.store.getModelState("topoMod"),
       viewState = _topo$store$getModelS.viewState;
 
@@ -29,6 +31,8 @@ var updateEdgeExpanded = function updateEdgeExpanded(topo) {
       expandAllEdges = _topo$store$getModelS2.expandAllEdges; // console.log("expandAllEdges----------", expandAllEdges);
 
 
+  (_topo$historyManager = topo.historyManager) === null || _topo$historyManager === void 0 ? void 0 : _topo$historyManager.setDisabled(true, '连线展开控制');
+
   if (expandAllEdges === 1) {
     (0, _linkUtils.showLinkByConfig)({
       topo: topo,
@@ -47,6 +51,8 @@ var updateEdgeExpanded = function updateEdgeExpanded(topo) {
     _rlog["default"].debug("updateEdgeExpanded 展开-isEditMode", isEditMode);
   }
 
+  (_topo$historyManager2 = topo.historyManager) === null || _topo$historyManager2 === void 0 ? void 0 : _topo$historyManager2.setDisabled(false, '连线展开控制');
+
   if (topo.linkDynamicStyleExecutor) {
     topo.linkDynamicStyleExecutor.execute();
   }

package/package.json

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