@abtnode/ux 1.17.2 → 1.17.3-beta-20251117-130331-b2ce7065

package/lib/blocklet/component/add-component/add-component-core.js

@@ -94,6 +94,12 @@ const postInstalledMessage = ({
     }, '*');
   }, timeout);
 };
+const getRegistryUrlByBundleSource = bundleSource => {
+  if (bundleSource?.store) {
+    return bundleSource.store;
+  }
+  return bundleSource?.url || '';
+};
 export default function AddComponentCore({
   onClose = () => {},
   mode = 'normal',
@@ -707,7 +713,7 @@ export default function AddComponentCore({
       chooseParams: {
         blocklets: [selectedMeta || installMeta],
         meta: selectedMeta || installMeta,
-        registryUrl: registryUrl || storeUrl || selectedMeta.homepage,
+        registryUrl: registryUrl || storeUrl || getRegistryUrlByBundleSource(selectedMeta?.bundleSource),
         inStore,
         inputUrl
       },

package/lib/blocklet/component/index.js

@@ -356,6 +356,8 @@ export default function BlockletComponent({
         })]
       }, `top-blocklet-${blocklet.meta.did}`), blocklet.optionalComponents?.map(component => /*#__PURE__*/_jsx(StyledComponentRow, {
         children: /*#__PURE__*/_jsx(OptionalComponentCell, {
+          blocklet: component,
+          ancestors: [blocklet],
           setInstallComponentMeta: setInstallComponentMeta,
           ...component
         })

package/lib/blocklet/component/optional-component-cell.js

@@ -4,21 +4,25 @@ import { Box, Button } from '@mui/material';
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
 import Tooltip from '@mui/material/Tooltip';
 import { Icon } from '@iconify/react';
-import { useNodeContext } from '../../contexts/node';
 import Line from './line';
 import { StyledComponentRow } from './component-cell';
+import BlockletBundleAvatar from '../bundle-avatar';
+import { useNodeContext } from '../../contexts/node';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 export default function OptionalComponentCell({
+  blocklet,
+  ancestors = [],
   meta,
   dependencies = [],
-  logoUrl = '',
-  setInstallComponentMeta
+  setInstallComponentMeta,
+  logoUrl = ''
 }) {
   const node = useNodeContext();
   const {
     t
   } = useLocaleContext();
   const handleOpen = () => {
+    meta.bundleSource = blocklet.bundleSource || {};
     setInstallComponentMeta(meta);
   };
   const size = 40;
@@ -28,15 +32,20 @@ export default function OptionalComponentCell({
       className: "cell",
       children: [/*#__PURE__*/_jsxs("div", {
         className: "component-left",
-        children: [/*#__PURE__*/_jsx("img", {
+        children: [/*#__PURE__*/_jsx("div", {
           className: "component-logo",
-          src: logoUrl,
-          onError: () => `${node.imgPrefix}/blocklet.png`,
-          alt: meta.title,
-          style: {
-            width: size,
-            height: size
-          }
+          children: logoUrl ? /*#__PURE__*/_jsx("img", {
+            src: logoUrl,
+            onError: () => `${node.imgPrefix}/blocklet.png`,
+            alt: meta.title,
+            style: {
+              width: size,
+              height: size
+            }
+          }) : /*#__PURE__*/_jsx(BlockletBundleAvatar, {
+            blocklet: blocklet,
+            ancestors: ancestors
+          })
         }), /*#__PURE__*/_jsxs("div", {
           className: "component-header",
           children: [/*#__PURE__*/_jsx("div", {
@@ -89,8 +98,10 @@ export default function OptionalComponentCell({
 }
 OptionalComponentCell.propTypes = {
   meta: PropTypes.object.isRequired,
-  logoUrl: PropTypes.string,
+  blocklet: PropTypes.object.isRequired,
+  ancestors: PropTypes.array,
   setInstallComponentMeta: PropTypes.func.isRequired,
+  logoUrl: PropTypes.string,
   dependencies: PropTypes.arrayOf(PropTypes.shape({
     parentDid: PropTypes.string,
     parentName: PropTypes.string,

package/lib/hooks/use-components-by-blocklet-meta-url.js

@@ -2,7 +2,7 @@ import { useEffect, useState } from 'react';
 import { useSearchParams } from 'react-router-dom';
 import { useNodeContext } from '../contexts/node';
 function parseBlockletMetaUrl(meta) {
-  return meta && (meta.registryUrl || meta.homepage) && meta.did ? `${meta.registryUrl || meta.homepage}/api/blocklets/${meta?.did}/blocklet.json` : '';
+  return meta && meta.registryUrl && meta.did ? `${meta.registryUrl}/api/blocklets/${meta?.did}/blocklet.json` : '';
 }
 function useComponentsByBlockletMetaUrl(meta) {
   const {

package/lib/util/index.js

@@ -527,7 +527,7 @@ export async function getAsset(chainHost, address) {
  * })} - 返回判断是否是新的url和解码后的url
  */
 export const isNewStoreUrl = (url, storeList) => {
-  if (typeof url === 'string') {
+  if (url && typeof url === 'string') {
     let decoded = decodeURIComponent(url?.trim());
     const regex = /^https?:\/\//;
     if (!regex.test(decoded)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/ux",
-  "version": "1.17.2",
+  "version": "1.17.3-beta-20251117-130331-b2ce7065",
   "description": "UX components shared across abtnode packages",
   "publishConfig": {
     "access": "public"
@@ -23,33 +23,33 @@
   "author": "linchen <linchen1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/auth": "1.17.2",
-    "@abtnode/constant": "1.17.2",
-    "@abtnode/docker-utils": "1.17.2",
-    "@abtnode/util": "1.17.2",
+    "@abtnode/auth": "1.17.3-beta-20251117-130331-b2ce7065",
+    "@abtnode/constant": "1.17.3-beta-20251117-130331-b2ce7065",
+    "@abtnode/docker-utils": "1.17.3-beta-20251117-130331-b2ce7065",
+    "@abtnode/util": "1.17.3-beta-20251117-130331-b2ce7065",
     "@ahooksjs/use-url-state": "^3.5.1",
-    "@arcblock/did": "^1.27.6",
-    "@arcblock/did-connect-react": "^3.2.5",
-    "@arcblock/did-ext": "^1.27.6",
+    "@arcblock/did": "^1.27.7",
+    "@arcblock/did-connect-react": "^3.2.6",
+    "@arcblock/did-ext": "^1.27.7",
     "@arcblock/did-motif": "^1.1.14",
-    "@arcblock/icons": "^3.2.5",
-    "@arcblock/nft-display": "^3.2.5",
-    "@arcblock/react-hooks": "^3.2.5",
-    "@arcblock/terminal": "^3.2.5",
-    "@arcblock/ux": "^3.2.5",
-    "@arcblock/validator": "^1.27.6",
-    "@blocklet/aigne-hub": "^0.6.5",
-    "@blocklet/constant": "1.17.2",
-    "@blocklet/did-domain-react": "^0.6.5",
-    "@blocklet/did-space-react": "^1.2.3",
-    "@blocklet/error": "^0.3.2",
-    "@blocklet/js-sdk": "1.17.2",
-    "@blocklet/launcher-layout": "^3.2.5",
-    "@blocklet/list": "^0.18.4",
-    "@blocklet/meta": "1.17.2",
-    "@blocklet/theme": "^3.2.5",
-    "@blocklet/ui-react": "^3.2.5",
-    "@blocklet/uploader": "^0.3.10",
+    "@arcblock/icons": "^3.2.6",
+    "@arcblock/nft-display": "^3.2.6",
+    "@arcblock/react-hooks": "^3.2.6",
+    "@arcblock/terminal": "^3.2.6",
+    "@arcblock/ux": "^3.2.6",
+    "@arcblock/validator": "^1.27.7",
+    "@blocklet/aigne-hub": "^0.6.7",
+    "@blocklet/constant": "1.17.3-beta-20251117-130331-b2ce7065",
+    "@blocklet/did-domain-react": "^0.6.7",
+    "@blocklet/did-space-react": "^1.2.4",
+    "@blocklet/error": "^0.3.3",
+    "@blocklet/js-sdk": "1.17.3-beta-20251117-130331-b2ce7065",
+    "@blocklet/launcher-layout": "^3.2.6",
+    "@blocklet/list": "^0.18.5",
+    "@blocklet/meta": "1.17.3-beta-20251117-130331-b2ce7065",
+    "@blocklet/theme": "^3.2.6",
+    "@blocklet/ui-react": "^3.2.6",
+    "@blocklet/uploader": "^0.3.11",
     "@emotion/react": "^11.14.0",
     "@emotion/styled": "^11.14.1",
     "@iconify-icons/material-symbols": "^1.2.58",
@@ -61,9 +61,9 @@
     "@mui/material": "^7.2.0",
     "@mui/x-date-pickers": "^8.9.0",
     "@mui/x-tree-view": "^8.9.0",
-    "@ocap/client": "^1.27.6",
-    "@ocap/mcrypto": "^1.27.6",
-    "@ocap/util": "^1.27.6",
+    "@ocap/client": "^1.27.7",
+    "@ocap/mcrypto": "^1.27.7",
+    "@ocap/util": "^1.27.7",
     "@uiw/react-markdown-preview": "^5.1.1",
     "ahooks": "^3.7.8",
     "axios": "^1.7.9",
@@ -127,5 +127,5 @@
     "babel-plugin-inline-react-svg": "^2.0.2",
     "glob": "^10.4.1"
   },
-  "gitHead": "d11c73575f9211d0794ccb72ea8981c50700ad10"
+  "gitHead": "4d719e72f7845c5f607d854300a0576dddfaaeff"
 }