@arcblock/ux 2.1.42 → 2.1.43

package/lib/Datatable/index.js

@@ -56,6 +56,24 @@ function Datatable(_ref) {
     children: /*#__PURE__*/(0, _jsxRuntime.jsx)(ReDatatable, _objectSpread({}, props))
   });
 }
+
+const fixCellProp = (tempObj, cellProps) => {
+  const cellStyle = {};
+
+  if (tempObj.align) {
+    cellProps.className = (0, _clsx.default)(cellProps.className, "pc-align-".concat(tempObj.align));
+  }
+
+  if (tempObj.verticalKeyAlign) {
+    cellProps.className = (0, _clsx.default)(cellProps.className, "vertical-align-".concat(tempObj.verticalKeyAlign));
+  }
+
+  if (tempObj.minWidth) {
+    cellStyle.minWidth = tempObj.minWidth;
+  }
+
+  cellProps.style = Object.assign({}, cellProps.style, cellStyle);
+};
 /**
  * @param {Object} props.options The options of mui-datatable，detail see https://github.com/gregnb/mui-datatables/tree/b8d2eee6af4589d254b40918e5d7e70b1ee4baca
  * @param {Array} props.customButtons Custom buttons for toolbar
@@ -147,14 +165,7 @@ function ReDatatable(_ref2) {
         cellProps.width = tempObj.width;
       }
 
-      if (tempObj.align) {
-        cellProps.className = (0, _clsx.default)(cellProps.className, "pc-align-".concat(tempObj.align));
-      }
-
-      if (tempObj.verticalKeyAlign) {
-        cellProps.className = (0, _clsx.default)(cellProps.className, "vertical-align-".concat(tempObj.verticalKeyAlign));
-      }
-
+      fixCellProp(tempObj, cellProps);
       return cellProps;
     }; // Prevent memory xie caused by recursive forwarding of setCellHeaderProps functions
 
@@ -171,14 +182,7 @@ function ReDatatable(_ref2) {
           cellProps = _objectSpread(_objectSpread({}, cellProps), setCellProps(...arguments) || {});
         }
 
-        if (tempObj.align) {
-          cellProps.className = (0, _clsx.default)(cellProps.className, "pc-align-".concat(tempObj.align));
-        }
-
-        if (tempObj.verticalKeyAlign) {
-          cellProps.className = (0, _clsx.default)(cellProps.className, "vertical-align-".concat(tempObj.verticalKeyAlign));
-        }
-
+        fixCellProp(tempObj, cellProps);
         return cellProps;
       };
 

package/lib/RelativeTime/index.js

@@ -27,7 +27,7 @@ var _Util = require("../Util");
 
 var _jsxRuntime = require("react/jsx-runtime");
 
-const _excluded = ["value", "locale", "withoutSuffix", "from", "to"];
+const _excluded = ["value", "locale", "withoutSuffix", "from", "to", "type"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -78,7 +78,8 @@ function RelativeTime(_ref) {
     locale,
     withoutSuffix,
     from,
-    to
+    to,
+    type
   } = _ref,
       rest = _objectWithoutProperties(_ref, _excluded);
 
@@ -87,20 +88,29 @@ function RelativeTime(_ref) {
   }
 
   const localeOption = locale === 'zh' ? 'zh-cn' : 'zh-us';
-  let innerContent;
+  let relativeString;
 
   if (from) {
-    innerContent = (0, _dayjs.default)(value).locale(localeOption).from(from, withoutSuffix);
+    relativeString = (0, _dayjs.default)(value).locale(localeOption).from(from, withoutSuffix);
   } else if (to) {
-    innerContent = (0, _dayjs.default)(value).locale(localeOption).to(to, withoutSuffix);
+    relativeString = (0, _dayjs.default)(value).locale(localeOption).to(to, withoutSuffix);
   } else {
-    innerContent = (0, _dayjs.default)(value).locale(localeOption).fromNow(withoutSuffix);
+    relativeString = (0, _dayjs.default)(value).locale(localeOption).fromNow(withoutSuffix);
+  }
+
+  const absoluteString = (0, _Util.formatToDatetime)(value, {
+    locale: localeOption
+  });
+  let innerContent = relativeString;
+  let popContent = absoluteString;
+
+  if (type === 'absolute') {
+    innerContent = absoluteString;
+    popContent = relativeString;
   }
 
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Tooltip.default, {
-    title: (0, _Util.formatToDatetime)(value, {
-      locale: localeOption
-    }),
+    title: popContent,
     placement: "top-end",
     enterTouchDelay: 0,
     children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", _objectSpread(_objectSpread({}, rest), {}, {
@@ -114,11 +124,13 @@ RelativeTime.propTypes = {
   locale: _propTypes.default.string,
   withoutSuffix: _propTypes.default.bool,
   from: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.number]),
-  to: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.number])
+  to: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.number]),
+  type: _propTypes.default.string
 };
 RelativeTime.defaultProps = {
   locale: 'en',
   withoutSuffix: false,
   from: '',
-  to: ''
+  to: '',
+  type: 'relative'
 };

package/package.json

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

package/src/Datatable/index.js

@@ -20,6 +20,24 @@ export default function Datatable({ ...props }) {
   );
 }
 
+const fixCellProp = (tempObj, cellProps) => {
+  const cellStyle = {};
+
+  if (tempObj.align) {
+    cellProps.className = clsx(cellProps.className, `pc-align-${tempObj.align}`);
+  }
+
+  if (tempObj.verticalKeyAlign) {
+    cellProps.className = clsx(cellProps.className, `vertical-align-${tempObj.verticalKeyAlign}`);
+  }
+
+  if (tempObj.minWidth) {
+    cellStyle.minWidth = tempObj.minWidth;
+  }
+
+  cellProps.style = Object.assign({}, cellProps.style, cellStyle);
+};
+
 /**
  * @param {Object} props.options The options of mui-datatable，detail see https://github.com/gregnb/mui-datatables/tree/b8d2eee6af4589d254b40918e5d7e70b1ee4baca
  * @param {Array} props.customButtons Custom buttons for toolbar
@@ -102,13 +120,7 @@ function ReDatatable({
         cellProps.width = tempObj.width;
       }
 
-      if (tempObj.align) {
-        cellProps.className = clsx(cellProps.className, `pc-align-${tempObj.align}`);
-      }
-
-      if (tempObj.verticalKeyAlign) {
-        cellProps.className = clsx(cellProps.className, `vertical-align-${tempObj.verticalKeyAlign}`);
-      }
+      fixCellProp(tempObj, cellProps);
 
       return cellProps;
     };
@@ -130,13 +142,7 @@ function ReDatatable({
           };
         }
 
-        if (tempObj.align) {
-          cellProps.className = clsx(cellProps.className, `pc-align-${tempObj.align}`);
-        }
-
-        if (tempObj.verticalKeyAlign) {
-          cellProps.className = clsx(cellProps.className, `vertical-align-${tempObj.verticalKeyAlign}`);
-        }
+        fixCellProp(tempObj, cellProps);
 
         return cellProps;
       };

package/src/RelativeTime/index.js

@@ -34,25 +34,35 @@ dayjs.updateLocale('zh-cn', {
 });
 setDateTool(dayjs);
 
-export default function RelativeTime({ value, locale, withoutSuffix, from, to, ...rest }) {
+export default function RelativeTime({ value, locale, withoutSuffix, from, to, type, ...rest }) {
   if (!value) {
     return '-';
   }
 
   const localeOption = locale === 'zh' ? 'zh-cn' : 'zh-us';
 
-  let innerContent;
+  let relativeString;
 
   if (from) {
-    innerContent = dayjs(value).locale(localeOption).from(from, withoutSuffix);
+    relativeString = dayjs(value).locale(localeOption).from(from, withoutSuffix);
   } else if (to) {
-    innerContent = dayjs(value).locale(localeOption).to(to, withoutSuffix);
+    relativeString = dayjs(value).locale(localeOption).to(to, withoutSuffix);
   } else {
-    innerContent = dayjs(value).locale(localeOption).fromNow(withoutSuffix);
+    relativeString = dayjs(value).locale(localeOption).fromNow(withoutSuffix);
+  }
+
+  const absoluteString = formatToDatetime(value, { locale: localeOption });
+
+  let innerContent = relativeString;
+  let popContent = absoluteString;
+
+  if (type === 'absolute') {
+    innerContent = absoluteString;
+    popContent = relativeString;
   }
 
   return (
-    <Tooltip title={formatToDatetime(value, { locale: localeOption })} placement="top-end" enterTouchDelay={0}>
+    <Tooltip title={popContent} placement="top-end" enterTouchDelay={0}>
       <span {...rest}>{innerContent}</span>
     </Tooltip>
   );
@@ -64,6 +74,7 @@ RelativeTime.propTypes = {
   withoutSuffix: PropTypes.bool,
   from: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
   to: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
+  type: PropTypes.string,
 };
 
 RelativeTime.defaultProps = {
@@ -71,4 +82,5 @@ RelativeTime.defaultProps = {
   withoutSuffix: false,
   from: '',
   to: '',
+  type: 'relative',
 };