@abtnode/ux 1.16.17-beta-952ef53d → 1.16.17-beta-d81014f4

package/es/blocklet/router/domain-status.js

@@ -62,7 +62,6 @@ export default function DomainStatus({
         style: {
           color: '#D0021B',
           fontSize: 20,
-          marginLeft: 8,
           cursor: 'pointer'
         }
       })

package/es/certificate.js

@@ -36,7 +36,6 @@ export default function Certificate({
       style: {
         color: '#44cdc6',
         fontSize: 20,
-        marginLeft: 8,
         cursor: 'pointer'
       }
     }), /*#__PURE__*/_jsx(Popover, {

package/es/dot.js

@@ -6,8 +6,8 @@ const color = {
 const defaultSize = '10px';
 const Dot = styled.div`
   display: inline-block;
-  width: ${props => props.size || defaultSize};
-  height: ${props => props.size || defaultSize};
+  min-width: ${props => props.size || defaultSize};
+  min-height: ${props => props.size || defaultSize};
   background: ${props => color[props.color] || props.color || color.success};
   border-radius: 100%;
 `;

package/es/locales/en.js

@@ -231,6 +231,7 @@ module.exports = {
     port: 'Port',
     pre: 'Previous',
     preferences: 'Preferences',
+    preview: 'Preview',
     protected: 'Protected',
     protocol: 'Protocol',
     publish: 'Publish',
@@ -1430,9 +1431,14 @@ module.exports = {
       hide: 'Hide navigation',
       show: 'Show navigation',
       del: 'Delete navigation',
+      new: 'New',
       noAddSub: "Uninstalled component can't add sub navigation",
       noEdit: "Uninstalled component can't edit",
-      noDel: 'Not allowed delete built-in navigation'
+      noDel: 'Not allowed delete built-in navigation',
+      reset: 'Reset',
+      restConfirmTitle: 'Do you want to clear all custom navigation?',
+      restConfirmDesc: "After clearing, the navigation will be restored to Blocklet's original default configuration.",
+      resetSuccessful: 'Reset successful'
     }
   },
   storage: {

package/es/locales/zh.js

@@ -236,6 +236,7 @@ module.exports = {
     port: '端口',
     pre: '上一步',
     preferences: '偏好',
+    preview: '预览',
     protected: '受保护',
     protocol: '协议',
     publish: '发布',
@@ -1407,8 +1408,8 @@ module.exports = {
     }
   },
   navigation: {
-    navigation: '导航',
     actionFailed: '操作失败',
+    navigation: '导航',
     form: {
       title: '标题',
       titlePlaceholder: '请输入导航标题',
@@ -1435,9 +1436,14 @@ module.exports = {
       hide: '隐藏导航',
       show: '显示导航',
       del: '删除导航',
+      new: '新建',
       noAddSub: '未安装组件无法添加子导航',
       noEdit: '未安装组件的导航无法编辑',
-      noDel: '内置的导航无法删除'
+      noDel: '内置的导航无法删除',
+      reset: '重置',
+      restConfirmTitle: '是否清空所有自定义导航?',
+      restConfirmDesc: '清空后，导航会恢复到 Blocklet 原有默认的配置.',
+      resetSuccessful: '重置成功'
     }
   },
   storage: {

package/es/lost-passport.js

@@ -1,6 +1,5 @@
 /* eslint-disable react/no-unstable-nested-components */
-/* eslint-disable react/jsx-one-expression-per-line */
-import { useState, useContext } from 'react';
+import { useContext } from 'react';
 import styled from '@emotion/styled';
 import { useNavigate, Link } from 'react-router-dom';
 import Typography from '@mui/material/Typography';
@@ -19,6 +18,7 @@ import { LocaleContext } from '@arcblock/ux/lib/Locale/context';
 import useBrowser from '@arcblock/react-hooks/lib/useBrowser';
 import DidConnect from '@arcblock/did-connect/lib/Connect';
 import { WELLKNOWN_SERVICE_PATH_PREFIX } from '@abtnode/constant';
+import { useReactive } from 'ahooks';
 import CardSelector from './card-selector';
 import DidAddress from './did-address';
 import wrapLocale from './wrap-locale';
@@ -73,18 +73,21 @@ function LostPassport({
     api,
     session
   } = useContext(SessionContext);
+  const pageState = useReactive({
+    user: null,
+    passport: null,
+    success: false,
+    activeStep: 0
+  });
+  const {
+    setPassportId,
+    clearPassportId
+  } = usePassportId();
   const {
     t,
     locale
   } = useContext(LocaleContext);
-  const [user, setUser] = useState(false);
-  const [passport, setPassport] = useState(false);
-  const [success, setSuccess] = useState(false);
   const navigate = useNavigate();
-  const [activeStep, setActiveStep] = useState(0);
-  const {
-    setPassportId
-  } = usePassportId();
   const {
     wallet: isWalletWebview
   } = useBrowser();
@@ -94,10 +97,10 @@ function LostPassport({
     searchParams
   } = new URL(window.location.href);
   const onNext = () => {
-    setActiveStep(activeStep + 1);
+    pageState.activeStep++;
   };
   const onGetUser = result => {
-    setUser(result.user);
+    pageState.user = result.user;
   };
   const onSelectPassport = () => {
     onNext();
@@ -106,7 +109,7 @@ function LostPassport({
     if (result?.passportId) {
       setPassportId(result.passportId);
     }
-    setSuccess(true);
+    pageState.success = true;
     onNext();
   };
   const onUsePassport = () => {
@@ -123,28 +126,27 @@ function LostPassport({
     }
     const redirect = searchParams.get('redirect');
     if (redirect) {
-      navigate(redirect, {
-        replace: true
-      });
+      window.location.replace(redirect);
       return;
     }
     if ((window.env?.apiPrefix || '').startsWith(WELLKNOWN_SERVICE_PATH_PREFIX)) {
-      navigate(`${WELLKNOWN_SERVICE_PATH_PREFIX}/login`, {
+      navigate(`${WELLKNOWN_SERVICE_PATH_PREFIX}/connect`, {
         replace: true
       });
       return;
     }
-    navigate('/', {
-      replace: true
-    });
+
+    // HACK: 因为默认页面不会处理 passportId 的逻辑，所以需要清除存储的信息
+    clearPassportId();
+    window.location.replace('/');
   };
-  const handleChange = event => {
-    setPassport(event.target.value);
+  const handleChangePassport = event => {
+    pageState.passport = event.target.value;
   };
   const steps = [{
     label: t('lostPassport.selectPassport'),
     content: () => {
-      if (!user) {
+      if (!pageState.user) {
         return /*#__PURE__*/_jsx(DidConnect, {
           popup: true,
           open: true,
@@ -174,7 +176,7 @@ function LostPassport({
           alignItems: "center",
           className: "user-info",
           children: [/*#__PURE__*/_jsx(Avatar, {
-            src: user.avatar,
+            src: pageState.user.avatar,
             style: {
               width: 48,
               height: 48,
@@ -184,12 +186,12 @@ function LostPassport({
           }), /*#__PURE__*/_jsxs(Box, {
             children: [/*#__PURE__*/_jsx(Box, {
               className: "name",
-              children: user.fullName
+              children: pageState.user.fullName
             }), /*#__PURE__*/_jsx(Box, {
               className: "did",
               mt: 1,
               children: /*#__PURE__*/_jsx(DidAddress, {
-                did: user.did
+                did: pageState.user.did
               })
             })]
           })]
@@ -198,24 +200,24 @@ function LostPassport({
             width: 230,
             height: 306,
             cardSpace: 24,
-            list: user.passportTypes.map(x => {
+            list: pageState.user.passportTypes.map(x => {
               return {
                 src: createPassportSvg({
                   title: x.title,
                   issuer: x.issuer.name,
                   issuerDid: x.issuer.id,
-                  ownerDid: user.did,
-                  ownerName: user.fullName,
-                  ownerAvatarUrl: user.avatar,
+                  ownerDid: pageState.user.did,
+                  ownerName: pageState.user.fullName,
+                  ownerAvatarUrl: pageState.user.avatar,
                   preferredColor: passportColor || 'auto'
                 }),
                 name: x.title,
                 id: x.id
               };
             }),
-            onSelect: index => handleChange({
+            onSelect: index => handleChangePassport({
               target: {
-                value: user.passportTypes[index].name
+                value: pageState.user.passportTypes[index].name
               }
             }),
             defaultIndex: 0
@@ -226,7 +228,7 @@ function LostPassport({
             variant: "contained",
             color: "primary",
             onClick: () => onSelectPassport(),
-            disabled: !passport,
+            disabled: !pageState.passport,
             children: t('common.next')
           })
         })]
@@ -236,8 +238,8 @@ function LostPassport({
     label: t('lostPassport.receivePassport'),
     content: () => {
       const extraParams = {
-        receiverDid: user.did,
-        passportName: passport,
+        receiverDid: pageState.user.did,
+        passportName: pageState.passport,
         teamDid: window?.blocklet?.did || ''
       };
       return /*#__PURE__*/_jsx(DidConnect, {
@@ -294,7 +296,7 @@ function LostPassport({
       children: [/*#__PURE__*/_jsx(Stepper, {
         className: "stepper-progress",
         alternativeLabel: true,
-        activeStep: activeStep,
+        activeStep: pageState.activeStep,
         children: steps.map(({
           label
         }) => /*#__PURE__*/_jsx(Step, {
@@ -305,8 +307,8 @@ function LostPassport({
         }, label))
       }), /*#__PURE__*/_jsx("div", {
         className: "stepper-content",
-        children: steps[activeStep].content()
-      }), !success && /*#__PURE__*/_jsx(Box, {
+        children: steps[pageState.activeStep].content()
+      }), !pageState.success && /*#__PURE__*/_jsx(Box, {
         textAlign: "center",
         fontSize: 12,
         children: /*#__PURE__*/_jsx(Link, {

package/es/team/passports/index.js

@@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
 import styled from '@emotion/styled';
 import AddIcon from '@mui/icons-material/Add';
 import Box from '@mui/material/Box';
+import Toast from '@arcblock/ux/lib/Toast';
 import { LocaleContext } from '@arcblock/ux/lib/Locale/context';
 import Button from '@arcblock/ux/lib/Button';
 import SplitButton from '@arcblock/ux/lib/SplitButton';
@@ -10,7 +11,7 @@ import Spinner from '@mui/material/CircularProgress';
 import EditIcon from '@arcblock/icons/lib/EditIcon';
 import LockIcon from '@arcblock/icons/lib/LockIcon';
 import ExternalIssuerIcon from '@arcblock/icons/lib/ExternalIssuerIcon';
-import Toast from '@arcblock/ux/lib/Toast';
+import useMediaQuery from '@mui/material/useMediaQuery';
 import { useNodeContext } from '../../contexts/node';
 import { useTeamContext } from '../../contexts/team';
 import { sleep, isProtectedRole, BlockletAdminRoles } from '../../util';
@@ -52,6 +53,7 @@ export default function PassportList({
   const [showTrustedFactories, setShowTrustedFactories] = useState(false);
   const [search, setSearch] = useState('');
   const [loading, setLoading] = useState(false);
+  const isMobile = useMediaQuery(x => x.breakpoints.down('md'));
   const toggleShowIssue = async e => {
     e.stopPropagation();
     if (loading) {
@@ -176,6 +178,10 @@ export default function PassportList({
       className: "list",
       children: filteredRoles.map(role => /*#__PURE__*/_jsxs(Box, {
         "data-cy": `passport-${role.name}`,
+        sx: {
+          display: 'flex',
+          justifyContent: 'space-between'
+        },
         className: "item",
         display: "flex",
         alignItems: "center",
@@ -205,7 +211,7 @@ export default function PassportList({
             className: "title",
             children: role.title
           })]
-        }), /*#__PURE__*/_jsx(Box, {
+        }), !isMobile && /*#__PURE__*/_jsx(Box, {
           className: "description",
           children: role.description
         }), /*#__PURE__*/_jsx(Permission, {

package/lib/blocklet/actions.js

@@ -27,7 +27,6 @@ var _Button = _interopRequireDefault(require("@arcblock/ux/lib/Button"));
 var _util = require("@blocklet/meta/lib/util");
 var _context = require("@arcblock/ux/lib/Locale/context");
 var _constant = require("@blocklet/constant");
-var _constant2 = require("@abtnode/constant");
 var _Toast = _interopRequireDefault(require("@arcblock/ux/lib/Toast"));
 var _util2 = require("../util");
 var _util3 = require("./util");
@@ -291,7 +290,7 @@ function BlockletActions(_ref) {
       }
     }
   };
-  const removeAction = !inService && (0, _util.isDeletableBlocklet)(blocklet) && blocklet.structVersion === _constant2.APP_STRUCT_VERSION ? {
+  const removeAction = !inService && (0, _util.isDeletableBlocklet)(blocklet) ? {
     action: 'remove',
     icon: _icons.default.Remove,
     name: t('common.remove'),

package/lib/blocklet/component/add.js

@@ -587,7 +587,7 @@ function AddComponent(_ref2) {
     } else {
       var _component$current$me, _component$current$me2;
       doc = _objectSpread(_objectSpread({}, doc), {}, {
-        pathPrefix: hasRootPath ? "/".concat((0, _urlPathFriendly.default)(name)) : '/',
+        pathPrefix: hasRootPath ? "/".concat((0, _urlPathFriendly.default)(title) || (0, _urlPathFriendly.default)(name)) : '/',
         title: title || '',
         componentName: '',
         hasEnvironmentsStep: ((_component$current$me = component.current.meta) === null || _component$current$me === void 0 ? void 0 : (_component$current$me2 = _component$current$me.environments) === null || _component$current$me2 === void 0 ? void 0 : _component$current$me2.length) > 0