@abtnode/ux 1.16.19-beta-630ac853 → 1.16.19-beta-626e4d43

package/lib/locales/en.js

@@ -924,8 +924,8 @@ module.exports = {
         recordValue: 'Record Value'
       },
       verify: {
-        ok: 'This site is resolved',
-        notResolved: 'This site neither resolved nor accessible, please check your DNS configuration'
+        ok: 'The domain resolution is normal',
+        notResolved: 'This domain neither resolved nor accessible, please check your DNS configuration'
       },
       https: {
         ok: 'This domain has https enabled',
@@ -938,8 +938,8 @@ module.exports = {
       }
     },
     domainAlias: {
-      inputDomain: 'Input Domain',
-      nftDomain: 'NFT Domain',
+      inputDomain: 'Manually config domain',
+      nftDomain: 'Automatic config with DID Domain',
       add: {
         title: 'Add Additional Domain',
         domainDescription: 'Please provide a valid domain name',
@@ -1596,13 +1596,23 @@ module.exports = {
     federated: 'Federated Login'
   },
   expiration: {
-    tips: {
-      success: 'Subscription will expire after {validity}',
-      warning: 'Subscription will expire after {validity}',
-      error: 'Subscription Expired'
+    mobile: {
+      tips: {
+        success: '{validity}',
+        warning: '{validity}',
+        error: 'Expired'
+      },
+      loadFailed: 'Retry!'
     },
-    loading: 'Load subscription...',
-    loadFailed: 'Failed to load subscription info, please retry!'
+    desktop: {
+      tips: {
+        success: 'Subscription will expire after {validity}',
+        warning: 'Subscription will expire after {validity}',
+        error: 'Subscription Expired'
+      },
+      loading: 'Load subscription...',
+      loadFailed: 'Failed to load subscription info, please retry!'
+    }
   },
   analytics: {
     trend: 'Trends',
@@ -1667,5 +1677,9 @@ module.exports = {
     },
     disbandFederatedLogin: 'Disband federated login',
     disbandFederatedLoginDescription: 'After disband federated login, all member site will quit federated login automatically'
+  },
+  optionsOrder: {
+    1: 'Option One',
+    2: 'Option Two'
   }
 };

package/lib/locales/zh.js

@@ -927,8 +927,8 @@ module.exports = {
         recordValue: '记录值'
       },
       verify: {
-        ok: '该站点解析正常',
-        notResolved: '改站点解析异常，请检查你域名服务商的 DNS 配置'
+        ok: '该域名解析正常',
+        notResolved: '该域名解析异常，请检查你域名服务商的 DNS 配置'
       },
       https: {
         ok: '该域名已启用 HTTPS',
@@ -941,8 +941,8 @@ module.exports = {
       }
     },
     domainAlias: {
-      inputDomain: '输入域名',
-      nftDomain: 'NFT 域名',
+      inputDomain: '手动配置域名',
+      nftDomain: '通过 DID Domain 自动配置域名',
       add: {
         title: '添加额外域名',
         domainDescription: '请填写有效的域名',
@@ -1600,13 +1600,23 @@ module.exports = {
     federated: '统一登录'
   },
   expiration: {
-    tips: {
-      success: '订阅将在{validity}后到期',
-      warning: '订阅将在{validity}后到期',
-      error: '订阅已过期'
+    mobile: {
+      tips: {
+        success: '{validity}',
+        warning: '{validity}',
+        error: '订阅已过期'
+      },
+      loadFailed: '请重试!'
     },
-    loadFailed: '加载订阅信息失败，请重试!',
-    loading: '加载订阅信息...'
+    desktop: {
+      tips: {
+        success: '订阅将在{validity}后到期',
+        warning: '订阅将在{validity}后到期',
+        error: '订阅已过期'
+      },
+      loadFailed: '加载订阅信息失败，请重试!',
+      loading: '加载订阅信息...'
+    }
   },
   analytics: {
     trend: '趋势',
@@ -1671,5 +1681,9 @@ module.exports = {
     },
     disbandFederatedLogin: '解散统一登录',
     disbandFederatedLoginDescription: '解散统一登录后，将自动让所有成员站点自动退出统一登录站点群'
+  },
+  optionsOrder: {
+    1: '选择一',
+    2: '选择二'
   }
 };

package/lib/schema-form/index.js

@@ -28,6 +28,12 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 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); }
+const componentMap = {
+  input: _textInput.default,
+  color: _colorInput.default,
+  passport: _passportInput.default,
+  uploader: props => /*#__PURE__*/(0, _jsxRuntime.jsx)(_logoUploader.default, _objectSpread({}, props.componentProps))
+};
 function getComponent(item, _ref) {
   let {
     editing = false
@@ -37,6 +43,7 @@ function getComponent(item, _ref) {
     render,
     renderFormItem
   } = item;
+
   // if provided renderItem and editing is true, use it
   if (editing && renderFormItem) {
     return renderFormItem;
@@ -46,12 +53,6 @@ function getComponent(item, _ref) {
   if (!editing && render) {
     return render;
   }
-  const componentMap = {
-    input: _textInput.default,
-    color: _colorInput.default,
-    passport: _passportInput.default,
-    uploader: props => /*#__PURE__*/(0, _jsxRuntime.jsx)(_logoUploader.default, _objectSpread({}, props.componentProps))
-  };
   return componentMap[componentType === null || componentType === void 0 ? void 0 : componentType.toLowerCase()];
 }
 function SchemaForm(_ref2) {

package/lib/subscription.js

@@ -16,6 +16,7 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 var _react = require("react");
 var _useAsyncRetry = _interopRequireDefault(require("react-use/lib/useAsyncRetry"));
 var _useSetState = _interopRequireDefault(require("react-use/lib/useSetState"));
+var _useMediaQuery = _interopRequireDefault(require("@mui/material/useMediaQuery"));
 var _util = require("./util");
 var _jsxRuntime = require("react/jsx-runtime");
 const _excluded = ["launcherUrl", "chainHost", "nftId", "retention"],
@@ -31,15 +32,31 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 const ALERT_THRESHOLD_MS = 30 * 24 * 60 * 60 * 1000;
 const DEFAULT_LAUNCHER_URL = 'https://launcher.arcblock.io/'; // 兼容: 旧版本的 blocklet.controller 没有 launcherUrl 字段
 
-function Subscription(_ref) {
+// eslint-disable-next-line react/prop-types
+function ChipLabel(_ref) {
+  let {
+    children
+  } = _ref;
+  return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
+    sx: {
+      display: 'flex',
+      alignItems: 'center',
+      gap: 1
+    },
+    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_AccessTime.default, {
+      fontSize: "small"
+    }), children]
+  });
+}
+function Subscription(_ref2) {
   var _asyncState$value, _asyncState$value2;
   let {
       launcherUrl,
       chainHost,
       nftId,
       retention
-    } = _ref,
-    props = _objectWithoutProperties(_ref, _excluded);
+    } = _ref2,
+    props = _objectWithoutProperties(_ref2, _excluded);
   const {
     t,
     locale
@@ -49,10 +66,12 @@ function Subscription(_ref) {
     popoverAnchorEl: null
   });
   const iframeRef = (0, _react.useRef)(null);
+  const isMobile = (0, _useMediaQuery.default)(x => x.breakpoints.down('md'));
   const {
       sx = {}
     } = props,
     rest = _objectWithoutProperties(props, _excluded2);
+  const typoKey = isMobile ? 'mobile' : 'desktop';
   const asyncState = (0, _useAsyncRetry.default)(async () => {
     const [asset, subscriptionURL] = await Promise.all([(0, _util.getAsset)(chainHost, nftId), (0, _util.getSubscriptionURL)({
       launcherUrl: launcherUrl || DEFAULT_LAUNCHER_URL,
@@ -65,23 +84,24 @@ function Subscription(_ref) {
     };
   }, [locale]);
   if (asyncState.loading) {
-    return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, _objectSpread(_objectSpread({
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Chip.default, _objectSpread({
+      label: /*#__PURE__*/(0, _jsxRuntime.jsxs)(ChipLabel, {
+        children: [!isMobile && t('expiration.desktop.loading'), /*#__PURE__*/(0, _jsxRuntime.jsx)(_CircularProgress.default, {
+          size: 16
+        })]
+      }),
+      variant: "success",
       sx: _objectSpread({
-        display: 'flex',
-        alignItems: 'center',
-        color: 'grey',
-        gap: 1
+        cursor: 'pointer'
       }, sx)
-    }, rest), {}, {
-      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_CircularProgress.default, {
-        size: 16
-      }), t('expiration.loading')]
-    }));
+    }, rest));
   }
   if (asyncState.error) {
     console.error(asyncState.error);
     return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Chip.default, _objectSpread(_objectSpread({
-      label: t('expiration.loadFailed'),
+      label: /*#__PURE__*/(0, _jsxRuntime.jsx)(ChipLabel, {
+        children: t("expiration.".concat(typoKey, ".loadFailed"))
+      }),
       color: "error",
       variant: "success",
       sx: _objectSpread({
@@ -113,23 +133,14 @@ function Subscription(_ref) {
   };
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
     children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Chip.default, _objectSpread(_objectSpread({
-      label: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
-        sx: {
-          display: 'flex',
-          alignItems: 'center'
-        },
-        children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_AccessTime.default, {
-          sx: {
-            mr: '4px'
-          },
-          fontSize: "small"
-        }), t("expiration.tips.".concat(status), {
+      label: /*#__PURE__*/(0, _jsxRuntime.jsx)(ChipLabel, {
+        children: t("expiration.".concat(typoKey, ".tips.").concat(status), {
           validity: (0, _prettyMsI18n.default)(validityMs, {
             locale: (0, _util.formatPrettyMsLocale)(locale),
             compact: true,
             verbose: true
           })
-        })]
+        })
       }),
       color: status,
       variant: status !== 'success' ? 'contained' : 'outlined',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/ux",
-  "version": "1.16.19-beta-630ac853",
+  "version": "1.16.19-beta-626e4d43",
   "description": "UX components shared across abtnode packages",
   "publishConfig": {
     "access": "public"
@@ -27,23 +27,23 @@
   "author": "linchen <linchen1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/auth": "1.16.19-beta-630ac853",
-    "@abtnode/constant": "1.16.19-beta-630ac853",
-    "@abtnode/util": "1.16.19-beta-630ac853",
+    "@abtnode/auth": "1.16.19-beta-626e4d43",
+    "@abtnode/constant": "1.16.19-beta-626e4d43",
+    "@abtnode/util": "1.16.19-beta-626e4d43",
     "@ahooksjs/use-url-state": "^3.5.1",
-    "@arcblock/did": "^1.18.95",
-    "@arcblock/did-connect": "^2.8.16",
+    "@arcblock/did": "^1.18.101",
+    "@arcblock/did-connect": "^2.8.17",
     "@arcblock/did-motif": "^1.1.13",
-    "@arcblock/icons": "^2.8.16",
-    "@arcblock/nft-display": "2.8.16",
-    "@arcblock/react-hooks": "^2.8.16",
-    "@arcblock/terminal": "^2.8.16",
-    "@arcblock/ux": "^2.8.16",
-    "@blocklet/constant": "1.16.19-beta-630ac853",
-    "@blocklet/launcher-layout": "2.2.41",
+    "@arcblock/icons": "^2.8.17",
+    "@arcblock/nft-display": "2.8.17",
+    "@arcblock/react-hooks": "^2.8.17",
+    "@arcblock/terminal": "^2.8.17",
+    "@arcblock/ux": "^2.8.17",
+    "@blocklet/constant": "1.16.19-beta-626e4d43",
+    "@blocklet/launcher-layout": "2.2.43",
     "@blocklet/list": "^0.12.53",
-    "@blocklet/meta": "1.16.19-beta-630ac853",
-    "@blocklet/ui-react": "^2.8.16",
+    "@blocklet/meta": "1.16.19-beta-626e4d43",
+    "@blocklet/ui-react": "^2.8.17",
     "@blocklet/uploader": "^0.0.45",
     "@emotion/react": "^11.10.4",
     "@emotion/styled": "^11.10.4",
@@ -54,7 +54,7 @@
     "@mui/material": "^5.14.10",
     "@mui/styles": "^5.14.10",
     "@mui/x-date-pickers": "^6.14.0",
-    "@ocap/client": "1.18.95",
+    "@ocap/client": "1.18.101",
     "@uiw/react-markdown-preview": "4.0.6",
     "ahooks": "^3.7.1",
     "axios": "^0.27.2",
@@ -100,7 +100,7 @@
     "babel-plugin-inline-react-svg": "^1.1.2",
     "glob": "^10.3.3"
   },
-  "gitHead": "a4feb519d9122ef75873dd8d657486afca2d4ac9",
+  "gitHead": "1acfc039b8866999003c156edb50c71859226532",
   "exports": {
     ".": {
       "import": "./es/index.js",