@abtnode/ux 1.16.15-beta-12f50442 → 1.16.15-beta-d649cecc

package/es/blocklet/configuration.js

@@ -307,10 +307,6 @@ function BlockletEnvironment({
       className: "config-form",
       component: Divider,
       my: 3
-    }), /*#__PURE__*/_jsx(Box, {
-      className: "config-form",
-      component: Divider,
-      my: 3
     }), /*#__PURE__*/_jsx(Box, {
       className: "config-form",
       mt: 2,
@@ -342,6 +338,10 @@ function BlockletEnvironment({
         initialValue: (site.corsAllowedOrigins || []).join(', '),
         onSubmit: onUpdateCors
       })]
+    }), /*#__PURE__*/_jsx(Box, {
+      className: "config-form",
+      component: Divider,
+      my: 3
     }), /*#__PURE__*/_jsx(Box, {
       mb: 2,
       className: "config-label",

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

@@ -269,6 +269,20 @@ function FederatedSiteList({
       }
     });
   });
+  const disbandFederatedLogin = useMemoizedFn(() => {
+    confirmApi.open({
+      title: t('federated.disbandFederatedLogin'),
+      content: t('federated.disbandFederatedLoginDescription'),
+      async onConfirm(close) {
+        await api.disbandFederatedLogin({
+          input: {
+            did: blocklet.appPid
+          }
+        });
+        close();
+      }
+    });
+  });
   const customButtons = [];
   if (mode !== 'master') {
     customButtons.push( /*#__PURE__*/_jsx(Button, {
@@ -280,7 +294,7 @@ function FederatedSiteList({
         ml: 1
       },
       children: t('federated.quitFederatedLogin')
-    }));
+    }, "quitFederatedLogin"));
   } else {
     customButtons.push( /*#__PURE__*/_jsx(Button, {
       size: "small",
@@ -290,7 +304,17 @@ function FederatedSiteList({
         ml: 1
       },
       children: t('federated.inviteJoinFederatedLogin')
-    }));
+    }, "inviteJoinFederatedLogin"));
+    customButtons.push( /*#__PURE__*/_jsx(Button, {
+      color: "error",
+      size: "small",
+      variant: "contained",
+      onClick: disbandFederatedLogin,
+      sx: {
+        ml: 1
+      },
+      children: t('federated.disbandFederatedLogin')
+    }, "disbandFederatedLogin"));
   }
   return /*#__PURE__*/_jsxs(_Fragment, {
     children: [/*#__PURE__*/_jsx(Datatable, {

package/es/hooks/confirm.js

@@ -13,7 +13,8 @@ const ConfirmHolder = /*#__PURE__*/forwardRef((props, ref) => {
     title: '',
     content: '',
     onConfirm: noop,
-    onCancel: noop
+    onCancel: noop,
+    loading: false
   });
   const open = useMemoizedFn((params = {}) => {
     state.show = true;
@@ -21,6 +22,7 @@ const ConfirmHolder = /*#__PURE__*/forwardRef((props, ref) => {
     state.content = params.content;
     state.onConfirm = params.onConfirm || noop;
     state.onCancel = params.onCancel || noop;
+    state.loading = false;
   });
   const reset = useMemoizedFn(() => {
     state.title = '';
@@ -38,8 +40,13 @@ const ConfirmHolder = /*#__PURE__*/forwardRef((props, ref) => {
     close();
     state?.onCancel();
   }, []);
-  const onConfirm = useMemoizedFn(() => {
-    state?.onConfirm(close);
+  const onConfirm = useMemoizedFn(async () => {
+    state.loading = true;
+    try {
+      await state?.onConfirm(close);
+    } finally {
+      state.loading = false;
+    }
   }, []);
   useImperativeHandle(ref, () => {
     return {
@@ -56,7 +63,8 @@ const ConfirmHolder = /*#__PURE__*/forwardRef((props, ref) => {
       text: t('common.confirm'),
       props: {
         variant: 'contained',
-        color: 'primary'
+        color: 'primary',
+        loading: state.loading
       }
     },
     cancelButton: {

package/es/locales/en.js

@@ -313,7 +313,8 @@ module.exports = {
     startTime: 'Start time',
     endTime: 'End time',
     selected: 'Selected',
-    timeoutError: 'Timeout error'
+    timeoutError: 'Timeout error',
+    tags: 'Tags'
   },
   blocklet: {
     external: 'External',
@@ -1558,6 +1559,8 @@ module.exports = {
       approved: 'Approved',
       rejected: 'Rejected',
       revoked: 'Revoked'
-    }
+    },
+    disbandFederatedLogin: 'Disband federated login',
+    disbandFederatedLoginDescription: 'After disband federated login, all member site will quit federated login automatically'
   }
 };

package/es/locales/zh.js

@@ -318,7 +318,8 @@ module.exports = {
     startTime: '开始时间',
     endTime: '结束时间',
     selected: '已选中',
-    timeoutError: '超时错误'
+    timeoutError: '超时错误',
+    tags: '标签'
   },
   blocklet: {
     external: '外部',
@@ -1561,6 +1562,8 @@ module.exports = {
       approved: '已通过',
       rejected: '已拒绝',
       revoked: '已撤销'
-    }
+    },
+    disbandFederatedLogin: '解散统一登录',
+    disbandFederatedLoginDescription: '解散统一登录后，将自动让所有成员站点自动退出统一登录站点群'
   }
 };

package/es/team/members/index.js

@@ -17,12 +17,14 @@ import { LocaleContext } from '@arcblock/ux/lib/Locale/context';
 import Button from '@arcblock/ux/lib/Button';
 import PersonIcon from '@arcblock/icons/lib/PersonIcon';
 import ExternalIssuerIcon from '@arcblock/icons/lib/ExternalIssuerIcon';
+import { getTextColor } from '@abtnode/auth/lib/util/create-passport-svg';
 import Datatable, { getDurableData } from '@arcblock/ux/lib/Datatable';
 import RelativeTime from '@arcblock/ux/lib/RelativeTime';
 import { EVENTS, USER_TYPE } from '@abtnode/constant';
 import useUrlState from '@ahooksjs/use-url-state';
 import { useMount } from 'ahooks';
 import Toast from '@arcblock/ux/lib/Toast';
+import Tag from '../../tag';
 import DidAddress from '../../did-address';
 import { useNodeContext } from '../../contexts/node';
 import { useTeamContext } from '../../contexts/team';
@@ -62,7 +64,7 @@ function SimpleInfo({
       className: "member-avatar",
       children: [/*#__PURE__*/_jsx(Avatar, {
         src: `${user.avatar}?imageFilter=resize&w=48&h=48`,
-        size: 24,
+        size: 32,
         did: user.did,
         shape: "circle",
         style: {
@@ -79,9 +81,22 @@ function SimpleInfo({
           children: /*#__PURE__*/_jsx(ExternalIssuerIcon, {})
         })
       })]
-    }), /*#__PURE__*/_jsx("div", {
-      className: "member-text",
-      children: user.fullName
+    }), /*#__PURE__*/_jsxs("div", {
+      className: "member-meta",
+      children: [/*#__PURE__*/_jsx("div", {
+        className: "member-text",
+        children: user.fullName
+      }), Array.isArray(user.tags) && user.tags.length > 0 && /*#__PURE__*/_jsx("div", {
+        className: "member-tags",
+        children: user.tags.map(x => /*#__PURE__*/_jsx(Tag, {
+          style: {
+            background: x.color,
+            color: getTextColor(x.color),
+            marginRight: 4
+          },
+          children: x.title
+        }, x.id))
+      })]
     })]
   });
   return user.approved ? main : /*#__PURE__*/_jsx(Box, {
@@ -171,7 +186,9 @@ export default function MemberList({
     num: getCount(userCounts, ROLE_NONE)
   });
   const getUsers = () => {
-    const query = {};
+    const query = {
+      includeTags: true
+    };
     if (search.hideBlocked) {
       query.approved = true;
     }
@@ -600,8 +617,12 @@ const Div = styled.div`
       justify-content: center;
       align-items: center;
     }
-    .member-text {
+    .member-meta {
       margin-left: 10px;
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
+      align-items: flex-start;
     }
     .badge-block {
       width: 14px;

package/es/team/members/member.js

@@ -12,9 +12,11 @@ import InfoRow from '@arcblock/ux/lib/InfoRow';
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
 import ForbidLoginIcon from '@arcblock/icons/lib/ForbidLoginIcon';
 import AllowLoginIcon from '@arcblock/icons/lib/AllowLoginIcon';
+import { getTextColor } from '@abtnode/auth/lib/util/create-passport-svg';
 import { useReactive } from 'ahooks';
 import { EVENTS, USER_TYPE } from '@abtnode/constant';
 import { LOGIN_PROVIDER } from '@blocklet/constant';
+import Tag from '../../tag';
 import DidAddress from '../../did-address';
 import Permission from '../../permission';
 import { useNodeContext } from '../../contexts/node';
@@ -106,6 +108,9 @@ export default function Member({
             teamDid: _teamDid,
             user: {
               did: _userDid
+            },
+            options: {
+              includeTags: true
             }
           }
         },
@@ -186,7 +191,17 @@ export default function Member({
     }, {
       name: t('common.remark'),
       value: pageState.user.remark || '--'
-    }].filter(Boolean) : [];
+    }, Array.isArray(pageState.user.tags) && pageState.user.tags.length > 0 ? {
+      name: t('common.tags'),
+      value: pageState.user.tags.map(x => /*#__PURE__*/_jsx(Tag, {
+        style: {
+          background: x.color,
+          color: getTextColor(x.color),
+          marginRight: 4
+        },
+        children: x.title
+      }, x.id))
+    } : null].filter(Boolean) : [];
     return rows.map(row => {
       if (row.name === t('common.did')) {
         return /*#__PURE__*/_jsx(InfoRow, {

package/lib/blocklet/configuration.js

@@ -326,10 +326,6 @@ function BlockletEnvironment(_ref) {
       className: "config-form",
       component: _Divider.default,
       my: 3
-    }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
-      className: "config-form",
-      component: _Divider.default,
-      my: 3
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
       className: "config-form",
       mt: 2,
@@ -361,6 +357,10 @@ function BlockletEnvironment(_ref) {
         initialValue: (site.corsAllowedOrigins || []).join(', '),
         onSubmit: onUpdateCors
       })]
+    }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
+      className: "config-form",
+      component: _Divider.default,
+      my: 3
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
       mb: 2,
       className: "config-label",

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

@@ -282,6 +282,20 @@ function FederatedSiteList(_ref) {
       }
     });
   });
+  const disbandFederatedLogin = (0, _ahooks.useMemoizedFn)(() => {
+    confirmApi.open({
+      title: t('federated.disbandFederatedLogin'),
+      content: t('federated.disbandFederatedLoginDescription'),
+      async onConfirm(close) {
+        await api.disbandFederatedLogin({
+          input: {
+            did: blocklet.appPid
+          }
+        });
+        close();
+      }
+    });
+  });
   const customButtons = [];
   if (mode !== 'master') {
     customButtons.push( /*#__PURE__*/(0, _jsxRuntime.jsx)(_Button.default, {
@@ -293,7 +307,7 @@ function FederatedSiteList(_ref) {
         ml: 1
       },
       children: t('federated.quitFederatedLogin')
-    }));
+    }, "quitFederatedLogin"));
   } else {
     customButtons.push( /*#__PURE__*/(0, _jsxRuntime.jsx)(_Button.default, {
       size: "small",
@@ -303,7 +317,17 @@ function FederatedSiteList(_ref) {
         ml: 1
       },
       children: t('federated.inviteJoinFederatedLogin')
-    }));
+    }, "inviteJoinFederatedLogin"));
+    customButtons.push( /*#__PURE__*/(0, _jsxRuntime.jsx)(_Button.default, {
+      color: "error",
+      size: "small",
+      variant: "contained",
+      onClick: disbandFederatedLogin,
+      sx: {
+        ml: 1
+      },
+      children: t('federated.disbandFederatedLogin')
+    }, "disbandFederatedLogin"));
   }
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
     children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Datatable.default, {

package/lib/hooks/confirm.js

@@ -20,7 +20,8 @@ const ConfirmHolder = /*#__PURE__*/(0, _react.forwardRef)((props, ref) => {
     title: '',
     content: '',
     onConfirm: _noop.default,
-    onCancel: _noop.default
+    onCancel: _noop.default,
+    loading: false
   });
   const open = (0, _ahooks.useMemoizedFn)(function () {
     let params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
@@ -29,6 +30,7 @@ const ConfirmHolder = /*#__PURE__*/(0, _react.forwardRef)((props, ref) => {
     state.content = params.content;
     state.onConfirm = params.onConfirm || _noop.default;
     state.onCancel = params.onCancel || _noop.default;
+    state.loading = false;
   });
   const reset = (0, _ahooks.useMemoizedFn)(() => {
     state.title = '';
@@ -46,8 +48,13 @@ const ConfirmHolder = /*#__PURE__*/(0, _react.forwardRef)((props, ref) => {
     close();
     state === null || state === void 0 ? void 0 : state.onCancel();
   }, []);
-  const onConfirm = (0, _ahooks.useMemoizedFn)(() => {
-    state === null || state === void 0 ? void 0 : state.onConfirm(close);
+  const onConfirm = (0, _ahooks.useMemoizedFn)(async () => {
+    state.loading = true;
+    try {
+      await (state === null || state === void 0 ? void 0 : state.onConfirm(close));
+    } finally {
+      state.loading = false;
+    }
   }, []);
   (0, _react.useImperativeHandle)(ref, () => {
     return {
@@ -64,7 +71,8 @@ const ConfirmHolder = /*#__PURE__*/(0, _react.forwardRef)((props, ref) => {
       text: t('common.confirm'),
       props: {
         variant: 'contained',
-        color: 'primary'
+        color: 'primary',
+        loading: state.loading
       }
     },
     cancelButton: {

package/lib/locales/en.js

@@ -315,7 +315,8 @@ module.exports = {
     startTime: 'Start time',
     endTime: 'End time',
     selected: 'Selected',
-    timeoutError: 'Timeout error'
+    timeoutError: 'Timeout error',
+    tags: 'Tags'
   },
   blocklet: {
     external: 'External',
@@ -1560,6 +1561,8 @@ module.exports = {
       approved: 'Approved',
       rejected: 'Rejected',
       revoked: 'Revoked'
-    }
+    },
+    disbandFederatedLogin: 'Disband federated login',
+    disbandFederatedLoginDescription: 'After disband federated login, all member site will quit federated login automatically'
   }
 };

package/lib/locales/zh.js

@@ -320,7 +320,8 @@ module.exports = {
     startTime: '开始时间',
     endTime: '结束时间',
     selected: '已选中',
-    timeoutError: '超时错误'
+    timeoutError: '超时错误',
+    tags: '标签'
   },
   blocklet: {
     external: '外部',
@@ -1563,6 +1564,8 @@ module.exports = {
       approved: '已通过',
       rejected: '已拒绝',
       revoked: '已撤销'
-    }
+    },
+    disbandFederatedLogin: '解散统一登录',
+    disbandFederatedLoginDescription: '解散统一登录后，将自动让所有成员站点自动退出统一登录站点群'
   }
 };

package/lib/team/members/index.js

@@ -21,12 +21,14 @@ var _context = require("@arcblock/ux/lib/Locale/context");
 var _Button = _interopRequireDefault(require("@arcblock/ux/lib/Button"));
 var _PersonIcon = _interopRequireDefault(require("@arcblock/icons/lib/PersonIcon"));
 var _ExternalIssuerIcon = _interopRequireDefault(require("@arcblock/icons/lib/ExternalIssuerIcon"));
+var _createPassportSvg = require("@abtnode/auth/lib/util/create-passport-svg");
 var _Datatable = _interopRequireWildcard(require("@arcblock/ux/lib/Datatable"));
 var _RelativeTime = _interopRequireDefault(require("@arcblock/ux/lib/RelativeTime"));
 var _constant = require("@abtnode/constant");
 var _useUrlState = _interopRequireDefault(require("@ahooksjs/use-url-state"));
 var _ahooks = require("ahooks");
 var _Toast = _interopRequireDefault(require("@arcblock/ux/lib/Toast"));
+var _tag = _interopRequireDefault(require("../../tag"));
 var _didAddress = _interopRequireDefault(require("../../did-address"));
 var _node = require("../../contexts/node");
 var _team = require("../../contexts/team");
@@ -79,7 +81,7 @@ function SimpleInfo(_ref) {
       className: "member-avatar",
       children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Avatar.default, {
         src: "".concat(user.avatar, "?imageFilter=resize&w=48&h=48"),
-        size: 24,
+        size: 32,
         did: user.did,
         shape: "circle",
         style: {
@@ -96,9 +98,22 @@ function SimpleInfo(_ref) {
           children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_ExternalIssuerIcon.default, {})
         })
       })]
-    }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-      className: "member-text",
-      children: user.fullName
+    }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+      className: "member-meta",
+      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+        className: "member-text",
+        children: user.fullName
+      }), Array.isArray(user.tags) && user.tags.length > 0 && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+        className: "member-tags",
+        children: user.tags.map(x => /*#__PURE__*/(0, _jsxRuntime.jsx)(_tag.default, {
+          style: {
+            background: x.color,
+            color: (0, _createPassportSvg.getTextColor)(x.color),
+            marginRight: 4
+          },
+          children: x.title
+        }, x.id))
+      })]
     })]
   });
   return user.approved ? main : /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
@@ -189,7 +204,9 @@ function MemberList(_ref2) {
     num: getCount(userCounts, ROLE_NONE)
   });
   const getUsers = () => {
-    const query = {};
+    const query = {
+      includeTags: true
+    };
     if (search.hideBlocked) {
       query.approved = true;
     }
@@ -534,7 +551,7 @@ function MemberList(_ref2) {
     })]
   });
 }
-const Div = _styled.default.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  .main {\n    .left {\n      width: 168px;\n      flex-shrink: 0;\n      margin-right: 65px;\n      .tabs {\n        padding-top: 16px;\n        .tab {\n          display: flex;\n          justify-content: space-between;\n          align-items: center;\n          padding: 8px 16px;\n          transition: background 0.4s;\n\n          width: 168px;\n          height: 36px;\n          border-radius: 8px;\n\n          cursor: pointer;\n          user-select: none;\n\n          &:nth-child(n + 2) {\n            margin-top: 24px;\n          }\n\n          &.active {\n            background: #f2f2f2;\n          }\n\n          &:hover {\n            background: #f2f2f2;\n          }\n\n          .text {\n            font-weight: 400;\n            font-size: 16px;\n            line-height: 19px;\n\n            color: #222222;\n          }\n\n          .badge {\n            display: flex;\n            justify-content: center;\n            align-items: center;\n            width: 20px;\n            height: 20px;\n            border-radius: 100%;\n            color: #fff;\n            background: #666666;\n            font-size: 10px;\n            font-weight: 400;\n            &.is-rect {\n              width: auto;\n              border-radius: 8px;\n              padding: 0 4px;\n            }\n          }\n        }\n      }\n      @media (max-width: ", "px) {\n        display: none;\n      }\n    }\n    .right {\n      flex-grow: 1;\n    }\n  }\n\n  .member-block {\n    display: flex;\n    justify-content: flex-start;\n    align-items: center;\n    .member-avatar {\n      position: relative;\n      display: flex;\n      justify-content: center;\n      align-items: center;\n    }\n    .member-text {\n      margin-left: 10px;\n    }\n    .badge-block {\n      width: 14px;\n      height: 14px;\n      position: absolute;\n      right: -4px;\n      top: -4px;\n      background: #ff5757;\n      border-radius: 100%;\n      display: flex;\n      align-items: center;\n      justify-content: center;\n      &::after {\n        content: '';\n        width: 6px;\n        height: 2px;\n        background: #fefefe;\n      }\n    }\n  }\n\n  .table-toolbar-left {\n    display: flex;\n    justify-content: center;\n    align-items: center;\n    padding: 7px 0;\n  }\n"])), props => props.theme.breakpoints.values.md);
+const Div = _styled.default.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  .main {\n    .left {\n      width: 168px;\n      flex-shrink: 0;\n      margin-right: 65px;\n      .tabs {\n        padding-top: 16px;\n        .tab {\n          display: flex;\n          justify-content: space-between;\n          align-items: center;\n          padding: 8px 16px;\n          transition: background 0.4s;\n\n          width: 168px;\n          height: 36px;\n          border-radius: 8px;\n\n          cursor: pointer;\n          user-select: none;\n\n          &:nth-child(n + 2) {\n            margin-top: 24px;\n          }\n\n          &.active {\n            background: #f2f2f2;\n          }\n\n          &:hover {\n            background: #f2f2f2;\n          }\n\n          .text {\n            font-weight: 400;\n            font-size: 16px;\n            line-height: 19px;\n\n            color: #222222;\n          }\n\n          .badge {\n            display: flex;\n            justify-content: center;\n            align-items: center;\n            width: 20px;\n            height: 20px;\n            border-radius: 100%;\n            color: #fff;\n            background: #666666;\n            font-size: 10px;\n            font-weight: 400;\n            &.is-rect {\n              width: auto;\n              border-radius: 8px;\n              padding: 0 4px;\n            }\n          }\n        }\n      }\n      @media (max-width: ", "px) {\n        display: none;\n      }\n    }\n    .right {\n      flex-grow: 1;\n    }\n  }\n\n  .member-block {\n    display: flex;\n    justify-content: flex-start;\n    align-items: center;\n    .member-avatar {\n      position: relative;\n      display: flex;\n      justify-content: center;\n      align-items: center;\n    }\n    .member-meta {\n      margin-left: 10px;\n      display: flex;\n      flex-direction: column;\n      justify-content: center;\n      align-items: flex-start;\n    }\n    .badge-block {\n      width: 14px;\n      height: 14px;\n      position: absolute;\n      right: -4px;\n      top: -4px;\n      background: #ff5757;\n      border-radius: 100%;\n      display: flex;\n      align-items: center;\n      justify-content: center;\n      &::after {\n        content: '';\n        width: 6px;\n        height: 2px;\n        background: #fefefe;\n      }\n    }\n  }\n\n  .table-toolbar-left {\n    display: flex;\n    justify-content: center;\n    align-items: center;\n    padding: 7px 0;\n  }\n"])), props => props.theme.breakpoints.values.md);
 MemberList.propTypes = {
   type: _propTypes.default.oneOf(['server', 'blocklet']).isRequired,
   createPassportSvg: _propTypes.default.func.isRequired

package/lib/team/members/member.js

@@ -17,9 +17,11 @@ var _InfoRow = _interopRequireDefault(require("@arcblock/ux/lib/InfoRow"));
 var _context = require("@arcblock/ux/lib/Locale/context");
 var _ForbidLoginIcon = _interopRequireDefault(require("@arcblock/icons/lib/ForbidLoginIcon"));
 var _AllowLoginIcon = _interopRequireDefault(require("@arcblock/icons/lib/AllowLoginIcon"));
+var _createPassportSvg = require("@abtnode/auth/lib/util/create-passport-svg");
 var _ahooks = require("ahooks");
 var _constant = require("@abtnode/constant");
 var _constant2 = require("@blocklet/constant");
+var _tag = _interopRequireDefault(require("../../tag"));
 var _didAddress = _interopRequireDefault(require("../../did-address"));
 var _permission = _interopRequireDefault(require("../../permission"));
 var _node = require("../../contexts/node");
@@ -124,6 +126,9 @@ function Member(_ref3) {
             teamDid: _teamDid,
             user: {
               did: _userDid
+            },
+            options: {
+              includeTags: true
             }
           }
         },
@@ -205,7 +210,17 @@ function Member(_ref3) {
     }, {
       name: t('common.remark'),
       value: pageState.user.remark || '--'
-    }].filter(Boolean) : [];
+    }, Array.isArray(pageState.user.tags) && pageState.user.tags.length > 0 ? {
+      name: t('common.tags'),
+      value: pageState.user.tags.map(x => /*#__PURE__*/(0, _jsxRuntime.jsx)(_tag.default, {
+        style: {
+          background: x.color,
+          color: (0, _createPassportSvg.getTextColor)(x.color),
+          marginRight: 4
+        },
+        children: x.title
+      }, x.id))
+    } : null].filter(Boolean) : [];
     return rows.map(row => {
       if (row.name === t('common.did')) {
         return /*#__PURE__*/(0, _jsxRuntime.jsx)(_InfoRow.default, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/ux",
-  "version": "1.16.15-beta-12f50442",
+  "version": "1.16.15-beta-d649cecc",
   "description": "UX components shared across abtnode packages",
   "publishConfig": {
     "access": "public"
@@ -27,9 +27,9 @@
   "author": "linchen <linchen1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/auth": "1.16.15-beta-12f50442",
-    "@abtnode/constant": "1.16.15-beta-12f50442",
-    "@abtnode/util": "1.16.15-beta-12f50442",
+    "@abtnode/auth": "1.16.15-beta-d649cecc",
+    "@abtnode/constant": "1.16.15-beta-d649cecc",
+    "@abtnode/util": "1.16.15-beta-d649cecc",
     "@ahooksjs/use-url-state": "^3.5.1",
     "@arcblock/did": "^1.18.89",
     "@arcblock/did-connect": "^2.7.9",
@@ -39,10 +39,10 @@
     "@arcblock/react-hooks": "^2.7.9",
     "@arcblock/terminal": "^2.7.9",
     "@arcblock/ux": "^2.7.9",
-    "@blocklet/constant": "1.16.15-beta-12f50442",
+    "@blocklet/constant": "1.16.15-beta-d649cecc",
     "@blocklet/launcher-layout": "2.1.101",
     "@blocklet/list": "^0.12.31",
-    "@blocklet/meta": "1.16.15-beta-12f50442",
+    "@blocklet/meta": "1.16.15-beta-d649cecc",
     "@blocklet/ui-react": "^2.7.9",
     "@emotion/react": "^11.10.4",
     "@emotion/styled": "^11.10.4",
@@ -98,7 +98,7 @@
     "babel-plugin-inline-react-svg": "^1.1.2",
     "glob": "^10.3.3"
   },
-  "gitHead": "48bda4b29eb31a70e0eb9cab0bce6e544960c7fd",
+  "gitHead": "56941d1056a9e5f189992ace6e93971aa4226d07",
   "exports": {
     ".": {
       "import": "./es/index.js",