@lemon-fe/components 0.1.3 → 0.1.6

package/es/BaseTable/index.js

@@ -1,4 +1,4 @@
-var _excluded = ["onWidthChange", "width", "fullTableRef"],
+var _excluded = ["onWidthChange", "width", "fullTableRef", "children", "className"],
     _excluded2 = ["id", "columns", "defaultColumnProps", "rowKey", "children", "summaryTitle", "summaryRecord", "dataSource", "onSortChange", "sort", "scroll", "virtual", "components", "pagination", "onChange", "rowHeight", "tableLayout", "rowActions"];
 
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
@@ -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) {

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/MainFramework/components/Menu/index.js

@@ -228,7 +228,7 @@ export default function Menu(props) {
   var activeMenu = useMemo(function () {
     var check = function check(path) {
       if (path) {
-        return new RegExp("".concat(path, "(?![^\\/])")).test(location.pathname);
+        return new RegExp("".concat(path.split('?')[0], "(?![^\\/])")).test(location.pathname);
       }
 
       return false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lemon-fe/components",
-  "version": "0.1.3",
+  "version": "0.1.6",
   "description": "> TODO: description",
   "author": "鲁盛杰 <lusj@cnlemon.net>",
   "homepage": "",
@@ -39,5 +39,5 @@
     "@types/lodash": "^4.14.179",
     "@types/react-resizable": "^1.7.4"
   },
-  "gitHead": "5f375aa03a86a1c776ef3e99ead0db39cbdbf7e8"
+  "gitHead": "15adfd8b84c2c81952656df2ffa553f58c301715"
 }