@lemon-fe/components 0.1.50 → 0.1.55

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,10 @@ function BaseTable(props) {
     hasPagination = paginationProp !== undefined && !!paginationProp.total || dataSource.length > 0;
   }
 
-  useLayoutEffect(function () {
-    setScrollY(calcScrollY() || undefined);
+  useEffect(function () {
+    if (scrollYProp === true) {
+      setScrollY(calcScrollY() || 0);
+    }
   }, [hasPagination]);
   useEffect(function () {
     if (scrollYProp !== true) {
@@ -324,7 +327,7 @@ function BaseTable(props) {
   /** row actions */
 
 
-  useMemo(function () {
+  var _useMemo3 = useMemo(function () {
     if (rowActions !== undefined) {
       var actionCol = {
         title: '',
@@ -339,13 +342,19 @@ function BaseTable(props) {
           });
         }
       };
-      formatedColumns.push(actionCol);
-      flattenColumns.push(actionCol);
+      return [[].concat(_toConsumableArray(formatedColumns), [actionCol]), [].concat(_toConsumableArray(flattenColumns), [actionCol])];
     }
+
+    return [formatedColumns, flattenColumns];
   }, [rowActions, flattenColumns, formatedColumns]);
-  /** virtualize scroll */
 
-  var _useMemo3 = useMemo(function () {
+  var _useMemo4 = _slicedToArray(_useMemo3, 2);
+
+  formatedColumns = _useMemo4[0];
+  flattenColumns = _useMemo4[1];
+
+  /** virtualize scroll */
+  var _useMemo5 = useMemo(function () {
     return {
       components: _objectSpread({
         header: {
@@ -357,7 +366,7 @@ function BaseTable(props) {
       }, componentsProp)
     };
   }, [virtual]),
-      components = _useMemo3.components;
+      components = _useMemo5.components;
   /** summary row */
 
 
@@ -416,13 +425,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 +448,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

@@ -23,8 +23,8 @@
     height: 100%;
     padding-left: 16px;
     white-space: nowrap;
-    background-color: @table-row-hover-bg;
-    background-clip: content-box;
+    // background-color: @table-row-hover-bg;
+    // background-clip: content-box;
 
     &::before {
       position: absolute;
@@ -32,7 +32,7 @@
       left: 0;
       width: 16px;
       height: 100%;
-      background: linear-gradient(90deg, rgba(248, 248, 248, 0) 0%, @table-row-hover-bg 100%);
+      // background: linear-gradient(90deg, rgba(248, 248, 248, 0) 0%, @table-row-hover-bg 100%);
       content: '';
     }
 
@@ -172,9 +172,9 @@
     text-align: center;
 
     & > img {
-      display: block;
       width: 120px;
       height: 120px;
+      vertical-align: top;
     }
   }
 }

package/es/EditableTable/typings.d.ts

@@ -76,6 +76,7 @@ export interface EditableTableProps<T>
   error?: string | EditableTableRowError[];
   onChange?: (value: T[]) => void;
   rowSelection?: BaseTableProps<RowType>['rowSelection'];
+  rowActions?: BaseTableProps<RowType>['rowActions'];
   columns: EditableTableColumnType<T>[];
 }
 

package/es/SelectView/index.js

@@ -50,22 +50,17 @@ export default function SelectView(props) {
       data = _useState2[0],
       setData = _useState2[1];
 
-  var _useState3 = useState(data),
+  var _useState3 = useState((filter === null || filter === void 0 ? void 0 : filter.defaultValue) || {}),
       _useState4 = _slicedToArray(_useState3, 2),
-      selected = _useState4[0],
-      setSelected = _useState4[1];
-
-  var _useState5 = useState((filter === null || filter === void 0 ? void 0 : filter.defaultValue) || {}),
-      _useState6 = _slicedToArray(_useState5, 2),
-      params = _useState6[0],
-      setParams = _useState6[1];
+      params = _useState4[0],
+      setParams = _useState4[1];
 
   var list = useRef(null);
 
-  var _useState7 = useState('list'),
-      _useState8 = _slicedToArray(_useState7, 2),
-      tabFlag = _useState8[0],
-      setTabFlag = _useState8[1];
+  var _useState5 = useState('list'),
+      _useState6 = _slicedToArray(_useState5, 2),
+      tabFlag = _useState6[0],
+      setTabFlag = _useState6[1];
 
   useEffect(function () {
     var _list$current;
@@ -96,7 +91,6 @@ export default function SelectView(props) {
 
   var handleClear = function handleClear() {
     var empty = [];
-    setSelected(empty);
     setData(empty);
     onChange === null || onChange === void 0 ? void 0 : onChange(empty);
   };
@@ -113,7 +107,6 @@ export default function SelectView(props) {
 
       return false;
     });
-    setSelected(newRows);
     setData(newRows);
     onChange === null || onChange === void 0 ? void 0 : onChange(newRows);
   };
@@ -155,9 +148,6 @@ export default function SelectView(props) {
   var dataKeys = useMemo(function () {
     return data.map(getRowKey);
   }, [data, rowKey]);
-  var selectedKeys = useMemo(function () {
-    return selected.map(getRowKey);
-  }, [rowKey, selected]);
   var selectTable = /*#__PURE__*/React.createElement("div", {
     className: "".concat(prefixCls, "-layout")
   }, siderNode !== null && /*#__PURE__*/React.createElement("div", {
@@ -191,20 +181,19 @@ export default function SelectView(props) {
       return {
         onClick: function onClick() {
           var key = getRowKey(row);
-
-          var keys = _toConsumableArray(dataKeys);
-
-          var index = keys.findIndex(function (item) {
-            return item === key;
-          });
-
-          if (index >= 0) {
-            keys.splice(index, 1);
+          var keys = new Set(_toConsumableArray(dataKeys));
+
+          if (multiple) {
+            if (keys.has(key)) {
+              keys.delete(key);
+            } else {
+              keys.add(key);
+            }
           } else {
-            keys.push(key);
+            keys = new Set([key]);
           }
 
-          handleChangeData(keys, [row]);
+          handleChangeData(_toConsumableArray(keys.values()), [row]);
         }
       };
     },
@@ -244,13 +233,16 @@ export default function SelectView(props) {
     }, /*#__PURE__*/React.createElement(Table, {
       dataSource: data,
       columns: selectedColumns,
-      rowSelection: _objectSpread({
-        preserveSelectedRowKeys: true,
-        selectedRowKeys: selectedKeys,
-        onChange: function onChange(_, rows) {
-          return setSelected(rows);
-        }
-      }, rowSelection),
+      rowActions: function rowActions(row) {
+        return [{
+          text: '删除',
+          onClick: function onClick() {
+            var keys = new Set(_toConsumableArray(dataKeys));
+            keys.delete(getRowKey(row));
+            handleChangeData(keys, [row]);
+          }
+        }];
+      },
       rowKey: rowKey
     }))))));
   }

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.55",
   "description": "> TODO: description",
   "author": "鲁盛杰 <lusj@cnlemon.net>",
   "homepage": "",
@@ -41,5 +41,5 @@
     "react": "^17.0.2",
     "react-dom": "^17.0.2"
   },
-  "gitHead": "27699afefdba7171bdc07a5e90a81308d699d1bf"
+  "gitHead": "26cf3c526e121d460bee164784fdd9a16a5b5cdc"
 }