@lemon-fe/components 0.1.77 → 0.1.81

package/es/BaseTable/index.less

@@ -24,18 +24,16 @@
     align-items: center;
     justify-content: flex-end;
     height: 100%;
-    padding-left: 16px;
     white-space: nowrap;
-    // background-color: @table-row-hover-bg;
-    // background-clip: content-box;
+    background-color: inherit;
 
     &::before {
       position: absolute;
       top: 0;
-      left: 0;
+      left: -16px;
       width: 16px;
       height: 100%;
-      // background: linear-gradient(90deg, rgba(248, 248, 248, 0) 0%, @table-row-hover-bg 100%);
+      box-shadow: inset -16px 0 8px -8px @table-row-hover-bg;
       content: '';
     }
 
@@ -114,6 +112,14 @@
     }
   }
 
+  .ant-table-row-selected &-operator::before {
+    box-shadow: inset -16px 0 8px -8px var(--ant-primary-1);
+  }
+
+  .ant-table-row-selected:hover &-operator::before {
+    box-shadow: inset -16px 0 8px -8px var(--ant-primary-color-2);
+  }
+
   &-resizable-handle {
     position: absolute;
     top: 50%;

package/es/EditableTable/EditableTableFormItem.js

@@ -45,5 +45,7 @@ export default function EditableTableFormItem(props) {
         return;
       }
     }]
-  }, /*#__PURE__*/React.createElement(Table, _objectSpread({}, tableProps)));
+  }, /*#__PURE__*/React.createElement(Table, _objectSpread({
+    ref: ref
+  }, tableProps)));
 }

package/es/Filter/index.js

@@ -282,7 +282,7 @@ function Filter(props) {
     form.resetFields();
 
     if (onChange) {
-      onChange(form.getFieldsValue());
+      onChange(form.getFieldsValue(true));
     }
   };
 
@@ -332,13 +332,13 @@ function Filter(props) {
     if (index !== active) {
       setActive(index);
       form.setFieldsValue(tabs[index].value);
-      handleFinish(form.getFieldsValue());
+      handleFinish();
     }
   };
 
-  var handleFinish = function handleFinish(value) {
+  var handleFinish = function handleFinish() {
     if (onChange) {
-      onChange(value);
+      onChange(form.getFieldsValue(true));
     }
   };
 
@@ -387,40 +387,33 @@ function Filter(props) {
       return [result, false];
     }
 
-    var rows = [];
-    var currRow = [];
-    var value = 0;
-    result.forEach(function (item) {
+    var btnsWidth = simple ? 208 : 248;
+    var btnsVisible = false;
+    var size = 0;
+    var end = result.length;
+
+    for (var i = 0; i < result.length; i++) {
       var _compMap$get;
 
+      var item = result[i];
       var itemWidth = getColStyle(item.colSpan || (item.type ? (_compMap$get = compMap.get(item.type)) === null || _compMap$get === void 0 ? void 0 : _compMap$get.colSpan : 1)).width;
+      size += itemWidth;
 
-      if (value + itemWidth > width) {
-        if (currRow.length > 0) {
-          rows.push(currRow);
-        }
-
-        currRow = [item];
-        value = itemWidth;
-      } else {
-        currRow.push(item);
-        value += itemWidth;
+      if (size > width - btnsWidth) {
+        end = i;
+        btnsVisible = true;
+        break;
       }
-    });
-    rows.push(currRow);
-    value += simple ? 208 : 248;
-
-    if (currRow.length > 0 && value >= width + getColStyle(1).width) {
-      rows.push([]);
     }
 
-    var visible = rows.length > 1;
+    end = end || 1;
+    btnsVisible = btnsVisible && result.length > 1;
 
-    if (!collapsed || !visible) {
-      return [result, visible];
+    if (!collapsed) {
+      return [result, btnsVisible];
     }
 
-    return [rows[0], visible];
+    return [result.slice(0, end), btnsVisible];
   }, [data, width, collapsed, simple, activeKeys]),
       _useMemo2 = _slicedToArray(_useMemo, 2),
       cols = _useMemo2[0],

package/es/FormLayout/index.less

@@ -50,6 +50,10 @@
         position: absolute;
         left: -11px;
       }
+
+      &-with-help &-explain {
+        margin-bottom: -@spaceY;
+      }
     }
 
     &-row {

package/es/Icons/Close.d.ts

@@ -0,0 +1,5 @@
+import { CSSProperties } from 'react';
+export default function Close(props: {
+    className?: string;
+    style?: CSSProperties;
+}): JSX.Element;

package/es/Icons/Close.js

@@ -0,0 +1,29 @@
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+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 from 'react';
+import Icon from '@ant-design/icons';
+
+var Svg = function Svg(props) {
+  return /*#__PURE__*/React.createElement("svg", _objectSpread({
+    viewBox: "0 0 1024 1024",
+    xmlns: "http://www.w3.org/2000/svg",
+    width: "16",
+    height: "16"
+  }, props), /*#__PURE__*/React.createElement("path", {
+    d: "m597.796 511.488 215.769-215.77c23.834-23.834 23.834-62.475 0-86.308-23.832-23.832-62.474-23.833-86.307 0l-215.77 215.77-215.77-215.77c-23.834-23.833-62.476-23.833-86.308 0-23.833 23.833-23.834 62.475 0 86.31l215.77 215.768-215.77 215.77c-23.833 23.834-23.833 62.475 0 86.308 23.834 23.834 62.475 23.834 86.309 0l215.768-215.768 215.769 215.77c23.835 23.833 62.476 23.832 86.309 0 23.834-23.835 23.834-62.476 0-86.308l-215.77-215.772z",
+    fill: "currentColor"
+  }));
+};
+
+export default function Close(props) {
+  return /*#__PURE__*/React.createElement(Icon, _objectSpread({
+    style: {
+      pointerEvents: 'none'
+    },
+    component: Svg
+  }, props));
+}

package/es/Icons/index.d.ts

@@ -7,6 +7,7 @@ import Calendar from './Calendar';
 import BigTip from './BigTip';
 import LookUp from './LookUp';
 import CollapseUp from './CollapseUp';
+import Close from './Close';
 declare const Icons: {
     Search: typeof Search;
     Down: typeof Down;
@@ -18,5 +19,6 @@ declare const Icons: {
     BigTip: typeof BigTip;
     LookUp: typeof LookUp;
     CollapseUp: typeof CollapseUp;
+    Close: typeof Close;
 };
 export default Icons;

package/es/Icons/index.js

@@ -8,6 +8,7 @@ import Calendar from './Calendar';
 import BigTip from './BigTip';
 import LookUp from './LookUp';
 import CollapseUp from './CollapseUp';
+import Close from './Close';
 var Icons = {
   Search: Search,
   Down: Down,
@@ -18,6 +19,7 @@ var Icons = {
   Calendar: Calendar,
   BigTip: BigTip,
   LookUp: LookUp,
-  CollapseUp: CollapseUp
+  CollapseUp: CollapseUp,
+  Close: Close
 };
 export default Icons;

package/es/Layout/index.d.ts

@@ -19,6 +19,7 @@ interface Props {
     header?: ReactNode;
     footer?: ReactNode;
     body?: ReactNode;
+    onCollapse?: (collapsed: boolean) => void;
 }
 declare function Layout(props: Props): JSX.Element;
 declare namespace Layout {
@@ -27,7 +28,7 @@ declare namespace Layout {
         children?: React.ReactNode;
         left?: React.ReactNode;
         tab?: string | undefined;
-    }) => JSX.Element;
+    } & Pick<Props, "onCollapse">) => JSX.Element;
 }
 export default Layout;
 declare function LayoutTabs(props: {

package/es/Layout/index.js

@@ -31,7 +31,8 @@ import { mapChildren } from '../utils';
 var prefixCls = "".concat(PREFIX_CLS, "-layout");
 
 function Sider(props) {
-  var children = props.children;
+  var children = props.children,
+      onCollapse = props.onCollapse;
 
   var _useState = useState(false),
       _useState2 = _slicedToArray(_useState, 2),
@@ -47,7 +48,9 @@ function Sider(props) {
   }, children)), /*#__PURE__*/React.createElement("div", {
     className: "".concat(prefixCls, "-left-collapse"),
     onClick: function onClick() {
-      return setCollapsed(!collapsed);
+      var result = !collapsed;
+      onCollapse === null || onCollapse === void 0 ? void 0 : onCollapse(result);
+      setCollapsed(result);
     }
   }, /*#__PURE__*/React.createElement("svg", {
     width: "12",
@@ -95,10 +98,13 @@ function Sider(props) {
 
 function Content(props) {
   var left = props.left,
-      children = props.children;
+      children = props.children,
+      onCollapse = props.onCollapse;
   return /*#__PURE__*/React.createElement("div", {
     className: "".concat(prefixCls, "-content")
-  }, left ? /*#__PURE__*/React.createElement(Sider, null, left) : null, /*#__PURE__*/React.createElement("div", {
+  }, left ? /*#__PURE__*/React.createElement(Sider, {
+    onCollapse: onCollapse
+  }, left) : null, /*#__PURE__*/React.createElement("div", {
     className: "".concat(prefixCls, "-main")
   }, children));
 }
@@ -114,7 +120,8 @@ export default function Layout(props) {
       header = props.header,
       left = props.left,
       footer = props.footer,
-      body = props.body;
+      body = props.body,
+      onCollapse = props.onCollapse;
   return /*#__PURE__*/React.createElement("div", {
     className: classNames(prefixCls, className, _defineProperty({}, "".concat(prefixCls, "-full"), full)),
     style: style
@@ -123,6 +130,7 @@ export default function Layout(props) {
   }, header) : null, /*#__PURE__*/React.createElement("div", {
     className: "".concat(prefixCls, "-body")
   }, body || /*#__PURE__*/React.createElement(Content, {
+    onCollapse: onCollapse,
     left: left
   }, children)), footer ? /*#__PURE__*/React.createElement("div", {
     className: "".concat(prefixCls, "-footer")

package/es/Table/index.js

@@ -50,7 +50,7 @@ export default function Table(props) {
       current = _useState2[0],
       setCurrent = _useState2[1];
 
-  var _useState3 = useState((pagination === null || pagination === void 0 ? void 0 : pagination.pageSize) || defaultPageSize),
+  var _useState3 = useState(pagination && pagination.pageSize || defaultPageSize),
       _useState4 = _slicedToArray(_useState3, 2),
       pageSize = _useState4[0],
       setPageSize = _useState4[1];
@@ -227,10 +227,10 @@ export default function Table(props) {
         src: empty
       }), /*#__PURE__*/React.createElement("div", null, remote.error.message))
     } : undefined,
-    pagination: _objectSpread({
+    pagination: pagination !== false ? _objectSpread({
       current: current,
       pageSize: pageSize,
       total: total
-    }, pagination)
+    }, pagination) : false
   }, restProps));
 }

package/es/Table/typings.d.ts

@@ -22,5 +22,4 @@ export interface TableProps<RecordType> extends BaseTableProps<RecordType> {
   autoLoad?: boolean;
   actionRef?: RefObject<TableRef<RecordType>>;
   onLoading?: (loading: boolean) => void;
-  pagination?: PaginationProps;
 }

package/es/init.js

@@ -7,13 +7,14 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 
 import React from 'react';
-import { message, Modal, Select, ConfigProvider, Result, Button, version, DatePicker, Cascader } from 'antd';
+import { message, Modal, Select, ConfigProvider, Result, Button, version, DatePicker, Cascader, TreeSelect } from 'antd';
 import { config } from '@lemon-fe/hooks';
 import PageLoading from './PageLoading';
 import Icons from './Icons';
 var Tip = Icons.Tip,
     Down = Icons.Down,
-    BigTip = Icons.BigTip;
+    BigTip = Icons.BigTip,
+    Close = Icons.Close;
 export default function init() {
   var opts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
 
@@ -86,6 +87,9 @@ export default function init() {
     }, arguments.length <= 0 ? undefined : arguments[0]));
   };
 
+  Modal.defaultProps = _objectSpread(_objectSpread({}, Modal.defaultProps), {}, {
+    closeIcon: /*#__PURE__*/React.createElement(Close, null)
+  });
   var node = /*#__PURE__*/React.createElement(Down, null); //@ts-ignore
 
   Select.defaultProps = {
@@ -94,6 +98,12 @@ export default function init() {
     }
   }; //@ts-ignore
 
+  TreeSelect.defaultProps = {
+    suffixIcon: version >= '4.18.9' ? node : function () {
+      return node;
+    }
+  }; //@ts-ignore
+
   Cascader.defaultProps = {
     suffixIcon: node
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lemon-fe/components",
-  "version": "0.1.77",
+  "version": "0.1.81",
   "description": "> TODO: description",
   "author": "鲁盛杰 <lusj@cnlemon.net>",
   "homepage": "",
@@ -41,5 +41,5 @@
     "react": "^17.0.2",
     "react-dom": "^17.0.2"
   },
-  "gitHead": "05d50e243e97f75d4f70667c57d66137a0311457"
+  "gitHead": "64ff3935c062ee3fffcdae9f4f22f9368fa989e2"
 }