@lemon-fe/components 0.1.50 → 0.1.52

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"];
+    _excluded2 = ["id", "columns", "defaultColumnProps", "rowKey", "children", "summaryTitle", "summaryRecord", "dataSource", "onSortChange", "sort", "scroll", "virtual", "components", "pagination", "rowHeight", "tableLayout", "rowActions", "style", "locale"];
 
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 
@@ -34,7 +34,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, useLayoutEffect } from 'react';
+import React, { useMemo, useState, useEffect, useRef } from 'react';
 import { Table as AntdTable } from 'antd';
 import { get } from 'lodash';
 import ResizeObserver from 'rc-resize-observer';
@@ -121,6 +121,7 @@ function BaseTable(props) {
       tableLayout = _props$tableLayout === void 0 ? 'fixed' : _props$tableLayout,
       rowActions = props.rowActions,
       style = props.style,
+      localeProp = props.locale,
       restProps = _objectWithoutProperties(props, _excluded2);
 
   var fullTableRef = useRef(null);
@@ -204,8 +205,8 @@ function BaseTable(props) {
     hasPagination = paginationProp !== undefined && !!paginationProp.total || dataSource.length > 0;
   }
 
-  useLayoutEffect(function () {
-    setScrollY(calcScrollY() || undefined);
+  useEffect(function () {
+    setScrollY(calcScrollY() || 0);
   }, [hasPagination]);
   useEffect(function () {
     if (scrollYProp !== true) {
@@ -416,13 +417,13 @@ function BaseTable(props) {
     style: scrollYProp === true ? _objectSpread(_objectSpread({}, style), {}, {
       height: '100%'
     }) : style,
-    locale: {
+    locale: _objectSpread({
       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"))
-    }
+    }, localeProp)
   }, restProps), {}, {
     pagination: paginationProp !== false ? _objectSpread({
       size: 'small',
@@ -439,7 +440,7 @@ function BaseTable(props) {
   if (scrollYProp === true) {
     tableNode = /*#__PURE__*/React.createElement(ResizeObserver, {
       onResize: function onResize(size) {
-        return changeScrollY(size.height);
+        changeScrollY(size.height);
       }
     }, tableNode);
   }

package/es/BaseTable/index.less

@@ -172,9 +172,9 @@
     text-align: center;
 
     & > img {
-      display: block;
       width: 120px;
       height: 120px;
+      vertical-align: top;
     }
   }
 }

package/es/Table/index.js

@@ -30,6 +30,8 @@ import React, { useMemo, useState, useImperativeHandle, useEffect } from 'react'
 import { useRequest } from '@lemon-fe/hooks';
 import BaseTable from '../BaseTable';
 import { isSortValue } from './utils';
+import empty from '../BaseTable/empty.png';
+import { PREFIX_CLS } from '../constants';
 export default function Table(props) {
   var _props$dataSource = props.dataSource,
       dataSource = _props$dataSource === void 0 ? [] : _props$dataSource,
@@ -115,16 +117,19 @@ export default function Table(props) {
         onLoading(false);
       }
 
-      setRemote(res.result);
+      setRemote(_objectSpread(_objectSpread({}, res.result), {}, {
+        error: undefined
+      }));
     },
-    onError: function onError() {
+    onError: function onError(error) {
       if (onLoading) {
         onLoading(false);
       }
 
       setRemote({
         data: [],
-        total: 0
+        total: 0,
+        error: error
       });
     }
   }),
@@ -215,6 +220,13 @@ export default function Table(props) {
         });
       }
     },
+    locale: remote.error ? {
+      emptyText: /*#__PURE__*/React.createElement("div", {
+        className: "".concat(PREFIX_CLS, "-table-empty")
+      }, /*#__PURE__*/React.createElement("img", {
+        src: empty
+      }), /*#__PURE__*/React.createElement("div", null, remote.error.message))
+    } : undefined,
     pagination: {
       current: current,
       pageSize: pageSize,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lemon-fe/components",
-  "version": "0.1.50",
+  "version": "0.1.52",
   "description": "> TODO: description",
   "author": "鲁盛杰 <lusj@cnlemon.net>",
   "homepage": "",
@@ -41,5 +41,5 @@
     "react": "^17.0.2",
     "react-dom": "^17.0.2"
   },
-  "gitHead": "27699afefdba7171bdc07a5e90a81308d699d1bf"
+  "gitHead": "68713e81d8cf4c82bae68564ae4c2e70c4a8cc27"
 }