@riil-frontend/component-topology 6.0.0-alpha.1 → 6.0.0-alpha.3

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

@@ -5,28 +5,83 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports["default"] = void 0;
 
-var _react = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
+
+var _htElementDataUtil = require("../../../../../utils/htElementDataUtil");
+
+var _useLayerAddResource = _interopRequireDefault(require("../../../hooks/useLayerAddResource"));
+
+var _LayerAddResourceDrawer = _interopRequireDefault(require("../../settings/propertyViews/layer/DataTab/LayerAddResourceDrawer"));
 
 var _ButtonBox = _interopRequireDefault(require("./components/ButtonBox"));
 
 var _WidgetBox = _interopRequireDefault(require("./WidgetBox"));
 
+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; }
+
+function getAddType(selection) {
+  if (selection.length === 1) {
+    var data = selection[0];
+
+    if ((0, _htElementDataUtil.isLayer)(data)) {
+      return 'layer';
+    } else if ((0, _htElementDataUtil.isGroup)(data)) {
+      return 'group';
+    }
+  }
+}
+
 function AddResourceButton(props) {
   var showLabel = props.showLabel,
       topo = props.topo,
-      topoEdit = props.topoEdit;
+      topoEdit = props.topoEdit,
+      editorProps = props.editorProps; // 选中的元素
+
+  var selection = topo.selectionManager.useSelection();
+
+  var _useState = (0, _react.useState)(getAddType(selection)),
+      addType = _useState[0],
+      setAddType = _useState[1]; // 选中分层添加
+
+
+  var layerAddResource = (0, _useLayerAddResource["default"])({
+    topo: topo,
+    topoEdit: topoEdit
+  });
+  (0, _react.useEffect)(function () {
+    setAddType(getAddType(selection));
+  }, [selection]);
+
+  var handleClick = function handleClick() {
+    if (!addType) {
+      // 未选中分层、分区添加资源
+      topoEdit.showGlobalAddResourceDrawer();
+    } else if (addType === 'layer') {
+      // 选中分层添加资源
+      layerAddResource.open();
+    } else if (addType === 'group') {
+      // 选中区域添加资源
+      var group = selection[0];
+      topoEdit.groupAddResource.open(group);
+    }
+  };
+
   return /*#__PURE__*/_react["default"].createElement(_WidgetBox["default"], {
     label: "\u6DFB\u52A0\u8D44\u6E90",
     tooltip: "\u6DFB\u52A0\u8D44\u6E90",
     showLabel: showLabel
   }, /*#__PURE__*/_react["default"].createElement(_ButtonBox["default"], {
-    onClick: function onClick() {
-      topoEdit.showGlobalAddResourceDrawer();
-    }
+    onClick: handleClick
   }, /*#__PURE__*/_react["default"].createElement("img", {
     src: "/img/topo/editor/toolbar/add/Normal.svg",
     alt: ""
-  })));
+  })), addType === 'layer' && /*#__PURE__*/_react["default"].createElement(_LayerAddResourceDrawer["default"], {
+    layer: selection[0],
+    editorProps: editorProps,
+    layerAddResource: layerAddResource
+  }));
 }
 
 var _default = AddResourceButton;

package/lib/core/editor/components/settings/propertyViews/layer/DataTab/DefaultLayerAddResourceDrawer.js

@@ -0,0 +1,63 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = void 0;
+
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _NetworkTopoResourceSelectDrawer = _interopRequireDefault(require("../../../../../../../components/NetworkTopoResourceSelectDrawer"));
+
+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; }
+
+var LayerAddResourceDrawer = function LayerAddResourceDrawer(props) {
+  var visible = props.visible,
+      layer = props.layer,
+      topo = props.topo,
+      topoEdit = props.topoEdit,
+      onClose = props.onClose;
+
+  var onOk = /*#__PURE__*/function () {
+    var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(selected) {
+      var layerData;
+      return _regenerator["default"].wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              layerData = {
+                id: layer.tag,
+                tag: layer.attrObject.tag
+              };
+              _context.next = 3;
+              return topoEdit.addLayerResources(layerData, selected);
+
+            case 3:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee);
+    }));
+
+    return function onOk(_x) {
+      return _ref.apply(this, arguments);
+    };
+  }();
+
+  return /*#__PURE__*/_react["default"].createElement(_NetworkTopoResourceSelectDrawer["default"], {
+    visible: visible,
+    getExcludeIds: topoEdit.getAllNodeResourceIds,
+    onOk: onOk,
+    onClose: onClose
+  });
+};
+
+var _default = LayerAddResourceDrawer;
+exports["default"] = _default;

package/lib/core/editor/components/settings/propertyViews/layer/DataTab/LayerAddResourceButton.js

@@ -5,45 +5,36 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports["default"] = LayerAddResourceButton;
 
-var _react = _interopRequireWildcard(require("react"));
+var _react = _interopRequireDefault(require("react"));
+
+var _useLayerAddResource = _interopRequireDefault(require("../../../../../hooks/useLayerAddResource"));
 
 var _AddResourceButton = _interopRequireDefault(require("../../../common/AddResourceButton"));
 
 var _LayerAddResourceDrawer = _interopRequireDefault(require("./LayerAddResourceDrawer"));
 
-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; }
-
 function LayerAddResourceButton(props) {
   var topo = props.topo,
-      layer = props.layer,
+      editorProps = props.editorProps,
       layerData = props.layerData,
-      CustomAddResourceDrawer = props.addResourceDrawer,
       onAdd = props.onAdd,
       topoEdit = props.topoEdit;
-
-  var _useState = (0, _react.useState)(false),
-      drawerVisible = _useState[0],
-      setDrawerVisible = _useState[1];
-
-  var AddResourceDrawer = CustomAddResourceDrawer || _LayerAddResourceDrawer["default"];
+  var layerAddResource = (0, _useLayerAddResource["default"])({
+    topo: topo,
+    topoEdit: topoEdit,
+    layerData: layerData
+  });
 
   var handleClick = function handleClick() {
-    setDrawerVisible(true);
+    layerAddResource.open();
   };
 
   return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_AddResourceButton["default"], {
     onClick: handleClick
-  }), /*#__PURE__*/_react["default"].createElement(AddResourceDrawer, {
-    visible: drawerVisible,
+  }), /*#__PURE__*/_react["default"].createElement(_LayerAddResourceDrawer["default"], {
     layer: layerData,
-    topo: topo,
-    topoEdit: topoEdit,
-    onClose: function onClose() {
-      setDrawerVisible(false);
-    },
-    setVisible: setDrawerVisible
+    editorProps: editorProps,
+    layerAddResource: layerAddResource
   }));
 }
 

package/lib/core/editor/components/settings/propertyViews/layer/DataTab/LayerAddResourceDrawer.js

@@ -5,59 +5,21 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports["default"] = void 0;
 
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _react = _interopRequireDefault(require("react"));
 
-var _react = _interopRequireWildcard(require("react"));
+var _DefaultLayerAddResourceDrawer = _interopRequireDefault(require("./DefaultLayerAddResourceDrawer"));
 
-var _NetworkTopoResourceSelectDrawer = _interopRequireDefault(require("../../../../../../../components/NetworkTopoResourceSelectDrawer"));
-
-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; }
-
-var LayerAddResourceDrawer = function LayerAddResourceDrawer(props) {
-  var visible = props.visible,
-      layer = props.layer,
-      topo = props.topo,
-      topoEdit = props.topoEdit,
-      onClose = props.onClose;
-
-  var onOk = /*#__PURE__*/function () {
-    var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(selected) {
-      var layerData;
-      return _regenerator["default"].wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              layerData = {
-                id: layer.tag,
-                tag: layer.attrObject.tag
-              };
-              _context.next = 3;
-              return topoEdit.addLayerResources(layerData, selected);
-
-            case 3:
-            case "end":
-              return _context.stop();
-          }
-        }
-      }, _callee);
-    }));
-
-    return function onOk(_x) {
-      return _ref.apply(this, arguments);
-    };
-  }();
-
-  return /*#__PURE__*/_react["default"].createElement(_NetworkTopoResourceSelectDrawer["default"], {
-    visible: visible,
-    getExcludeIds: topoEdit.getAllNodeResourceIds,
-    onOk: onOk,
-    onClose: onClose
-  });
-};
+function LayerAddResourceDrawer(props) {
+  var layer = props.layer,
+      editorProps = props.editorProps,
+      layerAddResource = props.layerAddResource;
+  var AddResourceDrawer = (editorProps === null || editorProps === void 0 ? void 0 : editorProps.layerResourceSelectComponent) || _DefaultLayerAddResourceDrawer["default"];
+  return /*#__PURE__*/_react["default"].createElement(AddResourceDrawer, (0, _extends2["default"])({
+    layer: layer
+  }, layerAddResource.drawerProps));
+}
 
 var _default = LayerAddResourceDrawer;
 exports["default"] = _default;

package/lib/core/editor/components/settings/propertyViews/layer/DataTab/RelateData.js

@@ -31,9 +31,10 @@ function LayerRelateData(props) {
       title: "\u5173\u8054\u8D44\u6E90",
       extra: /*#__PURE__*/_react["default"].createElement(_LayerAddResourceButton["default"], {
         topo: topo,
+        topoEdit: topoEditApi,
+        editorProps: editorProps,
         layer: layer,
         layerData: values,
-        topoEdit: topoEditApi,
         onAdd: function onAdd() {
           /* TODO 刷新列表 refreshList */
         },

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

@@ -34,7 +34,7 @@ function TopoEditorTitleBar(props) {
       topoEditApi = props.topoEditApi;
   var store = topo.store;
 
-  var _store$useModel = store.useModel("topoEdit"),
+  var _store$useModel = store.useModel('topoEdit'),
       topoEditState = _store$useModel[0],
       topoEditDispatchers = _store$useModel[1];
 
@@ -88,12 +88,6 @@ function TopoEditorTitleBar(props) {
   }, /*#__PURE__*/_react["default"].createElement(_DebugTools["default"], {
     topo: topo
   }), /*#__PURE__*/_react["default"].createElement(_button["default"], {
-    type: "primary",
-    className: _TitleBarModule["default"].button,
-    onClick: function onClick() {
-      topoEditApi.showGlobalAddResourceDrawer();
-    }
-  }, "\u6DFB\u52A0\u8D44\u6E90"), /*#__PURE__*/_react["default"].createElement(_button["default"], {
     className: _TitleBarModule["default"].button,
     onClick: function onClick() {
       setExitFlag(false);
@@ -103,8 +97,8 @@ function TopoEditorTitleBar(props) {
     className: _TitleBarModule["default"].button,
     onClick: function onClick() {
       _dialog["default"].confirm({
-        title: "提示",
-        content: "若直接退出，图上修改的内容将不会保存！",
+        title: '提示',
+        content: '若直接退出，图上修改的内容将不会保存！',
         onOk: function () {
           var _onOk = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
             return _regenerator["default"].wrap(function _callee2$(_context2) {
@@ -150,10 +144,10 @@ function TopoEditorTitleBar(props) {
           return onCancel;
         }(),
         cancelProps: {
-          children: "退出"
+          children: '退出'
         },
         okProps: {
-          children: "保存并退出"
+          children: '保存并退出'
         }
       });
     }

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

@@ -0,0 +1,34 @@
+"use strict";
+
+exports.__esModule = true;
+exports["default"] = useLayerAddResource;
+
+var _react = require("react");
+
+function useLayerAddResource(props) {
+  var topo = props.topo,
+      layer = props.layer,
+      topoEdit = props.topoEdit;
+
+  var _useState = (0, _react.useState)(false),
+      drawerVisible = _useState[0],
+      setDrawerVisible = _useState[1];
+
+  return {
+    open: function open() {
+      return setDrawerVisible(true);
+    },
+    close: function close() {
+      return setDrawerVisible(false);
+    },
+    drawerProps: {
+      visible: drawerVisible,
+      setVisible: setDrawerVisible,
+      onClose: function onClose() {
+        setDrawerVisible(false);
+      },
+      topo: topo,
+      topoEdit: topoEdit
+    }
+  };
+}

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

package/package.json

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

package/es/core/editor/components/Sidebar/views/LinkView.js

@@ -1,35 +0,0 @@
-import React, { useEffect, useRef } from 'react';
-
-function LinkView(props) {
-  var topo = props.topo,
-      active = props.active; // 组件
-
-  var viewRef = useRef(null); // div容器
-
-  var containerRef = useRef(); // 显示后初始化
-
-  useEffect(function () {
-    if (active && !viewRef.current) {
-      var htTopo = topo.getHtTopo();
-      var container = containerRef.current; // TODO 初始化
-
-      viewRef.current = htTopo.createLinkPalette(container);
-    }
-  }, [active]); // 注销组件
-
-  useEffect(function () {
-    if (viewRef.current) {
-      viewRef.current.destroy();
-      viewRef.current = null;
-    }
-  }, []);
-  return /*#__PURE__*/React.createElement("div", {
-    ref: containerRef,
-    style: {
-      width: '100%',
-      height: '100%'
-    }
-  });
-}
-
-export default LinkView;

package/es/core/editor/components/Toolbar/widgets/AddResourceWidget.js

@@ -1,17 +0,0 @@
-import React from 'react';
-import ButtonBox from "./components/ButtonBox";
-import WidgetBox from "./WidgetBox";
-
-function AddResourceWidget(props) {
-  var showLabel = props.showLabel;
-  return /*#__PURE__*/React.createElement(WidgetBox, {
-    label: "\u6DFB\u52A0\u8D44\u6E90",
-    tooltip: "\u6DFB\u52A0\u8D44\u6E90",
-    showLabel: showLabel
-  }, /*#__PURE__*/React.createElement(ButtonBox, null, /*#__PURE__*/React.createElement("img", {
-    src: "/img/topo/editor/toolbar/add/Normal.svg",
-    alt: ""
-  })));
-}
-
-export default AddResourceWidget;

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

@@ -1,27 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-exports.__esModule = true;
-exports["default"] = void 0;
-
-var _react = _interopRequireDefault(require("react"));
-
-var _ButtonBox = _interopRequireDefault(require("./components/ButtonBox"));
-
-var _WidgetBox = _interopRequireDefault(require("./WidgetBox"));
-
-function AddResourceWidget(props) {
-  var showLabel = props.showLabel;
-  return /*#__PURE__*/_react["default"].createElement(_WidgetBox["default"], {
-    label: "\u6DFB\u52A0\u8D44\u6E90",
-    tooltip: "\u6DFB\u52A0\u8D44\u6E90",
-    showLabel: showLabel
-  }, /*#__PURE__*/_react["default"].createElement(_ButtonBox["default"], null, /*#__PURE__*/_react["default"].createElement("img", {
-    src: "/img/topo/editor/toolbar/add/Normal.svg",
-    alt: ""
-  })));
-}
-
-var _default = AddResourceWidget;
-exports["default"] = _default;