@riil-frontend/component-topology 2.5.2 → 2.5.3

package/es/components/Drawer/index.js

@@ -11,8 +11,8 @@ var headerStyle = {
   zIndex: 1000
 };
 var bodyStyle = {
-  margin: '50px auto' // padding: '10px',
-
+  margin: '50px auto',
+  padding: '16px 24px'
 };
 
 var Drawer = function Drawer(props) {

package/es/components/FormTable/index.js

@@ -2,7 +2,7 @@ import _Table from "@alifd/next/lib/table";
 import _Button from "@alifd/next/lib/button";
 import _extends from "@babel/runtime/helpers/extends";
 import _Search from "@alifd/next/lib/search";
-import React from 'react';
+import React, { useState } from 'react';
 import { SchemaForm, SchemaMarkupField as Field } from '@formily/next';
 import Pagination from '@riil-frontend/component-pager';
 import MoreButtonsMenu from '@riil-frontend/component-more-buttons-menu';
@@ -11,6 +11,8 @@ import TableLayout from '@riil-frontend/component-table-layout';
 import NoDataPage from '@riil-frontend/component-topology-utils/es/components/NoDataPage';
 
 var FormTable = function FormTable(props) {
+  var _tableProps$filterPar;
+
   var className = props.className,
       children = props.children,
       formProps = props.formProps,
@@ -23,6 +25,12 @@ var FormTable = function FormTable(props) {
       showChecked = _props$showChecked === void 0 ? false : _props$showChecked,
       _props$showPageSizeSe = props.showPageSizeSelector,
       showPageSizeSelector = _props$showPageSizeSe === void 0 ? false : _props$showPageSizeSe;
+
+  var _useState = useState(false),
+      isSearching = _useState[0],
+      setIsSearching = _useState[1];
+
+  var isFilter = isSearching || ((_tableProps$filterPar = tableProps.filterParams.typeCode) === null || _tableProps$filterPar === void 0 ? void 0 : _tableProps$filterPar.selectedKeys.length);
   return /*#__PURE__*/React.createElement("div", {
     className: "riil-table-common " + className,
     style: {
@@ -43,8 +51,12 @@ var FormTable = function FormTable(props) {
     "x-component-props": {
       shape: 'simple',
       placeholder: '请输入关键字',
-      onSearch: function onSearch() {
-        return formProps.actions.submit();
+      onSearch: function onSearch(val) {
+        setIsSearching(!!val);
+        formProps.actions.submit();
+      },
+      style: {
+        width: 200
       }
     }
   }))), menu && /*#__PURE__*/React.createElement("div", {
@@ -75,7 +87,7 @@ var FormTable = function FormTable(props) {
     table: /*#__PURE__*/React.createElement(_Table, _extends({}, tableProps, {
       fixedHeader: true,
       hasBorder: false,
-      emptyContent: "\u6682\u65E0\u6570\u636E"
+      emptyContent: !isFilter ? '暂无数据' : '暂无搜索结果'
     }), columns.map(function (column) {
       return /*#__PURE__*/React.createElement(_Table.Column, _extends({}, column, {
         key: column.dataIndex

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

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

package/es/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,12 +35,20 @@
     .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;
     }

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

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

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

@@ -0,0 +1,8 @@
+import _Tab from "@alifd/next/lib/tab";
+import React, { useState, useEffect } from 'react';
+import styles from "./TabView.module.scss";
+export default function TabView(props) {
+  return /*#__PURE__*/React.createElement(_Tab, {
+    className: styles.tabs
+  }, props.children);
+}

package/es/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/es/core/editor/components/settings/node/NodePropertyView.js

@@ -11,6 +11,8 @@ import textStyles from "../../../../common/text.module.scss";
 import TopoTreeSelect from "./TopoTreeSelect";
 import NodeIconSelect from "./NodeIconSelect";
 import NodeRelateResourceButton from "./NodeRelateResourceButton";
+import styles from "./NodePropertyView.module.scss";
+import TabView from "../common/tab/TabView";
 var Option = _Select.Option;
 var CollapsePanel = _Collapse.Panel;
 
@@ -151,7 +153,9 @@ export default 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.createElement("div", null, showRelateResource ? /*#__PURE__*/React.createElement(_Tab, null, /*#__PURE__*/React.createElement(_Tab.Item, {
+  return /*#__PURE__*/React.createElement("div", {
+    className: styles.NodePropertyView
+  }, showRelateResource ? /*#__PURE__*/React.createElement(TabView, null, /*#__PURE__*/React.createElement(_Tab.Item, {
     title: "\u6570\u636E",
     key: "1"
   }, renderData()), /*#__PURE__*/React.createElement(_Tab.Item, {

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

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

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

@@ -52,7 +52,11 @@ export default function TextPropertyView(props) {
   useEffect(function () {
     field.setValues(parseValues(values));
   }, [values]);
-  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(_Form, {
+  return /*#__PURE__*/React.createElement("div", {
+    style: {
+      paddingTop: 4
+    }
+  }, /*#__PURE__*/React.createElement(_Form, {
     field: field,
     labelAlign: "top"
   }, /*#__PURE__*/React.createElement(_Form.Item, null, /*#__PURE__*/React.createElement(_Collapse, {

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

@@ -77,7 +77,11 @@ export default function ViewPropertyView(props) {
   useEffect(function () {
     field.setValues(parseValues(values));
   }, [values]);
-  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(_Form, {
+  return /*#__PURE__*/React.createElement("div", {
+    style: {
+      paddingTop: 4
+    }
+  }, /*#__PURE__*/React.createElement(_Form, {
     field: field,
     labelAlign: "top"
   }, /*#__PURE__*/React.createElement(_Form.Item, null, /*#__PURE__*/React.createElement(_Collapse, {
@@ -101,5 +105,5 @@ export default function ViewPropertyView(props) {
     title: "\u56FE\u7247"
   }, /*#__PURE__*/React.createElement(_Form.Item, {
     label: "\u56FE\u7247\u5C3A\u5BF8"
-  }, /*#__PURE__*/React.createElement(BatchSetNodeSize, null)))))));
+  }))))));
 }

package/lib/components/Drawer/index.js

@@ -23,8 +23,8 @@ var headerStyle = {
   zIndex: 1000
 };
 var bodyStyle = {
-  margin: '50px auto' // padding: '10px',
-
+  margin: '50px auto',
+  padding: '16px 24px'
 };
 
 var Drawer = function Drawer(props) {

package/lib/components/FormTable/index.js

@@ -1,5 +1,7 @@
 "use strict";
 
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
+
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 exports.__esModule = true;
@@ -13,7 +15,7 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 
 var _search = _interopRequireDefault(require("@alifd/next/lib/search"));
 
-var _react = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
 
 var _next = require("@formily/next");
 
@@ -28,6 +30,8 @@ var _componentTableLayout = _interopRequireDefault(require("@riil-frontend/compo
 var _NoDataPage = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/components/NoDataPage"));
 
 var FormTable = function FormTable(props) {
+  var _tableProps$filterPar;
+
   var className = props.className,
       children = props.children,
       formProps = props.formProps,
@@ -40,6 +44,12 @@ var FormTable = function FormTable(props) {
       showChecked = _props$showChecked === void 0 ? false : _props$showChecked,
       _props$showPageSizeSe = props.showPageSizeSelector,
       showPageSizeSelector = _props$showPageSizeSe === void 0 ? false : _props$showPageSizeSe;
+
+  var _useState = (0, _react.useState)(false),
+      isSearching = _useState[0],
+      setIsSearching = _useState[1];
+
+  var isFilter = isSearching || ((_tableProps$filterPar = tableProps.filterParams.typeCode) === null || _tableProps$filterPar === void 0 ? void 0 : _tableProps$filterPar.selectedKeys.length);
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: "riil-table-common " + className,
     style: {
@@ -60,8 +70,12 @@ var FormTable = function FormTable(props) {
     "x-component-props": {
       shape: 'simple',
       placeholder: '请输入关键字',
-      onSearch: function onSearch() {
-        return formProps.actions.submit();
+      onSearch: function onSearch(val) {
+        setIsSearching(!!val);
+        formProps.actions.submit();
+      },
+      style: {
+        width: 200
       }
     }
   }))), menu && /*#__PURE__*/_react["default"].createElement("div", {
@@ -92,7 +106,7 @@ var FormTable = function FormTable(props) {
     table: /*#__PURE__*/_react["default"].createElement(_table["default"], (0, _extends2["default"])({}, tableProps, {
       fixedHeader: true,
       hasBorder: false,
-      emptyContent: "\u6682\u65E0\u6570\u636E"
+      emptyContent: !isFilter ? '暂无数据' : '暂无搜索结果'
     }), columns.map(function (column) {
       return /*#__PURE__*/_react["default"].createElement(_table["default"].Column, (0, _extends2["default"])({}, column, {
         key: column.dataIndex

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/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,12 +35,20 @@
     .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;
     }

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "2.5.2",
+  "version": "2.5.3",
   "description": "拓扑",
   "scripts": {
     "start": "build-scripts start",
@@ -100,6 +100,6 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@riil-frontend/component-topology@2.5.2/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@2.5.3/build/index.html",
   "gitHead": "8d9f286eb5da11dfadbef62890d74d2c2dd4d3a9"
 }