@riil-frontend/component-topology 2.5.1 → 2.5.5

package/lib/components/MultiResourceDrawer/Static.js

@@ -15,28 +15,19 @@ var _indexModule = _interopRequireDefault(require("./index.module.scss"));
 
 var Static = function Static(props, ref) {
   var store = props.store,
-      checked = props.checked,
       selectedKeys = props.selectedKeys,
-      totalSelection = props.totalSelection,
-      onChange = props.onChange;
+      totalSelection = props.totalSelection;
   var initialData = {
     selected: selectedKeys,
     total: totalSelection
   };
-  return /*#__PURE__*/_react["default"].createElement(_ResourceCard["default"], {
-    title: "\u56FA\u5B9A\u8D44\u6E90",
-    checked: checked,
-    onCheckChange: onChange,
-    style: {
-      marginBottom: 0
-    }
-  }, /*#__PURE__*/_react["default"].createElement(_ResourceList["default"], {
+  return /*#__PURE__*/_react["default"].createElement(_ResourceList["default"], {
     ref: ref,
     store: store,
     className: _indexModule["default"].table,
     initialData: initialData,
     selectionMode: "multiple"
-  }));
+  });
 };
 
 var _default = /*#__PURE__*/_react["default"].forwardRef(Static);

package/lib/components/MultiResourceDrawer/index.js

@@ -15,6 +15,8 @@ var _Drawer = _interopRequireDefault(require("../Drawer"));
 
 var _Content = _interopRequireDefault(require("./Content"));
 
+var _ResourceSelect = _interopRequireDefault(require("./ResourceSelect"));
+
 // import styles from './index.module.scss';
 var MultiResourceDrawer = function MultiResourceDrawer(props) {
   var store = props.store,
@@ -57,7 +59,7 @@ var MultiResourceDrawer = function MultiResourceDrawer(props) {
       width: '80%'
     },
     buttons: ['确定', '取消']
-  }, initialData && /*#__PURE__*/_react["default"].createElement(_Content["default"], {
+  }, initialData && /*#__PURE__*/_react["default"].createElement(_ResourceSelect["default"], {
     ref: contentRef,
     store: store,
     initialData: initialData,

package/lib/components/ResourceSelect/ResourceSelectDrawer.module.scss

@@ -6,6 +6,8 @@
   :global {
     .next-drawer-body {
       flex: 1;
+      padding-top: 16px;
+      padding-bottom: 4px !important;
     }
   }
 }

package/lib/components/TemplateButton/index.js

@@ -17,12 +17,13 @@ var _Icon = _interopRequireDefault(require("./Icon"));
 
 var _indexModule = _interopRequireDefault(require("./index.module.scss"));
 
-var _excluded = ["children", "icon", "id", "selected", "onSelect", "size"];
+var _excluded = ["className", "children", "icon", "id", "selected", "onSelect", "size"];
 
 var TemplateButton = function TemplateButton(props) {
   var _classnames;
 
-  var children = props.children,
+  var className = props.className,
+      children = props.children,
       icon = props.icon,
       id = props.id,
       selected = props.selected,
@@ -36,7 +37,7 @@ var TemplateButton = function TemplateButton(props) {
   };
 
   return /*#__PURE__*/_react["default"].createElement("div", {
-    className: (0, _classnames2["default"])(_indexModule["default"].card, (_classnames = {}, _classnames[_indexModule["default"].selected] = selected, _classnames[_indexModule["default"].sizeSmall] = size === 'small', _classnames)),
+    className: (0, _classnames2["default"])(_indexModule["default"].card, className, (_classnames = {}, _classnames[_indexModule["default"].selected] = selected, _classnames[_indexModule["default"].sizeSmall] = size === 'small', _classnames[_indexModule["default"].sizeLarge] = size === 'large', _classnames)),
     onClick: handleClick
   }, /*#__PURE__*/_react["default"].createElement(_Icon["default"], (0, _extends2["default"])({
     className: _indexModule["default"].icon,

package/lib/components/TemplateButton/index.module.scss

@@ -6,18 +6,23 @@
   justify-content: center;
   align-items: center;
   border: 1px solid #c4c6cf;
-  width: 100px;
-  height: 100px;
-  margin: 10px;
+  width: 120px;
+  height: 136px;
   background-color: #fff;
   text-align: center;
   cursor: pointer;
   vertical-align: middle;
+  margin-right: 12px;
 
   &:hover, &:focus, &.selected {
     border-color: $color-brand1-5;
   }
 
+  &.sizeNormal {
+    width: 120px;
+    height: 136px;
+  }
+
   &.sizeSmall {
     width: 50px;
     height: 50px;

package/lib/components/TemplateGroup/index.js

@@ -5,6 +5,8 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports["default"] = void 0;
 
+var _box = _interopRequireDefault(require("@alifd/next/lib/box"));
+
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
 var _react = _interopRequireDefault(require("react"));
@@ -17,17 +19,20 @@ var TemplateGroup = function TemplateGroup(props) {
   var name = props.name,
       _props$data = props.data,
       data = _props$data === void 0 ? [] : _props$data,
-      size = props.size;
+      size = props.size,
+      _props$itemProps = props.itemProps,
+      itemProps = _props$itemProps === void 0 ? {} : _props$itemProps;
   return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, name && /*#__PURE__*/_react["default"].createElement("div", {
     className: _indexModule["default"].name
-  }, name), /*#__PURE__*/_react["default"].createElement("div", {
-    className: _indexModule["default"].buttons
+  }, name), /*#__PURE__*/_react["default"].createElement(_box["default"], {
+    direction: "row",
+    spacing: 32
   }, data.map(function (item) {
     return /*#__PURE__*/_react["default"].createElement(_TemplateButton["default"], (0, _extends2["default"])({
       key: item.id
     }, item, {
       size: size
-    }), item.name);
+    }, itemProps), item.name);
   })));
 };
 

package/lib/components/TemplateGroup/index.module.scss

@@ -1,7 +1,3 @@
 .name {
   margin: 20px 0 0 10px;
 }
-
-.buttons {
-  margin: 10px 0;
-}

package/lib/components/TemplateSelect/index.d.ts

@@ -0,0 +1,2 @@
+export default TemplateSelect;
+declare function TemplateSelect(props: any): JSX.Element;

package/lib/components/TemplateSelect/index.js

@@ -0,0 +1,45 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = void 0;
+
+var _tag = _interopRequireDefault(require("@alifd/next/lib/tag"));
+
+var _react = _interopRequireDefault(require("react"));
+
+var _TemplateButton = _interopRequireDefault(require("../TemplateButton"));
+
+var _indexModule = _interopRequireDefault(require("./index.module.scss"));
+
+var _TemplateGroup = _interopRequireDefault(require("../TemplateGroup"));
+
+var TagGroup = _tag["default"].Group,
+    SelectableTag = _tag["default"].Selectable;
+
+var TemplateSelect = function TemplateSelect(props) {
+  return /*#__PURE__*/_react["default"].createElement(_TemplateGroup["default"], props); // const { data = [], size } = props;
+  // return (
+  //   <TagGroup>
+  //     {data.map((item) => (
+  //       <SelectableTag
+  //         key={item.name}
+  //         checked={item.selected}
+  //         onChange={() => {}}
+  //       >
+  //         <TemplateButton
+  //           key={item.id}
+  //           {...item}
+  //           size={size}
+  //         >
+  //           {item.name}
+  //         </TemplateButton>
+  //       </SelectableTag>
+  //     ))}
+  //   </TagGroup>
+  // )
+};
+
+var _default = TemplateSelect;
+exports["default"] = _default;

package/lib/components/TemplateSelect/index.module.scss

@@ -0,0 +1,3 @@
+.name {
+  margin: 20px 0 0 10px;
+}

package/lib/core/components/titlebar/TitleBar.module.scss

@@ -1,16 +1,20 @@
 .titlebar {
   display: flex;
-  padding: 16px;
 
   .left {
+    display: flex;
     flex: 1;
-
+    align-items: center;
   }
 
   .right {
 
   }
 
+  &.titlebarViewMode {
+    padding: 16px 16px 16px 0;
+  }
+
   &.titlebarEditMode {
     padding: 10px 16px;
   }

package/lib/core/editor/components/settings/Settings.module.scss

@@ -20,11 +20,13 @@
       width: 7px;
       height: 7px;
     }
+
     ::-webkit-scrollbar-thumb {
       background-color: rgba(0, 0, 0, 0.2);
       border-radius: 7px;
       transition: all 0.25s ease-in-out;
     }
+
     ::-webkit-scrollbar-thumb:hover {
       background-color: rgba(0, 0, 0, 0.3);
     }
@@ -33,14 +35,23 @@
     .next-collapse-panel:not(:first-child) {
       border-top: none;
     }
+
     .next-collapse-panel-title {
       background: none;
       font-size: 12px;
       padding-bottom: 0;
       padding-left: 32px;
+
+      & > .next-collapse-panel-icon {
+        left: 12px;
+        margin-top: 0;
+        margin-left: 0;
+      }
     }
+
     .next-collapse-panel-content {
       padding-left: 32px;
+      padding-top: 8px;
     }
   }
 

package/lib/core/editor/components/settings/common/tab/TabView.d.ts

@@ -0,0 +1 @@
+export default function TabView(props: any): JSX.Element;

package/lib/core/editor/components/settings/common/tab/TabView.js

@@ -0,0 +1,20 @@
+"use strict";
+
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = TabView;
+
+var _tab = _interopRequireDefault(require("@alifd/next/lib/tab"));
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _TabViewModule = _interopRequireDefault(require("./TabView.module.scss"));
+
+function TabView(props) {
+  return /*#__PURE__*/_react["default"].createElement(_tab["default"], {
+    className: _TabViewModule["default"].tabs
+  }, props.children);
+}

package/lib/core/editor/components/settings/common/tab/TabView.module.scss

@@ -0,0 +1,13 @@
+.tabs {
+  margin-top: 8px;
+
+  :global {
+    .next-tabs-bar {
+      margin-left: 16px;
+      margin-right: 16px;
+    }
+    .next-tabs-content {
+      padding-top: 8px;
+    }
+  }
+}

package/lib/core/editor/components/settings/node/NodePropertyView.js

@@ -33,6 +33,10 @@ var _NodeIconSelect = _interopRequireDefault(require("./NodeIconSelect"));
 
 var _NodeRelateResourceButton = _interopRequireDefault(require("./NodeRelateResourceButton"));
 
+var _NodePropertyViewModule = _interopRequireDefault(require("./NodePropertyView.module.scss"));
+
+var _TabView = _interopRequireDefault(require("../common/tab/TabView"));
+
 var Option = _select["default"].Option;
 var CollapsePanel = _collapse["default"].Panel;
 
@@ -173,7 +177,9 @@ function NodePropertyView(props) {
 
 
   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;
-  return /*#__PURE__*/_react["default"].createElement("div", null, showRelateResource ? /*#__PURE__*/_react["default"].createElement(_tab["default"], null, /*#__PURE__*/_react["default"].createElement(_tab["default"].Item, {
+  return /*#__PURE__*/_react["default"].createElement("div", {
+    className: _NodePropertyViewModule["default"].NodePropertyView
+  }, showRelateResource ? /*#__PURE__*/_react["default"].createElement(_TabView["default"], null, /*#__PURE__*/_react["default"].createElement(_tab["default"].Item, {
     title: "\u6570\u636E",
     key: "1"
   }, renderData()), /*#__PURE__*/_react["default"].createElement(_tab["default"].Item, {

package/lib/core/editor/components/settings/node/NodePropertyView.module.scss

@@ -0,0 +1,3 @@
+.NodePropertyView {
+
+}

package/lib/core/editor/components/settings/text/TextPropertyView.js

@@ -68,7 +68,11 @@ function TextPropertyView(props) {
   (0, _react.useEffect)(function () {
     field.setValues(parseValues(values));
   }, [values]);
-  return /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_form["default"], {
+  return /*#__PURE__*/_react["default"].createElement("div", {
+    style: {
+      paddingTop: 4
+    }
+  }, /*#__PURE__*/_react["default"].createElement(_form["default"], {
     field: field,
     labelAlign: "top"
   }, /*#__PURE__*/_react["default"].createElement(_form["default"].Item, null, /*#__PURE__*/_react["default"].createElement(_collapse["default"], {

package/lib/core/editor/components/settings/view/ViewPropertyView.js

@@ -95,7 +95,11 @@ function ViewPropertyView(props) {
   (0, _react.useEffect)(function () {
     field.setValues(parseValues(values));
   }, [values]);
-  return /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_form["default"], {
+  return /*#__PURE__*/_react["default"].createElement("div", {
+    style: {
+      paddingTop: 4
+    }
+  }, /*#__PURE__*/_react["default"].createElement(_form["default"], {
     field: field,
     labelAlign: "top"
   }, /*#__PURE__*/_react["default"].createElement(_form["default"].Item, null, /*#__PURE__*/_react["default"].createElement(_collapse["default"], {
@@ -119,5 +123,5 @@ function ViewPropertyView(props) {
     title: "\u56FE\u7247"
   }, /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
     label: "\u56FE\u7247\u5C3A\u5BF8"
-  }, /*#__PURE__*/_react["default"].createElement(_BatchSetNodeSize["default"], null)))))));
+  }))))));
 }

package/lib/core/viewer/components/titlebar/TopoViewerTitleBar.js

@@ -1,23 +1,21 @@
 "use strict";
 
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
-
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
+
 exports.__esModule = true;
 exports["default"] = TopoViewerTitleBar;
 
-var _menuButton = _interopRequireDefault(require("@alifd/next/lib/menu-button"));
-
 var _react = _interopRequireWildcard(require("react"));
 
-var _ViewerTools = _interopRequireDefault(require("./ViewerTools"));
+var _classnames = _interopRequireDefault(require("classnames"));
 
-var _TitleWidget = _interopRequireDefault(require("../../../components/titlebar/widgets/TitleWidget"));
+var _ViewerTools = _interopRequireDefault(require("./ViewerTools"));
 
 var _TitleBarModule = _interopRequireDefault(require("../../../components/titlebar/TitleBar.module.scss"));
 
-var Item = _menuButton["default"].Item;
+var _SearchWidget = _interopRequireDefault(require("./widgets/SearchWidget"));
 
 function TopoViewerTitleBar(props) {
   var topo = props.topo,
@@ -25,10 +23,10 @@ function TopoViewerTitleBar(props) {
       onEnterEdit = props.onEnterEdit,
       children = props.children;
   return /*#__PURE__*/_react["default"].createElement("div", {
-    className: _TitleBarModule["default"].titlebar
+    className: (0, _classnames["default"])(_TitleBarModule["default"].titlebar, _TitleBarModule["default"].titlebarViewMode)
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: _TitleBarModule["default"].left
-  }, children || /*#__PURE__*/_react["default"].createElement(_TitleWidget["default"], {
+  }, children || /*#__PURE__*/_react["default"].createElement(_SearchWidget["default"], {
     topo: topo
   })), /*#__PURE__*/_react["default"].createElement("div", {
     className: _TitleBarModule["default"].right

package/lib/core/viewer/components/titlebar/ViewerTools.js

@@ -19,8 +19,6 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _SearchWidget = _interopRequireDefault(require("./widgets/SearchWidget"));
-
 var _TitleBarModule = _interopRequireDefault(require("../../../components/titlebar/TitleBar.module.scss"));
 
 var _EditButton = _interopRequireDefault(require("./widgets/EditButton"));
@@ -29,9 +27,7 @@ function ViewerTools(props) {
   var topo = props.topo,
       _props$showEditButton = props.showEditButton,
       showEditButton = _props$showEditButton === void 0 ? true : _props$showEditButton;
-  return /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_SearchWidget["default"], {
-    topo: topo
-  }), showEditButton && /*#__PURE__*/_react["default"].createElement(_EditButton["default"], (0, _extends2["default"])({
+  return /*#__PURE__*/_react["default"].createElement("div", null, showEditButton && /*#__PURE__*/_react["default"].createElement(_EditButton["default"], (0, _extends2["default"])({
     topo: topo
   }, props)), /*#__PURE__*/_react["default"].createElement(_dropdown["default"], {
     trigger: /*#__PURE__*/_react["default"].createElement(_button["default"], {

package/lib/style.js

@@ -18,7 +18,6 @@ require('@alifd/next/lib/select/style');
 require('@alifd/next/lib/balloon/style');
 require('@alifd/next/lib/grid/style');
 require('@alifd/next/lib/box/style');
-require('@alifd/next/lib/menu-button/style');
 require('@alifd/next/lib/dropdown/style');
 require('@alifd/next/lib/menu/style');
 require('@alifd/next/lib/tab/style');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "2.5.1",
+  "version": "2.5.5",
   "description": "拓扑",
   "scripts": {
     "start": "build-scripts start",
@@ -55,9 +55,9 @@
     "@riil-frontend/component-row-delete-ballon": "^1.0.2",
     "@riil-frontend/component-table-filter-tags": "latest",
     "@riil-frontend/component-table-layout": "^2.0.1",
-    "@riil-frontend/component-topo-icon-select": "^1.0.0",
-    "@riil-frontend/component-topology-graph": "^2.1.13",
-    "@riil-frontend/component-topology-utils": "^2.0.14",
+    "@riil-frontend/component-topo-icon-select": "^1.0.1",
+    "@riil-frontend/component-topology-graph": "^2.1.14",
+    "@riil-frontend/component-topology-utils": "^2.0.15",
     "@riil-frontend/css": "^2.0.2",
     "@riil-frontend/hooks": "latest",
     "@riil-frontend/next-collapse": "^1.0.1-a.0",
@@ -100,6 +100,6 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@riil-frontend/component-topology@2.5.1/build/index.html",
-  "gitHead": "8d9f286eb5da11dfadbef62890d74d2c2dd4d3a9"
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@2.5.5/build/index.html",
+  "gitHead": "46c3aa6114107b57341e29c43a8a1b520f4dd7a4"
 }

package/CHANGELOG.md

@@ -1,26 +0,0 @@
-## v2.1.8
-
-- 支持自定义分层添加资源组件
-- 支持添加节点、连线接口 `addElements(data)`
-
-## v2.1.4
-
-- ht 新旧版本共存
-
-## v2.1.3
-
-- 自定义图标
-
-
-## v2.0.2
-
-- 支持编辑模式右键菜单
-
-## v2.0.1
-
-新增功能
-- 拓扑图全量更新数据接口，更新时保留元素样式
-- 编辑模式右键菜单
-
-阻断变更
-- 暂时恢复页面加载ht topo-client.js