@abtnode/ux 1.16.16-beta-2e5e3db7 → 1.16.16-beta-cfa95fa6

package/es/blocklet/agreement-app.js

@@ -1,3 +1,4 @@
+import { COPYRIGHT_OWNER } from '@abtnode/constant';
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 export default function AgreementApp({
@@ -10,8 +11,8 @@ export default function AgreementApp({
     },
     children: [/*#__PURE__*/_jsx("h3", {
       children: "End User License Agreement for Application"
-    }), /*#__PURE__*/_jsx("p", {
-      children: "Blocklet Server License Agreement ArcBlock, Inc. version 2020-08-28"
+    }), /*#__PURE__*/_jsxs("p", {
+      children: ["Blocklet Server License Agreement ", COPYRIGHT_OWNER, " version 2020-08-28"]
     }), /*#__PURE__*/_jsx("p", {
       children: "BLOCKLET SERVER LICENSE AGREEMENT"
     }), /*#__PURE__*/_jsx("p", {

package/es/blocklet/audit-logs.js

@@ -48,15 +48,21 @@ function AuditLog({
   if (!log.actor.did) {
     return null;
   }
+
+  // HACK: blocklet 类型会在存储前被强制置为 `''`，所以需要增加空字符串判断
+  const isUser = !['blocklet', ''].includes(log.actor.role);
   return /*#__PURE__*/_jsxs(Box, {
     className: "log-entry",
     "data-cy": "log-entry",
     children: [/*#__PURE__*/_jsx("div", {
       className: "log-author",
-      children: /*#__PURE__*/_jsx(DidAvatar, {
+      children: isUser ? /*#__PURE__*/_jsx(DidAvatar, {
         did: log.actor.did,
         size: 36,
         shape: "circle"
+      }) : /*#__PURE__*/_jsx(DidAvatar, {
+        did: log.actor.did,
+        size: 36
       })
     }), /*#__PURE__*/_jsxs("div", {
       className: "log-body",
@@ -75,7 +81,7 @@ function AuditLog({
             },
             children: scopeFormatter(log.scope)
           })
-        }), /*#__PURE__*/_jsxs(Link, {
+        }), isUser ? /*#__PURE__*/_jsxs(Link, {
           to: getUserLink({
             log,
             inService,
@@ -83,6 +89,8 @@ function AuditLog({
           }),
           target: "_blank",
           children: [log.actor.fullName, log.actor.role ? `(${log.actor.role})` : '']
+        }) : /*#__PURE__*/_jsxs("span", {
+          children: [log.actor.fullName, log.actor.role ? `(${log.actor.role})` : '']
         }), ' ', /*#__PURE__*/_jsx("span", {
           style: {
             margin: '0 4px'
@@ -242,6 +250,10 @@ const Div = styled.div`
         li {
           list-style-type: disc;
         }
+        code.code-highlight {
+          max-height: 300px;
+          overflow: auto;
+        }
       }
 
       .log-meta {

package/es/blocklet/component/navigation/navigation-preview.js

@@ -7,6 +7,7 @@ import Box from '@mui/material/Box';
 import Grid from '@mui/material/Grid';
 import Skeleton from '@mui/material/Skeleton';
 import styled from '@emotion/styled';
+import { BLOCKLET_CONFIGURABLE_KEY } from '@blocklet/constant';
 import { useBlockletContext } from '../../../contexts/blocklet';
 import useAppLogo from '../../../hooks/use-app-logo';
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -23,13 +24,20 @@ function NavigationPreview({
   } = useAppLogo({
     blocklet
   });
+  const owner = blocklet?.environments?.find(x => x.key === BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_COPYRIGHT_OWNER)?.value;
+  const year = blocklet?.environments?.find(x => x.key === BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_COPYRIGHT_YEAR)?.value;
+  const copyright = owner || year ? {
+    owner,
+    year
+  } : undefined;
   const blockletInfo = {
     appId: blocklet.appDid,
     appLogo: logoUrl,
     appName: blocklet.meta.title,
     enableConnect: true,
     enableLocale: false,
-    navigation
+    navigation,
+    copyright
   };
   return /*#__PURE__*/_jsx(LinkBlocker, {
     children: /*#__PURE__*/_jsxs(Box, {

package/es/blocklet/configuration.js

@@ -67,14 +67,16 @@ function BlockletEnvironment({
   }
 
   // configurable blocklet environment
-  const customDelete = blocklet.environments.find(x => x.key === 'BLOCKLET_DELETABLE');
+  const customDelete = blocklet.environments.find(x => x.key === BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_DELETABLE);
   const deletable = !customDelete || customDelete.value === 'yes';
-  const customLanguages = blocklet.environments.find(x => x.key === 'BLOCKLET_APP_LANGUAGES');
-  const customUrl = blocklet.environments.find(x => x.key === 'BLOCKLET_APP_URL');
-  const customLogoSquare = blocklet.environments.find(x => x.key === 'BLOCKLET_APP_LOGO_SQUARE');
-  const customLogoRect = blocklet.environments.find(x => x.key === 'BLOCKLET_APP_LOGO_RECT');
-  const customLogoFavicon = blocklet.environments.find(x => x.key === 'BLOCKLET_APP_LOGO_FAVICON');
-  const customLogoDeprecated = blocklet.environments.find(x => x.key === 'BLOCKLET_APP_LOGO');
+  const customLanguages = blocklet.environments.find(x => x.key === BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_LANGUAGES);
+  const customUrl = blocklet.environments.find(x => x.key === BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_URL);
+  const customLogoSquare = blocklet.environments.find(x => x.key === BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_LOGO_SQUARE);
+  const customLogoRect = blocklet.environments.find(x => x.key === BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_LOGO_RECT);
+  const customLogoFavicon = blocklet.environments.find(x => x.key === BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_LOGO_FAVICON);
+  const customLogoDeprecated = blocklet.environments.find(x => x.key === BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_LOGO);
+  const copyrightOwner = blocklet.environments.find(x => x.key === BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_COPYRIGHT_OWNER);
+  const copyrightYear = blocklet.environments.find(x => x.key === BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_COPYRIGHT_YEAR);
   const configurableEnvs = [{
     key: BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_NAME,
     description: t('blocklet.config.name'),
@@ -103,6 +105,14 @@ function BlockletEnvironment({
     key: BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_LOGO,
     description: t('blocklet.config.logo'),
     value: customLogoDeprecated ? customLogoDeprecated.value : ''
+  }, {
+    key: BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_COPYRIGHT_OWNER,
+    description: t('blocklet.config.copyrightOwner'),
+    value: copyrightOwner ? copyrightOwner.value : ''
+  }, {
+    key: BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_COPYRIGHT_YEAR,
+    description: t('blocklet.config.copyrightYear'),
+    value: copyrightYear ? copyrightYear.value : ''
   }];
   if (clusterMode) {
     const exist = blocklet.configs.find(x => x.key === BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_CLUSTER_SIZE);

package/es/blocklet/oauth/federated-detail-dialog.js

@@ -10,6 +10,8 @@ import { Box, Button, SvgIcon } from '@mui/material';
 import { Address } from '@arcblock/did-connect';
 import Dialog from '@arcblock/ux/lib/Dialog';
 import StarsIcon from '@mui/icons-material/Stars';
+import isUrl from 'is-url';
+import joinUrl from 'url-join';
 import { useBlockletContext } from '../../contexts/blocklet';
 import { useNodeContext } from '../../contexts/node';
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -61,6 +63,9 @@ const FederatedDetailDialog = /*#__PURE__*/forwardRef((props, ref) => {
     approve
   }), [open, close, approve]);
   const infoList = useCreation(() => {
+    if (!state.show) {
+      return [];
+    }
     state.data.migratedFrom = [state.data.appId, state.data.appPid];
     const keys = ['appName', 'appLogo', 'appId', 'appPid', 'migratedFrom', 'appDescription', 'appUrl', 'version', 'appliedAt', 'status', 'serverId', 'serverVersion'];
     if (state.data.isMaster !== false) {
@@ -92,12 +97,27 @@ const FederatedDetailDialog = /*#__PURE__*/forwardRef((props, ref) => {
         });
       }
       if (['appLogo'].includes(key)) {
-        value = /*#__PURE__*/_jsx("img", {
-          src: `${state.data.appUrl}/${value}`,
-          width: "60",
-          height: "60",
-          alt: state.data.appName
-        });
+        const logoUrl = isUrl(value) ? value : joinUrl(state.data.appUrl || '', value || '');
+        try {
+          const logoUrlInstance = new URL(logoUrl);
+          logoUrlInstance.searchParams.set('imageFilter', 'resize');
+          // HACK: 保持跟其他地方使用的尺寸一致，可以复用同一资源的缓存，减少网络请求
+          logoUrlInstance.searchParams.set('w', '80');
+          logoUrlInstance.searchParams.set('h', '80');
+          value = /*#__PURE__*/_jsx("img", {
+            src: logoUrlInstance.href,
+            width: "60",
+            height: "60",
+            alt: state.data.appName
+          });
+        } catch {
+          value = /*#__PURE__*/_jsx("img", {
+            src: logoUrl,
+            width: "60",
+            height: "60",
+            alt: state.data.appName
+          });
+        }
       }
       if (key === 'status') {
         value = value && t(`federated.status.${value}`);

package/es/blocklet/oauth/federated-site-list.js

@@ -11,6 +11,7 @@ import { useContext, useRef, useState } from 'react';
 import { useCreation, useMemoizedFn } from 'ahooks';
 import Button from '@arcblock/ux/lib/Button';
 import Toast from '@arcblock/ux/lib/Toast';
+import { BLOCKLET_CONFIGURABLE_KEY } from '@blocklet/constant';
 import { useBlockletContext } from '../../contexts/blocklet';
 import { useNodeContext } from '../../contexts/node';
 import useConfirm from '../../hooks/confirm';
@@ -226,16 +227,13 @@ function FederatedSiteList({
     };
   }, []);
   const showInvite = useMemoizedFn(() => {
-    const link = blocklet.site?.domainAliases?.[0]?.href;
-    if (link) {
-      try {
-        const url = new URL(link);
-        federatedInviteDialogRef.current?.open({
-          link: url.origin
-        });
-      } catch {
-        Toast.error(t('federated.failedToGetFederatedLoginLink'));
-      }
+    const customUrl = blocklet.environments.find(x => x.key === BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_URL);
+    if (customUrl?.value) {
+      federatedInviteDialogRef.current?.open({
+        link: customUrl.value
+      });
+    } else {
+      Toast.error(t('federated.failedToGetFederatedLoginLink'));
     }
   }, [blocklet.site?.domainAliases?.[0]?.href]);
   const [checked, setChecked] = useState(federatedConfig.autoLogin || false);

package/es/locales/en.js

@@ -391,6 +391,8 @@ module.exports = {
       logoRect: 'Horizontal logo URL or path for the blocklet (optional)',
       logoFavicon: 'favicon URL or path for the blocklet (optional, default to square logo)',
       clusterSize: 'Instance count when run this blocklet in cluster mode',
+      copyrightOwner: 'Copyright Owner (Display in footer)',
+      copyrightYear: 'Copyright Year (Display in footer)',
       deletable: {
         name: 'Delete Protection',
         enable: 'This blocklet can NOT currently be deleted',

package/es/locales/zh.js

@@ -395,6 +395,8 @@ module.exports = {
       logoRect: '横版 Logo 地址或路径 (可选)',
       logoFavicon: 'favicon 地址或路径 (可选，默认和正方形 Logo 相同)',
       clusterSize: '以 Cluster 模式启动时的实例数量',
+      copyrightOwner: '版权所有者 (展示在页脚中)',
+      copyrightYear: '版权年份 (展示在页脚中)',
       deletable: {
         name: '删除保护',
         enable: '此应用当前不可被删除',

package/lib/blocklet/agreement-app.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = AgreementApp;
+var _constant = require("@abtnode/constant");
 var _jsxRuntime = require("react/jsx-runtime");
 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; }
@@ -19,8 +20,8 @@ function AgreementApp(_ref) {
     },
     children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("h3", {
       children: "End User License Agreement for Application"
-    }), /*#__PURE__*/(0, _jsxRuntime.jsx)("p", {
-      children: "Blocklet Server License Agreement ArcBlock, Inc. version 2020-08-28"
+    }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("p", {
+      children: ["Blocklet Server License Agreement ", _constant.COPYRIGHT_OWNER, " version 2020-08-28"]
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)("p", {
       children: "BLOCKLET SERVER LICENSE AGREEMENT"
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)("p", {

package/lib/blocklet/audit-logs.js

@@ -59,15 +59,21 @@ function AuditLog(_ref2) {
   if (!log.actor.did) {
     return null;
   }
+
+  // HACK: blocklet 类型会在存储前被强制置为 `''`，所以需要增加空字符串判断
+  const isUser = !['blocklet', ''].includes(log.actor.role);
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
     className: "log-entry",
     "data-cy": "log-entry",
     children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
       className: "log-author",
-      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Avatar.default, {
+      children: isUser ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_Avatar.default, {
         did: log.actor.did,
         size: 36,
         shape: "circle"
+      }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_Avatar.default, {
+        did: log.actor.did,
+        size: 36
       })
     }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
       className: "log-body",
@@ -86,7 +92,7 @@ function AuditLog(_ref2) {
             },
             children: scopeFormatter(log.scope)
           })
-        }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactRouterDom.Link, {
+        }), isUser ? /*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactRouterDom.Link, {
           to: getUserLink({
             log,
             inService,
@@ -94,6 +100,8 @@ function AuditLog(_ref2) {
           }),
           target: "_blank",
           children: [log.actor.fullName, log.actor.role ? "(".concat(log.actor.role, ")") : '']
+        }) : /*#__PURE__*/(0, _jsxRuntime.jsxs)("span", {
+          children: [log.actor.fullName, log.actor.role ? "(".concat(log.actor.role, ")") : '']
         }), ' ', /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
           style: {
             margin: '0 4px'
@@ -218,7 +226,7 @@ function WrappedAuditLogs(_ref3) {
     children: /*#__PURE__*/(0, _jsxRuntime.jsx)(AuditLogs, {})
   });
 }
-const Div = _styled.default.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  .log-controls {\n    display: flex;\n    justify-content: space-between;\n  }\n  .log-entry {\n    display: flex;\n    margin: 16px 0;\n\n    .log-author {\n      margin-right: 8px;\n    }\n\n    .log-body {\n      flex: 1;\n\n      a {\n        color: ", ";\n      }\n\n      .log-header {\n      }\n\n      .log-content {\n        p {\n          margin-bottom: 4px;\n        }\n        ul,\n        ol {\n          padding-left: 2rem;\n        }\n        li {\n          list-style-type: disc;\n        }\n      }\n\n      .log-meta {\n        margin-top: 4px;\n\n        span {\n          font-size: 0.8rem;\n          display: inline-block;\n          margin-right: 8px;\n          padding-right: 8px;\n          border-right: 1px solid #ccc;\n\n          &:last-of-type {\n            border-right: none;\n          }\n        }\n      }\n    }\n  }\n"])), _ref4 => {
+const Div = _styled.default.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  .log-controls {\n    display: flex;\n    justify-content: space-between;\n  }\n  .log-entry {\n    display: flex;\n    margin: 16px 0;\n\n    .log-author {\n      margin-right: 8px;\n    }\n\n    .log-body {\n      flex: 1;\n\n      a {\n        color: ", ";\n      }\n\n      .log-header {\n      }\n\n      .log-content {\n        p {\n          margin-bottom: 4px;\n        }\n        ul,\n        ol {\n          padding-left: 2rem;\n        }\n        li {\n          list-style-type: disc;\n        }\n        code.code-highlight {\n          max-height: 300px;\n          overflow: auto;\n        }\n      }\n\n      .log-meta {\n        margin-top: 4px;\n\n        span {\n          font-size: 0.8rem;\n          display: inline-block;\n          margin-right: 8px;\n          padding-right: 8px;\n          border-right: 1px solid #ccc;\n\n          &:last-of-type {\n            border-right: none;\n          }\n        }\n      }\n    }\n  }\n"])), _ref4 => {
   let {
     theme
   } = _ref4;

package/lib/blocklet/component/navigation/navigation-preview.js

@@ -13,6 +13,7 @@ var _Box = _interopRequireDefault(require("@mui/material/Box"));
 var _Grid = _interopRequireDefault(require("@mui/material/Grid"));
 var _Skeleton = _interopRequireDefault(require("@mui/material/Skeleton"));
 var _styled = _interopRequireDefault(require("@emotion/styled"));
+var _constant = require("@blocklet/constant");
 var _blocklet = require("../../../contexts/blocklet");
 var _useAppLogo = _interopRequireDefault(require("../../../hooks/use-app-logo"));
 var _jsxRuntime = require("react/jsx-runtime");
@@ -20,6 +21,7 @@ var _templateObject;
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
 function NavigationPreview(_ref) {
+  var _blocklet$environment, _blocklet$environment2, _blocklet$environment3, _blocklet$environment4;
   let {
     className,
     navigation
@@ -32,13 +34,20 @@ function NavigationPreview(_ref) {
   } = (0, _useAppLogo.default)({
     blocklet
   });
+  const owner = blocklet === null || blocklet === void 0 ? void 0 : (_blocklet$environment = blocklet.environments) === null || _blocklet$environment === void 0 ? void 0 : (_blocklet$environment2 = _blocklet$environment.find(x => x.key === _constant.BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_COPYRIGHT_OWNER)) === null || _blocklet$environment2 === void 0 ? void 0 : _blocklet$environment2.value;
+  const year = blocklet === null || blocklet === void 0 ? void 0 : (_blocklet$environment3 = blocklet.environments) === null || _blocklet$environment3 === void 0 ? void 0 : (_blocklet$environment4 = _blocklet$environment3.find(x => x.key === _constant.BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_COPYRIGHT_YEAR)) === null || _blocklet$environment4 === void 0 ? void 0 : _blocklet$environment4.value;
+  const copyright = owner || year ? {
+    owner,
+    year
+  } : undefined;
   const blockletInfo = {
     appId: blocklet.appDid,
     appLogo: logoUrl,
     appName: blocklet.meta.title,
     enableConnect: true,
     enableLocale: false,
-    navigation
+    navigation,
+    copyright
   };
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_linkBlocker.default, {
     children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {

package/lib/blocklet/configuration.js

@@ -87,14 +87,16 @@ function BlockletEnvironment(_ref) {
   }
 
   // configurable blocklet environment
-  const customDelete = blocklet.environments.find(x => x.key === 'BLOCKLET_DELETABLE');
+  const customDelete = blocklet.environments.find(x => x.key === _constant2.BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_DELETABLE);
   const deletable = !customDelete || customDelete.value === 'yes';
-  const customLanguages = blocklet.environments.find(x => x.key === 'BLOCKLET_APP_LANGUAGES');
-  const customUrl = blocklet.environments.find(x => x.key === 'BLOCKLET_APP_URL');
-  const customLogoSquare = blocklet.environments.find(x => x.key === 'BLOCKLET_APP_LOGO_SQUARE');
-  const customLogoRect = blocklet.environments.find(x => x.key === 'BLOCKLET_APP_LOGO_RECT');
-  const customLogoFavicon = blocklet.environments.find(x => x.key === 'BLOCKLET_APP_LOGO_FAVICON');
-  const customLogoDeprecated = blocklet.environments.find(x => x.key === 'BLOCKLET_APP_LOGO');
+  const customLanguages = blocklet.environments.find(x => x.key === _constant2.BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_LANGUAGES);
+  const customUrl = blocklet.environments.find(x => x.key === _constant2.BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_URL);
+  const customLogoSquare = blocklet.environments.find(x => x.key === _constant2.BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_LOGO_SQUARE);
+  const customLogoRect = blocklet.environments.find(x => x.key === _constant2.BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_LOGO_RECT);
+  const customLogoFavicon = blocklet.environments.find(x => x.key === _constant2.BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_LOGO_FAVICON);
+  const customLogoDeprecated = blocklet.environments.find(x => x.key === _constant2.BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_LOGO);
+  const copyrightOwner = blocklet.environments.find(x => x.key === _constant2.BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_COPYRIGHT_OWNER);
+  const copyrightYear = blocklet.environments.find(x => x.key === _constant2.BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_COPYRIGHT_YEAR);
   const configurableEnvs = [{
     key: _constant2.BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_NAME,
     description: t('blocklet.config.name'),
@@ -123,6 +125,14 @@ function BlockletEnvironment(_ref) {
     key: _constant2.BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_LOGO,
     description: t('blocklet.config.logo'),
     value: customLogoDeprecated ? customLogoDeprecated.value : ''
+  }, {
+    key: _constant2.BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_COPYRIGHT_OWNER,
+    description: t('blocklet.config.copyrightOwner'),
+    value: copyrightOwner ? copyrightOwner.value : ''
+  }, {
+    key: _constant2.BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_COPYRIGHT_YEAR,
+    description: t('blocklet.config.copyrightYear'),
+    value: copyrightYear ? copyrightYear.value : ''
   }];
   if (clusterMode) {
     const exist = blocklet.configs.find(x => x.key === _constant2.BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_CLUSTER_SIZE);

package/lib/blocklet/oauth/federated-detail-dialog.js

@@ -16,6 +16,8 @@ var _material = require("@mui/material");
 var _didConnect = require("@arcblock/did-connect");
 var _Dialog = _interopRequireDefault(require("@arcblock/ux/lib/Dialog"));
 var _Stars = _interopRequireDefault(require("@mui/icons-material/Stars"));
+var _isUrl = _interopRequireDefault(require("is-url"));
+var _urlJoin = _interopRequireDefault(require("url-join"));
 var _blocklet = require("../../contexts/blocklet");
 var _node = require("../../contexts/node");
 var _jsxRuntime = require("react/jsx-runtime");
@@ -68,6 +70,9 @@ const FederatedDetailDialog = /*#__PURE__*/(0, _react.forwardRef)((props, ref) =
     approve
   }), [open, close, approve]);
   const infoList = (0, _ahooks.useCreation)(() => {
+    if (!state.show) {
+      return [];
+    }
     state.data.migratedFrom = [state.data.appId, state.data.appPid];
     const keys = ['appName', 'appLogo', 'appId', 'appPid', 'migratedFrom', 'appDescription', 'appUrl', 'version', 'appliedAt', 'status', 'serverId', 'serverVersion'];
     if (state.data.isMaster !== false) {
@@ -99,12 +104,27 @@ const FederatedDetailDialog = /*#__PURE__*/(0, _react.forwardRef)((props, ref) =
         });
       }
       if (['appLogo'].includes(key)) {
-        value = /*#__PURE__*/(0, _jsxRuntime.jsx)("img", {
-          src: "".concat(state.data.appUrl, "/").concat(value),
-          width: "60",
-          height: "60",
-          alt: state.data.appName
-        });
+        const logoUrl = (0, _isUrl.default)(value) ? value : (0, _urlJoin.default)(state.data.appUrl || '', value || '');
+        try {
+          const logoUrlInstance = new URL(logoUrl);
+          logoUrlInstance.searchParams.set('imageFilter', 'resize');
+          // HACK: 保持跟其他地方使用的尺寸一致，可以复用同一资源的缓存，减少网络请求
+          logoUrlInstance.searchParams.set('w', '80');
+          logoUrlInstance.searchParams.set('h', '80');
+          value = /*#__PURE__*/(0, _jsxRuntime.jsx)("img", {
+            src: logoUrlInstance.href,
+            width: "60",
+            height: "60",
+            alt: state.data.appName
+          });
+        } catch (_unused) {
+          value = /*#__PURE__*/(0, _jsxRuntime.jsx)("img", {
+            src: logoUrl,
+            width: "60",
+            height: "60",
+            alt: state.data.appName
+          });
+        }
       }
       if (key === 'status') {
         value = value && t("federated.status.".concat(value));

package/lib/blocklet/oauth/federated-site-list.js

@@ -16,6 +16,7 @@ var _react = require("react");
 var _ahooks = require("ahooks");
 var _Button = _interopRequireDefault(require("@arcblock/ux/lib/Button"));
 var _Toast = _interopRequireDefault(require("@arcblock/ux/lib/Toast"));
+var _constant = require("@blocklet/constant");
 var _blocklet = require("../../contexts/blocklet");
 var _node = require("../../contexts/node");
 var _confirm = _interopRequireDefault(require("../../hooks/confirm"));
@@ -27,7 +28,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 /* eslint-disable react/no-unstable-nested-components */
 
 function FederatedSiteList(_ref) {
-  var _blocklet$settings$fe, _blocklet$settings$fe2, _blocklet$site2, _blocklet$site2$domai, _blocklet$site2$domai2;
+  var _blocklet$settings$fe, _blocklet$settings$fe2, _blocklet$site, _blocklet$site$domain, _blocklet$site$domain2;
   let {
     mode
   } = _ref;
@@ -237,20 +238,16 @@ function FederatedSiteList(_ref) {
     };
   }, []);
   const showInvite = (0, _ahooks.useMemoizedFn)(() => {
-    var _blocklet$site, _blocklet$site$domain, _blocklet$site$domain2;
-    const link = (_blocklet$site = blocklet.site) === null || _blocklet$site === void 0 ? void 0 : (_blocklet$site$domain = _blocklet$site.domainAliases) === null || _blocklet$site$domain === void 0 ? void 0 : (_blocklet$site$domain2 = _blocklet$site$domain[0]) === null || _blocklet$site$domain2 === void 0 ? void 0 : _blocklet$site$domain2.href;
-    if (link) {
-      try {
-        var _federatedInviteDialo;
-        const url = new URL(link);
-        (_federatedInviteDialo = federatedInviteDialogRef.current) === null || _federatedInviteDialo === void 0 ? void 0 : _federatedInviteDialo.open({
-          link: url.origin
-        });
-      } catch (_unused) {
-        _Toast.default.error(t('federated.failedToGetFederatedLoginLink'));
-      }
+    const customUrl = blocklet.environments.find(x => x.key === _constant.BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_URL);
+    if (customUrl !== null && customUrl !== void 0 && customUrl.value) {
+      var _federatedInviteDialo;
+      (_federatedInviteDialo = federatedInviteDialogRef.current) === null || _federatedInviteDialo === void 0 ? void 0 : _federatedInviteDialo.open({
+        link: customUrl.value
+      });
+    } else {
+      _Toast.default.error(t('federated.failedToGetFederatedLoginLink'));
     }
-  }, [(_blocklet$site2 = blocklet.site) === null || _blocklet$site2 === void 0 ? void 0 : (_blocklet$site2$domai = _blocklet$site2.domainAliases) === null || _blocklet$site2$domai === void 0 ? void 0 : (_blocklet$site2$domai2 = _blocklet$site2$domai[0]) === null || _blocklet$site2$domai2 === void 0 ? void 0 : _blocklet$site2$domai2.href]);
+  }, [(_blocklet$site = blocklet.site) === null || _blocklet$site === void 0 ? void 0 : (_blocklet$site$domain = _blocklet$site.domainAliases) === null || _blocklet$site$domain === void 0 ? void 0 : (_blocklet$site$domain2 = _blocklet$site$domain[0]) === null || _blocklet$site$domain2 === void 0 ? void 0 : _blocklet$site$domain2.href]);
   const [checked, setChecked] = (0, _react.useState)(federatedConfig.autoLogin || false);
   const changeAutoLogin = (0, _ahooks.useMemoizedFn)(() => {
     confirmApi.open({

package/lib/locales/en.js

@@ -393,6 +393,8 @@ module.exports = {
       logoRect: 'Horizontal logo URL or path for the blocklet (optional)',
       logoFavicon: 'favicon URL or path for the blocklet (optional, default to square logo)',
       clusterSize: 'Instance count when run this blocklet in cluster mode',
+      copyrightOwner: 'Copyright Owner (Display in footer)',
+      copyrightYear: 'Copyright Year (Display in footer)',
       deletable: {
         name: 'Delete Protection',
         enable: 'This blocklet can NOT currently be deleted',

package/lib/locales/zh.js

@@ -397,6 +397,8 @@ module.exports = {
       logoRect: '横版 Logo 地址或路径 (可选)',
       logoFavicon: 'favicon 地址或路径 (可选，默认和正方形 Logo 相同)',
       clusterSize: '以 Cluster 模式启动时的实例数量',
+      copyrightOwner: '版权所有者 (展示在页脚中)',
+      copyrightYear: '版权年份 (展示在页脚中)',
       deletable: {
         name: '删除保护',
         enable: '此应用当前不可被删除',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/ux",
-  "version": "1.16.16-beta-2e5e3db7",
+  "version": "1.16.16-beta-cfa95fa6",
   "description": "UX components shared across abtnode packages",
   "publishConfig": {
     "access": "public"
@@ -27,32 +27,32 @@
   "author": "linchen <linchen1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/auth": "1.16.16-beta-2e5e3db7",
-    "@abtnode/constant": "1.16.16-beta-2e5e3db7",
-    "@abtnode/util": "1.16.16-beta-2e5e3db7",
+    "@abtnode/auth": "1.16.16-beta-cfa95fa6",
+    "@abtnode/constant": "1.16.16-beta-cfa95fa6",
+    "@abtnode/util": "1.16.16-beta-cfa95fa6",
     "@ahooksjs/use-url-state": "^3.5.1",
     "@arcblock/did": "^1.18.90",
-    "@arcblock/did-connect": "^2.7.21",
+    "@arcblock/did-connect": "^2.7.23",
     "@arcblock/did-motif": "^1.1.13",
-    "@arcblock/icons": "^2.7.21",
-    "@arcblock/nft-display": "2.7.21",
-    "@arcblock/react-hooks": "^2.7.21",
-    "@arcblock/terminal": "^2.7.21",
-    "@arcblock/ux": "^2.7.21",
-    "@blocklet/constant": "1.16.16-beta-2e5e3db7",
-    "@blocklet/launcher-layout": "2.2.15",
-    "@blocklet/list": "^0.12.41",
-    "@blocklet/meta": "1.16.16-beta-2e5e3db7",
-    "@blocklet/ui-react": "^2.7.21",
+    "@arcblock/icons": "^2.7.23",
+    "@arcblock/nft-display": "2.7.23",
+    "@arcblock/react-hooks": "^2.7.23",
+    "@arcblock/terminal": "^2.7.23",
+    "@arcblock/ux": "^2.7.23",
+    "@blocklet/constant": "1.16.16-beta-cfa95fa6",
+    "@blocklet/launcher-layout": "2.2.16",
+    "@blocklet/list": "^0.12.42",
+    "@blocklet/meta": "1.16.16-beta-cfa95fa6",
+    "@blocklet/ui-react": "^2.7.23",
     "@emotion/react": "^11.10.4",
     "@emotion/styled": "^11.10.4",
     "@iconify/react": "^4.0.0",
     "@material-table/core": "^0.2.48",
-    "@mui/icons-material": "^5.10.6",
-    "@mui/lab": "^5.0.0-alpha.102",
-    "@mui/material": "^5.10.8",
-    "@mui/styles": "^5.10.8",
-    "@mui/x-date-pickers": "^6.9.0",
+    "@mui/icons-material": "^5.14.9",
+    "@mui/lab": "^5.0.0-alpha.145",
+    "@mui/material": "^5.14.10",
+    "@mui/styles": "^5.14.10",
+    "@mui/x-date-pickers": "^6.14.0",
     "@ocap/client": "1.18.90",
     "@uiw/react-markdown-preview": "4.0.6",
     "ahooks": "^3.7.1",
@@ -98,7 +98,7 @@
     "babel-plugin-inline-react-svg": "^1.1.2",
     "glob": "^10.3.3"
   },
-  "gitHead": "e0e3da338d7d35b994dd49015f4fae8ddf2410e0",
+  "gitHead": "7c554d38470156df47f8bc5bc6da1e359b007552",
   "exports": {
     ".": {
       "import": "./es/index.js",