@riil-frontend/component-topology 7.0.0-dev.14 → 7.0.0-dev.16

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -5,8 +5,11 @@ import { adapterGetEdgePropertyViewType, addEdgePropertyViews } from "./core/edg
5
5
  import PropertyViewManager from "./core/PropertyViewManager";
6
6
  import Settings from "./Settings";
7
7
  import styles from "./Settings.module.scss";
8
+
9
+ function PropertyViewProvider(props) {}
10
+
8
11
  export default function PropertyPanel(props) {
9
- var _classNames;
12
+ var _editorProps$property, _editorProps$property2, _classNames;
10
13
 
11
14
  var topo = props.topo,
12
15
  editorProps = props.editorProps;
@@ -18,21 +21,19 @@ export default function PropertyPanel(props) {
18
21
  var _store$useModelState = store.useModelState('selection'),
19
22
  selection = _store$useModelState.selection;
20
23
 
21
- var _topo$store$useModel = topo.store.useModel('topoEdit'),
22
- topoEditState = _topo$store$useModel[0],
23
- topoEditDispatchers = _topo$store$useModel[1];
24
-
24
+ var topoEditState = topo.store.useModelState('topoEdit');
25
25
  var propertyPanelVisible = topoEditState.propertyPanelVisible;
26
26
  var propertyViewManager = useMemo(function () {
27
27
  return new PropertyViewManager(topo);
28
- }, []); // 临时适配连线属性面板类型,后期组件支持自定义适配
29
-
30
- addEdgePropertyViews(propertyViewManager, editorProps);
28
+ }, []);
29
+ propertyViewManager.addViews((_editorProps$property = editorProps.propertyView) === null || _editorProps$property === void 0 ? void 0 : _editorProps$property.views);
31
30
 
32
- propertyViewManager.customGetViewType = editorProps.getPropertyViewType || function (elements) {
31
+ propertyViewManager.customGetViewType = ((_editorProps$property2 = editorProps.propertyView) === null || _editorProps$property2 === void 0 ? void 0 : _editorProps$property2.getPropertyViewType) || function (elements) {
33
32
  return adapterGetEdgePropertyViewType(elements, editorProps);
34
- };
33
+ }; // 临时适配连线属性面板类型,后期组件支持自定义适配
35
34
 
35
+
36
+ addEdgePropertyViews(propertyViewManager, editorProps);
36
37
  var PropertyView = propertyViewManager.getPropertyView();
37
38
  useEffect(function () {
38
39
  if (graphLoaded) {
@@ -2,6 +2,7 @@ import _extends from "@babel/runtime/helpers/extends";
2
2
  import React, { useEffect, useMemo, useState } from 'react';
3
3
  import useSettingRuntimeState from "./useSettingRuntimeState";
4
4
  import updateElementProperty from "./core/updateElementProperty";
5
+ import { isEdge } from "../../../../utils/htElementUtils";
5
6
 
6
7
  function buildElementValues(selection) {
7
8
  var values = _extends({}, selection[0]);
@@ -33,10 +34,16 @@ export default function PropertyViewContainer(props) {
33
34
  var elementProps = {};
34
35
 
35
36
  if (selection.length === 1) {
37
+ var element = selectionElements[0];
36
38
  elementProps = {
37
- selectionElement: selectionElements[0],
39
+ element: element,
40
+ selectionElement: element,
38
41
  values: singleElementValues
39
42
  };
43
+
44
+ if (isEdge(element)) {
45
+ elementProps.edge = element;
46
+ }
40
47
  }
41
48
 
42
49
  return /*#__PURE__*/React.createElement(PropertyView, _extends({
@@ -4,17 +4,18 @@ import _getPropertyViewType from "./getPropertyViewType";
4
4
 
5
5
  var PropertyViewManager = /*#__PURE__*/function () {
6
6
  function PropertyViewManager(topo) {
7
- this.viewMap = propertyViews;
7
+ this.viewMap = _extends({}, propertyViews);
8
8
  this.topo = void 0;
9
9
  this.customGetViewType = void 0;
10
10
  this.topo = topo;
11
+ this.topo.propertyViewManager = this;
11
12
  this.open = this.open.bind(this);
12
13
  }
13
14
 
14
15
  var _proto = PropertyViewManager.prototype;
15
16
 
16
- _proto.updateViews = function updateViews(viewMap) {
17
- this.viewMap = _extends({}, propertyViews, viewMap);
17
+ _proto.addViews = function addViews(viewMap) {
18
+ Object.assign(this.viewMap, viewMap);
18
19
  };
19
20
 
20
21
  _proto.init = function init() {
@@ -1,5 +1,4 @@
1
1
  import { isEdge } from "../../../../../utils/htElementUtils";
2
- import addEdgeProps from "../propertyViews/edge/addEdgeProps";
3
2
  export function adapterGetEdgePropertyViewType(selection, editorProps) {
4
3
  var fn = editorProps.getEdgePropertyViewType;
5
4
 
@@ -13,10 +12,5 @@ export function adapterGetEdgePropertyViewType(selection, editorProps) {
13
12
  return null;
14
13
  }
15
14
  export function addEdgePropertyViews(propertyViewManager, editorProps) {
16
- var oldMap = editorProps.edgePropertyViews || {};
17
- var map = {};
18
- Object.keys(oldMap).forEach(function (name) {
19
- map[name] = addEdgeProps(oldMap[name]);
20
- });
21
- propertyViewManager.updateViews(map);
15
+ propertyViewManager.addViews(editorProps.edgePropertyViews || {});
22
16
  }
@@ -23,7 +23,7 @@ import topoFactory from "./topoFactory";
23
23
  import ElementTagTipConfig from "./tagstips/ElementTagTipConfig";
24
24
  import SelectionModel from "./SelectionModel"; // eslint-disable-next-line no-undef
25
25
 
26
- var version = typeof "7.0.0-dev.14" === 'string' ? "7.0.0-dev.14" : null;
26
+ var version = typeof "7.0.0-dev.16" === 'string' ? "7.0.0-dev.16" : null;
27
27
  console.info("\u62D3\u6251\u7248\u672C: " + version);
28
28
  /**
29
29
  * 拓扑显示和编辑
package/es/utils/tree.js CHANGED
@@ -33,6 +33,7 @@ export function formatTree(json, funcPermissions) {
33
33
  }
34
34
 
35
35
  return {
36
+ data: node,
36
37
  id: "" + id,
37
38
  label: name,
38
39
  parentId: parentId,
@@ -23,8 +23,10 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
23
23
 
24
24
  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; }
25
25
 
26
+ function PropertyViewProvider(props) {}
27
+
26
28
  function PropertyPanel(props) {
27
- var _classNames;
29
+ var _editorProps$property, _editorProps$property2, _classNames;
28
30
 
29
31
  var topo = props.topo,
30
32
  editorProps = props.editorProps;
@@ -36,21 +38,19 @@ function PropertyPanel(props) {
36
38
  var _store$useModelState = store.useModelState('selection'),
37
39
  selection = _store$useModelState.selection;
38
40
 
39
- var _topo$store$useModel = topo.store.useModel('topoEdit'),
40
- topoEditState = _topo$store$useModel[0],
41
- topoEditDispatchers = _topo$store$useModel[1];
42
-
41
+ var topoEditState = topo.store.useModelState('topoEdit');
43
42
  var propertyPanelVisible = topoEditState.propertyPanelVisible;
44
43
  var propertyViewManager = (0, _react.useMemo)(function () {
45
44
  return new _PropertyViewManager["default"](topo);
46
- }, []); // 临时适配连线属性面板类型,后期组件支持自定义适配
47
-
48
- (0, _edgePropertyViewAdapter.addEdgePropertyViews)(propertyViewManager, editorProps);
45
+ }, []);
46
+ propertyViewManager.addViews((_editorProps$property = editorProps.propertyView) === null || _editorProps$property === void 0 ? void 0 : _editorProps$property.views);
49
47
 
50
- propertyViewManager.customGetViewType = editorProps.getPropertyViewType || function (elements) {
48
+ propertyViewManager.customGetViewType = ((_editorProps$property2 = editorProps.propertyView) === null || _editorProps$property2 === void 0 ? void 0 : _editorProps$property2.getPropertyViewType) || function (elements) {
51
49
  return (0, _edgePropertyViewAdapter.adapterGetEdgePropertyViewType)(elements, editorProps);
52
- };
50
+ }; // 临时适配连线属性面板类型,后期组件支持自定义适配
51
+
53
52
 
53
+ (0, _edgePropertyViewAdapter.addEdgePropertyViews)(propertyViewManager, editorProps);
54
54
  var PropertyView = propertyViewManager.getPropertyView();
55
55
  (0, _react.useEffect)(function () {
56
56
  if (graphLoaded) {
@@ -13,6 +13,8 @@ var _useSettingRuntimeState = _interopRequireDefault(require("./useSettingRuntim
13
13
 
14
14
  var _updateElementProperty = _interopRequireDefault(require("./core/updateElementProperty"));
15
15
 
16
+ var _htElementUtils = require("../../../../utils/htElementUtils");
17
+
16
18
  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); }
17
19
 
18
20
  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) {
46
48
  var elementProps = {};
47
49
 
48
50
  if (selection.length === 1) {
51
+ var element = selectionElements[0];
49
52
  elementProps = {
50
- selectionElement: selectionElements[0],
53
+ element: element,
54
+ selectionElement: element,
51
55
  values: singleElementValues
52
56
  };
57
+
58
+ if ((0, _htElementUtils.isEdge)(element)) {
59
+ elementProps.edge = element;
60
+ }
53
61
  }
54
62
 
55
63
  return /*#__PURE__*/_react["default"].createElement(PropertyView, (0, _extends2["default"])({
@@ -13,17 +13,18 @@ var _getPropertyViewType2 = _interopRequireDefault(require("./getPropertyViewTyp
13
13
 
14
14
  var PropertyViewManager = /*#__PURE__*/function () {
15
15
  function PropertyViewManager(topo) {
16
- this.viewMap = _propertyViews["default"];
16
+ this.viewMap = (0, _extends2["default"])({}, _propertyViews["default"]);
17
17
  this.topo = void 0;
18
18
  this.customGetViewType = void 0;
19
19
  this.topo = topo;
20
+ this.topo.propertyViewManager = this;
20
21
  this.open = this.open.bind(this);
21
22
  }
22
23
 
23
24
  var _proto = PropertyViewManager.prototype;
24
25
 
25
- _proto.updateViews = function updateViews(viewMap) {
26
- this.viewMap = (0, _extends2["default"])({}, _propertyViews["default"], viewMap);
26
+ _proto.addViews = function addViews(viewMap) {
27
+ Object.assign(this.viewMap, viewMap);
27
28
  };
28
29
 
29
30
  _proto.init = function init() {
@@ -1,15 +1,11 @@
1
1
  "use strict";
2
2
 
3
- var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
-
5
3
  exports.__esModule = true;
6
4
  exports.adapterGetEdgePropertyViewType = adapterGetEdgePropertyViewType;
7
5
  exports.addEdgePropertyViews = addEdgePropertyViews;
8
6
 
9
7
  var _htElementUtils = require("../../../../../utils/htElementUtils");
10
8
 
11
- var _addEdgeProps = _interopRequireDefault(require("../propertyViews/edge/addEdgeProps"));
12
-
13
9
  function adapterGetEdgePropertyViewType(selection, editorProps) {
14
10
  var fn = editorProps.getEdgePropertyViewType;
15
11
 
@@ -24,10 +20,5 @@ function adapterGetEdgePropertyViewType(selection, editorProps) {
24
20
  }
25
21
 
26
22
  function addEdgePropertyViews(propertyViewManager, editorProps) {
27
- var oldMap = editorProps.edgePropertyViews || {};
28
- var map = {};
29
- Object.keys(oldMap).forEach(function (name) {
30
- map[name] = (0, _addEdgeProps["default"])(oldMap[name]);
31
- });
32
- propertyViewManager.updateViews(map);
23
+ propertyViewManager.addViews(editorProps.edgePropertyViews || {});
33
24
  }
@@ -54,7 +54,7 @@ var _ElementTagTipConfig = _interopRequireDefault(require("./tagstips/ElementTag
54
54
  var _SelectionModel = _interopRequireDefault(require("./SelectionModel"));
55
55
 
56
56
  // eslint-disable-next-line no-undef
57
- var version = typeof "7.0.0-dev.14" === 'string' ? "7.0.0-dev.14" : null;
57
+ var version = typeof "7.0.0-dev.16" === 'string' ? "7.0.0-dev.16" : null;
58
58
  console.info("\u62D3\u6251\u7248\u672C: " + version);
59
59
  /**
60
60
  * 拓扑显示和编辑
package/lib/utils/tree.js CHANGED
@@ -46,6 +46,7 @@ function formatTree(json, funcPermissions) {
46
46
  }
47
47
 
48
48
  return {
49
+ data: node,
49
50
  id: "" + id,
50
51
  label: name,
51
52
  parentId: parentId,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@riil-frontend/component-topology",
3
- "version": "7.0.0-dev.14",
3
+ "version": "7.0.0-dev.16",
4
4
  "description": "拓扑",
5
5
  "scripts": {
6
6
  "start": "build-scripts start",
@@ -116,6 +116,6 @@
116
116
  "access": "public"
117
117
  },
118
118
  "license": "MIT",
119
- "homepage": "https://unpkg.com/@riil-frontend/component-topology@7.0.0-dev.14/build/index.html",
119
+ "homepage": "https://unpkg.com/@riil-frontend/component-topology@7.0.0-dev.16/build/index.html",
120
120
  "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
121
121
  }
@@ -1,10 +0,0 @@
1
- import _extends from "@babel/runtime/helpers/extends";
2
- import React from 'react';
3
- export default function addEdgeProps(Component) {
4
- return function AdapterEdgeProps(props) {
5
- var selectionElement = props.selectionElement;
6
- return /*#__PURE__*/React.createElement(Component, _extends({}, props, {
7
- edge: selectionElement
8
- }));
9
- };
10
- }
@@ -1,19 +0,0 @@
1
- "use strict";
2
-
3
- var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
-
5
- exports.__esModule = true;
6
- exports["default"] = addEdgeProps;
7
-
8
- var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
9
-
10
- var _react = _interopRequireDefault(require("react"));
11
-
12
- function addEdgeProps(Component) {
13
- return function AdapterEdgeProps(props) {
14
- var selectionElement = props.selectionElement;
15
- return /*#__PURE__*/_react["default"].createElement(Component, (0, _extends2["default"])({}, props, {
16
- edge: selectionElement
17
- }));
18
- };
19
- }