@abtnode/ux 1.8.65-beta-81d3340c → 1.8.65-beta-f7af64a4

package/lib/blocklet/app-avatar.js

@@ -7,6 +7,7 @@ exports.default = BlockletAppAvatar;
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _Avatar = _interopRequireDefault(require("@mui/material/Avatar"));
 var _Avatar2 = _interopRequireDefault(require("@arcblock/did-connect/lib/Avatar"));
+var _constant = require("@blocklet/constant");
 var _useAppLogo = _interopRequireDefault(require("../hooks/use-app-logo"));
 var _jsxRuntime = require("react/jsx-runtime");
 const _excluded = ["blocklet", "style", "size"];
@@ -41,10 +42,14 @@ function BlockletAppAvatar(_ref) {
     }
   });
   if (!blocklet.meta.logo) {
-    imgEle = /*#__PURE__*/(0, _jsxRuntime.jsx)(_Avatar2.default, {
-      did: blocklet.meta.did || '',
-      responsive: true
-    });
+    var _find;
+    const exist = (_find = (blocklet.configs || []).find(x => x.key === _constant.BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_LOGO_SQUARE)) === null || _find === void 0 ? void 0 : _find.value;
+    if (!exist) {
+      imgEle = /*#__PURE__*/(0, _jsxRuntime.jsx)(_Avatar2.default, {
+        did: blocklet.meta.did || '',
+        responsive: true
+      });
+    }
   }
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Avatar.default, _objectSpread(_objectSpread({
     variant: variant || 'square',

package/lib/blocklet/configuration.js

@@ -80,9 +80,7 @@ function BlockletEnvironment(_ref) {
   const {
     site
   } = blocklet;
-  const {
-    domainAliases
-  } = site;
+  const domains = (0, _util2.sortDomains)(site === null || site === void 0 ? void 0 : site.domainAliases);
   const clusterMode = (0, _get.default)(blocklet.meta, 'capabilities.clusterMode', false);
   useSubscription(_constant.EVENTS.NODE_RUNTIME_INFO, res => {
     if (clusterMode) {
@@ -398,7 +396,7 @@ function BlockletEnvironment(_ref) {
             }
           })
         })]
-      }), domainAliases.map((domain, index) => /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
+      }), domains.map((domain, index) => /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
         display: "flex",
         alignItems: "center",
         justifyContent: "space-between",
@@ -460,7 +458,7 @@ function BlockletEnvironment(_ref) {
             })
           })
         })]
-      }, domain.value)), !domainAliases.length && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
+      }, domain.value)), !domains.length && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
         mt: 4,
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Empty.default, {
           children: t('common.empty')

package/lib/blocklet/overview.js

@@ -99,7 +99,7 @@ const getEngineRows = (engine, t) => {
   }];
 };
 function BlockletOverview() {
-  var _blocklet$settings;
+  var _blocklet$settings, _blocklet$site;
   const {
     t,
     locale
@@ -207,12 +207,7 @@ function BlockletOverview() {
       children: row.value
     }, row.name);
   });
-  const {
-    site
-  } = blocklet;
-  const {
-    domainAliases = []
-  } = site || {};
+  const domains = (0, _util2.sortDomains)((_blocklet$site = blocklet.site) === null || _blocklet$site === void 0 ? void 0 : _blocklet$site.domainAliases);
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(Div, {
     component: "div",
     children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
@@ -231,7 +226,7 @@ function BlockletOverview() {
         severity: "warning",
         children: t('blocklet.router.noRunning')
       })
-    }), domainAliases.map((domain, index) => /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
+    }), domains.map((domain, index) => /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
       display: "flex",
       alignItems: "center",
       justifyContent: "space-between",
@@ -260,7 +255,7 @@ function BlockletOverview() {
           }
         })]
       })
-    }, domain.value)), !domainAliases.length && (loadingRuntimeInfo ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_Spinner.default, {
+    }, domain.value)), !domains.length && (loadingRuntimeInfo ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_Spinner.default, {
       size: 16
     }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_Empty.default, {
       children: t('common.empty')

package/lib/locales/en.js

@@ -892,6 +892,7 @@ module.exports = {
       passport: 'Passport',
       passports: 'Passports',
       lastLogin: 'Last Login',
+      lastLoginIp: 'Last Login IP',
       filter: 'Filter by',
       forbidLogin: 'Forbid Login',
       forbidLoginDescription: 'The user will not be able to connect to this application',

package/lib/locales/zh.js

@@ -895,6 +895,7 @@ module.exports = {
       passport: '通行证',
       passports: '通行证',
       lastLogin: '上次登录',
+      lastLoginIp: '上次登陆 IP',
       filter: '条件筛选',
       forbidLogin: '禁止登录',
       forbidLoginDescription: '该成员将无法登录此应用',

package/lib/team/members/index.js

@@ -259,6 +259,14 @@ function MemberList(_ref2) {
         });
       }
     }
+  }, {
+    label: t('team.member.lastLoginIp'),
+    name: 'lastLoginIp',
+    options: {
+      customBodyRender: e => {
+        return e || '-';
+      }
+    }
   }, {
     label: t('common.actions'),
     name: '',

package/lib/team/members/member.js

@@ -122,7 +122,10 @@ function Member(_ref) {
       value: user.approved ? t('common.yes') : t('common.no')
     }, {
       name: t('team.member.lastLogin'),
-      value: (0, _util.formatToDatetime)(user.updatedAt)
+      value: (0, _util.formatToDatetime)(user.lastLoginAt)
+    }, {
+      name: t('team.member.lastLoginIp'),
+      value: user.lastLoginIp || ''
     }, {
       name: t('common.createdAt'),
       value: (0, _util.formatToDatetime)(user.createdAt)

package/lib/util/index.js

@@ -40,7 +40,7 @@ exports.parseQuery = void 0;
 exports.patchJsxToLocale = patchJsxToLocale;
 exports.shouldCheckDomainStatus = void 0;
 exports.sleep = sleep;
-exports.validateDomain = exports.toSlotDomain = exports.stringSortHandlerAsc = void 0;
+exports.validateDomain = exports.toSlotDomain = exports.stringSortHandlerAsc = exports.sortDomains = void 0;
 var _constant = require("@abtnode/constant");
 var _dayjs = _interopRequireDefault(require("dayjs"));
 require("moment/locale/zh-cn");
@@ -692,4 +692,25 @@ const getStoreList = _ref5 => {
     storeList
   };
 };
-exports.getStoreList = getStoreList;
+exports.getStoreList = getStoreList;
+const isDidDomainOrIpEchoDomain = domain => {
+  if (!domain) {
+    return false;
+  }
+  return domain.endsWith(_constant.DEFAULT_DID_DOMAIN) || domain.endsWith(_constant.DEFAULT_IP_DOMAIN_SUFFIX);
+};
+const sortDomains = domains => {
+  return (domains || []).sort((x, y) => {
+    if (isDidDomainOrIpEchoDomain(x.value) && isDidDomainOrIpEchoDomain(y.value)) {
+      return 0;
+    }
+    if (isDidDomainOrIpEchoDomain(x.value)) {
+      return 1;
+    }
+    if (isDidDomainOrIpEchoDomain(y.value)) {
+      return -1;
+    }
+    return 1;
+  });
+};
+exports.sortDomains = sortDomains;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.8.65-beta-81d3340c",
+  "version": "1.8.65-beta-f7af64a4",
   "description": "UX components shared across abtnode packages",
   "main": "lib/index.js",
   "files": [
@@ -21,18 +21,18 @@
   "author": "linchen <linchen1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/auth": "1.8.65-beta-81d3340c",
-    "@abtnode/constant": "1.8.65-beta-81d3340c",
-    "@abtnode/util": "1.8.65-beta-81d3340c",
+    "@abtnode/auth": "1.8.65-beta-f7af64a4",
+    "@abtnode/constant": "1.8.65-beta-f7af64a4",
+    "@abtnode/util": "1.8.65-beta-f7af64a4",
     "@arcblock/did-connect": "^2.4.66",
     "@arcblock/did-motif": "^1.1.10",
     "@arcblock/icons": "^2.4.66",
     "@arcblock/terminal": "^2.4.66",
     "@arcblock/ux": "^2.4.66",
-    "@blocklet/constant": "1.8.65-beta-81d3340c",
+    "@blocklet/constant": "1.8.65-beta-f7af64a4",
     "@blocklet/launcher-layout": "^1.9.50",
     "@blocklet/list": "^0.10.47",
-    "@blocklet/meta": "1.8.65-beta-81d3340c",
+    "@blocklet/meta": "1.8.65-beta-f7af64a4",
     "@blocklet/ui-react": "^2.4.66",
     "@emotion/react": "^11.10.4",
     "@emotion/styled": "^11.10.4",
@@ -86,5 +86,5 @@
     "@babel/preset-react": "^7.18.6",
     "babel-plugin-inline-react-svg": "^1.1.2"
   },
-  "gitHead": "5a904b9192febd1d09a759d929ca4de639a50cd1"
+  "gitHead": "97607d6e12bf8508ac29ab6546110c4ae3b31a82"
 }