@lemon-fe/components 0.1.1 → 0.1.5

package/es/BaseTable/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference path="../../typings.d.ts" />
 import type { BaseTableProps as Props } from './typings';
 declare function BaseTable<T extends Record<string, any>>(props: Props<T>): JSX.Element;
 declare namespace BaseTable {

package/es/BaseTable/index.js

@@ -33,6 +33,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 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; }
 
+/// <reference path="../../typings.d.ts" />
 import React, { useMemo, useState, useEffect, useRef } from 'react';
 import { Table as AntdTable } from 'antd';
 import { get } from 'lodash';
@@ -43,6 +44,7 @@ import { PREFIX_CLS } from '../constants';
 import VirtualList from './VirtualBody';
 import BaseTableContext from './BaseTableContext';
 import Actions from './Actions';
+import empty from './empty.png';
 
 function formatSummary(summary) {
   if (!summary) {
@@ -396,7 +398,14 @@ function BaseTable(props) {
     },
     components: components,
     onChange: handleChange,
-    tableLayout: tableLayout
+    tableLayout: tableLayout,
+    locale: {
+      emptyText: /*#__PURE__*/React.createElement("div", {
+        className: "".concat(PREFIX_CLS, "-table-empty")
+      }, /*#__PURE__*/React.createElement("img", {
+        src: empty
+      }), /*#__PURE__*/React.createElement("div", null, "\u6682\u65E0\u6570\u636E"))
+    }
   }, restProps), {}, {
     pagination: paginationProp !== false ? _objectSpread({
       size: 'small',

package/es/BaseTable/index.less

@@ -197,4 +197,15 @@
       font-size: 12px;
     }
   }
+
+  &-empty {
+    display: inline-block;
+    text-align: center;
+
+    & > img {
+      display: block;
+      width: 120px;
+      height: 120px;
+    }
+  }
 }

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/FormLayout/index.less

@@ -17,6 +17,7 @@
 
 .col(@colSpan: 8) {
   flex-shrink: 0;
+  flex-wrap: nowrap;
   width: percentage((@colSpan / 24));
   min-width: if((@colSpan >= 12), 2 * @minWidth, @minWidth);
   padding: 0 (@spaceX / 2);

package/es/Icons/BigTip/index.d.ts

@@ -0,0 +1,6 @@
+import { CSSProperties } from 'react';
+export default function BigTip(props: {
+    type?: 'success' | 'error' | 'warning' | 'info';
+    style?: CSSProperties;
+    className?: string;
+}): JSX.Element;

package/es/Icons/BigTip/index.js

@@ -0,0 +1,50 @@
+var _excluded = ["type"];
+
+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; }
+
+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 from 'react';
+import success from './success.png';
+import error from './error.png';
+import info from './info.png';
+import warning from './warning.png';
+export default function BigTip(props) {
+  var _props$type = props.type,
+      type = _props$type === void 0 ? 'success' : _props$type,
+      restProps = _objectWithoutProperties(props, _excluded);
+
+  var src;
+
+  switch (type) {
+    case 'warning':
+      src = warning;
+      break;
+
+    case 'error':
+      src = error;
+      break;
+
+    case 'info':
+      src = info;
+      break;
+
+    case 'success':
+    default:
+      src = success;
+  }
+
+  return /*#__PURE__*/React.createElement("img", _objectSpread({
+    src: src,
+    style: {
+      width: 48,
+      height: 48
+    }
+  }, 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/Icons/index.d.ts

@@ -4,6 +4,7 @@ import Tip from './Tip';
 import DarkSearch from './DarkSearch';
 import More from './More';
 import Calendar from './Calendar';
+import BigTip from './BigTip';
 declare const Icons: {
     Search: typeof Search;
     Down: typeof Down;
@@ -12,5 +13,6 @@ declare const Icons: {
     DarkSearch: typeof DarkSearch;
     More: typeof More;
     Calendar: typeof Calendar;
+    BigTip: typeof BigTip;
 };
 export default Icons;

package/es/Icons/index.js

@@ -5,6 +5,7 @@ import Empty from './Empty';
 import DarkSearch from './DarkSearch';
 import More from './More';
 import Calendar from './Calendar';
+import BigTip from './BigTip';
 var Icons = {
   Search: Search,
   Down: Down,
@@ -12,6 +13,7 @@ var Icons = {
   Empty: Empty,
   DarkSearch: DarkSearch,
   More: More,
-  Calendar: Calendar
+  Calendar: Calendar,
+  BigTip: BigTip
 };
 export default Icons;

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/es/SiderTree/index.js

@@ -34,12 +34,13 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 import React, { useMemo, useState } from 'react';
 import { useDebounce } from '@lemon-fe/hooks';
 import Tree from 'rc-tree';
-import { Empty, Input, Tabs } from 'antd';
+import { Input, Tabs } from 'antd';
 import { PREFIX_CLS } from '../constants';
 import TreeNodeTitle from './TreeNodeTitle';
 import Icons from '../Icons';
 import TabBar from '../TabBar';
 import { mapChildren } from '../utils';
+import empty from './empty.png';
 
 function SiderTreeTabs(props) {
   var tabs = props.tabs,
@@ -156,9 +157,11 @@ export default function SiderTree(props) {
     className: "".concat(prefixCls, "-header")
   }, mHeader), /*#__PURE__*/React.createElement("div", {
     className: "".concat(prefixCls, "-body")
-  }, tree.length <= 0 ? /*#__PURE__*/React.createElement(Empty, {
-    description: false
-  }) : /*#__PURE__*/React.createElement(Tree, _objectSpread({
+  }, tree.length <= 0 ? /*#__PURE__*/React.createElement("div", {
+    className: "".concat(prefixCls, "-empty")
+  }, /*#__PURE__*/React.createElement("img", {
+    src: empty
+  }), /*#__PURE__*/React.createElement("div", null, "\u6682\u65E0\u6570\u636E")) : /*#__PURE__*/React.createElement(Tree, _objectSpread({
     treeData: tree,
     prefixCls: prefixCls,
     itemHeight: 40,

package/es/SiderTree/index.less

@@ -160,6 +160,26 @@
       }
     }
   }
+
+  &-empty {
+    width: 72px;
+    margin: 0 auto;
+    padding-top: 75px;
+    text-align: center;
+
+    img {
+      display: block;
+      width: 72px;
+      height: 72px;
+    }
+
+    div {
+      margin-top: 8px;
+      color: rgba(51, 51, 51, 0.5);
+      font-size: 14px;
+      line-height: 22px;
+    }
+  }
 }
 
 .@{prefixCls}-layout-left .@{prefixCls}-tree-wrapper:first-child .@{prefixCls}-tree-header {

package/es/init.js

@@ -7,13 +7,13 @@ 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, Empty, Select, ConfigProvider, Result, Button, version, DatePicker } from 'antd';
+import { message, Modal, Select, ConfigProvider, Result, Button, version, DatePicker } from 'antd';
 import { config } from '@lemon-fe/hooks';
 import PageLoading from './PageLoading';
 import Icons from './Icons';
 var Tip = Icons.Tip,
-    EmptyIcon = Icons.Empty,
-    Down = Icons.Down;
+    Down = Icons.Down,
+    BigTip = Icons.BigTip;
 export default function init() {
   var opts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
 
@@ -62,12 +62,10 @@ export default function init() {
 
     Modal[item] = function () {
       return modalAPI(_objectSpread({
-        icon: /*#__PURE__*/React.createElement(Tip, {
-          type: item,
-          style: {
-            fontSize: 20
-          }
-        })
+        icon: /*#__PURE__*/React.createElement(BigTip, {
+          type: item
+        }),
+        title: '提示'
       }, arguments.length <= 0 ? undefined : arguments[0]));
     };
   });
@@ -75,12 +73,10 @@ export default function init() {
 
   Modal.confirm = function () {
     return modalConfirm(_objectSpread({
-      icon: /*#__PURE__*/React.createElement(Tip, {
-        type: "warning",
-        style: {
-          fontSize: 20
-        }
-      })
+      icon: /*#__PURE__*/React.createElement(BigTip, {
+        type: "info"
+      }),
+      title: '提示'
     }, arguments.length <= 0 ? undefined : arguments[0]));
   };
 
@@ -91,10 +87,6 @@ export default function init() {
       return node;
     }
   };
-  Empty.PRESENTED_IMAGE_DEFAULT = /*#__PURE__*/React.createElement(EmptyIcon, null);
-  Empty.defaultProps = {
-    image: Empty.PRESENTED_IMAGE_DEFAULT
-  };
   DatePicker.RangePicker.defaultProps = {
     suffixIcon: /*#__PURE__*/React.createElement(Icons.Calendar, null)
   };

package/es/overrides.less

@@ -38,15 +38,10 @@ a[title='站长统计'] {
     padding: 40px 48px;
     overflow: hidden;
 
-    & > .anticon:first-child {
+    & > img:first-child {
       position: absolute;
       top: 40px;
       left: 48px;
-      padding: 2px;
-    }
-
-    & > .anticon + .ant-modal-confirm-title + .ant-modal-confirm-content {
-      margin-left: 36px;
     }
   }
 
@@ -66,14 +61,14 @@ a[title='站长统计'] {
 
   .ant-modal-confirm-title {
     float: none;
-    margin-left: 36px;
+    margin-left: 56px;
     font-weight: 600;
     line-height: 24px;
   }
 
   .ant-modal-confirm-content {
     float: none;
-    margin: 2px 0 0 36px;
+    margin: 2px 0 0 56px;
     color: rgba(51, 51, 51, 0.5);
     line-height: 22px;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lemon-fe/components",
-  "version": "0.1.1",
+  "version": "0.1.5",
   "description": "> TODO: description",
   "author": "鲁盛杰 <lusj@cnlemon.net>",
   "homepage": "",
@@ -16,8 +16,8 @@
     "registry": "https://registry.npmjs.org"
   },
   "dependencies": {
-    "@lemon-fe/hooks": "^0.0.33",
-    "antd": "^4.17.0",
+    "@lemon-fe/hooks": "^0.1.2",
+    "antd": "^4.20.2",
     "classnames": "^2.2.6",
     "lodash": "^4.17.21",
     "react": "^17.0.2",
@@ -39,5 +39,5 @@
     "@types/lodash": "^4.14.179",
     "@types/react-resizable": "^1.7.4"
   },
-  "gitHead": "b86fa2f3e6d5d47d43d7dcc3d662d3c941832c4d"
+  "gitHead": "03156b8418da16a062304610592219d40df9e313"
 }