@lemon-fe/components 0.1.4 → 0.1.7

package/es/BaseTable/index.js

@@ -1,5 +1,5 @@
-var _excluded = ["onWidthChange", "width", "fullTableRef"],
-    _excluded2 = ["id", "columns", "defaultColumnProps", "rowKey", "children", "summaryTitle", "summaryRecord", "dataSource", "onSortChange", "sort", "scroll", "virtual", "components", "pagination", "onChange", "rowHeight", "tableLayout", "rowActions"];
+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"];
 
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 
@@ -37,7 +37,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 import React, { useMemo, useState, useEffect, useRef } from 'react';
 import { Table as AntdTable } from 'antd';
 import { get } from 'lodash';
-import { useThrottle } from '@lemon-fe/hooks';
+import ResizeObserver from 'rc-resize-observer';
 import { isColumnType, getColumnKey } from './utils';
 import ResizeHeaderCell from './ResizeHeaderCell';
 import { PREFIX_CLS } from '../constants';
@@ -69,10 +69,25 @@ function Th(props) {
   var onWidthChange = props.onWidthChange,
       width = props.width,
       fullTableRef = props.fullTableRef,
+      children = props.children,
+      className = props.className,
       restProps = _objectWithoutProperties(props, _excluded);
 
+  var reg = /\bant-table-cell-ellipsis\b/;
+  var content = children;
+  var mClassName = className;
+
+  if (mClassName && reg.test(mClassName)) {
+    mClassName = mClassName.replace(reg, '');
+    content = /*#__PURE__*/React.createElement("div", {
+      className: "ant-table-cell-ellipsis"
+    }, content);
+  }
+
   if (!width || !onWidthChange) {
-    return /*#__PURE__*/React.createElement("th", _objectSpread({}, restProps));
+    return /*#__PURE__*/React.createElement("th", _objectSpread(_objectSpread({}, restProps), {}, {
+      className: mClassName
+    }), content);
   }
 
   return /*#__PURE__*/React.createElement(ResizeHeaderCell, {
@@ -80,7 +95,9 @@ function Th(props) {
     onChange: onWidthChange,
     fullTableRef: fullTableRef,
     prefixCls: "".concat(PREFIX_CLS, "-table")
-  }, /*#__PURE__*/React.createElement("th", _objectSpread({}, restProps)));
+  }, /*#__PURE__*/React.createElement("th", _objectSpread(_objectSpread({}, restProps), {}, {
+    className: mClassName
+  }), content));
 }
 
 function BaseTable(props) {
@@ -99,26 +116,29 @@ function BaseTable(props) {
       virtual = props.virtual,
       componentsProp = props.components,
       paginationProp = props.pagination,
-      onChangeProp = props.onChange,
       rowHeight = props.rowHeight,
       _props$tableLayout = props.tableLayout,
       tableLayout = _props$tableLayout === void 0 ? 'fixed' : _props$tableLayout,
       rowActions = props.rowActions,
+      style = props.style,
       restProps = _objectWithoutProperties(props, _excluded2);
 
   var fullTableRef = useRef(null);
 
-  var _useState = useState(0),
+  var _useState = useState(new Map()),
       _useState2 = _slicedToArray(_useState, 2),
-      scrollY = _useState2[0],
-      setScrollY = _useState2[1];
+      colsState = _useState2[0],
+      setColsState = _useState2[1];
+
+  var scrollYProp = scroll === null || scroll === void 0 ? void 0 : scroll.y;
 
-  var _useState3 = useState(new Map()),
+  var _useState3 = useState(scrollYProp === true ? 0 : scrollYProp),
       _useState4 = _slicedToArray(_useState3, 2),
-      colsState = _useState4[0],
-      setColsState = _useState4[1];
-  /** auto scroll y */
+      scrollY = _useState4[0],
+      setScrollY = _useState4[1];
 
+  var memoHeight = useRef(0);
+  /** auto scroll y */
 
   var calcScrollY = function calcScrollY() {
     var wrapper = fullTableRef.current;
@@ -164,31 +184,34 @@ function BaseTable(props) {
     return contentHeight;
   };
 
-  var changeScrollY = useThrottle(function () {
-    var nextScrollY = scrollY;
-
-    if ((scroll === null || scroll === void 0 ? void 0 : scroll.y) === true) {
-      var y = calcScrollY();
-      nextScrollY = y || undefined;
-    } else {
-      nextScrollY = scroll === null || scroll === void 0 ? void 0 : scroll.y;
+  var changeScrollY = function changeScrollY(height) {
+    if (height === memoHeight.current) {
+      return;
     }
 
-    setScrollY(nextScrollY);
+    memoHeight.current = height;
+    setScrollY(calcScrollY() || undefined);
+  };
 
-    if (fullTableRef.current !== null) {
+  useEffect(function () {
+    if (scrollYProp !== true) {
+      setScrollY(scrollYProp);
+    }
+  }, [scrollYProp]);
+  useEffect(function () {
+    if (scrollY !== undefined && fullTableRef.current !== null) {
       var body = fullTableRef.current.querySelector('.ant-table-body');
 
       if (body !== null) {
-        var dataType = _typeof(nextScrollY);
+        var dataType = _typeof(scrollY);
 
         switch (dataType) {
           case 'string':
-            body.style.height = nextScrollY;
+            body.style.height = scrollY;
             break;
 
           case 'number':
-            body.style.height = nextScrollY + 'px';
+            body.style.height = scrollY + 'px';
             break;
 
           default:
@@ -196,29 +219,9 @@ function BaseTable(props) {
         }
       }
     }
-  }, 100, {
-    trailing: true
-  });
-  useEffect(function () {
-    changeScrollY();
-  }, [scroll === null || scroll === void 0 ? void 0 : scroll.y, dataSource]);
-  useEffect(function () {
-    window.addEventListener('resize', changeScrollY);
-    return function () {
-      window.removeEventListener('resize', changeScrollY);
-    };
-  }, []);
-
-  var handleChange = function handleChange() {
-    changeScrollY();
-
-    if (onChangeProp) {
-      onChangeProp.apply(void 0, arguments);
-    }
-  };
+  }, [scrollY]);
   /** resizable column */
 
-
   var _useMemo = useMemo(function () {
     var flattenCols = [];
     var isFixedLayout = tableLayout === 'fixed';
@@ -383,22 +386,22 @@ function BaseTable(props) {
       rowHeight: rowHeight
     };
   }, [scrollY, rowHeight]);
-  return /*#__PURE__*/React.createElement(BaseTableContext.Provider, {
-    value: ctx
-  }, /*#__PURE__*/React.createElement(AntdTable, _objectSpread(_objectSpread({
+  var tableNode = /*#__PURE__*/React.createElement(AntdTable, _objectSpread(_objectSpread({
     size: "small",
     ref: fullTableRef,
     columns: formatedColumns,
     dataSource: dataSource,
     rowKey: rowKey,
     summary: summary,
+    components: components,
+    tableLayout: tableLayout,
     scroll: {
       x: (scroll === null || scroll === void 0 ? void 0 : scroll.x) || '100%',
       y: scrollY
     },
-    components: components,
-    onChange: handleChange,
-    tableLayout: tableLayout,
+    style: scrollYProp === true ? _objectSpread(_objectSpread({}, style), {}, {
+      height: '100%'
+    }) : style,
     locale: {
       emptyText: /*#__PURE__*/React.createElement("div", {
         className: "".concat(PREFIX_CLS, "-table-empty")
@@ -417,7 +420,19 @@ function BaseTable(props) {
       },
       defaultPageSize: 20
     }, paginationProp) : false
-  })));
+  }));
+
+  if (scrollYProp === true) {
+    tableNode = /*#__PURE__*/React.createElement(ResizeObserver, {
+      onResize: function onResize(size) {
+        return changeScrollY(size.height);
+      }
+    }, tableNode);
+  }
+
+  return /*#__PURE__*/React.createElement(BaseTableContext.Provider, {
+    value: ctx
+  }, tableNode);
 }
 
 BaseTable.Summary = AntdTable.Summary;

package/es/BaseTable/index.less

@@ -77,8 +77,12 @@
       content: '';
     }
 
-    &-column::after {
-      display: none !important;
+    &-column {
+      border-right: none !important;
+
+      &::after {
+        display: none !important;
+      }
     }
 
     &-item {
@@ -157,22 +161,28 @@
     width: 11px;
     height: 12px;
     margin-top: -6px;
+    padding: 0 5px;
+    background-color: #bbb;
+    background-clip: content-box;
     cursor: col-resize;
+  }
 
-    & > div {
-      width: 1px;
-      height: 100%;
-      margin: 0 auto;
-      background-color: #bbb;
-    }
+  .ant-table-bordered &-resizable-handle {
+    right: -6px;
+    background-color: transparent;
   }
 
   &-resizable-indicator {
     position: absolute;
     top: 0;
     z-index: 20;
-    width: 1px;
+    box-sizing: border-box;
+    width: 11px;
+    margin-left: -5px;
+    padding: 0 5px;
     background-color: @resize-indicator-color;
+    background-clip: content-box;
+    cursor: col-resize;
   }
 
   &-resizing-col thead th {

package/es/DurationPicker/index.js

@@ -1,3 +1,5 @@
+var _excluded = ["prefixCls", "types", "options", "value", "dateFormat", "onChange"];
+
 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; }
@@ -16,6 +18,10 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 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 React, { useMemo, useState, useEffect } from 'react';
 import { DatePicker, Dropdown, Menu } from 'antd';
 import moment from 'moment';
@@ -106,7 +112,9 @@ export default function DurationPicker(props) {
       valueProp = props.value,
       _props$dateFormat = props.dateFormat,
       dateFormat = _props$dateFormat === void 0 ? 'YYYY-MM-DD' : _props$dateFormat,
-      onChange = props.onChange;
+      onChange = props.onChange,
+      restProps = _objectWithoutProperties(props, _excluded);
+
   var defaultValue = useMemo(function () {
     if (valueProp === undefined) {
       var _options$0$value, _options$;
@@ -218,9 +226,9 @@ export default function DurationPicker(props) {
     }))
   }, /*#__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, {
+  }, (_result$option = result.option) === null || _result$option === void 0 ? void 0 : _result$option.label, /*#__PURE__*/React.createElement(Down, null))), /*#__PURE__*/React.createElement(DatePicker.RangePicker, _objectSpread({
     value: result.dates,
     onChange: handleChangeDates,
     disabled: ((_result$option2 = result.option) === null || _result$option2 === void 0 ? void 0 : _result$option2.value) !== null
-  })));
+  }, restProps))));
 }

package/es/Icons/More.js

@@ -15,7 +15,7 @@ var MoreSvg = function MoreSvg(props) {
     xmlns: "http://www.w3.org/2000/svg"
   }, props), /*#__PURE__*/React.createElement("g", {
     fill: "currentColor",
-    "fill-rule": "evenodd"
+    fillRule: "evenodd"
   }, /*#__PURE__*/React.createElement("circle", {
     opacity: ".7",
     cx: "15",

package/es/Layout/index.less

@@ -2,19 +2,21 @@
   position: relative;
   display: flex;
   flex-direction: column;
-  min-height: 100%;
+  height: 100%;
   padding: 0 @space;
   background: #f2f2f2;
 
   &-header {
     padding: @space 0;
+    background-color: #f2f2f2;
   }
 
   &-content {
     display: flex;
     flex: 1;
+    min-height: 0;
+    overflow: hidden;
     background-color: #fff;
-    background-clip: content-box;
     border-top-left-radius: 8px;
     border-top-right-radius: 8px;
 
@@ -87,19 +89,18 @@
   }
 
   &-main {
+    display: flex;
     flex: 1;
+    flex-direction: column;
     min-width: 0;
+    overflow: auto;
   }
 
   &-footer {
-    position: sticky;
-    bottom: 0;
-    z-index: 10;
     display: flex;
     align-items: center;
-    justify-content: flex-end;
+    justify-content: center;
     box-sizing: border-box;
-    width: 100%;
     height: 65px;
     padding: @space;
     background: #fff;
@@ -118,17 +119,3 @@
     background-color: rgba(255, 255, 255, 0.5);
   }
 }
-
-.@{prefixCls}-layout.@{prefixCls}-layout-full {
-  height: 100%;
-  min-height: 0;
-
-  .@{prefixCls}-layout-content {
-    min-height: 0;
-  }
-
-  .@{prefixCls}-layout-main {
-    display: flex;
-    flex-direction: column;
-  }
-}

package/es/Section/index.less

@@ -18,6 +18,7 @@
 
   &-flex &-body {
     flex: 1 1 100%;
+    min-height: 0;
   }
 
   &-header {

package/es/SiderTree/TreeNodeTitle.js

@@ -63,7 +63,8 @@ export default function TreeNodeTitle(props) {
   var others = (_operation$others = operation.others) === null || _operation$others === void 0 ? void 0 : _operation$others.call(operation, item);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: "".concat(prefixCls, "-title-content"),
-    ref: trigger
+    ref: trigger,
+    title: item.title.toString()
   }, item.title), /*#__PURE__*/React.createElement("div", {
     className: "".concat(prefixCls, "-title-operators"),
     style: {

package/es/SiderTree/index.less

@@ -69,6 +69,7 @@
     &-unit {
       display: inline-block;
       width: @indentWidth;
+      vertical-align: top;
     }
   }
 
@@ -121,7 +122,7 @@
     flex: 1;
     align-items: center;
     justify-content: space-between;
-    min-width: 0;
+    min-width: 56px;
     padding: 0 8px;
     border-radius: 4px;
     cursor: pointer;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lemon-fe/components",
-  "version": "0.1.4",
+  "version": "0.1.7",
   "description": "> TODO: description",
   "author": "鲁盛杰 <lusj@cnlemon.net>",
   "homepage": "",
@@ -17,11 +17,8 @@
   },
   "dependencies": {
     "@lemon-fe/hooks": "^0.1.2",
-    "antd": "^4.20.2",
     "classnames": "^2.2.6",
     "lodash": "^4.17.21",
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2",
     "react-resizable": "^3.0.4"
   },
   "peerDependencies": {
@@ -30,6 +27,7 @@
     "classnames": ">=2.2.6",
     "color-string": ">=1.0.0",
     "lodash": ">=4.17.0",
+    "rc-resize-observer": "^1.0.0",
     "rc-tree": ">=4.0.0",
     "react": ">=16.9.0",
     "react-dom": ">=16.9.0"
@@ -37,7 +35,11 @@
   "devDependencies": {
     "@types/color-string": "^1.5.2",
     "@types/lodash": "^4.14.179",
-    "@types/react-resizable": "^1.7.4"
+    "@types/react-resizable": "^1.7.4",
+    "antd": "^4.20.2",
+    "rc-resize-observer": "^1.2.0",
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2"
   },
-  "gitHead": "f0f512c0a2e59bedb7ec800d545d395580f07038"
+  "gitHead": "84f94d37e2938930fa2c32d2da6573dfc517b458"
 }