@riil-frontend/component-topology 6.0.0-alpha.8 → 6.0.1

package/es/core/editor/components/settings/propertyViews/node/NodePropertyViewV1.js

@@ -0,0 +1,53 @@
+import _Tab from "@alifd/next/es/tab";
+import _extends from "@babel/runtime/helpers/extends";
+import React from 'react';
+import useHtElement from "../../../../../common/hooks/useHtElement";
+import TabView from "../../common/tab/TabView";
+import Data from "./data/Data";
+import styles from "./NodePropertyView.module.scss";
+import Setting from "./Setting";
+export default function NodePropertyView(props) {
+  var _topo$options$editor;
+
+  var topo = props.topo,
+      topoEditApi = props.topoEditApi,
+      values = props.values,
+      onChange = props.onChange,
+      editorProps = props.editorProps,
+      settingRuntimeState = props.settingRuntimeState;
+  var node = useHtElement({
+    topo: topo,
+    id: values.id
+  });
+
+  var renderData = function renderData() {
+    return /*#__PURE__*/React.createElement(Data, _extends({}, props, {
+      node: node
+    }));
+  };
+
+  var renderSetting = function renderSetting() {
+    var nodeSettingViewProps = editorProps.nodeSettingViewProps;
+    return /*#__PURE__*/React.createElement(Setting, _extends({}, props, nodeSettingViewProps));
+  }; // 未绑定资源的节点，根据参数控制是否可关联资源
+
+
+  var showRelateResource = !!values.tag || !values.tag && ((_topo$options$editor = topo.options.editor) === null || _topo$options$editor === void 0 ? void 0 : _topo$options$editor.enableRelateResource) !== false;
+  var content;
+
+  if (showRelateResource) {
+    content = /*#__PURE__*/React.createElement(TabView, null, /*#__PURE__*/React.createElement(_Tab.Item, {
+      title: "\u6570\u636E",
+      key: "1"
+    }, renderData()), /*#__PURE__*/React.createElement(_Tab.Item, {
+      title: "\u8BBE\u7F6E",
+      key: "2"
+    }, renderSetting()));
+  } else {
+    content = renderSetting();
+  }
+
+  return /*#__PURE__*/React.createElement("div", {
+    className: styles.NodePropertyView
+  }, content);
+}

package/es/core/editor/components/settings/propertyViews/node/Setting/BasicSetting.js

@@ -0,0 +1,49 @@
+import _Form from "@alifd/next/es/form";
+import _Field from "@alifd/next/es/field";
+import _extends from "@babel/runtime/helpers/extends";
+import React, { useEffect } from 'react';
+import NameInput from "./NameInput";
+
+function parseValues(values) {
+  return _extends({}, values, {
+    'attrObject.customName': values['attrObject.customName'] || values['attrObject.name'],
+    'attrObject.bindTopo': values['attrObject.bindTopo'] || '' // 解决切换节点时关联拓扑选项未重置
+
+  });
+}
+
+export default function BasicSetting(props) {
+  var topo = props.topo,
+      values = props.values,
+      _onChange = props.onChange,
+      editorProps = props.editorProps,
+      settingRuntimeState = props.settingRuntimeState,
+      _props$showImageSetti = props.showImageSetting,
+      showImageSetting = _props$showImageSetti === void 0 ? true : _props$showImageSetti;
+
+  var field = _Field.useField({
+    autoUnmount: false,
+    values: parseValues(values),
+    onChange: function onChange(name, value) {
+      var newValues = field.getValues();
+
+      _onChange(name, value, newValues);
+    }
+  });
+
+  useEffect(function () {
+    field.setValues(parseValues(values));
+  }, [values]);
+  return /*#__PURE__*/React.createElement(_Form, {
+    field: field,
+    labelAlign: "top",
+    style: {
+      margin: '12px 16px 0 32px'
+    }
+  }, /*#__PURE__*/React.createElement(_Form.Item, {
+    label: "\u56FE\u7247\u540D\u79F0"
+  }, /*#__PURE__*/React.createElement(NameInput, {
+    name: "attrObject.customName",
+    topo: topo
+  })));
+}

package/es/core/editor/components/settings/propertyViews/node/Setting/NameInput.js

@@ -1,7 +1,7 @@
-import _Input from "@alifd/next/es/input";
 import _extends from "@babel/runtime/helpers/extends";
 import React, { useEffect, useState } from 'react';
-var NameInput = /*#__PURE__*/React.forwardRef(function (props, ref) {
+import NameInput from "../../../common/NameInput";
+var NodeNameInput = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var onChange = props.onChange,
       topo = props.topo;
 
@@ -33,12 +33,13 @@ var NameInput = /*#__PURE__*/React.forwardRef(function (props, ref) {
     topo.historyManager.endTransaction();
   };
 
-  return /*#__PURE__*/React.createElement(_Input, _extends({}, props, {
+  return /*#__PURE__*/React.createElement(NameInput, _extends({}, props, {
     ref: ref,
     value: value,
+    multipleLine: true,
     onChange: handleChange,
     onFocus: handleFocus,
     onBlur: handleBlur
   }));
 });
-export default NameInput;
+export default NodeNameInput;

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

@@ -134,7 +134,8 @@ export default function Data(props) {
     style: {
       flex: 1,
       paddingRight: 16,
-      color: "#4D6277"
+      color: "#4D6277",
+      lineHeight: '20px'
     },
     title: values.tag ? values.name : null
   }, values.tag ? values.name : "—"), /*#__PURE__*/React.createElement(NodeRelateResourceButton, {

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

@@ -24,6 +24,7 @@ export default function NodeRelateResourceButton(props) {
   return !hide ? /*#__PURE__*/React.createElement(_Button, {
     type: "primary",
     text: true,
+    size: "small",
     onClick: function onClick() {
       setVisible(true);
     }

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

@@ -37,7 +37,7 @@ export default function TextPropertyView(props) {
 
         _onChange('styleMap.label.color', value.color, newValues);
 
-        var font = fontStyleUtil.build(value);
+        var font = fontStyleUtil.build(value.font);
 
         _onChange('styleMap.text.font', font, newValues);
 
@@ -59,23 +59,11 @@ export default function TextPropertyView(props) {
   useEffect(function () {
     field.setValues(parseValues(values));
   }, [values]);
-  return /*#__PURE__*/React.createElement("div", {
-    style: {
-      paddingTop: 4
-    }
-  }, /*#__PURE__*/React.createElement(_Form, {
+  return /*#__PURE__*/React.createElement(_Form, {
     field: field,
-    labelAlign: "top"
-  }, /*#__PURE__*/React.createElement(_Form.Item, null, /*#__PURE__*/React.createElement(_Collapse, {
-    defaultExpandedKeys: ['显示设置'],
-    style: {
-      border: 'none'
-    }
-  }, /*#__PURE__*/React.createElement(CollapsePanel, {
-    key: "\u663E\u793A\u8BBE\u7F6E",
-    title: "\u663E\u793A\u8BBE\u7F6E",
+    labelAlign: "top",
     style: {
-      padding: 0
+      margin: '12px 16px 0 32px'
     }
   }, /*#__PURE__*/React.createElement(_Form.Item, {
     label: "\u6587\u672C"
@@ -92,8 +80,5 @@ export default function TextPropertyView(props) {
     onBlur: function onBlur() {
       topo.historyManager.endTransaction();
     }
-  })), /*#__PURE__*/React.createElement(_Form.Item, null, /*#__PURE__*/React.createElement(TextStyle, {
-    name: "styleMap.textObj",
-    topo: topo
-  })))))));
+  })));
 }

package/es/core/editor/components/settings/propertyViews/view/BatchSetNodeSize.js

@@ -1,10 +1,13 @@
 import _extends from "@babel/runtime/helpers/extends";
-import React, { useState, useEffect, useRef, useCallback } from 'react';
-import SizeInput from "../../common/SizeInput";
+import React, { useState, useEffect, useRef, useCallback } from "react";
+import SizeInput from "../../common/SizeInput"; // 这个似乎不需要了
+
 export default function BatchSetNodeSize(props) {
-  var size = props.size;
+  var value = props.value,
+      size = props.size,
+      disabled = props.disabled;
   return /*#__PURE__*/React.createElement(SizeInput, _extends({}, props, {
-    value: {}
+    disabled: disabled,
+    value: value
   }));
-}
-;
+}

package/es/core/editor/components/titlebar/TopoEditorTitleBar.js

@@ -1,15 +1,15 @@
 import _Box from "@alifd/next/es/box";
+import _extends from "@babel/runtime/helpers/extends";
 import _Dialog from "@alifd/next/es/dialog";
 import _Button from "@alifd/next/es/button";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-import React from 'react';
+import React, { useState, useEffect } from 'react';
 import classnames from 'classnames';
 import TitleWidget from "../../../components/titlebar/widgets/TitleWidget";
 import styles from "../../../components/titlebar/TitleBar.module.scss";
-import { useState } from 'react';
-import { useEffect } from 'react';
 import DebugTools from "./widgets/DebugTools";
+import SettingButtonWidget from "../../../viewer/components/titlebar/widgets/SettingButtonWidget";
 export default function TopoEditorTitleBar(props) {
   var topo = props.topo,
       topoEditApi = props.topoEditApi;
@@ -132,5 +132,9 @@ export default function TopoEditorTitleBar(props) {
         }
       });
     }
-  }, "\u9000\u51FA"))));
+  }, "\u9000\u51FA"), /*#__PURE__*/React.createElement(SettingButtonWidget, _extends({
+    isEditor: true
+  }, props, {
+    viewerProps: topo.viewProps.viewerProps
+  })))));
 }

package/es/core/editor/config/themes.js

@@ -0,0 +1,105 @@
+import _extends from "@babel/runtime/helpers/extends";
+var baseLightTheme = {
+  color: '#FFFFFF',
+  globalNodeLabelColor: '#4d6277',
+  globalNodeLabelStyle: {
+    color: '#4d6277'
+  },
+  globalEdgeTagStyle: {
+    color: '#777B9A',
+    background: '#FFFFFF',
+    // 背景色，不传使用默认内置 @V1.2
+    borderColor: '#CBCBCB' // 边框颜色，不传使用默认内置。用于主题切换 @V1.2
+
+  },
+  text: {
+    color: '#4d6277'
+  },
+  group: {
+    style: {
+      'group.title.background': '#E4E9EE',
+      // 标题背景颜色
+      'group.title.color': '#4D6277',
+      // 标题文字颜色
+      'group.background': 'rgba(255, 255, 255, 0.9)',
+      'group.border.color': '#E4E9EE' // 边框颜色
+
+    }
+  },
+  cluster: {
+    style: {
+      'group.title.color': '#4D6277',
+      // 标题文字颜色
+      'group.title.background': 'rgba(229,245,253,0.6)',
+      // 标题背景颜色
+      'group.background': 'rgba(229,245,253,0.6)',
+      'group.border.color': '#C7E4F3',
+      // 边框颜色
+      'group.border.radius': 3
+    }
+  }
+};
+var THEMES = [_extends({}, baseLightTheme, {
+  name: 'white',
+  label: '白色',
+  color: '#FFFFFF',
+  toolsTheme: 'lightgrayblue'
+}), _extends({}, baseLightTheme, {
+  name: 'lightblue',
+  label: '蓝色',
+  color: '#F9FBFF',
+  toolsTheme: 'white'
+}), // {
+//   name: 'yellow',
+//   label: '黄色',
+//   color: '#FFFDE6',
+// },
+// {
+//   name: 'green',
+//   label: '绿色',
+//   color: '#EAFFE8',
+// },
+{
+  name: 'dark',
+  label: '深色',
+  color: '#031425',
+  toolsTheme: 'black',
+  globalNodeLabelStyle: {
+    color: '#ffffff'
+  },
+  globalEdgeTagStyle: {
+    color: '#E4E9EE',
+    background: '#063658',
+    // 背景色，不传使用默认内置 @V1.2
+    borderColor: '#08A5F4' // 边框颜色，不传使用默认内置。用于主题切换 @V1.2
+
+  },
+  text: {
+    color: '#ffffff'
+  },
+  group: {
+    style: {
+      'group.title.background': 'rgba(8,165,244,1)',
+      // 标题背景颜色 #08A5F4
+      'group.title.color': '#FFFFFF',
+      // 标题文字颜色
+      'group.background': 'rgba(29,55,113,0.6)',
+      'group.border.color': 'rgba(8,165,244,0.8)' // 边框颜色
+
+    }
+  },
+  cluster: {
+    style: {
+      'group.title.color': '#FFFFFF',
+      // 标题文字颜色
+      'group.title.background': 'rgba(14,44,69,1)',
+      // 标题背景颜色 #0E2C45
+      'group.background': 'rgba(14,44,69,1)',
+      // #0E2C45
+      'group.border.color': '#08A5F4',
+      // 边框颜色
+      'group.border.radius': 3
+    }
+  }
+}];
+export default THEMES;

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

@@ -0,0 +1,39 @@
+import React, { useEffect } from 'react';
+var ht = window.ht; // 快捷键
+
+export default function useKeyboardShortcut(props) {
+  var topo = props.topo,
+      topoEdit = props.topoEdit;
+  useEffect(function () {
+    var handleKeyDown = function handleKeyDown(e) {
+      if (e.target.tagName === 'INPUT') {
+        return;
+      }
+
+      var isCtrlDown = ht.Default.isCtrlDown;
+
+      if (isCtrlDown(e)) {
+        if (e.keyCode === 90) {
+          // ctrl+z 撤销
+          topo.historyManager.undo();
+        } //  else if (e.keyCode == 89) {//ctrl+y 重做
+        //   this.redo();
+        // }
+
+      }
+
+      if (e.keyCode === 32) {
+        // 空格
+        var _topo$store$getModelS = topo.store.getModelState('topoEdit'),
+            viewMouseMode = _topo$store$getModelS.viewMouseMode;
+
+        topoEdit.setViewMouseMode(viewMouseMode === 'select' ? 'move' : 'select');
+      }
+    };
+
+    window.addEventListener('keydown', handleKeyDown);
+    return function () {
+      window.removeEventListener('keydown', handleKeyDown);
+    };
+  }, []);
+}

package/es/core/editor/hooks/useNewElementTheme.js

@@ -0,0 +1,46 @@
+import { useEffect } from 'react';
+import THEMES from "../config/themes";
+import ThemeUtil from "../utils/themeUtil";
+
+function useNewElementTheme(props) {
+  var topo = props.topo;
+  var topoModState = topo.store.useModelState('topoMod');
+  var graphLoaded2 = topoModState.graphLoaded2;
+  useEffect(function () {
+    var dm = topo.getHtTopo().getGraphView().dm();
+    var inited = false;
+
+    if (graphLoaded2) {
+      dm.addDataModelChangeListener(handleDataModelChangeListener);
+      inited = true;
+    }
+
+    function handleDataModelChangeListener(e) {
+      var kind = e.kind,
+          data = e.data;
+
+      if (kind === 'add') {
+        var displayConfig = topo.store.getModelState('displayConfig');
+        var theme = displayConfig.canvasTheme || 'white';
+        var themeConfig = THEMES.find(function (item) {
+          return item.name === theme;
+        });
+
+        var _ThemeUtil = ThemeUtil({
+          topo: topo
+        }),
+            setElementTheme = _ThemeUtil.setElementTheme;
+
+        setElementTheme(data, themeConfig);
+      }
+    }
+
+    return function () {
+      if (inited && dm) {
+        dm.removeDataModelChangeListener(handleDataModelChangeListener);
+      }
+    };
+  }, [graphLoaded2]);
+}
+
+export default useNewElementTheme;

package/es/core/editor/store/topoEdit.js

@@ -6,41 +6,48 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
  * 拓扑编辑 Model
  */
 import rlog from '@riil-frontend/component-topology-utils/es/rlog';
-import topoService from '@riil-frontend/component-topology-common/es/services/topo';
-export default {
-  // 定义 model 的初始 state
-  state: {
-    // 是否就绪
-    ready: false,
-    // 保存状态
-    saving: false,
-    // 选择/拖动模式模式。默认选择模式 select|move
-    viewMouseMode: 'select',
-    // 资源面板展开项
-    resourceTabactiveKey: null
-  },
-  // 定义改变该模型状态的纯函数
-  reducers: {
-    update: function update(prevState, payload) {
-      return _extends({}, prevState, payload);
-    }
-  },
-  // 定义处理该模型副作用的函数
-  effects: function effects(dispatch) {
-    return {
-      init: function init(payload, rootState) {
-        return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-          return _regeneratorRuntime.wrap(function _callee$(_context) {
-            while (1) {
-              switch (_context.prev = _context.next) {
-                case 0:
-                case "end":
-                  return _context.stop();
-              }
-            }
-          }, _callee);
-        }))();
+var initState = {
+  // 是否就绪
+  ready: false,
+  // 保存状态
+  saving: false,
+  // 选择/拖动模式模式。默认选择模式 select|move
+  viewMouseMode: 'select',
+  // 资源面板展开项
+  resourceTabActiveKey: null,
+  // 属性面板是否显示
+  propertyPanelVisible: false
+};
+export default function (topo) {
+  return {
+    // 定义 model 的初始 state
+    state: initState,
+    // 定义改变该模型状态的纯函数
+    reducers: {
+      update: function update(prevState, payload) {
+        return _extends({}, prevState, payload);
+      },
+      reset: function reset(prevState, payload) {
+        return _extends({}, initState);
       }
-    };
-  }
-};
+    },
+    // 定义处理该模型副作用的函数
+    effects: function effects(dispatch) {
+      return {
+        init: function init(payload, rootState) {
+          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+            return _regeneratorRuntime.wrap(function _callee$(_context) {
+              while (1) {
+                switch (_context.prev = _context.next) {
+                  case 0:
+                  case "end":
+                    return _context.stop();
+                }
+              }
+            }, _callee);
+          }))();
+        }
+      };
+    }
+  };
+}

package/es/core/editor/utils/edgeTypeStyleUtil.js

@@ -44,30 +44,53 @@ export function getEdgesBySelection(topo) {
   return getSelectedEdges(topo);
 }
 /**
- * 批量设置连线线形
- * 
- * @param {*} edges 
- * @param {*} type 
+ * 遍历连线及子连线
  * @param {*} topo 
+ * @param {*} edges 
+ * @param {*} operateEdgeFn 
  */
 
-export function setEdgesType(edges, type, topo) {
+export function loopEdgesAndChildren(topo, edges, operateEdgeFn) {
   var htTopo = topo.getHtTopo();
   edges.forEach(function (edge) {
-    htTopo.setGraphLinear(edge, {
-      type: type
-    });
+    operateEdgeFn(edge);
 
     if (edge.isEdgeGroupAgent()) {
       // 连线组折叠时同时设置子连线
       var edgeChildren = edge.getEdgeGroup().getEdges().toArray();
       htTopo.toggleEdgeGroup(edge.getSource(), edge.getTarget(), true);
       edgeChildren.forEach(function (edgeChild) {
-        htTopo.setGraphLinear(edgeChild, {
-          type: type
-        });
+        operateEdgeFn(edgeChild);
       });
       htTopo.toggleEdgeGroup(edge.getSource(), edge.getTarget(), false);
     }
   });
+}
+/**
+ * 设置连线及子连线。带回退事务控制
+ * @param {*} topo 
+ * @param {*} edges 
+ * @param {*} operateEdgeFn 
+ */
+
+export function setEdgesAndChildren(topo, edges, operateEdgeFn) {
+  topo.historyManager.beginTransaction();
+  loopEdgesAndChildren(topo, edges, operateEdgeFn);
+  topo.historyManager.endTransaction();
+}
+/**
+ * 批量设置连线线形
+ * 
+ * @param {*} edges 
+ * @param {*} type 
+ * @param {*} topo 
+ */
+
+export function setEdgesType(edges, type, topo) {
+  var htTopo = topo.getHtTopo();
+  setEdgesAndChildren(topo, edges, function (edge) {
+    htTopo.setGraphLinear(edge, {
+      type: type
+    });
+  });
 }

package/es/core/editor/utils/themeUtil.js

@@ -0,0 +1,32 @@
+import { isClusterHtElement } from "../../../utils/clusterUtil";
+import { getElements, isEdge, isGroup, isText } from "../../../utils/htElementUtils";
+export default function ThemeUtil(props) {
+  var topo = props.topo;
+
+  function setElementsTheme(themeConfig) {
+    var dm = topo.getHtTopo().getGraphView().dm();
+    var elements = getElements(dm);
+    elements.forEach(function (element) {
+      setElementTheme(element, themeConfig);
+    });
+  }
+
+  function setElementTheme(element, themeConfig) {
+    if (isText(element)) {
+      element.s('text.color', themeConfig.text.color);
+    } else if (isGroup(element)) {
+      if (isClusterHtElement(element)) {
+        // 集群
+        element.s(themeConfig.cluster.style);
+      } else {
+        // 区域（非集群）
+        element.s(themeConfig.group.style);
+      }
+    } else if (isEdge(element)) {}
+  }
+
+  return {
+    setElementsTheme: setElementsTheme,
+    setElementTheme: setElementTheme
+  };
+}

package/es/core/hooks/useCanvasTheme.js

@@ -0,0 +1,54 @@
+import _extends from "@babel/runtime/helpers/extends";
+import React, { useEffect } from 'react';
+var themeMap = [{
+  name: 'white',
+  label: '白色',
+  color: null,
+  toolsTheme: 'lightgrayblue'
+}, {
+  name: 'lightblue',
+  label: '蓝色',
+  color: '#F9FBFF',
+  toolsTheme: 'white'
+}, {
+  name: 'yellow',
+  label: '黄色',
+  color: '#FFFDE6'
+}, {
+  name: 'green',
+  label: '绿色',
+  color: '#EAFFE8'
+}, {
+  name: 'dark',
+  label: '深色',
+  color: '#031425',
+  toolsTheme: 'black'
+}].reduce(function (map, item) {
+  var _extends2;
+
+  return _extends({}, map, (_extends2 = {}, _extends2[item.name] = item, _extends2));
+}, {});
+export default function useCanvasTheme(props) {
+  var topo = props.topo,
+      themeName = props.themeName; // 拓扑图是否加载
+
+  var _topo$store$useModelS = topo.store.useModelState('topoMod'),
+      graphLoaded = _topo$store$useModelS.graphLoaded;
+
+  useEffect(function () {
+    // 设置
+    var themeConfig = themeMap[themeName || 'white'];
+
+    if (graphLoaded && themeConfig) {
+      try {
+        topo.getHtTopo().setTheme(themeName);
+        topo.getHtTopo().setToolsTheme(themeName);
+      } catch (error) {
+        console.error('切换主题失败', error);
+      }
+    }
+  }, [themeName, graphLoaded]);
+  return {
+    canvasColor: themeMap[themeName].color
+  };
+}