@abtnode/ux 1.16.13 → 1.16.14-beta-0c29907f

package/lib/team/members/member.js

@@ -15,11 +15,11 @@ var _Avatar = _interopRequireDefault(require("@mui/material/Avatar"));
 var _Tabs = _interopRequireDefault(require("@arcblock/ux/lib/Tabs"));
 var _InfoRow = _interopRequireDefault(require("@arcblock/ux/lib/InfoRow"));
 var _context = require("@arcblock/ux/lib/Locale/context");
-var _Address = _interopRequireDefault(require("@arcblock/did-connect/lib/Address"));
 var _ForbidLoginIcon = _interopRequireDefault(require("@arcblock/icons/lib/ForbidLoginIcon"));
 var _AllowLoginIcon = _interopRequireDefault(require("@arcblock/icons/lib/AllowLoginIcon"));
 var _ahooks = require("ahooks");
 var _constant = require("@abtnode/constant");
+var _didAddress = _interopRequireDefault(require("../../did-address"));
 var _permission = _interopRequireDefault(require("../../permission"));
 var _node = require("../../contexts/node");
 var _team = require("../../contexts/team");
@@ -73,8 +73,8 @@ function TabOAuth(_ref2) {
       valueComponent: "div",
       nameWidth: 120,
       name: account.provider,
-      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Address.default, {
-        children: account.did
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_didAddress.default, {
+        did: account.did
       })
     }, account.did);
   });
@@ -91,7 +91,8 @@ function Member(_ref3) {
   let {
     userDid,
     onCancel,
-    initTab
+    initTab,
+    createPassportSvg
   } = _ref3;
   const {
     api,
@@ -245,6 +246,7 @@ function Member(_ref3) {
         user: pageState.user,
         teamDid: teamDid,
         roles: roles,
+        createPassportSvg: createPassportSvg,
         onCreate: () => {
           getData(teamDid, userDid).then(() => {
             // oauth 账户邀请后，不会产生待领取的邀请链接
@@ -356,8 +358,8 @@ function Member(_ref3) {
             }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
               className: "did",
               mt: 1,
-              children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Address.default, {
-                children: pageState.user.did
+              children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_didAddress.default, {
+                did: pageState.user.did
               })
             })]
           })]
@@ -381,6 +383,7 @@ function Member(_ref3) {
 Member.propTypes = {
   userDid: _propTypes.default.string.isRequired,
   onCancel: _propTypes.default.func.isRequired,
+  createPassportSvg: _propTypes.default.func.isRequired,
   initTab: _propTypes.default.string
 };
 Member.defaultProps = {

package/lib/team/members/passports.js

@@ -21,7 +21,6 @@ var _RevokeIcon = _interopRequireDefault(require("@arcblock/icons/lib/RevokeIcon
 var _ExternalIssuerIcon = _interopRequireDefault(require("@arcblock/icons/lib/ExternalIssuerIcon"));
 var _Empty = _interopRequireDefault(require("@arcblock/ux/lib/Empty"));
 var _constant = require("@abtnode/constant");
-var _createPassportSvg = _interopRequireDefault(require("@abtnode/auth/lib/util/create-passport-svg"));
 var _node = require("../../contexts/node");
 var _session = require("../../contexts/session");
 var _team = require("../../contexts/team");
@@ -75,7 +74,8 @@ function Passports(_ref2) {
   var _blocklet$settings;
   let {
     user,
-    onCreate
+    onCreate,
+    createPassportSvg
   } = _ref2;
   const {
     t
@@ -230,15 +230,16 @@ function Passports(_ref2) {
             children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
               // eslint-disable-next-line react/no-danger
               dangerouslySetInnerHTML: {
-                __html: (0, _createPassportSvg.default)({
+                __html: createPassportSvg({
                   title: x.title || x.name,
                   issuer: x.issuer && x.issuer.name,
                   issuerDid: x.issuer && x.issuer.id,
                   ownerName: user.fullName,
+                  ownerDid: user.did,
                   ownerAvatarUrl: user.avatar,
                   revoked: x.revoked,
                   preferredColor: passportColor,
-                  width: '120px'
+                  width: '150px'
                 })
               }
             }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
@@ -303,7 +304,7 @@ function Passports(_ref2) {
             })
           })]
         })
-      })), !filteredPassports.length && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Empty.default, {
+      }, x.id)), !filteredPassports.length && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Empty.default, {
         children: t('common.empty')
       })]
     }), showIssueDialog && /*#__PURE__*/(0, _jsxRuntime.jsx)(_issuePassport.default, {
@@ -331,6 +332,7 @@ function Passports(_ref2) {
 }
 Passports.propTypes = {
   user: _propTypes.default.object.isRequired,
+  createPassportSvg: _propTypes.default.func.isRequired,
   onCreate: _propTypes.default.func
 };
 Passports.defaultProps = {

package/lib/team/passports/color.js

@@ -14,7 +14,7 @@ var _context = require("@arcblock/ux/lib/Locale/context");
 var _Button = _interopRequireDefault(require("@arcblock/ux/lib/Button"));
 var _createPassportSvg = _interopRequireDefault(require("@abtnode/auth/lib/util/create-passport-svg"));
 var _util = require("@blocklet/meta/lib/util");
-var _passportColor = require("@abtnode/auth/lib/util/passport-color");
+var _nftDisplay = require("@arcblock/nft-display");
 var _constant = require("@blocklet/constant");
 var _Toast = _interopRequireDefault(require("@arcblock/ux/lib/Toast"));
 var _node = require("../../contexts/node");
@@ -44,7 +44,7 @@ function PassportColor(_ref) {
   } = (0, _context.useLocaleContext)();
   const [loading, setLoading] = (0, _react.useState)(false);
   const curColor = (blocklet.environments.find(x => x.key === 'BLOCKLET_PASSPORT_COLOR') || {}).value || 'auto';
-  const defaultColor = curColor === 'auto' ? (0, _passportColor.getPassportColorFromDid)(blocklet.appDid) : curColor;
+  const defaultColor = curColor === 'auto' ? (0, _nftDisplay.getPassportColorFromDid)(blocklet.appDid) : curColor;
   const [color, setColor] = (0, _react.useState)(defaultColor);
   const onSubmit = async () => {
     const params = [{
@@ -107,6 +107,7 @@ function PassportColor(_ref) {
           issuer: (0, _util.getDisplayName)(blocklet),
           issuerDid: blocklet.appDid,
           ownerName: 'Your Name',
+          ownerDid: blocklet.appDid,
           isDataUrl: true,
           preferredColor: color
         })

package/lib/team/passports/index.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = PassportList;
 var _react = _interopRequireWildcard(require("react"));
+var _propTypes = _interopRequireDefault(require("prop-types"));
 var _styled = _interopRequireDefault(require("@emotion/styled"));
 var _Add = _interopRequireDefault(require("@mui/icons-material/Add"));
 var _Box = _interopRequireDefault(require("@mui/material/Box"));
@@ -15,7 +16,6 @@ var _CircularProgress = _interopRequireDefault(require("@mui/material/CircularPr
 var _EditIcon = _interopRequireDefault(require("@arcblock/icons/lib/EditIcon"));
 var _LockIcon = _interopRequireDefault(require("@arcblock/icons/lib/LockIcon"));
 var _ExternalIssuerIcon = _interopRequireDefault(require("@arcblock/icons/lib/ExternalIssuerIcon"));
-var _createPassportSvg = _interopRequireDefault(require("@abtnode/auth/lib/util/create-passport-svg"));
 var _Toast = _interopRequireDefault(require("@arcblock/ux/lib/Toast"));
 var _node = require("../../contexts/node");
 var _team = require("../../contexts/team");
@@ -34,7 +34,10 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
-function PassportList() {
+function PassportList(_ref) {
+  let {
+    createPassportSvg
+  } = _ref;
   const {
     t
   } = (0, _react.useContext)(_context.LocaleContext);
@@ -187,19 +190,23 @@ function PassportList() {
         children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
           display: "flex",
           alignItems: "center",
-          children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("img", {
+          children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
             style: {
-              width: 120
-            },
-            alt: "",
-            src: (0, _createPassportSvg.default)({
-              title: role.title,
-              issuer: teamName,
-              issuerDid: teamIssuerDid,
-              ownerName: 'Your Name',
-              isDataUrl: true,
-              preferredColor: passportColor
-            })
+              width: 150
+            }
+            // eslint-disable-next-line react/no-danger
+            ,
+            dangerouslySetInnerHTML: {
+              __html: createPassportSvg({
+                title: role.title,
+                issuer: teamName,
+                issuerDid: teamIssuerDid,
+                ownerName: 'Your Name',
+                ownerDid: teamIssuerDid,
+                preferredColor: passportColor,
+                width: '150px'
+              })
+            }
           }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
             ml: 3,
             className: "title",
@@ -248,5 +255,7 @@ function PassportList() {
   });
 }
 const Div = _styled.default.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  .list {\n    .item {\n      padding: 12px;\n      margin: 12px -12px;\n      cursor: pointer;\n      transition: box-shadow 0.4s;\n      &:hover {\n        box-shadow: 0 0 10px 4px rgba(0, 0, 0, 0.1);\n      }\n    }\n\n    .title {\n      font-weight: 400;\n      font-size: 18px;\n      width: 80px;\n      line-height: 21px;\n      color: #222222;\n    }\n\n    .description {\n      flex: 1;\n      margin-left: 64px;\n      color: #999999;\n    }\n\n    .action {\n      color: #bfbfbf;\n      fill: #bfbfbf;\n    }\n  }\n"])));
-PassportList.propTypes = {};
+PassportList.propTypes = {
+  createPassportSvg: _propTypes.default.func.isRequired
+};
 PassportList.defaultProps = {};

package/lib/team/passports/trusted-factories.js

@@ -16,11 +16,10 @@ var _context = require("@arcblock/ux/lib/Locale/context");
 var _Button = _interopRequireDefault(require("@arcblock/ux/lib/Button"));
 var _Empty = _interopRequireDefault(require("@arcblock/ux/lib/Empty"));
 var _Tag = _interopRequireDefault(require("@arcblock/ux/lib/Tag"));
-var _Address = _interopRequireDefault(require("@arcblock/did-connect/lib/Address"));
 var _EditIcon = _interopRequireDefault(require("@arcblock/icons/lib/EditIcon"));
 var _DeleteIcon = _interopRequireDefault(require("@arcblock/icons/lib/DeleteIcon"));
-var _Avatar = _interopRequireDefault(require("@arcblock/did-connect/lib/Avatar"));
 var _Toast = _interopRequireDefault(require("@arcblock/ux/lib/Toast"));
+var _didAddress = _interopRequireDefault(require("../../did-address"));
 var _permission = require("../../permission");
 var _node = require("../../contexts/node");
 var _team = require("../../contexts/team");
@@ -134,26 +133,12 @@ function TrustedFactories(_ref) {
             mt: "20px",
             children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
               flexGrow: 1,
-              children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Address.default, {
+              children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_didAddress.default, {
                 copyable: false,
-                prepend: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
-                  display: "flex",
-                  alignItems: "center",
-                  mr: 1,
-                  children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Avatar.default, {
-                    did: x.factoryAddress,
-                    size: 20
-                  })
-                }),
-                showDidLogo: false,
-                children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
-                  style: {
-                    fontSize: 16
-                  },
-                  children: x.factoryAddress
-                })
+                did: x.factoryAddress,
+                size: 16,
+                showDidLogo: false
               }), !!x.remark && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
-                pl: 3.5,
                 fontSize: 12,
                 maxWidth: "300px",
                 children: x.remark

package/lib/team/passports/trusted-issuers.js

@@ -15,11 +15,10 @@ var _IconButton = _interopRequireDefault(require("@mui/material/IconButton"));
 var _context = require("@arcblock/ux/lib/Locale/context");
 var _Button = _interopRequireDefault(require("@arcblock/ux/lib/Button"));
 var _Empty = _interopRequireDefault(require("@arcblock/ux/lib/Empty"));
-var _Address = _interopRequireDefault(require("@arcblock/did-connect/lib/Address"));
 var _EditIcon = _interopRequireDefault(require("@arcblock/icons/lib/EditIcon"));
 var _DeleteIcon = _interopRequireDefault(require("@arcblock/icons/lib/DeleteIcon"));
-var _Avatar = _interopRequireDefault(require("@arcblock/did-connect/lib/Avatar"));
 var _Toast = _interopRequireDefault(require("@arcblock/ux/lib/Toast"));
+var _didAddress = _interopRequireDefault(require("../../did-address"));
 var _permission = require("../../permission");
 var _node = require("../../contexts/node");
 var _team = require("../../contexts/team");
@@ -139,24 +138,11 @@ function TrustedIssuers(_ref) {
             mt: "20px",
             children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
               flexShrink: 0,
-              children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Address.default, {
+              children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_didAddress.default, {
                 copyable: false,
-                prepend: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
-                  display: "flex",
-                  alignItems: "center",
-                  mr: 1,
-                  children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Avatar.default, {
-                    did: x.issuerDid,
-                    size: 20
-                  })
-                }),
-                showDidLogo: false,
-                children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
-                  style: {
-                    fontSize: 16
-                  },
-                  children: x.issuerDid
-                })
+                size: 16,
+                did: x.issuerDid,
+                showDidLogo: false
               }), !!x.remark && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
                 pl: 3.5,
                 fontSize: 12,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/ux",
-  "version": "1.16.13",
+  "version": "1.16.14-beta-0c29907f",
   "description": "UX components shared across abtnode packages",
   "publishConfig": {
     "access": "public"
@@ -23,22 +23,23 @@
   "author": "linchen <linchen1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/auth": "1.16.13",
-    "@abtnode/constant": "1.16.13",
-    "@abtnode/util": "1.16.13",
+    "@abtnode/auth": "1.16.14-beta-0c29907f",
+    "@abtnode/constant": "1.16.14-beta-0c29907f",
+    "@abtnode/util": "1.16.14-beta-0c29907f",
     "@ahooksjs/use-url-state": "^3.5.1",
-    "@arcblock/did": "^1.18.84",
-    "@arcblock/did-connect": "^2.5.54",
-    "@arcblock/did-motif": "^1.1.12",
-    "@arcblock/icons": "^2.5.54",
-    "@arcblock/react-hooks": "^2.5.54",
-    "@arcblock/terminal": "^2.5.54",
-    "@arcblock/ux": "^2.5.54",
-    "@blocklet/constant": "1.16.13",
-    "@blocklet/launcher-layout": "2.1.26",
-    "@blocklet/list": "^0.12.4",
-    "@blocklet/meta": "1.16.13",
-    "@blocklet/ui-react": "^2.5.54",
+    "@arcblock/did": "^1.18.87",
+    "@arcblock/did-connect": "^2.5.60",
+    "@arcblock/did-motif": "^1.1.13",
+    "@arcblock/icons": "^2.5.60",
+    "@arcblock/nft-display": "2.5.60",
+    "@arcblock/react-hooks": "^2.5.60",
+    "@arcblock/terminal": "^2.5.60",
+    "@arcblock/ux": "^2.5.60",
+    "@blocklet/constant": "1.16.14-beta-0c29907f",
+    "@blocklet/launcher-layout": "2.1.46",
+    "@blocklet/list": "^0.12.8",
+    "@blocklet/meta": "1.16.14-beta-0c29907f",
+    "@blocklet/ui-react": "^2.5.60",
     "@emotion/react": "^11.10.4",
     "@emotion/styled": "^11.10.4",
     "@iconify/react": "^4.0.0",
@@ -48,11 +49,12 @@
     "@mui/material": "^5.10.8",
     "@mui/styles": "^5.10.8",
     "@mui/x-date-pickers": "^6.9.0",
-    "@ocap/client": "1.18.84",
+    "@ocap/client": "1.18.87",
     "@uiw/react-markdown-preview": "4.0.6",
     "ahooks": "^3.7.1",
     "axios": "^0.27.2",
     "classnames": "^2.3.2",
+    "copy-to-clipboard": "^3.3.3",
     "date-fns": "^2.30.0",
     "dsbridge": "3.1.4",
     "file-saver": "^2.0.5",
@@ -95,5 +97,5 @@
     "@babel/preset-react": "^7.18.6",
     "babel-plugin-inline-react-svg": "^1.1.2"
   },
-  "gitHead": "0f07f6617a8cf53a4fa693d6ca227f6f6bd90af2"
+  "gitHead": "1f02851a71861dbf09bfedfa9df6d9fc6d2355a3"
 }