@lemon-fe/components 0.1.75 → 0.1.78

package/es/BaseTable/index.less

@@ -24,18 +24,17 @@
     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;
+    background-clip: content-box;
 
     &::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 +113,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/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,31 @@ 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 = 0;
+
+    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;
 
-      if (value + itemWidth > width) {
-        if (currRow.length > 0) {
-          rows.push(currRow);
-        }
-
-        currRow = [item];
-        value = itemWidth;
-      } else {
-        currRow.push(item);
-        value += itemWidth;
+      if (size + itemWidth > 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([]);
+      size += itemWidth;
     }
 
-    var visible = rows.length > 1;
-
-    if (!collapsed || !visible) {
-      return [result, visible];
+    if (!collapsed) {
+      return [result, btnsVisible];
     }
 
-    return [rows[0], visible];
+    return [result.slice(0, end || 1), 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/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/Popup/index.d.ts

@@ -23,10 +23,14 @@ export interface PopupProps<ValueType> extends ModalProps {
     disabledTip?: string;
     bordered?: boolean;
     onClick?: () => void;
+    /**
+     * @description 清空后的值
+     */
+    emptyValue?: ValueType;
 }
-interface ValuedPopupProps<ValueType> extends Omit<PopupProps<ValueType>, 'value' | 'onChange' | 'allowClear'> {
-    value: ValueType;
+interface ValuedPopupProps<ValueType> extends Omit<PopupProps<ValueType>, 'onChange' | 'emptyValue'> {
     onChange?: (value: ValueType) => void;
+    emptyValue: ValueType;
 }
 declare function Popup<ValueType>(props: ValuedPopupProps<ValueType>): JSX.Element;
 declare function Popup<ValueType>(props: PopupProps<ValueType>): JSX.Element;

package/es/Popup/index.js

@@ -1,4 +1,4 @@
-var _excluded = ["value", "onChange", "component", "children", "formatLabel", "disabled", "allowClear", "autoFocus", "showLabel", "beforeOk", "placeholder", "onClick", "disabledTip", "bordered"];
+var _excluded = ["value", "onChange", "component", "children", "formatLabel", "disabled", "allowClear", "autoFocus", "showLabel", "beforeOk", "placeholder", "onClick", "disabledTip", "bordered", "emptyValue"];
 
 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; }
 
@@ -51,11 +51,12 @@ function Popup(props) {
       disabledTip = props.disabledTip,
       _props$bordered = props.bordered,
       bordered = _props$bordered === void 0 ? true : _props$bordered,
+      emptyValue = props.emptyValue,
       restProps = _objectWithoutProperties(props, _excluded);
 
   var prefixCls = "".concat(PREFIX_CLS, "-popup");
 
-  var _useState = useState(valueProp),
+  var _useState = useState(valueProp || emptyValue),
       _useState2 = _slicedToArray(_useState, 2),
       value = _useState2[0],
       setValue = _useState2[1];
@@ -144,7 +145,7 @@ function Popup(props) {
     e.stopPropagation();
 
     if (onChange) {
-      onChange(undefined);
+      onChange(emptyValue);
     }
   };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lemon-fe/components",
-  "version": "0.1.75",
+  "version": "0.1.78",
   "description": "> TODO: description",
   "author": "鲁盛杰 <lusj@cnlemon.net>",
   "homepage": "",
@@ -41,5 +41,5 @@
     "react": "^17.0.2",
     "react-dom": "^17.0.2"
   },
-  "gitHead": "08765b2dabbe56554bdd10f38865ffaaf905b17f"
+  "gitHead": "c3ea23e58ff912db41794c92c844fcf9b2d7c18c"
 }