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

package/es/components/VerticalIconTab/VerticalIconTab.module.scss

@@ -11,7 +11,7 @@
   width: 60px;
   height: 100%;
   padding-top: 4px;
-  // border-right: 1px solid #E6E7EB;
+  border-right: 1px solid var(--tab-wrapped-border-line-color);
   background: none !important;
 
   :global {
@@ -46,6 +46,7 @@
   width: 260px;
   height: 100%;
   transition: all .1s linear;
+  border-left: none !important;
   border-right: 1px solid var(--tab-wrapped-border-line-color);
 
   :global {

package/es/components/collapse/Collapse.module.scss

@@ -26,8 +26,19 @@
 
     .#{$css-prefix}collapse-panel-content,
     .#{$css-prefix}collapse-panel-expanded>.#{$css-prefix}collapse-panel-content {
-      padding-left: 32px;
+      // padding-left: 32px;
       padding-top: 8px;
     }
   }
+
+  &.contentNoPadding {
+
+    :global {
+
+      .#{$css-prefix}collapse-panel-content,
+      .#{$css-prefix}collapse-panel-expanded>.#{$css-prefix}collapse-panel-content {
+        padding: 8px 0;
+      }
+    }
+  }
 }

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

@@ -7,8 +7,11 @@ import ImagePanel from "./views/ImagePanel";
 import BackgroundPanel from "./views/BackgroundPanel";
 import CanvasPanel from "./views/CanvasPanel";
 import styles from "./Sidebar.module.scss";
+import classNames from 'classnames';
 
 function Sidebar(props) {
+  var _classNames;
+
   var topo = props.topo;
 
   var _useState = useState(null),
@@ -65,7 +68,7 @@ function Sidebar(props) {
   return /*#__PURE__*/React.createElement("div", {
     className: styles.sidebar
   }, /*#__PURE__*/React.createElement("div", {
-    className: styles.tabsContainer
+    className: classNames(styles.tabsContainer, (_classNames = {}, _classNames[styles.expanded] = !!activeKey, _classNames))
   }, /*#__PURE__*/React.createElement(VerticalIconTab, {
     activeKey: activeKey,
     onChange: setActivekey

package/es/core/editor/components/Sidebar/Sidebar.module.scss

@@ -5,11 +5,15 @@
 
   .tabsContainer {
     position: absolute;
+    width: 60px;
     height: 100%;
     left: 0;
     top: 0;
     z-index: 1;
-    width: 320px;
     background: #FFF;
+
+    &.expanded {
+      width: 320px;
+    }
   }
 }

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

@@ -4,7 +4,6 @@ export default function BackgroundPanel(props) {
   var topo = props.topo,
       editorProps = props.editorProps;
   return /*#__PURE__*/React.createElement(BackgroundView, {
-    topo: topo,
-    editorProps: editorProps
+    topo: topo
   });
 }

package/es/core/editor/components/Sidebar/views/ImagePanel/CiTypeImagePanel.js

@@ -1,6 +1,6 @@
 import React, { useEffect, useMemo, useRef } from 'react';
 import rlog from '@riil-frontend/component-topology-utils/es/rlog';
-import ImagePalette from "./ImagePalette";
+import ImagePalette from "./HtImagePalette";
 import { getNodeDefaultIcons } from "../../../../../common/icons/icon";
 /**
  * 组件面板

package/es/core/editor/components/Sidebar/views/ImagePanel/CustomImagePanel.js

@@ -1,6 +1,7 @@
-import React, { useEffect, useRef } from 'react';
+import React, { useEffect, useRef, useMemo } from 'react';
 import rlog from '@riil-frontend/component-topology-utils/es/rlog';
 import { getUserCustomIconsForHt } from "../../../../../common/icons/icon";
+import HtCustomImagePanel from "./HtCustomImagePanel";
 /**
  * 组件面板
  * @param {*} props 
@@ -8,38 +9,12 @@ import { getUserCustomIconsForHt } from "../../../../../common/icons/icon";
  */
 
 export default function CustomImagePanel(props) {
-  var topo = props.topo; // 组件
-
-  var viewRef = useRef(null); // div容器
-
-  var divRef = useRef();
-  useEffect(function () {
-    // 初始化
-    var icons = getUserCustomIconsForHt(topo);
-    var htTopo = topo.getHtTopo();
-    var container = divRef.current;
-
-    try {
-      viewRef.current = htTopo.createUploadImagePalette(container, {
-        icons: icons
-      });
-    } catch (error) {
-      rlog.error('初始化资源面板失败', error);
-    } // 注销组件
-
-
-    return function () {
-      if (viewRef.current) {
-        viewRef.current.destroy();
-        viewRef.current = null;
-      }
-    };
+  var topo = props.topo;
+  var icons = useMemo(function () {
+    return getUserCustomIconsForHt(topo);
   }, []);
-  return /*#__PURE__*/React.createElement("div", {
-    ref: divRef,
-    style: {
-      width: '100%',
-      height: '100%'
-    }
+  return /*#__PURE__*/React.createElement(HtCustomImagePanel, {
+    icons: icons,
+    topo: topo
   });
 }

package/es/core/editor/components/Sidebar/views/ImagePanel/HtCustomImagePanel.js

@@ -0,0 +1,45 @@
+import React, { useEffect, useRef } from 'react';
+import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import { getUserCustomIconsForHt } from "../../../../../common/icons/icon";
+/**
+ * 组件面板
+ * @param {*} props 
+ * @returns 
+ */
+
+export default function HtCustomImagePanel(props) {
+  var topo = props.topo,
+      icons = props.icons; // 组件
+
+  var viewRef = useRef(null); // div容器
+
+  var divRef = useRef();
+  useEffect(function () {
+    // 初始化
+    var htTopo = topo.getHtTopo();
+    var container = divRef.current;
+
+    try {
+      viewRef.current = htTopo.createUploadImagePalette(container, {
+        icons: icons
+      });
+    } catch (error) {
+      rlog.error('初始化资源面板失败', error);
+    } // 注销组件
+
+
+    return function () {
+      if (viewRef.current) {
+        viewRef.current.destroy();
+        viewRef.current = null;
+      }
+    };
+  }, []);
+  return /*#__PURE__*/React.createElement("div", {
+    ref: divRef,
+    style: {
+      width: '100%' // height: '100%',
+
+    }
+  });
+}

package/es/core/editor/components/Sidebar/views/ImagePanel/HtImagePalette.js

@@ -0,0 +1,44 @@
+import React, { useEffect, useRef } from 'react';
+import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+/**
+ * 组件面板
+ * @param {*} props 
+ * @returns 
+ */
+
+export default function HtImagePalette(props) {
+  var topo = props.topo,
+      icons = props.icons; // 组件
+
+  var viewRef = useRef(null); // div容器
+
+  var divRef = useRef();
+  useEffect(function () {
+    // 初始化
+    var htTopo = topo.getHtTopo();
+    var container = divRef.current;
+
+    try {
+      viewRef.current = htTopo.createImagePalette(container, {
+        icons: icons
+      });
+    } catch (error) {
+      rlog.error('初始化资源面板失败', error);
+    } // 注销组件
+
+
+    return function () {
+      if (viewRef.current) {
+        viewRef.current.destroy();
+        viewRef.current = null;
+      }
+    };
+  }, []);
+  return /*#__PURE__*/React.createElement("div", {
+    ref: divRef,
+    style: {
+      width: '100%' // height: '100%',
+
+    }
+  });
+}

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

@@ -2,6 +2,7 @@ import _Collapse from "@alifd/next/es/collapse";
 import _Button from "@alifd/next/es/button";
 import _Icon from "@alifd/next/es/icon";
 import React from 'react';
+import classNames from 'classnames';
 import CollapsePanel from "../../../../../../components/collapse/Panel";
 import CollapseStyles from "../../../../../../components/collapse/Collapse.module.scss";
 import CiTypeImagePanel from "./CiTypeImagePanel";
@@ -12,7 +13,7 @@ export default function ImagePanel(props) {
     style: {
       border: 'none'
     },
-    className: CollapseStyles.collapse
+    className: classNames(CollapseStyles.collapse, CollapseStyles.contentNoPadding)
   }, /*#__PURE__*/React.createElement(CollapsePanel, {
     key: "\u8D44\u6E90\u56FE\u7247",
     title: "\u8D44\u6E90\u56FE\u7247"

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

@@ -1,23 +1,71 @@
-import React from 'react';
+import React, { useEffect, useState } from 'react';
+import { isGroup, isLayer } from "../../../../../utils/htElementDataUtil";
+import useLayerAddResource from "../../../hooks/useLayerAddResource";
+import LayerAddResourceDrawer from "../../settings/propertyViews/layer/DataTab/LayerAddResourceDrawer";
 import ButtonBox from "./components/ButtonBox";
 import WidgetBox from "./WidgetBox";
 
+function getAddType(selection) {
+  if (selection.length === 1) {
+    var data = selection[0];
+
+    if (isLayer(data)) {
+      return 'layer';
+    } else if (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 = useState(getAddType(selection)),
+      addType = _useState[0],
+      setAddType = _useState[1]; // 选中分层添加
+
+
+  var layerAddResource = useLayerAddResource({
+    topo: topo,
+    topoEdit: topoEdit
+  });
+  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.createElement(WidgetBox, {
     label: "\u6DFB\u52A0\u8D44\u6E90",
     tooltip: "\u6DFB\u52A0\u8D44\u6E90",
     showLabel: showLabel
   }, /*#__PURE__*/React.createElement(ButtonBox, {
-    onClick: function onClick() {
-      topoEdit.showGlobalAddResourceDrawer();
-    }
+    onClick: handleClick
   }, /*#__PURE__*/React.createElement("img", {
     src: "/img/topo/editor/toolbar/add/Normal.svg",
     alt: ""
-  })));
+  })), addType === 'layer' && /*#__PURE__*/React.createElement(LayerAddResourceDrawer, {
+    layer: selection[0],
+    editorProps: editorProps,
+    layerAddResource: layerAddResource
+  }));
 }
 
 export default AddResourceButton;

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

@@ -0,0 +1,48 @@
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+import React, { useState, useEffect } from 'react';
+import ResourceSelectDrawer from "../../../../../../../components/NetworkTopoResourceSelectDrawer";
+
+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 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(selected) {
+      var layerData;
+      return _regeneratorRuntime.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.createElement(ResourceSelectDrawer, {
+    visible: visible,
+    getExcludeIds: topoEdit.getAllNodeResourceIds,
+    onOk: onOk,
+    onClose: onClose
+  });
+};
+
+export default LayerAddResourceDrawer;

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

@@ -1,35 +1,29 @@
-import React, { useState } from 'react';
+import React from 'react';
+import useLayerAddResource from "../../../../../hooks/useLayerAddResource";
 import AddResourceButton from "../../../common/AddResourceButton";
 import LayerAddResourceDrawer from "./LayerAddResourceDrawer";
 export default 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 = useState(false),
-      drawerVisible = _useState[0],
-      setDrawerVisible = _useState[1];
-
-  var AddResourceDrawer = CustomAddResourceDrawer || LayerAddResourceDrawer;
+  var layerAddResource = useLayerAddResource({
+    topo: topo,
+    topoEdit: topoEdit,
+    layerData: layerData
+  });
 
   var handleClick = function handleClick() {
-    setDrawerVisible(true);
+    layerAddResource.open();
   };
 
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(AddResourceButton, {
     onClick: handleClick
-  }), /*#__PURE__*/React.createElement(AddResourceDrawer, {
-    visible: drawerVisible,
+  }), /*#__PURE__*/React.createElement(LayerAddResourceDrawer, {
     layer: layerData,
-    topo: topo,
-    topoEdit: topoEdit,
-    onClose: function onClose() {
-      setDrawerVisible(false);
-    },
-    setVisible: setDrawerVisible
+    editorProps: editorProps,
+    layerAddResource: layerAddResource
   }));
 }
 ;

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

@@ -1,48 +1,15 @@
-import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
-import _regeneratorRuntime from "@babel/runtime/regenerator";
-import React, { useState, useEffect } from 'react';
-import ResourceSelectDrawer from "../../../../../../../components/NetworkTopoResourceSelectDrawer";
-
-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 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(selected) {
-      var layerData;
-      return _regeneratorRuntime.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.createElement(ResourceSelectDrawer, {
-    visible: visible,
-    getExcludeIds: topoEdit.getAllNodeResourceIds,
-    onOk: onOk,
-    onClose: onClose
-  });
-};
+import _extends from "@babel/runtime/helpers/extends";
+import React from 'react';
+import DefaultLayerAddResourceDrawer from "./DefaultLayerAddResourceDrawer";
+
+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;
+  return /*#__PURE__*/React.createElement(AddResourceDrawer, _extends({
+    layer: layer
+  }, layerAddResource.drawerProps));
+}
 
 export default LayerAddResourceDrawer;

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

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

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

@@ -0,0 +1,28 @@
+import { useState } from 'react';
+export default function useLayerAddResource(props) {
+  var topo = props.topo,
+      layer = props.layer,
+      topoEdit = props.topoEdit;
+
+  var _useState = 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/es/core/models/TopoApp.js

@@ -22,7 +22,7 @@ import topoFactory from "./topoFactory";
 import ElementTagTipConfig from "./tagstips/ElementTagTipConfig";
 import SelectionManager from "./SelectionManager"; // eslint-disable-next-line no-undef
 
-var version = typeof "6.0.0-alpha.2" === 'string' ? "6.0.0-alpha.2" : null;
+var version = typeof "6.0.0-alpha.3" === 'string' ? "6.0.0-alpha.3" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/lib/components/VerticalIconTab/VerticalIconTab.module.scss

@@ -11,7 +11,7 @@
   width: 60px;
   height: 100%;
   padding-top: 4px;
-  // border-right: 1px solid #E6E7EB;
+  border-right: 1px solid var(--tab-wrapped-border-line-color);
   background: none !important;
 
   :global {
@@ -46,6 +46,7 @@
   width: 260px;
   height: 100%;
   transition: all .1s linear;
+  border-left: none !important;
   border-right: 1px solid var(--tab-wrapped-border-line-color);
 
   :global {

package/lib/components/collapse/Collapse.module.scss

@@ -26,8 +26,19 @@
 
     .#{$css-prefix}collapse-panel-content,
     .#{$css-prefix}collapse-panel-expanded>.#{$css-prefix}collapse-panel-content {
-      padding-left: 32px;
+      // padding-left: 32px;
       padding-top: 8px;
     }
   }
+
+  &.contentNoPadding {
+
+    :global {
+
+      .#{$css-prefix}collapse-panel-content,
+      .#{$css-prefix}collapse-panel-expanded>.#{$css-prefix}collapse-panel-content {
+        padding: 8px 0;
+      }
+    }
+  }
 }

package/lib/core/editor/components/Sidebar/Sidebar.js

@@ -23,11 +23,15 @@ var _CanvasPanel = _interopRequireDefault(require("./views/CanvasPanel"));
 
 var _SidebarModule = _interopRequireDefault(require("./Sidebar.module.scss"));
 
+var _classnames = _interopRequireDefault(require("classnames"));
+
 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 Sidebar(props) {
+  var _classNames;
+
   var topo = props.topo;
 
   var _useState = (0, _react.useState)(null),
@@ -84,7 +88,7 @@ function Sidebar(props) {
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: _SidebarModule["default"].sidebar
   }, /*#__PURE__*/_react["default"].createElement("div", {
-    className: _SidebarModule["default"].tabsContainer
+    className: (0, _classnames["default"])(_SidebarModule["default"].tabsContainer, (_classNames = {}, _classNames[_SidebarModule["default"].expanded] = !!activeKey, _classNames))
   }, /*#__PURE__*/_react["default"].createElement(_VerticalIconTab["default"], {
     activeKey: activeKey,
     onChange: setActivekey

package/lib/core/editor/components/Sidebar/Sidebar.module.scss

@@ -5,11 +5,15 @@
 
   .tabsContainer {
     position: absolute;
+    width: 60px;
     height: 100%;
     left: 0;
     top: 0;
     z-index: 1;
-    width: 320px;
     background: #FFF;
+
+    &.expanded {
+      width: 320px;
+    }
   }
 }

package/lib/core/editor/components/Sidebar/views/BackgroundPanel/BackgroundPanel.js

@@ -13,7 +13,6 @@ function BackgroundPanel(props) {
   var topo = props.topo,
       editorProps = props.editorProps;
   return /*#__PURE__*/_react["default"].createElement(_BackgroundView["default"], {
-    topo: topo,
-    editorProps: editorProps
+    topo: topo
   });
 }

package/lib/core/editor/components/Sidebar/views/ImagePanel/CiTypeImagePanel.js

@@ -9,7 +9,7 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
 
-var _ImagePalette = _interopRequireDefault(require("./ImagePalette"));
+var _HtImagePalette = _interopRequireDefault(require("./HtImagePalette"));
 
 var _icon = require("../../../../../common/icons/icon");
 
@@ -27,7 +27,7 @@ function CiTypeImagePanel(props) {
   var icons = (0, _react.useMemo)(function () {
     return (0, _icon.getNodeDefaultIcons)(topo);
   }, []);
-  return /*#__PURE__*/_react["default"].createElement(_ImagePalette["default"], {
+  return /*#__PURE__*/_react["default"].createElement(_HtImagePalette["default"], {
     icons: icons,
     topo: topo
   });