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

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

@@ -5,8 +5,11 @@ import { adapterGetEdgePropertyViewType, addEdgePropertyViews } from "./core/edg
 import PropertyViewManager from "./core/PropertyViewManager";
 import Settings from "./Settings";
 import styles from "./Settings.module.scss";
+
+function PropertyViewProvider(props) {}
+
 export default function PropertyPanel(props) {
-  var _classNames;
+  var _editorProps$property, _editorProps$property2, _classNames;
 
   var topo = props.topo,
       editorProps = props.editorProps;
@@ -18,21 +21,19 @@ export default 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 = useMemo(function () {
     return new PropertyViewManager(topo);
-  }, []); // 临时适配连线属性面板类型，后期组件支持自定义适配
-
-  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 adapterGetEdgePropertyViewType(elements, editorProps);
-  };
+  }; // 临时适配连线属性面板类型，后期组件支持自定义适配
 
+
+  addEdgePropertyViews(propertyViewManager, editorProps);
   var PropertyView = propertyViewManager.getPropertyView();
   useEffect(function () {
     if (graphLoaded) {

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

@@ -2,6 +2,7 @@ import _extends from "@babel/runtime/helpers/extends";
 import React, { useEffect, useMemo, useState } from 'react';
 import useSettingRuntimeState from "./useSettingRuntimeState";
 import updateElementProperty from "./core/updateElementProperty";
+import { isEdge } from "../../../../utils/htElementUtils";
 
 function buildElementValues(selection) {
   var values = _extends({}, selection[0]);
@@ -33,10 +34,16 @@ export default function PropertyViewContainer(props) {
   var elementProps = {};
 
   if (selection.length === 1) {
+    var element = selectionElements[0];
     elementProps = {
-      selectionElement: selectionElements[0],
+      element: element,
+      selectionElement: element,
       values: singleElementValues
     };
+
+    if (isEdge(element)) {
+      elementProps.edge = element;
+    }
   }
 
   return /*#__PURE__*/React.createElement(PropertyView, _extends({

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

@@ -4,17 +4,18 @@ import _getPropertyViewType from "./getPropertyViewType";
 
 var PropertyViewManager = /*#__PURE__*/function () {
   function PropertyViewManager(topo) {
-    this.viewMap = propertyViews;
+    this.viewMap = _extends({}, propertyViews);
     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 = _extends({}, propertyViews, viewMap);
+  _proto.addViews = function addViews(viewMap) {
+    Object.assign(this.viewMap, viewMap);
   };
 
   _proto.init = function init() {

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

@@ -1,5 +1,4 @@
 import { isEdge } from "../../../../../utils/htElementUtils";
-import addEdgeProps from "../propertyViews/edge/addEdgeProps";
 export function adapterGetEdgePropertyViewType(selection, editorProps) {
   var fn = editorProps.getEdgePropertyViewType;
 
@@ -13,10 +12,5 @@ export function adapterGetEdgePropertyViewType(selection, editorProps) {
   return null;
 }
 export function addEdgePropertyViews(propertyViewManager, editorProps) {
-  var oldMap = editorProps.edgePropertyViews || {};
-  var map = {};
-  Object.keys(oldMap).forEach(function (name) {
-    map[name] = addEdgeProps(oldMap[name]);
-  });
-  propertyViewManager.updateViews(map);
+  propertyViewManager.addViews(editorProps.edgePropertyViews || {});
 }

package/es/core/models/TopoApp.js

@@ -23,7 +23,7 @@ import topoFactory from "./topoFactory";
 import ElementTagTipConfig from "./tagstips/ElementTagTipConfig";
 import SelectionModel from "./SelectionModel"; // eslint-disable-next-line no-undef
 
-var version = typeof "7.0.0-dev.14" === 'string' ? "7.0.0-dev.14" : null;
+var version = typeof "7.0.0-dev.16" === 'string' ? "7.0.0-dev.16" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/es/utils/tree.js

@@ -33,6 +33,7 @@ export function formatTree(json, funcPermissions) {
       }
 
       return {
+        data: node,
         id: "" + id,
         label: name,
         parentId: parentId,

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/models/TopoApp.js

@@ -54,7 +54,7 @@ var _ElementTagTipConfig = _interopRequireDefault(require("./tagstips/ElementTag
 var _SelectionModel = _interopRequireDefault(require("./SelectionModel"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "7.0.0-dev.14" === 'string' ? "7.0.0-dev.14" : null;
+var version = typeof "7.0.0-dev.16" === 'string' ? "7.0.0-dev.16" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/lib/utils/tree.js

@@ -46,6 +46,7 @@ function formatTree(json, funcPermissions) {
       }
 
       return {
+        data: node,
         id: "" + id,
         label: name,
         parentId: parentId,

package/package.json

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

package/es/core/editor/components/settings/propertyViews/edge/addEdgeProps.js

@@ -1,10 +0,0 @@
-import _extends from "@babel/runtime/helpers/extends";
-import React from 'react';
-export default function addEdgeProps(Component) {
-  return function AdapterEdgeProps(props) {
-    var selectionElement = props.selectionElement;
-    return /*#__PURE__*/React.createElement(Component, _extends({}, props, {
-      edge: selectionElement
-    }));
-  };
-}

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

@@ -1,19 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-exports.__esModule = true;
-exports["default"] = addEdgeProps;
-
-var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-
-var _react = _interopRequireDefault(require("react"));
-
-function addEdgeProps(Component) {
-  return function AdapterEdgeProps(props) {
-    var selectionElement = props.selectionElement;
-    return /*#__PURE__*/_react["default"].createElement(Component, (0, _extends2["default"])({}, props, {
-      edge: selectionElement
-    }));
-  };
-}