@abtnode/ux 1.16.16-beta-740ea329 → 1.16.16-beta-301539f6

package/es/blocklet/component/add.js

@@ -1107,8 +1107,6 @@ AddComponent.propTypes = {
 AddComponent.defaultProps = {
   children: null
 };
-
-// FIXME: @zhanghan 下面代码中的 header:empty 用于修复 e2e-test 中的问题 core/webapp/cypress/e2e/3-blocklet-lifecycle.cy.js L70
 const DialogWrapper = styled(Dialog)`
   .MuiDialogContent-root {
     padding-left: 0;
@@ -1119,9 +1117,6 @@ const DialogWrapper = styled(Dialog)`
   .MuiDialogActions-root {
     padding: 16px 24px;
   }
-  header:empty {
-    display: none;
-  }
 `;
 const TypographyWrapper = styled(Typography)`
   width: 100%;

package/es/blocklet/component/sortable-tree.js

@@ -56,6 +56,7 @@ function TreeTitle({
         variant: "body2",
         color: "gray",
         ml: 1.5,
+        lineHeight: 1,
         children: subtitleShow
       })]
     });

package/es/layout/addon.js

@@ -65,7 +65,8 @@ export default function HeaderAddon({
       session: session,
       size: 24,
       showRole: true,
-      ...sessionManagerProps
+      ...sessionManagerProps,
+      showManageBlocklet: false
     })]
   });
 }

package/es/locales/en.js

@@ -1040,7 +1040,8 @@ module.exports = {
       error: {
         passportEmpty: 'Passport should not be empty'
       },
-      connectedAccounts: 'Connected Accounts'
+      connectedAccounts: 'Connected Accounts',
+      federated: 'Federated'
     },
     transferNode: {
       name: 'Transfer Ownership',

package/es/locales/zh.js

@@ -1042,7 +1042,8 @@ module.exports = {
       error: {
         passportEmpty: '通行证不能为空'
       },
-      connectedAccounts: '已连接账号'
+      connectedAccounts: '已连接账号',
+      federated: '统一登录'
     },
     transferNode: {
       name: '转移所有者',

package/es/team/members/index.js

@@ -294,14 +294,19 @@ export default function MemberList({
     label: t('team.member.source'),
     name: 'sourceProvider',
     options: {
-      customBodyRender: e => {
-        const source = e || USER_TYPE.WALLET;
+      customBodyRenderLite: rowIndex => {
+        const user = users[rowIndex];
+        const source = user.sourceProvider || USER_TYPE.WALLET;
         const providerNameMap = {
           auth0: 'Auth0',
           wallet: 'DID wallet',
           federated: 'Federated'
         };
-        return providerNameMap[source] || source;
+        const providerName = providerNameMap[source] || source;
+        if (user.sourceAppPid) {
+          return `${providerName} (${t('team.member.federated')})`;
+        }
+        return providerName;
       }
     }
   }, {

package/lib/blocklet/component/add.js

@@ -1115,9 +1115,7 @@ AddComponent.propTypes = {
 AddComponent.defaultProps = {
   children: null
 };
-
-// FIXME: @zhanghan 下面代码中的 header:empty 用于修复 e2e-test 中的问题 core/webapp/cypress/e2e/3-blocklet-lifecycle.cy.js L70
-const DialogWrapper = (0, _styled.default)(_Dialog.default)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  .MuiDialogContent-root {\n    padding-left: 0;\n    padding-right: 0;\n    padding-bottom: 0;\n  }\n\n  .MuiDialogActions-root {\n    padding: 16px 24px;\n  }\n  header:empty {\n    display: none;\n  }\n"])));
+const DialogWrapper = (0, _styled.default)(_Dialog.default)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  .MuiDialogContent-root {\n    padding-left: 0;\n    padding-right: 0;\n    padding-bottom: 0;\n  }\n\n  .MuiDialogActions-root {\n    padding: 16px 24px;\n  }\n"])));
 const TypographyWrapper = (0, _styled.default)(_Typography.default)(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  width: 100%;\n  height: 100%;\n"])));
 const RightContent = _styled.default.div(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  width: 100%;\n  height: 100%;\n  display: flex;\n  flex-direction: column;\n  justify-content: flex-start;\n  align-items: flex-start;\n\n  .bottom-button {\n    min-width: 200px;\n  }\n\n  // blocklet-select-side\n  aside {\n    width: 140px;\n  }\n"])));
 const isMobileDialogContent = props => {

package/lib/blocklet/component/sortable-tree.js

@@ -68,6 +68,7 @@ function TreeTitle(_ref2) {
         variant: "body2",
         color: "gray",
         ml: 1.5,
+        lineHeight: 1,
         children: subtitleShow
       })]
     });

package/lib/layout/addon.js

@@ -73,12 +73,14 @@ function HeaderAddon(_ref) {
     }), showHelper && /*#__PURE__*/(0, _jsxRuntime.jsx)(_IconButton.default, {
       onClick: onHelpClick,
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_QuestionMarkCircle.default, {})
-    }), showSessionManager && /*#__PURE__*/(0, _jsxRuntime.jsx)(_SessionManager.default, _objectSpread({
+    }), showSessionManager && /*#__PURE__*/(0, _jsxRuntime.jsx)(_SessionManager.default, _objectSpread(_objectSpread({
       locale: locale,
       session: session,
       size: 24,
       showRole: true
-    }, sessionManagerProps))]
+    }, sessionManagerProps), {}, {
+      showManageBlocklet: false
+    }))]
   });
 }
 HeaderAddon.propTypes = {

package/lib/locales/en.js

@@ -1042,7 +1042,8 @@ module.exports = {
       error: {
         passportEmpty: 'Passport should not be empty'
       },
-      connectedAccounts: 'Connected Accounts'
+      connectedAccounts: 'Connected Accounts',
+      federated: 'Federated'
     },
     transferNode: {
       name: 'Transfer Ownership',

package/lib/locales/zh.js

@@ -1044,7 +1044,8 @@ module.exports = {
       error: {
         passportEmpty: '通行证不能为空'
       },
-      connectedAccounts: '已连接账号'
+      connectedAccounts: '已连接账号',
+      federated: '统一登录'
     },
     transferNode: {
       name: '转移所有者',

package/lib/team/members/index.js

@@ -312,14 +312,19 @@ function MemberList(_ref2) {
     label: t('team.member.source'),
     name: 'sourceProvider',
     options: {
-      customBodyRender: e => {
-        const source = e || _constant.USER_TYPE.WALLET;
+      customBodyRenderLite: rowIndex => {
+        const user = users[rowIndex];
+        const source = user.sourceProvider || _constant.USER_TYPE.WALLET;
         const providerNameMap = {
           auth0: 'Auth0',
           wallet: 'DID wallet',
           federated: 'Federated'
         };
-        return providerNameMap[source] || source;
+        const providerName = providerNameMap[source] || source;
+        if (user.sourceAppPid) {
+          return "".concat(providerName, " (").concat(t('team.member.federated'), ")");
+        }
+        return providerName;
       }
     }
   }, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/ux",
-  "version": "1.16.16-beta-740ea329",
+  "version": "1.16.16-beta-301539f6",
   "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.16-beta-740ea329",
-    "@abtnode/constant": "1.16.16-beta-740ea329",
-    "@abtnode/util": "1.16.16-beta-740ea329",
+    "@abtnode/auth": "1.16.16-beta-301539f6",
+    "@abtnode/constant": "1.16.16-beta-301539f6",
+    "@abtnode/util": "1.16.16-beta-301539f6",
     "@ahooksjs/use-url-state": "^3.5.1",
-    "@arcblock/did": "^1.18.89",
-    "@arcblock/did-connect": "^2.7.16",
+    "@arcblock/did": "^1.18.90",
+    "@arcblock/did-connect": "^2.7.20",
     "@arcblock/did-motif": "^1.1.13",
-    "@arcblock/icons": "^2.7.16",
-    "@arcblock/nft-display": "2.7.16",
-    "@arcblock/react-hooks": "^2.7.16",
-    "@arcblock/terminal": "^2.7.16",
-    "@arcblock/ux": "^2.7.16",
-    "@blocklet/constant": "1.16.16-beta-740ea329",
-    "@blocklet/launcher-layout": "2.2.5",
-    "@blocklet/list": "^0.12.35",
-    "@blocklet/meta": "1.16.16-beta-740ea329",
-    "@blocklet/ui-react": "^2.7.16",
+    "@arcblock/icons": "^2.7.20",
+    "@arcblock/nft-display": "2.7.20",
+    "@arcblock/react-hooks": "^2.7.20",
+    "@arcblock/terminal": "^2.7.20",
+    "@arcblock/ux": "^2.7.20",
+    "@blocklet/constant": "1.16.16-beta-301539f6",
+    "@blocklet/launcher-layout": "2.2.14",
+    "@blocklet/list": "^0.12.40",
+    "@blocklet/meta": "1.16.16-beta-301539f6",
+    "@blocklet/ui-react": "^2.7.20",
     "@emotion/react": "^11.10.4",
     "@emotion/styled": "^11.10.4",
     "@iconify/react": "^4.0.0",
@@ -53,7 +53,7 @@
     "@mui/material": "^5.10.8",
     "@mui/styles": "^5.10.8",
     "@mui/x-date-pickers": "^6.9.0",
-    "@ocap/client": "1.18.89",
+    "@ocap/client": "1.18.90",
     "@uiw/react-markdown-preview": "4.0.6",
     "ahooks": "^3.7.1",
     "axios": "^0.27.2",
@@ -98,7 +98,7 @@
     "babel-plugin-inline-react-svg": "^1.1.2",
     "glob": "^10.3.3"
   },
-  "gitHead": "6abb5a7319ad1093f1e2d04d76215d4a127b538d",
+  "gitHead": "4abf42f8b8cc859b76a85ab083414654dea10fcb",
   "exports": {
     ".": {
       "import": "./es/index.js",