@abtnode/ux 1.16.29-beta-44e63d18 → 1.16.29-beta-0c32fe15

package/lib/blocklet/overview.js

@@ -1,13 +1,15 @@
-import Button from '@arcblock/ux/lib/Button';
 import styled from '@emotion/styled';
 import React, { useState } from 'react';
-import ExpandLess from '@mui/icons-material/ExpandLess';
-import ExpandMore from '@mui/icons-material/ExpandMore';
+import { Box, Tooltip, Typography } from '@mui/material';
+import { Icon } from '@iconify/react';
+import QuestionMarkRoundedIcon from '@iconify-icons/material-symbols/question-mark-rounded';
+import KeyboardArrowDownRoundedIcon from '@iconify-icons/material-symbols/keyboard-arrow-down-rounded';
+import KeyboardArrowUpRoundedIcon from '@iconify-icons/material-symbols/keyboard-arrow-up-rounded';
+import Button from '@arcblock/ux/lib/Button';
 import InfoRow from '@arcblock/ux/lib/InfoRow';
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
 import Tag from '@arcblock/ux/lib/Tag';
 import { getDisplayName, getWhoCanAccess } from '@blocklet/meta/lib/util';
-import Typography from '@mui/material/Typography';
 import { useBlockletContext } from '../contexts/blocklet';
 import { useNodeContext } from '../contexts/node';
 import DidAddress from '../did-address';
@@ -45,8 +47,20 @@ export default function BlockletOverview() {
       did: appDid,
       showQrcode: true
     })
-  } : null, appPid ? {
-    name: t('blocklet.appPid'),
+  } : null, appPid && appDid !== appPid ? {
+    name: /*#__PURE__*/_jsxs(Box, {
+      sx: {
+        display: 'flex',
+        alignItems: 'center',
+        gap: 1
+      },
+      children: [t('blocklet.appPid'), /*#__PURE__*/_jsx(Tooltip, {
+        title: t('blocklet.whyNeedAppPid'),
+        children: /*#__PURE__*/_jsx(Icon, {
+          icon: QuestionMarkRoundedIcon
+        })
+      })]
+    }),
     value: /*#__PURE__*/_jsx(DidAddress, {
       did: appPid,
       showQrcode: true
@@ -61,7 +75,11 @@ export default function BlockletOverview() {
         style: {
           marginLeft: '18px'
         },
-        endIcon: showAllDIDs ? /*#__PURE__*/_jsx(ExpandLess, {}) : /*#__PURE__*/_jsx(ExpandMore, {}),
+        endIcon: showAllDIDs ? /*#__PURE__*/_jsx(Icon, {
+          icon: KeyboardArrowUpRoundedIcon
+        }) : /*#__PURE__*/_jsx(Icon, {
+          icon: KeyboardArrowDownRoundedIcon
+        }),
         onClick: () => setShowAllDIDs(!showAllDIDs),
         children: showAllDIDs ? t('common.collapseAll') : t('blocklet.router.showAllDIDs')
       })]

package/lib/blocklet/publish/create-release/connect-store-button.js

@@ -116,7 +116,7 @@ export default function ConnectStoreButton({
       })]
     }), /*#__PURE__*/_jsx(Popper, {
       sx: {
-        zIndex: 1
+        zIndex: 10
       },
       open: open,
       anchorEl: anchorRef.current,

package/lib/blocklet/publish/create-release/header.js

@@ -384,7 +384,7 @@ function Header({
         })]
       })
     }), /*#__PURE__*/_jsx(Dialog, {
-      title: t('common.connectToStore'),
+      title: t('blocklet.publish.connectOrUpload'),
       disableEscapeKeyDown: true,
       disablePortal: false,
       fullWidth: true,

package/lib/blocklet/publish/utils/wait-connect.js

@@ -1,4 +1,4 @@
-async function waitPromiseFunction(promiseFunction, interval = 1500, maxAttempts = 600, intervalFirst = 5000) {
+async function waitPromiseFunction(promiseFunction, interval = 1000, maxAttempts = 300, intervalFirst = 4000) {
   let attempts = 0;
 
   // eslint-disable-next-line no-promise-executor-return

package/lib/hooks/use-promise-window-open.js

@@ -1,4 +1,8 @@
+import { WELLKNOWN_SERVICE_PATH_PREFIX } from '@abtnode/constant';
 import { useRef } from 'react';
+
+// `${WELLKNOWN_SERVICE_PATH_PREFIX}/open-window`
+
 function usePromiseWindowOpen({
   onOpen,
   onClose
@@ -10,17 +14,25 @@ function usePromiseWindowOpen({
       clearInterval(timer.current);
       windowRef.current.close();
     }
-    windowRef.current = window.open('about:blank', '_blank');
+    const key = Math.random().toString(36).slice(2);
+    windowRef.current = window.open(`${WELLKNOWN_SERVICE_PATH_PREFIX}/open-window?key=${key}`, '_blank');
     onOpen?.(windowRef.current);
     timer.current = setInterval(() => {
       if (!windowRef.current || windowRef.current.closed) {
         windowRef.current = null;
         clearInterval(timer.current);
-        onClose?.();
+        // close 之前, 需要多等待一次 project-id 的轮询
+        setTimeout(() => {
+          onClose?.();
+        }, 1100);
       }
-    }, 500);
+    }, 200);
     await Promise.resolve(fn(windowRef.current, url => {
       if (!windowRef.current) {
+        localStorage.setItem(`open-window-url-${key}`, JSON.stringify({
+          url,
+          time: Date.now()
+        }));
         return;
       }
       windowRef.current.location.href = url;

package/lib/locales/ar.js

@@ -736,10 +736,13 @@ export default {
       resourceSelect: 'اختر موردًا من Blocklets',
       resourceUpload: 'تحميل المورد من القرص الخاص بك (الفهرس.html مطلوب في الأرشيف)',
       deleteStoreTip: 'هل أنت متأكد أنك تريد إزالة {name} من قائمة متجر الاتصال؟',
-      disconnectStoreTip: 'سيتم حذف بلوكليت من المخزن بعد الفصل. هل أنت متأكد من أنك تريد الفصل؟'
+      disconnectStoreTip: 'سيتم حذف بلوكليت من المخزن بعد الفصل. هل أنت متأكد من أنك تريد الفصل؟',
+      connectOrUpload: 'الاتصال أو التحميل',
+      developerInfo: 'معلومات المطور'
     },
     titleValidationError: 'يجب أن يكون طول العنوان على الأقل 3 أحرف',
-    descriptionValidationError: 'يجب أن تكون طول الوصف بين 3 و 160 حرفًا'
+    descriptionValidationError: 'يجب أن تكون طول الوصف بين 3 و 160 حرفًا',
+    whyNeedAppPid: 'إذا تم نقل تطبيقك، فإن DID الدائم هو DID الذي تم إنشاؤه عند تثبيت Blocklet هذا في الأصل.'
   },
   dashboard: {
     nodeDid: 'عقدة',

package/lib/locales/de.js

@@ -736,10 +736,13 @@ export default {
       resourceSelect: 'Wählen Sie eine Ressource aus Blocklets',
       resourceUpload: 'Ressource von Ihrer Festplatte hochladen (index.html ist im Archiv erforderlich)',
       deleteStoreTip: 'Möchten Sie {name} wirklich aus der Verbindungsliste des Stores entfernen?',
-      disconnectStoreTip: 'Das Blocklet wird nach dem Trennen aus dem Store entfernt. Möchten Sie wirklich trennen?'
+      disconnectStoreTip: 'Das Blocklet wird nach dem Trennen aus dem Store entfernt. Möchten Sie wirklich trennen?',
+      connectOrUpload: 'Verbinden oder Hochladen',
+      developerInfo: 'Entwicklerinformation'
     },
     titleValidationError: 'Die Länge des Titels muss mindestens 3 Zeichen betragen',
-    descriptionValidationError: 'Die Beschreibungslänge muss zwischen 3 und 160 Zeichen liegen'
+    descriptionValidationError: 'Die Beschreibungslänge muss zwischen 3 und 160 Zeichen liegen',
+    whyNeedAppPid: 'Wenn Ihre Anwendung migriert wurde, ist die permanente DID die DID, die bei der ursprünglichen Installation dieses Blocklets generiert wurde.'
   },
   dashboard: {
     nodeDid: 'Knoten',

package/lib/locales/en.js

@@ -372,6 +372,7 @@ export default {
     noService: 'No Services',
     appId: 'App DID',
     appPid: 'Permanent DID',
+    whyNeedAppPid: 'If your application has been migrated, the permanent DID is the DID generated when this Blocklet was originally installed',
     alsoKnownAs: 'Also Known As',
     skSource: 'Owner Wallet',
     reloadSuccess: 'Blocklet was reloaded successfully',
@@ -658,6 +659,8 @@ export default {
       isInProgress: 'Blocklet is in progress, please wait for it to finish'
     },
     publish: {
+      connectOrUpload: 'Connect or Upload',
+      developerInfo: 'Developer Information',
       branding: 'Branding',
       brandingHelp: 'More information about the blocklet will be displayed in the Store',
       download: 'Download {name}',

package/lib/locales/es.js

@@ -736,10 +736,13 @@ export default {
       resourceSelect: 'Seleccionar recurso de blocklets',
       resourceUpload: 'Cargar recurso desde tu disco (index.html es requerido en el archivo)',
       deleteStoreTip: '¿Estás seguro de que quieres eliminar a {name} de la lista de la tienda Connect?',
-      disconnectStoreTip: 'Después de la desconexión, se eliminará el blocklet de la tienda. ¿Seguro que desea desconectar?'
+      disconnectStoreTip: 'Después de la desconexión, se eliminará el blocklet de la tienda. ¿Seguro que desea desconectar?',
+      connectOrUpload: 'Conectar o Subir',
+      developerInfo: 'Información del desarrollador'
     },
     titleValidationError: 'La longitud del título debe ser de al menos 3 caracteres',
-    descriptionValidationError: 'La longitud de la descripción debe estar entre 3 y 160 caracteres'
+    descriptionValidationError: 'La longitud de la descripción debe estar entre 3 y 160 caracteres',
+    whyNeedAppPid: 'Si se ha migrado su aplicación, el DID permanente es el DID generado cuando este Blocklet se instaló originalmente.'
   },
   dashboard: {
     nodeDid: 'Nodo',

package/lib/locales/fr.js

@@ -736,10 +736,13 @@ export default {
       resourceSelect: 'Sélectionnez une ressource des blocklets',
       resourceUpload: "Téléchargez la ressource depuis votre disque (index.html est requis dans l'archive)",
       deleteStoreTip: 'Êtes-vous sûr de vouloir supprimer {name} de la liste du magasin Connect?',
-      disconnectStoreTip: 'Le bloclet sera supprimé du store après sa déconnexion. Êtes-vous sûr de vouloir le déconnecter ?'
+      disconnectStoreTip: 'Le bloclet sera supprimé du store après sa déconnexion. Êtes-vous sûr de vouloir le déconnecter ?',
+      connectOrUpload: 'Connecter ou Télécharger',
+      developerInfo: 'Informations sur le développeur'
     },
     titleValidationError: "La longueur du titre doit être d'au moins 3 caractères",
-    descriptionValidationError: 'La longueur de la description doit être comprise entre 3 et 160 caractères'
+    descriptionValidationError: 'La longueur de la description doit être comprise entre 3 et 160 caractères',
+    whyNeedAppPid: "Si votre application a été migrée, le DID permanent est le DID généré lors de l'installation initiale de ce Blocklet."
   },
   dashboard: {
     nodeDid: 'Noeud',

package/lib/locales/hi.js

@@ -736,10 +736,13 @@ export default {
       resourceSelect: 'ब्लॉकलेट से संसाधन का चयन करें',
       resourceUpload: 'अपनी डिस्क से संसाधन अपलोड करें (संग्रह में index.html आवश्यक है)',
       deleteStoreTip: 'क्या आप वाकई {name} को कनेक्ट स्टोर से हटाना चाहते हैं?',
-      disconnectStoreTip: 'ब्लॉकलेट को डिस्कनेक्ट करने के बाद उसे स्टोर से हटा दिया जाएगा। क्या आप वाकई में उसे डिस्कनेक्ट करना चाहते हैं?'
+      disconnectStoreTip: 'ब्लॉकलेट को डिस्कनेक्ट करने के बाद उसे स्टोर से हटा दिया जाएगा। क्या आप वाकई में उसे डिस्कनेक्ट करना चाहते हैं?',
+      connectOrUpload: 'कनेक्ट करें या अपलोड करें',
+      developerInfo: 'डेवलपर सूचना'
     },
     titleValidationError: 'शीर्षक की लंबाई कम से कम 3 अक्षर होनी चाहिए',
-    descriptionValidationError: 'विवरण की लंबाई 3 और 160 वर्णों के बीच होनी चाहिए'
+    descriptionValidationError: 'विवरण की लंबाई 3 और 160 वर्णों के बीच होनी चाहिए',
+    whyNeedAppPid: 'अगर आपका एप्लीकेशन माइग्रेट कर दिया गया है, तो परमानेंट DID वही DID है जो उस समय जनरेट की गई थी जब पहली बार यह ब्लॉकलेट इंस्टॉल किया गया था।'
   },
   dashboard: {
     nodeDid: 'नोड',

package/lib/locales/id.js

@@ -736,10 +736,13 @@ export default {
       resourceSelect: 'Pilih sumber dari blocklets',
       resourceUpload: 'Unggah sumber daya dari disk Anda (index.html diperlukan dalam arsip)',
       deleteStoreTip: 'Apakah Anda yakin ingin menghapus {name} dari daftar Toko Koneksi?',
-      disconnectStoreTip: 'Setelah terputus, blocklet akan dihapus dari toko. Apa Anda yakin untuk memutuskan?'
+      disconnectStoreTip: 'Setelah terputus, blocklet akan dihapus dari toko. Apa Anda yakin untuk memutuskan?',
+      connectOrUpload: 'Hubungkan atau Unggah',
+      developerInfo: 'Informasi Pengembang'
     },
     titleValidationError: 'Panjang judul harus setidaknya 3 karakter',
-    descriptionValidationError: 'Panjang deskripsi harus antara 3 dan 160 karakter.'
+    descriptionValidationError: 'Panjang deskripsi harus antara 3 dan 160 karakter.',
+    whyNeedAppPid: 'Jika aplikasi Anda telah dimigrasikan, DID permanen adalah DID yang dihasilkan saat Blocklet ini pertama kali dipasang'
   },
   dashboard: {
     nodeDid: 'Node',

package/lib/locales/ja.js

@@ -736,10 +736,13 @@ export default {
       resourceSelect: 'ブロックレットからリソースを選択する',
       resourceUpload: 'ディスクからリソースをアップロードします（アーカイブにindex.htmlが必要です）',
       deleteStoreTip: '{name}を接続ストアリストから削除してもよろしいですか？',
-      disconnectStoreTip: 'ブロックレットの接続を解除すると、ブロックレットはストアから削除されます。接続を解除してもよろしいですか？'
+      disconnectStoreTip: 'ブロックレットの接続を解除すると、ブロックレットはストアから削除されます。接続を解除してもよろしいですか？',
+      connectOrUpload: '接続またはアップロード',
+      developerInfo: '開発者情報'
     },
     titleValidationError: 'タイトルの長さは最低3文字以上である必要があります',
-    descriptionValidationError: '説明の長さは3から160文字の間でなければなりません'
+    descriptionValidationError: '説明の長さは3から160文字の間でなければなりません',
+    whyNeedAppPid: 'アプリケーションが移行されている場合、永続的な DID はこの Blocklet が最初にインストールされたときに生成された DID です。'
   },
   dashboard: {
     nodeDid: 'ノード',

package/lib/locales/ko.js

@@ -736,10 +736,13 @@ export default {
       resourceSelect: '블록릿에서 리소스 선택',
       resourceUpload: '디스크에서 리소스를 업로드하세요 (아카이브에 index.html이 필요합니다)',
       deleteStoreTip: '{name}을(를) 연결 스토어 목록에서 제거하시겠습니까?',
-      disconnectStoreTip: '연결이 끊어지면 Blocklet이 스토어에서 제거됩니다. 연결을 끊으시겠습니까?'
+      disconnectStoreTip: '연결이 끊어지면 Blocklet이 스토어에서 제거됩니다. 연결을 끊으시겠습니까?',
+      connectOrUpload: '연결하거나 업로드',
+      developerInfo: '개발자 정보'
     },
     titleValidationError: '제목 길이는 최소 3자 이상이어야 합니다',
-    descriptionValidationError: '설명 길이는 3에서 160자 사이여야 합니다'
+    descriptionValidationError: '설명 길이는 3에서 160자 사이여야 합니다',
+    whyNeedAppPid: '애플리케이션이 마이그레이션된 경우 영구 DID는 이 Blocklet이 처음 설치되었을 때 생성된 DID입니다.'
   },
   dashboard: {
     nodeDid: '노드',

package/lib/locales/pt.js

@@ -736,10 +736,13 @@ export default {
       resourceSelect: 'Selecionar recurso dos blocos',
       resourceUpload: 'Carregar recurso do seu disco (index.html é necessário no arquivo)',
       deleteStoreTip: 'Tem certeza de que deseja remover {name} da lista da Loja de Conexão?',
-      disconnectStoreTip: 'Após desconectado, o Blocklet será removido da loja. Você tem certeza que deseja desconectar?'
+      disconnectStoreTip: 'Após desconectado, o Blocklet será removido da loja. Você tem certeza que deseja desconectar?',
+      connectOrUpload: 'Conectar ou Enviar',
+      developerInfo: 'Informações do Desenvolvedor'
     },
     titleValidationError: 'O comprimento do título deve ter pelo menos 3 caracteres',
-    descriptionValidationError: 'O comprimento da descrição deve estar entre 3 e 160 caracteres.'
+    descriptionValidationError: 'O comprimento da descrição deve estar entre 3 e 160 caracteres.',
+    whyNeedAppPid: 'Se o seu aplicativo foi migrado, o DID permanente é o DID gerado quando este Blocklet foi instalado originalmente'
   },
   dashboard: {
     nodeDid: 'Nó',

package/lib/locales/ru.js

@@ -736,10 +736,13 @@ export default {
       resourceSelect: 'Выберите ресурс из блоклетов',
       resourceUpload: 'Загрузите ресурс с вашего диска (в архиве требуется index.html)',
       deleteStoreTip: 'Вы уверены, что хотите удалить {name} из списка магазина Connect?',
-      disconnectStoreTip: 'Блоклет будет удален из магазина после отключения. Уверены, что хотите отключить?'
+      disconnectStoreTip: 'Блоклет будет удален из магазина после отключения. Уверены, что хотите отключить?',
+      connectOrUpload: 'Подключиться или Загрузить',
+      developerInfo: 'Информация для разработчиков'
     },
     titleValidationError: 'Длина заголовка должна быть не менее 3 символов',
-    descriptionValidationError: 'Длина описания должна быть от 3 до 160 символов'
+    descriptionValidationError: 'Длина описания должна быть от 3 до 160 символов',
+    whyNeedAppPid: 'Если ваше приложение перенесено, постоянный DID — это DID, созданный при первоначальной установке этого Blocklet.'
   },
   dashboard: {
     nodeDid: 'Узел',

package/lib/locales/th.js

@@ -736,10 +736,13 @@ export default {
       resourceSelect: 'เลือกทรัพยากรจากบล็อกเล็ต',
       resourceUpload: 'อัปโหลดทรัพยากรจากดิสก์ของคุณ (index.html จำเป็นในไฟล์เข้าเก็บ)',
       deleteStoreTip: 'คุณแน่ใจหรือว่าต้องการลบ {name} ออกจากรายการร้านค้าเชื่อมต่อหรือไม่?',
-      disconnectStoreTip: 'เมื่อยกเลิกการเชื่อมต่อแล้ว Blocklet จะถูกลบออกจากร้าน คุณแน่ใจไหมว่าต้องการยกเลิกการเชื่อมต่อหรือไม่'
+      disconnectStoreTip: 'เมื่อยกเลิกการเชื่อมต่อแล้ว Blocklet จะถูกลบออกจากร้าน คุณแน่ใจไหมว่าต้องการยกเลิกการเชื่อมต่อหรือไม่',
+      connectOrUpload: 'เชื่อมต่อหรืออัปโหลด',
+      developerInfo: 'ข้อมูลนักพัฒนา'
     },
     titleValidationError: 'ความยาวของชื่อต้องมีอย่างน้อย 3 ตัวอักษร',
-    descriptionValidationError: 'ความยาวคำอธิบายต้องอยู่ระหว่าง 3 ถึง 160 ตัวอักษร.'
+    descriptionValidationError: 'ความยาวคำอธิบายต้องอยู่ระหว่าง 3 ถึง 160 ตัวอักษร.',
+    whyNeedAppPid: 'หากแอปพลิเคชันของคุณได้รับการโยกย้ายมา DID ถาวรคือ DID ที่สร้างขึ้นเมื่อติดตั้ง Blocklet นี้เริ่มแรก'
   },
   dashboard: {
     nodeDid: 'โหนด',

package/lib/locales/vi.js

@@ -736,10 +736,13 @@ export default {
       resourceSelect: 'Chọn tài nguyên từ blocklets',
       resourceUpload: 'Tải tài nguyên từ ổ đĩa của bạn (index.html cần thiết trong tệp nén)',
       deleteStoreTip: 'Bạn có chắc chắn muốn xóa {name} khỏi danh sách Cửa hàng Kết nối không?',
-      disconnectStoreTip: 'Sau khi ngắt kết nối, Blocklet sẽ bị xóa khỏi cửa hàng. Bạn có chắc chắn muốn ngắt kết nối không?'
+      disconnectStoreTip: 'Sau khi ngắt kết nối, Blocklet sẽ bị xóa khỏi cửa hàng. Bạn có chắc chắn muốn ngắt kết nối không?',
+      connectOrUpload: 'Kết nối hoặc Tải lên',
+      developerInfo: 'Thông tin nhà phát triển'
     },
     titleValidationError: 'Độ dài tiêu đề phải ít nhất 3 ký tự',
-    descriptionValidationError: 'Chiều dài mô tả phải từ 3 đến 160 ký tự.'
+    descriptionValidationError: 'Chiều dài mô tả phải từ 3 đến 160 ký tự.',
+    whyNeedAppPid: 'Nếu ứng dụng của bạn đã được di chuyển, DID vĩnh viễn là DID được tạo khi Blocklet này được cài đặt ban đầu'
   },
   dashboard: {
     nodeDid: 'Nút',

package/lib/locales/zh-tw.js

@@ -736,10 +736,13 @@ export default {
       resourceSelect: '從 blocklets 選擇資源',
       resourceUpload: '從您的磁盤上傳資源（存檔中需要index.html）',
       deleteStoreTip: '您確定要將{name}從連接商店列表中移除嗎？',
-      disconnectStoreTip: '斷開連線後，blocklet 將從商店中移除。您確定要斷開連線嗎？'
+      disconnectStoreTip: '斷開連線後，blocklet 將從商店中移除。您確定要斷開連線嗎？',
+      connectOrUpload: '連接或上傳',
+      developerInfo: '開發者資訊'
     },
     titleValidationError: '標題長度必須至少為3到40個字符',
-    descriptionValidationError: '描述長度必須介於3到160個字符之間'
+    descriptionValidationError: '描述長度必須介於3到160個字符之間',
+    whyNeedAppPid: '如果已遷移您的應用程式，永久 DID 是最初安裝此 Blocklet 時產生的 DID。'
   },
   dashboard: {
     nodeDid: '節點',

package/lib/locales/zh.js

@@ -370,6 +370,7 @@ export default {
     noService: '暂无服务',
     appId: '应用 DID',
     appPid: '永久性 DID',
+    whyNeedAppPid: '如果你的应用曾经迁移过，永久性 DID 是最初安装这个 Blocklet 时产生的 DID',
     alsoKnownAs: '曾用 DID',
     skSource: '安装钱包',
     reloadSuccess: '应用重启成功',
@@ -736,7 +737,9 @@ export default {
       resourceSelect: '从 blocklets 选择资源',
       resourceUpload: '从您的磁盘上传资源（存档中需要index.html）',
       deleteStoreTip: '您确定要将{name}从连接商店列表中移除吗？',
-      disconnectStoreTip: '断开连接后，blocklet 将从商店中移除。您确定要断开连接吗？'
+      disconnectStoreTip: '断开连接后，blocklet 将从商店中移除。您确定要断开连接吗？',
+      connectOrUpload: '连接或上传',
+      developerInfo: '开发者信息'
     },
     titleValidationError: '标题长度必须至少为3到40个字符',
     descriptionValidationError: '描述长度必须在3到160个字符之间'

package/lib/store/connect-actions.js

@@ -13,7 +13,7 @@ import canDeleteStore from '../blocklet/publish/utils/can-delete-store';
 import { useSessionContext } from '../contexts/session';
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 function ConnectActions({
-  connected,
+  connectedStore,
   onDisconnect,
   onDelete,
   store,
@@ -31,8 +31,14 @@ function ConnectActions({
   const [showDisconnectConfirm, setShowDisconnectConfirm] = useState(false);
   const handleOpenUrl = e => {
     e.stopPropagation();
-    window.open(joinURL(store.url, 'developer/blocklets'));
-    window.open(store.url);
+    if (connectedStore?.developerDid) {
+      const didConnect = Buffer.from(JSON.stringify({
+        forceConnected: connectedStore?.developerDid
+      }), 'utf8').toString('base64');
+      window.open(`${joinURL(store.url, 'developer/blocklets')}?__did-connect__=${didConnect}`);
+    } else {
+      window.open(`${joinURL(store.url, 'developer/blocklets')}`);
+    }
   };
   const handleOpen = event => {
     setAnchorEl(event.currentTarget);
@@ -55,7 +61,7 @@ function ConnectActions({
       setShowDisconnectConfirm(true);
     },
     icon: LinkOffIcon,
-    hidden: !connected
+    hidden: !connectedStore
   }];
   return /*#__PURE__*/_jsxs(_Fragment, {
     children: [/*#__PURE__*/_jsx(Button, {
@@ -132,7 +138,7 @@ function ConnectActions({
   });
 }
 ConnectActions.propTypes = {
-  connected: PropTypes.bool,
+  connectedStore: PropTypes.object.isRequired,
   onDisconnect: PropTypes.func,
   onDelete: PropTypes.func,
   store: PropTypes.object.isRequired,
@@ -141,7 +147,6 @@ ConnectActions.propTypes = {
 };
 ConnectActions.defaultProps = {
   projectId: '',
-  connected: false,
   onDelete: () => {},
   onDisconnect: () => {}
 };

package/lib/store/developer-avatar.js

@@ -0,0 +1,27 @@
+import { Avatar } from '@mui/material';
+import { joinURL } from 'ufo';
+import PropTypes from 'prop-types';
+import { jsx as _jsx } from "react/jsx-runtime";
+function DeveloperAvatar({
+  connectedStore,
+  sx,
+  ...rest
+}) {
+  return /*#__PURE__*/_jsx(Avatar, {
+    sx: {
+      width: 24,
+      height: 24,
+      ...sx
+    },
+    src: joinURL(connectedStore.storeUrl, `/.well-known/service/user/avatar/${connectedStore.developerDid}?imageFilter=resize&w=120&h=120`),
+    ...rest
+  });
+}
+DeveloperAvatar.propTypes = {
+  connectedStore: PropTypes.object.isRequired,
+  sx: PropTypes.object
+};
+DeveloperAvatar.defaultProps = {
+  sx: {}
+};
+export default DeveloperAvatar;

package/lib/store/item.js

@@ -1,22 +1,22 @@
 import { makeStyles, styled } from '@mui/styles';
 import { Typography, Button, ButtonGroup, CircularProgress, Box, Tooltip, tooltipClasses } from '@mui/material';
 import LaunchIcon from '@mui/icons-material/Launch';
-import PublishIcon from '@mui/icons-material/BackupOutlined';
 import LinkOutlinedIcon from '@mui/icons-material/LinkOutlined';
-import AdminPanelSettingsIcon from '@mui/icons-material/AdminPanelSettings';
 import DoneIcon from '@mui/icons-material/Done';
 import PropTypes from 'prop-types';
 import { useEffect, useState } from 'react';
 import { joinURL } from 'ufo';
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
 import Toast from '@arcblock/ux/lib/Toast';
+import PublishIcon from '@mui/icons-material/BackupOutlined';
 import DeleteStore from './delete';
 import { useNodeContext } from '../contexts/node';
 import { formatError } from '../util';
 import ConnectActions from './connect-actions';
 import DidAddress from '../did-address';
 import usePromiseWindowOpen from '../hooks/use-promise-window-open';
-import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+import DeveloperAvatar from './developer-avatar';
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 export const BEHAVIOR = {
   CONNECT: 'connect',
   SELECT: 'select'
@@ -83,7 +83,6 @@ const WhiteTooltip = styled(({
   [`& .${tooltipClasses.tooltip}`]: {
     backgroundColor: '#fff',
     color: 'rgba(0, 0, 0, 0.87)',
-    maxWidth: 250,
     borderRadius: 8,
     padding: theme.spacing(2),
     fontSize: theme.typography.pxToRem(12),
@@ -238,33 +237,61 @@ export default function StoreItem({
     }), /*#__PURE__*/_jsxs("div", {
       className: classes.actions,
       children: [connectedStore && /*#__PURE__*/_jsx(WhiteTooltip, {
-        placement: "left",
-        title: /*#__PURE__*/_jsxs(_Fragment, {
+        placement: "top",
+        title: /*#__PURE__*/_jsxs(Box, {
           children: [/*#__PURE__*/_jsx(Typography, {
             component: "span",
-            className: classes.title,
-            variant: "subtitle1",
-            children: connectedStore.developerName
-          }), /*#__PURE__*/_jsx(DidAddress, {
-            size: 14,
-            copyable: true,
-            responsive: true,
-            did: connectedStore.developerDid
+            variant: "caption",
+            sx: {
+              opacity: 0.7
+            },
+            children: t('blocklet.publish.developerInfo')
+          }), /*#__PURE__*/_jsxs(Box, {
+            sx: {
+              display: 'flex',
+              flexDirection: 'row',
+              alignItems: 'center',
+              gap: 1,
+              mt: 1
+            },
+            children: [/*#__PURE__*/_jsx(DeveloperAvatar, {
+              connectedStore: connectedStore,
+              sx: {
+                width: 42,
+                height: 42
+              }
+            }), /*#__PURE__*/_jsxs(Box, {
+              sx: {
+                flex: 1
+              },
+              children: [/*#__PURE__*/_jsx(Typography, {
+                component: "span",
+                variant: "subtitle1",
+                children: connectedStore.developerName
+              }), /*#__PURE__*/_jsx(DidAddress, {
+                size: 14,
+                copyable: true,
+                compact: true,
+                responsive: false,
+                did: connectedStore.developerDid
+              })]
+            })]
           })]
         }),
-        children: /*#__PURE__*/_jsx(AdminPanelSettingsIcon, {
-          sx: {
-            color: 'rgba(10,10,60,0.3)',
-            fontSize: 22,
-            marginRight: 1,
-            cursor: 'help'
-          }
+        children: /*#__PURE__*/_jsx("div", {
+          children: /*#__PURE__*/_jsx(DeveloperAvatar, {
+            connectedStore: connectedStore,
+            sx: {
+              marginRight: 1,
+              cursor: 'help'
+            }
+          })
         })
       }), isPublish && /*#__PURE__*/_jsxs(ButtonGroup, {
         disabled: loading,
         variant: "outlined",
         sx: {
-          height: 36
+          height: 38
         },
         size: "small",
         children: [!connected && /*#__PURE__*/_jsxs(Button, {
@@ -324,7 +351,7 @@ export default function StoreItem({
           }), t('common.upload')]
         }), /*#__PURE__*/_jsx(ConnectActions, {
           projectId: projectId,
-          connected: connected,
+          connectedStore: connectedStore,
           store: store,
           onDelete: onDelete,
           teamDid: teamDid,

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

@@ -33,7 +33,7 @@ export default function InviteMember({
     inviteInfo: null,
     role: '',
     remark: '',
-    sourceAppPid: apps.length > 0 ? apps[0].appId : null
+    sourceAppPid: apps.length > 0 ? apps[0].appPid : null
   });
   const onCreate = async () => {
     if (!currentState.role) {
@@ -44,6 +44,10 @@ export default function InviteMember({
     currentState.error = null;
     currentState.loading = true;
     try {
+      let sourceAppPid = currentState.sourceAppPid ?? null;
+      if (sourceAppPid === teamDid) {
+        sourceAppPid = null;
+      }
       const {
         inviteInfo
       } = await api.createMemberInvitation({
@@ -51,7 +55,7 @@ export default function InviteMember({
           teamDid,
           role: currentState.role,
           remark: trimRemark,
-          sourceAppPid: currentState.sourceAppPid ?? null
+          sourceAppPid
         }
       });
       currentState.inviteInfo = inviteInfo;
@@ -85,7 +89,7 @@ export default function InviteMember({
           label: t('common.passport'),
           disabled: currentState.loading,
           children: apps.map(r => /*#__PURE__*/_jsx(MenuItem, {
-            value: r.appId,
+            value: r.appPid,
             children: /*#__PURE__*/_jsxs(Box, {
               sx: {
                 display: 'flex',
@@ -100,16 +104,16 @@ export default function InviteMember({
                   gap: 1
                 },
                 children: [/*#__PURE__*/_jsx(Avatar, {
-                  did: r.appId,
+                  did: r.appPid,
                   size: 28
                 }), r.appName]
               }), /*#__PURE__*/_jsx(DID, {
-                did: r.appId,
+                did: r.appPid,
                 compact: true,
                 responsive: false
               })]
             })
-          }, r.appId))
+          }, r.appPid))
         })]
       }) : null, /*#__PURE__*/_jsxs(FormControl, {
         fullWidth: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/ux",
-  "version": "1.16.29-beta-44e63d18",
+  "version": "1.16.29-beta-0c32fe15",
   "description": "UX components shared across abtnode packages",
   "publishConfig": {
     "access": "public"
@@ -25,9 +25,9 @@
   "author": "linchen <linchen1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/auth": "1.16.29-beta-44e63d18",
-    "@abtnode/constant": "1.16.29-beta-44e63d18",
-    "@abtnode/util": "1.16.29-beta-44e63d18",
+    "@abtnode/auth": "1.16.29-beta-0c32fe15",
+    "@abtnode/constant": "1.16.29-beta-0c32fe15",
+    "@abtnode/util": "1.16.29-beta-0c32fe15",
     "@ahooksjs/use-url-state": "^3.5.1",
     "@arcblock/did": "^1.18.124",
     "@arcblock/did-connect": "^2.10.3",
@@ -37,13 +37,13 @@
     "@arcblock/react-hooks": "^2.10.3",
     "@arcblock/terminal": "^2.10.3",
     "@arcblock/ux": "^2.10.3",
-    "@blocklet/constant": "1.16.29-beta-44e63d18",
-    "@blocklet/js-sdk": "1.16.29-beta-44e63d18",
-    "@blocklet/launcher-layout": "2.3.24",
-    "@blocklet/list": "^0.13.4",
-    "@blocklet/meta": "1.16.29-beta-44e63d18",
+    "@blocklet/constant": "1.16.29-beta-0c32fe15",
+    "@blocklet/js-sdk": "1.16.29-beta-0c32fe15",
+    "@blocklet/launcher-layout": "2.3.27",
+    "@blocklet/list": "^0.13.6",
+    "@blocklet/meta": "1.16.29-beta-0c32fe15",
     "@blocklet/ui-react": "^2.10.3",
-    "@blocklet/uploader": "0.1.18",
+    "@blocklet/uploader": "0.1.19",
     "@emotion/react": "^11.10.4",
     "@emotion/styled": "^11.10.4",
     "@iconify-icons/logos": "^1.2.36",
@@ -108,5 +108,5 @@
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0"
   },
-  "gitHead": "0a389ad71f5a189041c4896b029f05f73c8ce8d6"
+  "gitHead": "38987125da4365838cc40c38a34daaf1bc364763"
 }