@lemon-fe/components 0.1.8 → 0.1.9

package/es/Actions/index.js

@@ -49,7 +49,7 @@ function Actions(props) {
     style: style
   }, /*#__PURE__*/React.createElement(Space, {
     direction: "horizontal",
-    size: 16
+    size: 12
   }, visibleBtns.map(function (item, index) {
     if (item === null) {
       return item;
@@ -118,7 +118,8 @@ function Actions(props) {
       }, rest), text, /*#__PURE__*/React.createElement(Icons.Down, {
         style: {
           opacity: 0.7,
-          fontSize: 16
+          fontSize: 16,
+          verticalAlign: -3
         }
       })));
     }

package/es/Dropdown/index.d.ts

@@ -0,0 +1,14 @@
+import type { PopoverProps } from 'antd';
+import type { ReactElement } from 'react';
+interface Props {
+    actions: ({
+        text: string | ReactElement;
+        onClick: () => void;
+        disabled?: boolean;
+    } | null)[];
+    overlayClassName?: string;
+    placement?: PopoverProps['placement'];
+    children?: ReactElement | null;
+}
+export default function Dropdown(props: Props): JSX.Element;
+export {};

package/es/Dropdown/index.js

@@ -0,0 +1,53 @@
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
+function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
+import { Popover } from 'antd';
+import React, { useState } from 'react';
+import classNames from 'classnames';
+import { PREFIX_CLS } from '../constants';
+export default function Dropdown(props) {
+  var actions = props.actions,
+      overlayClassName = props.overlayClassName,
+      _props$placement = props.placement,
+      placement = _props$placement === void 0 ? 'bottomRight' : _props$placement,
+      children = props.children;
+
+  var _useState = useState(false),
+      _useState2 = _slicedToArray(_useState, 2),
+      visible = _useState2[0],
+      setVisible = _useState2[1];
+
+  var prefixCls = "".concat(PREFIX_CLS, "-dropdown");
+  return /*#__PURE__*/React.createElement(Popover, {
+    trigger: "click",
+    placement: placement,
+    visible: visible,
+    onVisibleChange: setVisible,
+    overlayClassName: classNames(prefixCls, overlayClassName),
+    content: actions.map(function (item, index) {
+      return item !== null && /*#__PURE__*/React.createElement("div", {
+        className: classNames("".concat(prefixCls, "-item"), _defineProperty({}, "".concat(prefixCls, "-item-disabled"), item.disabled)),
+        key: index,
+        onClick: function onClick() {
+          if (item.disabled) {
+            return;
+          }
+
+          setVisible(false);
+          item.onClick();
+        }
+      }, item.text);
+    })
+  }, children);
+}

package/es/Dropdown/index.less

@@ -0,0 +1,13 @@
+.@{prefixCls}-dropdown {
+  .popover();
+
+  &-item {
+    .popoverItem();
+
+    &-disabled {
+      color: rgba(0, 0, 0, 0.25);
+      background-color: #fff !important;
+      cursor: not-allowed;
+    }
+  }
+}

package/es/Filter/index.js

@@ -29,13 +29,15 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 import React, { useEffect, useMemo, useState } from 'react';
-import { Button, Checkbox, Form, Input, Popover, Space, Dropdown, Menu, Modal, message, Select, Empty, InputNumber } from 'antd';
+import { Button, Checkbox, Form, Input, Popover, Space, Modal, message, Select, Empty, InputNumber } from 'antd';
 import { useDebounce, useRequest } from '@lemon-fe/hooks';
+import classNames from 'classnames';
 import Icons from '../Icons';
 import DurationPicker from '../DurationPicker';
 import FormLayout from '../FormLayout';
 import { PREFIX_CLS } from '../constants';
 import TabBar from '../TabBar';
+import Dropdown from '../Dropdown';
 var components = [{
   type: 'input',
   render: function render(item) {
@@ -107,7 +109,8 @@ function Filter(props) {
       defaultActiveKeys = props.defaultActiveKeys,
       storageKey = props.storageKey,
       onValuesChange = props.onValuesChange,
-      style = props.style;
+      style = props.style,
+      simple = props.simple;
   var prefixCls = PREFIX_CLS;
   var defaultValue = useMemo(function () {
     return defaultValueProp || value;
@@ -407,10 +410,10 @@ function Filter(props) {
     initialValues: defaultValue,
     onFinish: handleFinish,
     form: form,
-    className: "".concat(prefixCls, "-filter"),
+    className: classNames("".concat(prefixCls, "-filter"), _defineProperty({}, "".concat(prefixCls, "-simple-filter"), simple)),
     onValuesChange: handleValuesChange,
     style: style
-  }, /*#__PURE__*/React.createElement(TabBar, {
+  }, !simple && /*#__PURE__*/React.createElement(TabBar, {
     tabs: tabs,
     activeKey: tabs[active].title,
     onTabClick: function onTabClick(_, index) {
@@ -442,18 +445,33 @@ function Filter(props) {
       type: "primary",
       htmlType: "submit"
     }, "\u67E5\u8BE2")
-  }, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Dropdown, {
-    placement: "bottomRight",
-    overlay: /*#__PURE__*/React.createElement(Menu, null, /*#__PURE__*/React.createElement(Menu.Item, {
-      key: "reset",
+  }, simple ? /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Button, {
+    className: "".concat(prefixCls, "-filter-btn"),
+    onClick: handleReset
+  }, /*#__PURE__*/React.createElement("svg", {
+    width: "20",
+    height: "20",
+    viewBox: "0 0 20 20",
+    xmlns: "http://www.w3.org/2000/svg"
+  }, /*#__PURE__*/React.createElement("path", {
+    d: "m15 12 .98 3.314a8 8 0 1 0-3.293 2.223",
+    stroke: "currentColor",
+    strokeWidth: "1.5",
+    strokeLinecap: "round",
+    strokeLinejoin: "round",
+    fill: "none",
+    fillRule: "evenodd"
+  })))) : /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Dropdown, {
+    actions: [{
+      text: '重置',
       onClick: handleReset
-    }, "\u91CD\u7F6E"), /*#__PURE__*/React.createElement(Menu.Item, {
-      key: "save",
+    }, {
+      text: '保存方案',
       onClick: handleAddTab
-    }, "\u4FDD\u5B58\u65B9\u6848"), /*#__PURE__*/React.createElement(Menu.Item, {
-      key: "delete",
+    }, {
+      text: '删除方案',
       onClick: handleDelete
-    }, "\u5220\u9664\u65B9\u6848"))
+    }]
   }, /*#__PURE__*/React.createElement(Button, {
     icon: /*#__PURE__*/React.createElement(Icons.More, null)
   })), /*#__PURE__*/React.createElement(Popover, {
@@ -464,11 +482,7 @@ function Filter(props) {
       placeholder: "\u641C\u7D22\u9009\u9879",
       allowClear: true,
       className: "".concat(prefixCls, "-filter-items-search"),
-      suffix: /*#__PURE__*/React.createElement(Icons.Search, {
-        style: {
-          color: '#686868'
-        }
-      }),
+      prefix: /*#__PURE__*/React.createElement(Icons.Search, null),
       onChange: function onChange(e) {
         return handleChangeKeywords(e.currentTarget.value);
       }

package/es/Filter/index.less

@@ -1,5 +1,3 @@
-@import '../theme.less';
-
 .@{prefixCls}-filter {
   &-tab {
     height: 100%;
@@ -38,46 +36,30 @@
   }
 
   &-popover {
-    width: 227px;
-    padding-top: 0;
-
-    .ant-popover-arrow {
-      display: none;
-    }
+    .popover(220px);
 
     .ant-popover-inner {
-      box-shadow: 0 2px 6px 0 rgba(0, 0, 0, 0.15);
-    }
-
-    .ant-popover-inner-content {
-      padding: 4px 5px 16px;
+      padding: 16px 0;
     }
   }
 
-  &-items-search.ant-input-affix-wrapper {
-    height: 40px;
-    background-color: #f7f6f6;
-    border: none;
-    outline: none;
-    box-shadow: none;
-
-    input {
-      background-color: transparent;
-    }
+  &-items-search {
+    width: auto;
+    margin: 0 16px 8px;
   }
 
   &-items {
     max-height: 400px;
-    padding: 0 20px;
     overflow: auto;
   }
 
   &-item {
-    margin-top: 16px;
-    overflow: hidden;
+    .popoverItem();
 
-    .ant-checkbox-wrapper {
-      color: #888;
-    }
+    overflow: hidden;
   }
 }
+
+.@{prefixCls}-section-body > .@{prefixCls}-filter:not(.@{prefixCls}-simple-filter):first-child {
+  margin-top: -16px;
+}

package/es/Filter/typings.d.ts

@@ -19,6 +19,10 @@ export interface FilterProps<T extends Record<string, any> = Record<string, any>
   defaultActiveKeys?: string[];
   storageKey?: string;
   style?: CSSProperties;
+  /**
+   * @description 是否简化筛选器，简化版不包含标签以及选项保存
+   */
+  simple?: boolean;
 }
 
 export interface ComponentOption {

package/es/Section/index.less

@@ -54,10 +54,6 @@
     &.ant-tabs-tabpane {
       border-top-left-radius: 0;
     }
-
-    & > .@{prefixCls}-filter:first-child {
-      margin-top: -16px;
-    }
   }
 
   &-footer {

package/es/index.d.ts

@@ -27,3 +27,4 @@ export { default as FormTable } from './FormTable';
 export type { FormTableColumnType, FormTableProps, FormTableRef } from './FormTable/typings';
 export { default as TabBar } from './TabBar';
 export { default as SymbolIcon } from './SymbolIcon';
+export { default as Dropdown } from './Dropdown';

package/es/index.js

@@ -21,4 +21,5 @@ export { default as FormHorizontal } from './FormHorizontal';
 export { default as FormInline } from './FormInline';
 export { default as FormTable } from './FormTable';
 export { default as TabBar } from './TabBar';
-export { default as SymbolIcon } from './SymbolIcon';
+export { default as SymbolIcon } from './SymbolIcon';
+export { default as Dropdown } from './Dropdown';

package/es/index.less

@@ -22,3 +22,4 @@
 @import './FormTable/index.less';
 @import './TabBar/index.less';
 @import './SymbolIcon/index.less';
+@import './Dropdown/index.less';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lemon-fe/components",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "description": "> TODO: description",
   "author": "鲁盛杰 <lusj@cnlemon.net>",
   "homepage": "",
@@ -41,5 +41,5 @@
     "react": "^17.0.2",
     "react-dom": "^17.0.2"
   },
-  "gitHead": "4ccc4baa581c66b4820373dffec12433c3ae7712"
+  "gitHead": "f43d8d68fe859bd2d30478c18b85fafc2310595d"
 }