@abtnode/ux 1.16.13-beta-0656f92f → 1.16.13-beta-2eb54cbc

package/lib/locales/zh.js

@@ -134,7 +134,7 @@ module.exports = {
     createdAt: '创建时间',
     createdBy: '创建人',
     dAddress: '去中心化地址(DID)',
-    dataStorage: '数据存储',
+    dataStorage: '本地数据存储',
     delConfirm: '删除',
     delConfirmDescription: '确认删除 {data}？',
     delete: '删除',
@@ -207,7 +207,9 @@ module.exports = {
     members: '成员',
     memory: '内存',
     meta: '元数据',
-    monitor: '监控',
+    analytics: '统计分析',
+    runtime: '运行监控',
+    traffic: '流量分析',
     more: '更多',
     mountPoint: '挂载点',
     name: '名称',
@@ -691,7 +693,7 @@ module.exports = {
         verifying: '验证节点新版本 v{version}',
         rollback: '回滚此次升级',
         complete: '升级完成!',
-        progress: '正在升级节点到 v{version}',
+        progress: '正在升级节点 {version}',
         check: '检查更新',
         latest: '太棒了，你的节点已经是最新版！'
       },
@@ -1464,5 +1466,21 @@ module.exports = {
     },
     loadFailed: '加载订阅信息失败，请重试!',
     loading: '加载订阅信息...'
+  },
+  analytics: {
+    trend: '趋势',
+    detail: '探究',
+    traffic: {
+      totalRequests: '总请求数',
+      validRequests: '成功请求数',
+      failedRequests: '失败请求数',
+      uniqueVisitors: '访客数量',
+      uniqueFiles: '网址数量',
+      uniqueReferrers: '来源数量',
+      uniqueNotFound: '404 数量',
+      uniqueStaticFiles: '静态资源数量',
+      logSize: '日志大小',
+      bandwidth: '带宽消耗'
+    }
   }
 };

package/lib/logs/download.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = DownloadLog;
 var _react = require("react");
 var _propTypes = _interopRequireDefault(require("prop-types"));
-var _dayjs = _interopRequireDefault(require("dayjs"));
+var _dayjs = _interopRequireDefault(require("@abtnode/util/lib/dayjs"));
 var _Box = _interopRequireDefault(require("@mui/material/Box"));
 var _Download = _interopRequireDefault(require("@mui/icons-material/Download"));
 var _FormControl = _interopRequireDefault(require("@mui/material/FormControl"));

package/lib/relative-time.js

@@ -31,7 +31,7 @@ function RelativeTime(_ref) {
   if (valTime > now) {
     const time = (0, _prettyMsI18n.default)(valTime - now, prettyOption);
     return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Tooltip.default, {
-      title: (0, _util.formatToDatetime)(value),
+      title: (0, _util.formatToDatetime)(value, locale),
       placement: "top-end",
       enterTouchDelay: 0,
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
@@ -43,7 +43,7 @@ function RelativeTime(_ref) {
   }
   const time = (0, _prettyMsI18n.default)(now - valTime, prettyOption);
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Tooltip.default, {
-    title: (0, _util.formatToDatetime)(value),
+    title: (0, _util.formatToDatetime)(value, locale),
     placement: "top-end",
     enterTouchDelay: 0,
     children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {

package/lib/subscription.js

@@ -10,7 +10,7 @@ var _Chip = _interopRequireDefault(require("@mui/material/Chip"));
 var _Box = _interopRequireDefault(require("@mui/material/Box"));
 var _Popover = _interopRequireDefault(require("@mui/material/Popover"));
 var _CircularProgress = _interopRequireDefault(require("@mui/material/CircularProgress"));
-var _dayjs = _interopRequireDefault(require("dayjs"));
+var _dayjs = _interopRequireDefault(require("@abtnode/util/lib/dayjs"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _react = require("react");
 var _useAsyncRetry = _interopRequireDefault(require("react-use/lib/useAsyncRetry"));

package/lib/team/members/invite-member.js

@@ -41,7 +41,8 @@ function InviteMember(_ref) {
   const [loading, setLoading] = (0, _react.useState)(false);
   const [error, setError] = (0, _react.useState)('');
   const {
-    t
+    t,
+    locale
   } = (0, _context.useLocaleContext)();
   const [activeStep, setActiveStep] = (0, _react.useState)(0);
   const [inviteInfo, setInviteInfo] = (0, _react.useState)('');
@@ -150,7 +151,7 @@ function InviteMember(_ref) {
       return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
         children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(Bold, {
           children: t('team.member.inviteDialog.createSuccessTip', {
-            expireDate: (0, _util.formatToDatetime)(inviteInfo.expireDate)
+            expireDate: (0, _util.formatToDatetime)(inviteInfo.expireDate, locale)
           })
         }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
           style: {

package/lib/team/members/member.js

@@ -106,7 +106,8 @@ function Member(_ref3) {
     enablePassportIssuance
   } = (0, _team.useTeamContext)();
   const {
-    t
+    t,
+    locale
   } = (0, _context.useLocaleContext)();
   const pageState = (0, _ahooks.useReactive)({
     user: null,
@@ -191,13 +192,13 @@ function Member(_ref3) {
       value: pageState.user.approved ? t('common.yes') : t('common.no')
     }, {
       name: t('team.member.lastLogin'),
-      value: (0, _util.formatToDatetime)(pageState.user.lastLoginAt)
+      value: (0, _util.formatToDatetime)(pageState.user.lastLoginAt, locale)
     }, {
       name: t('team.member.lastLoginIp'),
       value: pageState.user.lastLoginIp || ''
     }, {
       name: t('common.createdAt'),
-      value: (0, _util.formatToDatetime)(pageState.user.createdAt)
+      value: (0, _util.formatToDatetime)(pageState.user.createdAt, locale)
     }, {
       name: t('common.remark'),
       value: pageState.user.remark || '--'

package/lib/team/members/passport-issuances.js

@@ -33,7 +33,8 @@ function PassportIssuances(_ref) {
     inService
   } = (0, _node.useNodeContext)();
   const {
-    t
+    t,
+    locale
   } = (0, _react.useContext)(_context.LocaleContext);
   const [delConfirm, setDelConfirm] = (0, _react.useState)(null);
   const [loading, setLoading] = (0, _react.useState)(false);
@@ -113,7 +114,7 @@ function PassportIssuances(_ref) {
           style: {
             color: '#999'
           },
-          children: [t('common.expires'), ":\xA0", (0, _util.formatToDatetime)(d.expireDate)]
+          children: [t('common.expires'), ":\xA0", (0, _util.formatToDatetime)(d.expireDate, locale)]
         })]
       }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
         mt: 2,

package/lib/team/members/transfer-node.js

@@ -44,12 +44,10 @@ function TransferMember(_ref) {
   } = (0, _react.useContext)(_session.SessionContext);
   const [loading, setLoading] = (0, _react.useState)(false);
   const {
+    t,
     locale
   } = (0, _context.useLocaleContext)();
   const [error, setError] = (0, _react.useState)('');
-  const {
-    t
-  } = (0, _context.useLocaleContext)();
   const [openTransferNFTAuth, setOpenTransferNFTAuth] = (0, _react.useState)(false);
   const [activeStep, setActiveStep] = (0, _react.useState)(0);
   const [inviteInfo, setInviteInfo] = (0, _react.useState)('');
@@ -203,7 +201,7 @@ function TransferMember(_ref) {
       return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
         children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(Bold, {
           children: t('team.transferNode.inviteDialog.createSuccessTip', {
-            expireDate: (0, _util.formatToDatetime)(inviteInfo.expireDate)
+            expireDate: (0, _util.formatToDatetime)(inviteInfo.expireDate, locale)
           })
         }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
           style: {

package/lib/util/index.js

@@ -17,8 +17,6 @@ Object.defineProperty(exports, "formatError", {
 exports.formatFactoryPrice = formatFactoryPrice;
 exports.formatRegistryScreenshotPath = exports.formatRegistryLogoPath = exports.formatPerson = exports.formatMountPoint = exports.formatLocale = void 0;
 exports.formatTime = formatTime;
-exports.formatTimeFromNow = formatTimeFromNow;
-exports.formatTimestamp = formatTimestamp;
 exports.formatToDate = formatToDate;
 exports.formatToDatetime = formatToDatetime;
 exports.formatUrl = void 0;
@@ -32,9 +30,7 @@ exports.getBlockletUrl = getBlockletUrl;
 exports.getBlockletUrlParams = void 0;
 exports.getBlockletUrls = getBlockletUrls;
 exports.getExplorerLink = getExplorerLink;
-exports.getPathPrefix = exports.getIssuePassportLink = exports.getInviteLink = void 0;
-exports.getRelativeTime = getRelativeTime;
-exports.getTransferAppLink = exports.getSubscriptionURL = exports.getStoreList = exports.getRenewBlockletURL = void 0;
+exports.getTransferAppLink = exports.getSubscriptionURL = exports.getStoreList = exports.getRenewBlockletURL = exports.getPathPrefix = exports.getIssuePassportLink = exports.getInviteLink = void 0;
 exports.getWebWalletUrl = getWebWalletUrl;
 exports.isNewStoreUrl = exports.isInstalling = exports.isDownloading = exports.isChrome = exports.isCertificateMatch = exports.isBlockletDev = void 0;
 exports.isProtectedRole = isProtectedRole;
@@ -46,11 +42,8 @@ exports.shouldCheckDomainStatus = void 0;
 exports.sleep = sleep;
 exports.validateDomain = exports.toSlotDomain = exports.stringSortHandlerAsc = exports.sortDomains = void 0;
 var _constant = require("@abtnode/constant");
-var _dayjs = _interopRequireDefault(require("dayjs"));
-require("moment/locale/zh-cn");
 var _querystring = _interopRequireDefault(require("querystring"));
 var _isUrl = _interopRequireDefault(require("is-url"));
-var _moment = _interopRequireDefault(require("moment"));
 var _humanizeUrl = _interopRequireDefault(require("humanize-url"));
 var _filesize = _interopRequireDefault(require("filesize"));
 var _urlJoin = _interopRequireDefault(require("url-join"));
@@ -64,6 +57,7 @@ var _axios = _interopRequireDefault(require("@abtnode/util/lib/axios"));
 var _normalizePathPrefix = _interopRequireDefault(require("@abtnode/util/lib/normalize-path-prefix"));
 var _urlPathFriendly = _interopRequireDefault(require("@blocklet/meta/lib/url-path-friendly"));
 var _formatError = _interopRequireDefault(require("@abtnode/util/lib/format-error"));
+var _dayjs = _interopRequireDefault(require("@abtnode/util/lib/dayjs"));
 var _window$env;
 /* eslint-disable max-len */
 /* eslint-disable implicit-arrow-linebreak */
@@ -229,54 +223,36 @@ function patchJsxToLocale(rawStr) {
     return item;
   }).filter(Boolean);
 }
-function formatTimestamp(ts) {
-  if (!ts) {
-    return '-';
-  }
-  let date;
-  if (Number(ts).toString() === ts) {
-    date = new Date();
-    date.setTime(ts);
-  } else {
-    date = new Date(ts);
-  }
-  return date.toLocaleString();
-}
 function formatToDate(date) {
+  let locale = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'en';
   if (!date) {
     return '-';
   }
-  return (0, _moment.default)(date).format('ll');
+  return (0, _dayjs.default)(date).locale(formatLocale(locale)).format('ll');
 }
 function formatToDatetime(date) {
+  let locale = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'en';
   if (!date) {
     return '-';
   }
-  return (0, _moment.default)(date).format('lll');
-}
-function formatTimeFromNow(date) {
-  if (!date) {
-    return '-';
-  }
-  const startDate = (0, _moment.default)(date);
-  const endDate = (0, _moment.default)();
-  const diffDay = endDate.diff(startDate, 'day');
-  return diffDay > 3 ? formatToDate(date) : startDate.fromNow();
+  return (0, _dayjs.default)(date).locale(formatLocale(locale)).format('lll');
 }
 function formatTime(date) {
   let format = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'lll';
+  let locale = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'en';
   if (!date) {
     return '-';
   }
-  return (0, _moment.default)(date).format(format);
+  return (0, _dayjs.default)(date).locale(formatLocale(locale)).format(format);
 }
 function formatDateTime(date) {
-  return (0, _dayjs.default)(date).format('YYYY-MM-DD HH:mm');
+  let locale = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'en';
+  return (0, _dayjs.default)(date).locale(formatLocale(locale)).format('YYYY-MM-DD HH:mm');
 }
 const formatLocale = function formatLocale() {
   let locale = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'en';
-  if (locale === 'zh') {
-    return 'zh_CN';
+  if (locale === 'tw') {
+    return 'zh';
   }
   return locale;
 };
@@ -614,10 +590,6 @@ async function getAsset(chainHost, address) {
 function getAssetExpiration(asset) {
   return (0, _last.default)((0, _get.default)(asset, 'data.value.expirationDate', []));
 }
-function getRelativeTime(datetime) {
-  let locale = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'en';
-  return (0, _moment.default)(datetime).locale(formatLocale(locale)).fromNow().toString();
-}
 
 /**
  * 检查url是否 未添加到 store list 中

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/ux",
-  "version": "1.16.13-beta-0656f92f",
+  "version": "1.16.13-beta-2eb54cbc",
   "description": "UX components shared across abtnode packages",
   "publishConfig": {
     "access": "public"
@@ -23,22 +23,22 @@
   "author": "linchen <linchen1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/auth": "1.16.13-beta-0656f92f",
-    "@abtnode/constant": "1.16.13-beta-0656f92f",
-    "@abtnode/util": "1.16.13-beta-0656f92f",
+    "@abtnode/auth": "1.16.13-beta-2eb54cbc",
+    "@abtnode/constant": "1.16.13-beta-2eb54cbc",
+    "@abtnode/util": "1.16.13-beta-2eb54cbc",
     "@ahooksjs/use-url-state": "^3.5.1",
     "@arcblock/did": "^1.18.84",
-    "@arcblock/did-connect": "^2.5.53",
+    "@arcblock/did-connect": "^2.5.54",
     "@arcblock/did-motif": "^1.1.12",
-    "@arcblock/icons": "^2.5.53",
-    "@arcblock/react-hooks": "^2.5.53",
-    "@arcblock/terminal": "^2.5.53",
-    "@arcblock/ux": "^2.5.53",
-    "@blocklet/constant": "1.16.13-beta-0656f92f",
+    "@arcblock/icons": "^2.5.54",
+    "@arcblock/react-hooks": "^2.5.54",
+    "@arcblock/terminal": "^2.5.54",
+    "@arcblock/ux": "^2.5.54",
+    "@blocklet/constant": "1.16.13-beta-2eb54cbc",
     "@blocklet/launcher-layout": "2.1.26",
     "@blocklet/list": "^0.12.4",
-    "@blocklet/meta": "1.16.13-beta-0656f92f",
-    "@blocklet/ui-react": "^2.5.53",
+    "@blocklet/meta": "1.16.13-beta-2eb54cbc",
+    "@blocklet/ui-react": "^2.5.54",
     "@emotion/react": "^11.10.4",
     "@emotion/styled": "^11.10.4",
     "@iconify/react": "^4.0.0",
@@ -47,12 +47,13 @@
     "@mui/lab": "^5.0.0-alpha.102",
     "@mui/material": "^5.10.8",
     "@mui/styles": "^5.10.8",
+    "@mui/x-date-pickers": "^6.9.0",
     "@ocap/client": "1.18.84",
     "@uiw/react-markdown-preview": "4.0.6",
     "ahooks": "^3.7.1",
     "axios": "^0.27.2",
     "classnames": "^2.3.2",
-    "dayjs": "^1.11.7",
+    "date-fns": "^2.30.0",
     "dsbridge": "3.1.4",
     "file-saver": "^2.0.5",
     "filesize": "^6.4.0",
@@ -64,8 +65,8 @@
     "jszip": "^3.10.1",
     "lodash": "^4.17.21",
     "md5": "^2.3.0",
-    "moment": "^2.29.4",
     "ms": "^2.1.3",
+    "mui-daterange-picker": "^1.0.5",
     "nanoid": "^4.0.0",
     "p-wait-for": "^4.1.0",
     "pretty-ms-i18n": "^1.0.3",
@@ -94,5 +95,5 @@
     "@babel/preset-react": "^7.18.6",
     "babel-plugin-inline-react-svg": "^1.1.2"
   },
-  "gitHead": "07996e8ec6fd2141ee3e93dd699ed7fd434bc0ad"
+  "gitHead": "7adf96c2eb31762d8eb14b8121fce9865d6a458c"
 }

package/lib/monitor/memory.js

@@ -1,144 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = MemoryMonitor;
-var _react = require("react");
-var _propTypes = _interopRequireDefault(require("prop-types"));
-var _filesize = _interopRequireDefault(require("filesize"));
-var _ahooks = require("ahooks");
-var _Box = _interopRequireDefault(require("@mui/material/Box"));
-var _context = require("@arcblock/ux/lib/Locale/context");
-var _Sparkline = _interopRequireDefault(require("@arcblock/ux/lib/Sparkline"));
-var _card = _interopRequireDefault(require("./card"));
-var _util = require("../util");
-var _jsxRuntime = require("react/jsx-runtime");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-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) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); } /* eslint-disable react/jsx-one-expression-per-line */
-const formatNumber = x => (0, _filesize.default)(x);
-function MemoryMonitor(_ref) {
-  let {
-    instanceCount,
-    title,
-    total,
-    used,
-    history,
-    hideDescription
-  } = _ref;
-  const {
-    t
-  } = (0, _react.useContext)(_context.LocaleContext);
-  const svgRef = (0, _react.useRef)(null);
-  const tooltipRef = (0, _react.useRef)(null);
-  const tooltipState = (0, _ahooks.useReactive)({
-    style: {
-      top: 0,
-      left: 0
-    },
-    hidden: true,
-    textContent: ''
-  });
-  const [dom, setDom] = (0, _react.useState)();
-  const size = (0, _ahooks.useSize)(dom) || {};
-  const showPercent = !!total;
-  const available = total - used;
-  const memoryPercent = showPercent ? "(".concat(Math.floor(used / total * 100), "%)") : '';
-  const memoryList = [];
-  if (instanceCount) {
-    memoryList.push({
-      title: t('system.instances'),
-      metric: instanceCount
-    });
-  }
-  memoryList.push({
-    title: t('system.used'),
-    metric: (0, _filesize.default)(used)
-  });
-  if (showPercent) {
-    memoryList.push({
-      title: t('system.free'),
-      metric: (0, _filesize.default)(available)
-    }, {
-      title: t('system.total'),
-      metric: (0, _filesize.default)(total)
-    });
-  }
-  const sparklineOptions = {
-    onmousemove(event, dataPoint) {
-      const date = (0, _util.formatTime)(dataPoint.date, 'HH:mm');
-      const left = '80px';
-      tooltipState.textContent = "".concat(date, ": ").concat(formatNumber(dataPoint.value));
-      tooltipState.style.top = '-30px';
-      tooltipState.style.left = left;
-      tooltipState.hidden = false;
-    },
-    onmouseout() {
-      tooltipState.hidden = true;
-    }
-  };
-  (0, _react.useEffect)(() => {
-    // if (!loading) {
-    //   // see: https://github.com/alibaba/hooks/issues/838
-    // }
-    setTimeout(() => {
-      setDom(document.querySelector('.mem-sparkline'));
-      setTimeout(() => {
-        if (svgRef.current) {
-          (0, _Sparkline.default)(svgRef.current, history, sparklineOptions);
-        }
-      }, 400);
-    });
-  }, [history]); // eslint-disable-line react-hooks/exhaustive-deps
-
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_card.default, {
-    title: title || t('common.memory'),
-    value: "".concat((0, _filesize.default)(Math.floor(used || 0)), " ").concat(memoryPercent),
-    graph: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
-      className: "card-sparkline mem-sparkline",
-      style: {
-        marginTop: 16
-      },
-      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("svg", {
-        ref: svgRef,
-        className: "sparkline",
-        width: size.width || 100,
-        height: 30,
-        strokeWidth: "2"
-      }), /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
-        className: "tooltip",
-        ref: tooltipRef,
-        hidden: tooltipState.hidden,
-        style: _objectSpread({}, tooltipState.style),
-        children: tooltipState.textContent
-      })]
-    }),
-    description: memoryList.map((x, index) => /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
-      sx: {
-        marginLeft: index === 0 ? 0 : 2
-      },
-      children: [x.title, ": ", x.metric]
-    }, x.title)),
-    hideDescription: hideDescription
-  });
-}
-MemoryMonitor.propTypes = {
-  title: _propTypes.default.string,
-  instanceCount: _propTypes.default.number,
-  total: _propTypes.default.number,
-  used: _propTypes.default.number,
-  history: _propTypes.default.array,
-  hideDescription: _propTypes.default.bool
-};
-MemoryMonitor.defaultProps = {
-  title: '',
-  instanceCount: null,
-  total: null,
-  used: null,
-  history: [],
-  hideDescription: false
-};