@lemon-fe/kits 1.0.0-144 → 1.0.0-146

package/es/components/DataGrid/components/Search.js

@@ -158,9 +158,10 @@ export default /*#__PURE__*/memo( /*#__PURE__*/forwardRef(function Search(props,
       }
     };
   });
-  return /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement("span", null, "\u5173\u952E\u5B57"), /*#__PURE__*/React.createElement(Input, {
-    placeholder: placeholder,
+  return /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Input, {
+    placeholder: placeholder || '输入关键字搜索',
     value: state.keywords,
+    size: "small",
     onChange: function onChange(e) {
       setState(function (prev) {
         return _objectSpread(_objectSpread({}, prev), {}, {
@@ -176,8 +177,10 @@ export default /*#__PURE__*/memo( /*#__PURE__*/forwardRef(function Search(props,
       }
     }
   }), /*#__PURE__*/React.createElement(Button, {
+    size: "small",
     onClick: handlePrev
   }, "\u4E0A\u4E00\u4E2A"), /*#__PURE__*/React.createElement(Button, {
+    size: "small",
     onClick: handleNext
   }, "\u4E0B\u4E00\u4E2A"));
 }));

package/es/components/DataGrid/index.js

@@ -1039,6 +1039,10 @@ var DataGrid = /*#__PURE__*/function (_Component) {
           if (onLoad) {
             onLoad(res.extra);
           }
+
+          _this5.store.setState({
+            fetchError: undefined
+          });
         }).catch(function (err) {
           _this5.store.setState({
             fetchError: err

package/es/components/DurationPicker/index.js

@@ -24,11 +24,11 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 
-import { DatePicker, Dropdown, Menu } from 'antd';
+import { DatePicker, Select } from 'antd';
 import moment from 'moment';
 import React, { useMemo, useState, useEffect } from 'react';
 import { PREFIX_CLS } from "../../constants";
-import Down from "../Icons/Down";
+import InputCompact from "../InputCompact";
 var defaultOptions = [{
   label: '自定义时段',
   value: null
@@ -177,37 +177,39 @@ function DurationPicker(props) {
 
   return /*#__PURE__*/React.createElement("div", {
     className: "".concat(prefixCls, "-duration")
-  }, !hideType && /*#__PURE__*/React.createElement(Dropdown, {
-    overlay: /*#__PURE__*/React.createElement(Menu, {
-      items: types.map(function (item) {
-        return {
-          label: item.label,
-          key: item.value,
-          onClick: function onClick() {
-            handleChangeType(item);
-          }
-        };
-      })
-    })
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "".concat(prefixCls, "-duration-type")
-  }, (_result$type = result.type) === null || _result$type === void 0 ? void 0 : _result$type.label, /*#__PURE__*/React.createElement(Down, null))), /*#__PURE__*/React.createElement("div", {
-    className: "".concat(prefixCls, "-duration-picker")
-  }, /*#__PURE__*/React.createElement(Dropdown, {
-    overlay: /*#__PURE__*/React.createElement(Menu, {
-      items: options.map(function (item) {
-        return {
-          label: item.label,
-          key: item.label,
-          onClick: function onClick() {
-            handleChangeOption(item);
-          }
-        };
-      })
-    })
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "".concat(prefixCls, "-duration-option")
-  }, (_result$option = result.option) === null || _result$option === void 0 ? void 0 : _result$option.label, /*#__PURE__*/React.createElement(Down, null))), /*#__PURE__*/React.createElement(DatePicker.RangePicker, _extends({
+  }, !hideType && /*#__PURE__*/React.createElement(Select, {
+    options: types.map(function (item) {
+      return {
+        label: item.label,
+        value: item.label,
+        item: item
+      };
+    }),
+    style: {
+      marginRight: 8,
+      color: '#666'
+    },
+    onSelect: function onSelect(_, opt) {
+      handleChangeType(opt.item);
+    },
+    value: (_result$type = result.type) === null || _result$type === void 0 ? void 0 : _result$type.label
+  }), /*#__PURE__*/React.createElement(InputCompact, null, /*#__PURE__*/React.createElement(Select, {
+    style: {
+      width: 110,
+      color: '#666'
+    },
+    options: options.map(function (item) {
+      return {
+        label: item.label,
+        value: item.label,
+        item: item
+      };
+    }),
+    onSelect: function onSelect(_, opt) {
+      handleChangeOption(opt.item);
+    },
+    value: (_result$option = result.option) === null || _result$option === void 0 ? void 0 : _result$option.label
+  }), /*#__PURE__*/React.createElement(DatePicker.RangePicker, _extends({
     value: result.dates,
     onChange: handleChangeDates,
     allowClear: false

package/es/components/DurationPicker/index.less

@@ -1,61 +1,4 @@
 .@{prefixCls}-duration {
   display: flex;
   width: 100%;
-  height: @input-height-base;
-
-  .@{ant-prefix}-dropdown-trigger {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    height: 100%;
-    padding: 0 8px;
-    color: rgba(51, 51, 51, 0.7);
-    font-size: 14px;
-    text-align: center;
-    cursor: pointer;
-
-    & > .@{ant-prefix}icon {
-      margin-left: 4px;
-      font-size: 14px;
-    }
-  }
-
-  &-type.@{ant-prefix}-dropdown-trigger {
-    flex: 0 0 auto;
-    margin-right: 8px;
-    border: 1px solid @select-border-color;
-    border-radius: @border-radius-base;
-  }
-
-  &-option.@{ant-prefix}-dropdown-trigger {
-    position: relative;
-    flex: 0 0 110px;
-
-    &::after {
-      position: absolute;
-      top: 50%;
-      right: 0;
-      display: block;
-      width: 1px;
-      height: 14px;
-      margin-top: -7px;
-      background-color: #d8d8d8;
-      content: '';
-    }
-  }
-
-  &-picker {
-    display: flex;
-    flex: 1;
-    height: 100%;
-    border: 1px solid @select-border-color;
-    border-radius: @border-radius-base;
-
-    .@{ant-prefix}-picker {
-      flex: 1;
-      border: none;
-      outline: none;
-      box-shadow: none;
-    }
-  }
 }

package/es/components/Filter/index.d.ts

@@ -7,7 +7,7 @@ declare namespace Filter {
         title: string;
         value: Record<string | number, any>;
     }>(getData: (storageKey: string) => T[] | Promise<T[]>, setData: (storageKey: string, data: T[], action: {
-        type: "set" | "delete";
+        type: "delete" | "set";
         target: T;
     }) => void | Promise<void>) => void;
     var defaultProps: Partial<FilterProps<Record<string, any>>>;

package/es/components/Filter/index.js

@@ -35,7 +35,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
 import { useDebounce, useRequest } from '@lemon-fe/hooks';
-import { Button, Checkbox, Form, Input, Popover, Space, Modal, message, Select, Empty, InputNumber } from 'antd';
+import { Button, Checkbox, Form, Input, Popover, Space, Modal, message, Select, Empty } from 'antd';
 import classNames from 'classnames';
 import ResizeObserver from 'rc-resize-observer';
 import React, { useEffect, useMemo, useState } from 'react';
@@ -43,6 +43,7 @@ import Dropdown from "../Dropdown";
 import DurationPicker from "../DurationPicker";
 import FormLayout from "../FormLayout";
 import Icons from "../Icons";
+import InputNumber from "../InputNumber";
 import TabBar from "../TabBar";
 import { prefixClassName } from "../utils";
 var components = [{

package/es/components/InputCompact/index.d.ts

@@ -0,0 +1,10 @@
+import type { HTMLAttributes, ReactNode } from 'react';
+interface Props extends HTMLAttributes<HTMLDivElement> {
+    children?: ReactNode;
+    /**
+     * 会同时禁用多个表单
+     */
+    disabled?: boolean;
+}
+export default function InputCompact(props: Props): JSX.Element;
+export {};

package/es/components/InputCompact/index.js

@@ -0,0 +1,69 @@
+var _excluded = ["children", "className", "disabled", "onFocus", "onBlur"];
+
+function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+
+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; }
+
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+
+import { ConfigProvider } from 'antd';
+import classNames from 'classnames';
+import React, { useContext, useState, Children, cloneElement, isValidElement } from 'react';
+import { prefixClassName } from "../utils";
+var prefix = prefixClassName('input-compact');
+export default function InputCompact(props) {
+  var _classNames;
+
+  var children = props.children,
+      className = props.className,
+      disabled = props.disabled,
+      _onFocus = props.onFocus,
+      _onBlur = props.onBlur,
+      restProps = _objectWithoutProperties(props, _excluded);
+
+  var inputPrefixCls = useContext(ConfigProvider.ConfigContext).getPrefixCls('input');
+
+  var _useState = useState(false),
+      _useState2 = _slicedToArray(_useState, 2),
+      focused = _useState2[0],
+      setFocused = _useState2[1];
+
+  return /*#__PURE__*/React.createElement("div", _extends({
+    className: classNames(className, prefix(), inputPrefixCls, (_classNames = {}, _defineProperty(_classNames, "".concat(inputPrefixCls, "-focused"), focused), _defineProperty(_classNames, "".concat(inputPrefixCls, "-disabled"), disabled), _classNames)),
+    onFocus: function onFocus(e) {
+      setFocused(true);
+      _onFocus === null || _onFocus === void 0 ? void 0 : _onFocus(e);
+    },
+    onBlur: function onBlur(e) {
+      setFocused(false);
+      _onBlur === null || _onBlur === void 0 ? void 0 : _onBlur(e);
+    }
+  }, restProps), Children.map(children, function (node) {
+    var newNode = node;
+
+    if ( /*#__PURE__*/isValidElement(node)) {
+      newNode = /*#__PURE__*/cloneElement(node, {
+        disabled: disabled,
+        bordered: false
+      });
+    }
+
+    return /*#__PURE__*/React.createElement(React.Fragment, null, newNode, /*#__PURE__*/React.createElement("div", {
+      className: prefix('gutter')
+    }));
+  }));
+}

package/es/components/InputCompact/index.less

@@ -0,0 +1,18 @@
+.@{prefixCls}-input-compact {
+  display: flex;
+  align-items: center;
+  height: @input-height-base;
+  padding: 0;
+
+  &-gutter {
+    position: relative;
+    display: block;
+    width: 1px;
+    height: (@input-height-base - 2px - 10px);
+    background-color: @border-color-base;
+
+    &:last-child {
+      display: none;
+    }
+  }
+}

package/es/index.d.ts

@@ -43,6 +43,7 @@ export { default as State } from './components/State';
 export { default as GreyPanel } from './components/GreyPanel';
 export { default as Alert } from './components/Alert';
 export { default as InputNumber } from './components/InputNumber';
+export { default as InputCompact } from './components/InputCompact';
 export { default as BasicLayout } from './layouts/BasicLayout';
 export { default as BlankLayout } from './layouts/BlankLayout';
 export { default as MicroLayout } from './layouts/MicroLayout';

package/es/index.js

@@ -35,6 +35,7 @@ export { default as State } from "./components/State";
 export { default as GreyPanel } from "./components/GreyPanel";
 export { default as Alert } from "./components/Alert";
 export { default as InputNumber } from "./components/InputNumber";
+export { default as InputCompact } from "./components/InputCompact";
 export { default as BasicLayout } from "./layouts/BasicLayout";
 export { default as BlankLayout } from "./layouts/BlankLayout";
 export { default as MicroLayout } from "./layouts/MicroLayout";

package/es/index.less

@@ -24,6 +24,7 @@
 @import './components/State/index.less';
 @import './components/GreyPanel/index.less';
 @import './components/InputNumber/index.less';
+@import './components//InputCompact/index.less';
 
 @import './layouts/BasicLayout/components/MainFramework/index.less';
 @import './layouts/Breadcrumb/index.less';

package/es/layouts/BasicLayout/components/MainFramework/index.less

@@ -87,6 +87,10 @@
       background-color: #fff;
       border-top-left-radius: 8px;
       border-top-right-radius: 8px;
+
+      &:first-child {
+        margin-top: 8px;
+      }
     }
   }
 }

package/es/styles/overrides.less

@@ -171,6 +171,11 @@ a[title='站长统计'] {
 @input-disabled-color: fade(#333, 70);
 @input-disabled-bg: #fff;
 
+.@{ant-prefix}-input-prefix,
+.@{ant-prefix}-input-suffix {
+  color: #666;
+}
+
 /** picker */
 .@{ant-prefix}-picker {
   .@{ant-prefix}-picker-clear {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lemon-fe/kits",
-  "version": "1.0.0-144",
+  "version": "1.0.0-146",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",