@lemon-fe/components 0.1.55 → 0.1.60

package/es/BaseTable/index.js

@@ -1,5 +1,5 @@
 var _excluded = ["onWidthChange", "width", "fullTableRef", "children", "className"],
-    _excluded2 = ["id", "columns", "defaultColumnProps", "rowKey", "children", "summaryTitle", "summaryRecord", "dataSource", "onSortChange", "sort", "scroll", "virtual", "components", "pagination", "rowHeight", "tableLayout", "rowActions", "style", "locale"];
+    _excluded2 = ["id", "columns", "defaultColumnProps", "rowKey", "children", "summaryTitle", "summaryRecord", "dataSource", "onSortChange", "sort", "scroll", "virtual", "components", "pagination", "rowHeight", "tableLayout", "rowActions", "style", "className", "locale"];
 
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 
@@ -36,6 +36,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 /// <reference path="../../typings.d.ts" />
 import React, { useMemo, useState, useEffect, useRef } from 'react';
 import { Table as AntdTable } from 'antd';
+import classNames from 'classnames';
 import { get } from 'lodash';
 import ResizeObserver from 'rc-resize-observer';
 import { isColumnType, getColumnKey } from './utils';
@@ -121,6 +122,7 @@ function BaseTable(props) {
       tableLayout = _props$tableLayout === void 0 ? 'fixed' : _props$tableLayout,
       rowActions = props.rowActions,
       style = props.style,
+      className = props.className,
       localeProp = props.locale,
       restProps = _objectWithoutProperties(props, _excluded2);
 
@@ -412,6 +414,7 @@ function BaseTable(props) {
   var tableNode = /*#__PURE__*/React.createElement(AntdTable, _objectSpread(_objectSpread({
     size: "small",
     ref: fullTableRef,
+    className: classNames("".concat(PREFIX_CLS, "-table"), className),
     columns: formatedColumns,
     dataSource: dataSource,
     rowKey: rowKey,

package/es/BaseTable/index.less

@@ -3,15 +3,18 @@
 @resize-indicator-color: #333;
 
 .@{tablePrefixCls} {
-  position: relative;
-  box-sizing: border-box;
-  color: @text-color;
-  font-size: @font-size-base;
-
   .ant-table-cell-row-hover &-operator {
     display: flex;
   }
 
+  td .ant-input-number-input {
+    text-align: inherit;
+  }
+
+  td .ant-input-number-handler-wrap {
+    display: none;
+  }
+
   &-operator {
     position: absolute;
     top: 0;

package/es/Filter/index.js

@@ -412,13 +412,13 @@ function Filter(props) {
       rows.push([]);
     }
 
-    var visible = rows.length > 2;
+    var visible = rows.length > 1;
 
     if (!collapsed || !visible) {
       return [result, visible];
     }
 
-    return [[rows[0], rows[rows.length - 1]].flat(), visible];
+    return [rows[0], visible];
   }, [data, width, collapsed, simple, activeKeys]),
       _useMemo2 = _slicedToArray(_useMemo, 2),
       cols = _useMemo2[0],

package/es/FormLayout/index.less

@@ -16,17 +16,19 @@
   flex-wrap: wrap;
 }
 
-.col(@colSpan: 8) {
+.col(@colSpan: 6) {
   flex-shrink: 0;
   flex-wrap: nowrap;
   width: percentage((@colSpan / 24));
-  min-width: if((@colSpan >= 12), 2 * @minWidth, @minWidth);
-  max-width: if((@colSpan >= 12), 2 * @maxWidth, @maxWidth);
+  min-width: (@colSpan / 6) * @minWidth;
   padding: 0 (@spaceX / 2);
 }
 
 .@{prefixCls}-form {
   &-layout {
+    min-width: @minWidth - @spaceX;
+    max-width: 4 * @maxWidth - @spaceX;
+
     .ant-form-item {
       flex-wrap: nowrap;
       margin-bottom: @spaceY;
@@ -63,7 +65,7 @@
       .wrapper();
 
       & > .ant-form-item {
-        .col();
+        .col(8);
       }
     }
 
@@ -93,3 +95,9 @@
     max-width: 100%;
   }
 }
+
+@media (max-width: 575px) {
+  .@{prefixCls}-form-layout .ant-form-item {
+    flex-wrap: wrap;
+  }
+}

package/es/Table/index.js

@@ -227,10 +227,10 @@ export default function Table(props) {
         src: empty
       }), /*#__PURE__*/React.createElement("div", null, remote.error.message))
     } : undefined,
-    pagination: {
+    pagination: _objectSpread({
       current: current,
       pageSize: pageSize,
       total: total
-    }
+    }, pagination)
   }, restProps));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lemon-fe/components",
-  "version": "0.1.55",
+  "version": "0.1.60",
   "description": "> TODO: description",
   "author": "鲁盛杰 <lusj@cnlemon.net>",
   "homepage": "",
@@ -16,7 +16,7 @@
     "registry": "https://registry.npmjs.org"
   },
   "dependencies": {
-    "@lemon-fe/hooks": "^0.1.2",
+    "@lemon-fe/hooks": "^0.1.56",
     "classnames": "^2.2.6",
     "lodash": "^4.17.21",
     "react-resizable": "^3.0.4"
@@ -40,6 +40,5 @@
     "rc-resize-observer": "^1.2.0",
     "react": "^17.0.2",
     "react-dom": "^17.0.2"
-  },
-  "gitHead": "26cf3c526e121d460bee164784fdd9a16a5b5cdc"
+  }
 }