@arcblock/ux 2.1.22 → 2.1.23

package/lib/Datatable/index.js

@@ -11,12 +11,14 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _muiDatatables = _interopRequireWildcard(require("mui-datatables"));
 
-var _styledComponents = _interopRequireDefault(require("styled-components"));
+var _styledComponents = _interopRequireWildcard(require("styled-components"));
 
 var _isObject = _interopRequireDefault(require("lodash/isObject"));
 
 var _cloneDeep = _interopRequireDefault(require("lodash/cloneDeep"));
 
+var _get = _interopRequireDefault(require("lodash/get"));
+
 var _Empty = _interopRequireDefault(require("../Empty"));
 
 var _CustomToolbar = _interopRequireDefault(require("./CustomToolbar"));
@@ -106,14 +108,17 @@ function ReDatatable(_ref2) {
     }
 
     const {
-      setCellHeaderProps
+      setCellHeaderProps,
+      setCellProps
     } = tempObj.options;
 
-    tempObj.options.setCellHeaderProps = columnMeta => {
-      let cellProps = {}; // Complementing width while inheriting old setCellHeaderProps
+    tempObj.options.setCellHeaderProps = function () {
+      let cellProps = {
+        className: ''
+      }; // Complementing width while inheriting old setCellHeaderProps
 
       if (setCellHeaderProps && !setCellHeaderProps.__innerFunc) {
-        cellProps = setCellHeaderProps(columnMeta) || {};
+        cellProps = _objectSpread(_objectSpread({}, cellProps), setCellHeaderProps(...arguments) || {});
       }
 
       if (loading || disabled) {
@@ -126,17 +131,42 @@ function ReDatatable(_ref2) {
         cellProps.width = tempObj.width;
       }
 
+      if (tempObj.align) {
+        cellProps.className = "pc-align-".concat(tempObj.align);
+      }
+
       return cellProps;
     }; // Prevent memory xie caused by recursive forwarding of setCellHeaderProps functions
 
 
     tempObj.options.setCellHeaderProps.__innerFunc = 1;
+
+    if (tempObj.align || tempObj.style) {
+      tempObj.options.setCellProps = function () {
+        let cellProps = {
+          className: ''
+        }; // Complementing width while inheriting old setCellHeaderProps
+
+        if (setCellProps && !setCellProps.__innerFunc) {
+          cellProps = _objectSpread(_objectSpread({}, cellProps), setCellProps(...arguments) || {});
+        }
+
+        if (tempObj.align) {
+          cellProps.className = "pc-align-".concat(tempObj.align);
+        }
+
+        return cellProps;
+      };
+
+      tempObj.options.setCellProps.__innerFunc = 1;
+    }
+
     return tempObj;
   }); // Fixing object-type structures
 
   const data = originData.map(e => {
     if (!Array.isArray(e) && (0, _isObject.default)(e)) {
-      return keys.map(key => e[key]);
+      return keys.map(key => (0, _get.default)(e, key));
     }
 
     return e;
@@ -303,10 +333,12 @@ function ReDatatable(_ref2) {
   });
 }
 
+const alignCss = (0, _styledComponents.css)([".MuiTableCell-head{[class*='MUIDataTableHeadCell-toolButton']{width:100%;> [class*='MUIDataTableHeadCell-sortAction']{width:100%;}}&.pc-align-center{text-align:center;[class*='MUIDataTableHeadCell-toolButton'] > [class*='MUIDataTableHeadCell-sortAction']{justify-content:center;}}&.pc-align-right{text-align:right;[class*='MUIDataTableHeadCell-toolButton']{margin-right:0;padding-right:0;& > [class*='MUIDataTableHeadCell-sortAction']{justify-content:right;}}}}.MuiTableCell-body{&.pc-align-center{text-align:center;}&.pc-align-right{text-align:right;}}"]);
+
 const TableContainer = _styledComponents.default.div.withConfig({
   displayName: "Datatable__TableContainer",
   componentId: "sc-1ju12vq-0"
-})(["height:100%;> .MuiPaper-root{display:flex;flex-direction:column;height:100%;box-shadow:none;}", "{[class*='MUIDataTableBody-emptyTitle']{padding-left:16px;width:200%;margin-left:-100%;text-align:center;}}&.datatable-stripped{.MuiTableBody-root{tr:nth-of-type(odd){background-color:", ";}}}"], props => props.theme.breakpoints.down('md'), props => props.theme.palette.action.hover);
+})(["height:100%;> .MuiPaper-root{display:flex;flex-direction:column;height:100%;box-shadow:none;}", "{[class*='MUIDataTableBody-emptyTitle']{padding-left:16px;width:200%;margin-left:-100%;text-align:center;}[class*='MUIDataTableBodyCell-simpleCell']{[class*='MUIDataTableBody-emptyTitle']{padding-left:16px;width:100%;margin-left:0;text-align:center;}}}", "{[class*='responsiveSimple']{td.MuiTableCell-body{display:flex;padding-right:0;> div{width:auto;flex:1;&:first-child{flex:0;padding-right:16px;}}}}}", "{", "}", "{[class*='responsiveSimple']{", "}}&.datatable-stripped{.MuiTableBody-root{tr:nth-of-type(odd){background-color:", ";}}}"], props => props.theme.breakpoints.down('md'), props => props.theme.breakpoints.down('sm'), props => props.theme.breakpoints.up('md'), alignCss, props => props.theme.breakpoints.up('sm'), alignCss, props => props.theme.palette.action.hover);
 
 const FilterLine = _styledComponents.default.div.withConfig({
   displayName: "Datatable__FilterLine",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arcblock/ux",
-  "version": "2.1.22",
+  "version": "2.1.23",
   "description": "Common used react components for arcblock products",
   "keywords": [
     "react",
@@ -52,10 +52,10 @@
     "react": ">=18.1.0",
     "react-ga": "^2.7.0"
   },
-  "gitHead": "bc296a11385c44672b18f3bb90db599a8fe05e24",
+  "gitHead": "bce078a75dc904ab3bc86ff4d537f00e6503a3c1",
   "dependencies": {
-    "@arcblock/icons": "^2.1.22",
-    "@arcblock/react-hooks": "^2.1.22",
+    "@arcblock/icons": "^2.1.23",
+    "@arcblock/react-hooks": "^2.1.23",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
     "@emotion/react": "^11.9.0",
     "@emotion/styled": "^11.8.1",

package/src/Datatable/index.js

@@ -2,9 +2,10 @@
 import { useEffect, useRef } from 'react';
 import PropTypes from 'prop-types';
 import MUIDataTable, { TableFilterList, TableFooter } from 'mui-datatables';
-import styled from 'styled-components';
+import styled, { css } from 'styled-components';
 import isObject from 'lodash/isObject';
 import cloneDeep from 'lodash/cloneDeep';
+import get from 'lodash/get';
 import Empty from '../Empty';
 import CustomToolbar from './CustomToolbar';
 import { DatatableProvide, useDatatableContext } from './DatatableContext';
@@ -66,13 +67,19 @@ function ReDatatable({
       tempObj.options = {};
     }
 
-    const { setCellHeaderProps } = tempObj.options;
-    tempObj.options.setCellHeaderProps = (columnMeta) => {
-      let cellProps = {};
+    const { setCellHeaderProps, setCellProps } = tempObj.options;
+
+    tempObj.options.setCellHeaderProps = (...args) => {
+      let cellProps = {
+        className: '',
+      };
 
       // Complementing width while inheriting old setCellHeaderProps
       if (setCellHeaderProps && !setCellHeaderProps.__innerFunc) {
-        cellProps = setCellHeaderProps(columnMeta) || {};
+        cellProps = {
+          ...cellProps,
+          ...(setCellHeaderProps(...args) || {}),
+        };
       }
 
       if (loading || disabled) {
@@ -83,19 +90,46 @@ function ReDatatable({
         cellProps.width = tempObj.width;
       }
 
+      if (tempObj.align) {
+        cellProps.className = `pc-align-${tempObj.align}`;
+      }
+
       return cellProps;
     };
 
     // Prevent memory xie caused by recursive forwarding of setCellHeaderProps functions
     tempObj.options.setCellHeaderProps.__innerFunc = 1;
 
+    if (tempObj.align || tempObj.style) {
+      tempObj.options.setCellProps = (...args) => {
+        let cellProps = {
+          className: '',
+        };
+
+        // Complementing width while inheriting old setCellHeaderProps
+        if (setCellProps && !setCellProps.__innerFunc) {
+          cellProps = {
+            ...cellProps,
+            ...(setCellProps(...args) || {}),
+          };
+        }
+
+        if (tempObj.align) {
+          cellProps.className = `pc-align-${tempObj.align}`;
+        }
+
+        return cellProps;
+      };
+      tempObj.options.setCellProps.__innerFunc = 1;
+    }
+
     return tempObj;
   });
 
   // Fixing object-type structures
   const data = originData.map((e) => {
     if (!Array.isArray(e) && isObject(e)) {
-      return keys.map((key) => e[key]);
+      return keys.map((key) => get(e, key));
     }
     return e;
   });
@@ -229,6 +263,41 @@ function ReDatatable({
   );
 }
 
+const alignCss = css`
+  .MuiTableCell-head {
+    [class*='MUIDataTableHeadCell-toolButton'] {
+      width: 100%;
+      > [class*='MUIDataTableHeadCell-sortAction'] {
+        width: 100%;
+      }
+    }
+    &.pc-align-center {
+      text-align: center;
+      [class*='MUIDataTableHeadCell-toolButton'] > [class*='MUIDataTableHeadCell-sortAction'] {
+        justify-content: center;
+      }
+    }
+    &.pc-align-right {
+      text-align: right;
+      [class*='MUIDataTableHeadCell-toolButton'] {
+        margin-right: 0;
+        padding-right: 0;
+        & > [class*='MUIDataTableHeadCell-sortAction'] {
+          justify-content: right;
+        }
+      }
+    }
+  }
+  .MuiTableCell-body {
+    &.pc-align-center {
+      text-align: center;
+    }
+    &.pc-align-right {
+      text-align: right;
+    }
+  }
+`;
+
 const TableContainer = styled.div`
   height: 100%;
   > .MuiPaper-root {
@@ -244,6 +313,38 @@ const TableContainer = styled.div`
       margin-left: -100%;
       text-align: center;
     }
+    [class*='MUIDataTableBodyCell-simpleCell'] {
+      [class*='MUIDataTableBody-emptyTitle'] {
+        padding-left: 16px;
+        width: 100%;
+        margin-left: 0;
+        text-align: center;
+      }
+    }
+  }
+  ${(props) => props.theme.breakpoints.down('sm')} {
+    [class*='responsiveSimple'] {
+      td.MuiTableCell-body {
+        display: flex;
+        padding-right: 0;
+        > div {
+          width: auto;
+          flex: 1;
+          &:first-child {
+            flex: 0;
+            padding-right: 16px;
+          }
+        }
+      }
+    }
+  }
+  ${(props) => props.theme.breakpoints.up('md')} {
+    ${alignCss}
+  }
+  ${(props) => props.theme.breakpoints.up('sm')} {
+    [class*='responsiveSimple'] {
+      ${alignCss}
+    }
   }
   &.datatable-stripped {
     .MuiTableBody-root {