@abtnode/ux 1.16.19-beta-ba354e01 → 1.16.19-beta-beb58af7

package/es/blocklet/component/add-component-core.js

@@ -322,6 +322,7 @@ export default function AddComponentCore({
     component.current = {};
     onClose();
   };
+  const alreadyInstalled = did => (blocklet?.children || []).some(x => x.meta.did === did);
   const onInstall = async payload => {
     const {
       pathPrefix: mountPoint,
@@ -522,7 +523,7 @@ export default function AddComponentCore({
     } = meta;
 
     // deleted history list
-    const list = (blocklet.settings?.children || []).filter(x => x.status === 'deleted' && x.meta.bundleDid === bundleDid);
+    const deletedList = (blocklet.settings?.children || []).filter(x => x.status === 'deleted' && x.meta.bundleDid === bundleDid);
     const componentDid = componentDidValue || '';
     const newConfigs = meta.environments?.map(item => {
       const {
@@ -613,21 +614,29 @@ export default function AddComponentCore({
     const hasRootPath = blocklet.children.some(x => x.mountPoint === '/');
 
     // use deleted history
-    const config = list.find(x => x.meta.bundleDid === bundleDid);
-    if (config) {
+    const deletedConfig = deletedList.find(x => x.meta.bundleDid === bundleDid);
+    const installedConfig = blocklet.children.find(x => x.meta.bundleDid === bundleDid);
+    doc.title = title || '';
+    if (deletedConfig) {
       doc = {
         ...doc,
-        pathPrefix: config.mountPoint || '',
-        title: title || '',
-        componentName: config.meta.name,
+        pathPrefix: deletedConfig.mountPoint || '',
+        componentName: deletedConfig.meta.name,
         // use history's environments
         hasEnvironmentsStep: false
       };
+    } else if (installedConfig) {
+      doc = {
+        ...doc,
+        pathPrefix: installedConfig.mountPoint || '',
+        componentName: installedConfig.meta.name,
+        // use current's environments
+        hasEnvironmentsStep: false
+      };
     } else {
       doc = {
         ...doc,
         pathPrefix: hasRootPath ? `/${urlPathFriendly(title) || urlPathFriendly(name)}` : '/',
-        title: title || '',
         componentName: '',
         hasEnvironmentsStep: component.current.meta?.environments?.length > 0
       };
@@ -852,7 +861,7 @@ export default function AddComponentCore({
     onCancel: () => {
       onCancel();
     }
-  }, hasStartEngine(meta) && {
+  }, hasStartEngine(meta) && !alreadyInstalled(meta.did) && {
     key: 'config',
     name: t('common.config'),
     error,
@@ -900,7 +909,7 @@ export default function AddComponentCore({
     onConfirm: () => {
       onNext();
     }
-  }, meta && params?.hasEnvironmentsStep && {
+  }, meta && !alreadyInstalled(meta.did) && params?.hasEnvironmentsStep && {
     key: 'environment',
     name: /*#__PURE__*/_jsxs(_Fragment, {
       children: [t('common.environment'), " ", params.hasRequiredEnvironments && /*#__PURE__*/_jsx(Required, {})]
@@ -945,7 +954,7 @@ export default function AddComponentCore({
     confirm: t('common.next'),
     onCancel,
     onConfirm: onNext
-  }, meta && params?.didSpaceCapability && {
+  }, meta && !alreadyInstalled(meta.did) && params?.didSpaceCapability && {
     key: 'didSpace',
     name: /*#__PURE__*/_jsxs(_Fragment, {
       children: [t('blocklet.component.didSpaceConfig'), " ", params.didSpaceCapability === 'required' && /*#__PURE__*/_jsx(Required, {})]
@@ -985,7 +994,7 @@ export default function AddComponentCore({
     onConfirm: onNext
   }, {
     key: 'install',
-    name: t('common.install'),
+    name: alreadyInstalled(meta?.did) ? t('common.upgrade') : t('common.install'),
     disabled: false,
     loading: false,
     body: /*#__PURE__*/_jsx(TypographyWrapper, {

package/es/blocklet/component/domain-list.js

@@ -58,11 +58,18 @@ export default function DomainListWithPermission(props) {
     loadingRuntimeInfo: loadingRuntimeInfo
   });
 }
+DomainListWithPermission.propTypes = {
+  listOnly: PropTypes.bool
+};
+DomainListWithPermission.defaultProps = {
+  listOnly: false
+};
 function DomainList({
   hasPermission,
   blocklet,
   loadingRuntimeInfo,
-  inService
+  inService,
+  listOnly
 }) {
   const {
     t
@@ -94,46 +101,48 @@ function DomainList({
     }
   });
   return /*#__PURE__*/_jsxs(_Fragment, {
-    children: [/*#__PURE__*/_jsxs(Box, {
-      className: "title first",
-      display: "flex",
-      justifyContent: "space-between",
-      alignItems: "center",
-      children: [/*#__PURE__*/_jsx(Box, {
-        children: t('common.domain')
-      }), hasMutatePermission && /*#__PURE__*/_jsx(AddDomainAlias, {
-        id: site.id,
-        title: t('router.domain.add.title'),
-        teamDid: blocklet.meta?.did,
-        appId: blocklet.appPid,
-        appPk: appPk,
-        systemDomains: systemDomains?.map(x => x.value),
-        children: ({
-          open
-        }) => /*#__PURE__*/_jsxs(Button, {
-          style: {
-            marginLeft: 16
-          },
-          variant: "contained",
-          color: "primary",
-          "data-cy": "add-domain-alias",
-          onClick: open,
-          disabled: isInProgress(blocklet.status),
-          children: [/*#__PURE__*/_jsx(AddIcon, {
+    children: [!listOnly && /*#__PURE__*/_jsxs(_Fragment, {
+      children: [/*#__PURE__*/_jsxs(Box, {
+        className: "title first",
+        display: "flex",
+        justifyContent: "space-between",
+        alignItems: "center",
+        children: [/*#__PURE__*/_jsx(Box, {
+          children: t('common.domain')
+        }), hasMutatePermission && /*#__PURE__*/_jsx(AddDomainAlias, {
+          id: site.id,
+          title: t('router.domain.add.title'),
+          teamDid: blocklet.meta?.did,
+          appId: blocklet.appPid,
+          appPk: appPk,
+          systemDomains: systemDomains?.map(x => x.value),
+          children: ({
+            open
+          }) => /*#__PURE__*/_jsxs(Button, {
             style: {
-              fontSize: '1.3em',
-              marginRight: 4
-            }
-          }), t('common.add')]
+              marginLeft: 16
+            },
+            variant: "contained",
+            color: "primary",
+            "data-cy": "add-domain-alias",
+            onClick: open,
+            disabled: isInProgress(blocklet.status),
+            children: [/*#__PURE__*/_jsx(AddIcon, {
+              style: {
+                fontSize: '1.3em',
+                marginRight: 4
+              }
+            }), t('common.add')]
+          })
+        })]
+      }), isAccessible(blocklet.status) === false && /*#__PURE__*/_jsx(Box, {
+        mt: 1.5,
+        mb: 1.5,
+        children: /*#__PURE__*/_jsx(Alert, {
+          severity: "warning",
+          children: t('blocklet.router.noRunning')
         })
       })]
-    }), isAccessible(blocklet.status) === false && /*#__PURE__*/_jsx(Box, {
-      mt: 1.5,
-      mb: 1.5,
-      children: /*#__PURE__*/_jsx(Alert, {
-        severity: "warning",
-        children: t('blocklet.router.noRunning')
-      })
     }), /*#__PURE__*/_jsx(Box, {
       sx: {
         display: 'flex',
@@ -248,11 +257,13 @@ DomainList.propTypes = {
   hasPermission: PropTypes.bool,
   blocklet: PropTypes.object.isRequired,
   loadingRuntimeInfo: PropTypes.bool,
-  inService: PropTypes.bool.isRequired
+  inService: PropTypes.bool.isRequired,
+  listOnly: PropTypes.bool
 };
 DomainList.defaultProps = {
   hasPermission: false,
-  loadingRuntimeInfo: false
+  loadingRuntimeInfo: false,
+  listOnly: false
 };
 function DomainLink({
   domain,

package/es/blocklet/component/environment.js

@@ -80,14 +80,16 @@ export default function ComponentEnvironment({
       return;
     }
     data.custom = true;
-    const result = await node.api.configBlocklet({
-      input: {
-        did: dids,
-        configs: [data]
-      }
-    });
-    if (result.code === 'ok') {
+    try {
+      const result = await node.api.configBlocklet({
+        input: {
+          did: dids,
+          configs: [data]
+        }
+      });
       onConfigChanged(result.blocklet);
+    } catch (err) {
+      Toast.error(formatError(err));
     }
   };
   const onEditConfig = async (newData, oldData) => {
@@ -125,9 +127,7 @@ export default function ComponentEnvironment({
           configs
         }
       });
-      if (result.code === 'ok') {
-        onConfigChanged(result.blocklet);
-      }
+      onConfigChanged(result.blocklet);
     } catch (err) {
       Toast.error(formatError(err));
     }
@@ -141,17 +141,19 @@ export default function ComponentEnvironment({
       Toast.error('Only key of custom env can be changed');
       return;
     }
-    const result = await node.api.configBlocklet({
-      input: {
-        did: dids,
-        configs: [{
-          key: data.key,
-          custom: true
-        }]
-      }
-    });
-    if (result.code === 'ok') {
+    try {
+      const result = await node.api.configBlocklet({
+        input: {
+          did: dids,
+          configs: [{
+            key: data.key,
+            custom: true
+          }]
+        }
+      });
       onConfigChanged(result.blocklet);
+    } catch (err) {
+      Toast.error(formatError(err));
     }
   };
 

package/es/blocklet/router/add-domain.js

@@ -1,14 +1,12 @@
 import Connect from '@arcblock/did-connect/lib/Connect';
+import Button from '@arcblock/ux/lib/Button';
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
-import DiamondIcon from '@mui/icons-material/Diamond';
-import EditIcon from '@mui/icons-material/Edit';
 import OpenInNewIcon from '@mui/icons-material/OpenInNew';
 import Box from '@mui/material/Box';
-import Button from '@arcblock/ux/lib/Button';
 import Link from '@mui/material/Link';
 import TextField from '@mui/material/TextField';
-import useTheme from '@mui/material/styles/useTheme';
 import noop from 'lodash/noop';
+import trim from 'lodash/trim';
 import PropTypes from 'prop-types';
 import useSetState from 'react-use/lib/useSetState';
 import joinURL from 'url-join';
@@ -19,6 +17,7 @@ import { axios } from '../../util/api';
 import DNSTip from './dns-tip';
 import { parseDomainFromURL } from './util';
 import { jsx as _jsx } from "react/jsx-runtime";
+import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 export default function AddDomain({
   siteId,
@@ -29,9 +28,10 @@ export default function AddDomain({
   appId,
   appPk,
   onSuccess,
+  disabled,
+  autoFocus,
   ...props
 }) {
-  const theme = useTheme();
   const {
     t,
     locale
@@ -84,23 +84,18 @@ export default function AddDomain({
   const domainTypes = {
     inputDomain: {
       name: t('router.domainAlias.inputDomain'),
-      icon: /*#__PURE__*/_jsx(EditIcon, {}),
-      component: /*#__PURE__*/_jsxs(Box, {
+      component: /*#__PURE__*/_jsxs(_Fragment, {
         children: [/*#__PURE__*/_jsx(TextField, {
-          style: {
-            marginTop: '8px'
-          },
           label: t('router.domainAlias.add.domainDescription'),
           helperText: state.error || t('router.domainAlias.add.helperText'),
           inputProps: {
             'data-cy': 'domain-name-input'
           },
           fullWidth: true,
+          disabled: disabled,
           value: state.domain,
           onChange: e => {
-            const {
-              value
-            } = e.target;
+            const value = trim(e.target?.value);
             setState({
               domain: value
             });
@@ -114,7 +109,14 @@ export default function AddDomain({
               error: errMessage
             });
           },
-          autoFocus: true,
+          autoFocus: autoFocus,
+          onBlur: () => {
+            if (!state.domain) {
+              setState({
+                error: null
+              });
+            }
+          },
           size: "small",
           variant: "outlined",
           error: !!state.error
@@ -131,11 +133,7 @@ export default function AddDomain({
   if (info?.nftDomainUrl) {
     domainTypes.nftDomain = {
       name: t('router.domainAlias.nftDomain'),
-      icon: /*#__PURE__*/_jsx(DiamondIcon, {}),
-      component: /*#__PURE__*/_jsxs(Box, {
-        sx: {
-          marginTop: '12px'
-        },
+      component: /*#__PURE__*/_jsxs(_Fragment, {
         children: [/*#__PURE__*/_jsxs(Box, {
           sx: {
             maxWidth: '640px',
@@ -164,6 +162,7 @@ export default function AddDomain({
           sx: {
             marginTop: '8px'
           },
+          disabled: disabled,
           onClick: () => setState({
             showNFTDomainAuth: true
           }),
@@ -206,37 +205,26 @@ export default function AddDomain({
     }
     return -1;
   });
-  return /*#__PURE__*/_jsxs(Box, {
+  return /*#__PURE__*/_jsx(Box, {
     ...props,
-    children: [/*#__PURE__*/_jsx(Box, {
+    children: /*#__PURE__*/_jsx(Box, {
       sx: {
         display: 'flex',
+        flexDirection: 'column',
         justifyContent: 'flex-start',
-        gap: '16px'
+        gap: '1em'
       },
-      children: inputDomainTypes.map(type => /*#__PURE__*/_jsxs(Box, {
-        sx: {
-          width: '128px',
-          height: '64px',
-          padding: '8px',
-          cursor: 'pointer',
-          borderRadius: '8px',
-          display: 'flex',
-          flexDirection: 'column',
-          justifyContent: 'center',
-          alignItems: 'flex-start',
-          color: type === state.type ? theme.palette.primary.main : theme.palette.common.main,
-          border: `1px solid ${type === state.type ? theme.palette.primary.main : '#E0E0E0'}`
-        },
-        onClick: () => setState({
-          type
-        }),
-        children: [domainTypes[type].icon, domainTypes[type].name]
+      children: inputDomainTypes.map((type, index) => /*#__PURE__*/_jsxs(Box, {
+        children: [/*#__PURE__*/_jsx(Box, {
+          children: `${t(`optionsOrder.${index + 1}`)}: ${domainTypes[type]?.name}`
+        }), /*#__PURE__*/_jsx(Box, {
+          sx: {
+            marginTop: '8px'
+          },
+          children: domainTypes[type]?.component
+        })]
       }, type))
-    }), /*#__PURE__*/_jsx(Box, {
-      marginTop: "12px",
-      children: domainTypes[state.type]?.component
-    })]
+    })
   });
 }
 AddDomain.propTypes = {
@@ -247,12 +235,16 @@ AddDomain.propTypes = {
   onInputDomain: PropTypes.func,
   onSuccess: PropTypes.func,
   appId: PropTypes.string,
-  appPk: PropTypes.string
+  appPk: PropTypes.string,
+  disabled: PropTypes.bool,
+  autoFocus: PropTypes.bool
 };
 AddDomain.defaultProps = {
   defaultCustomDomain: '',
   onInputDomain: noop,
   onSuccess: noop,
   appId: '',
-  appPk: ''
+  appPk: '',
+  disabled: false,
+  autoFocus: true
 };

package/es/locales/en.js

@@ -922,8 +922,8 @@ module.exports = {
         recordValue: 'Record Value'
       },
       verify: {
-        ok: 'This site is resolved',
-        notResolved: 'This site neither resolved nor accessible, please check your DNS configuration'
+        ok: 'The domain resolution is normal',
+        notResolved: 'This domain neither resolved nor accessible, please check your DNS configuration'
       },
       https: {
         ok: 'This domain has https enabled',
@@ -936,8 +936,8 @@ module.exports = {
       }
     },
     domainAlias: {
-      inputDomain: 'Input Domain',
-      nftDomain: 'NFT Domain',
+      inputDomain: 'Manually config domain',
+      nftDomain: 'Automatic config with DID Domain',
       add: {
         title: 'Add Additional Domain',
         domainDescription: 'Please provide a valid domain name',
@@ -1665,5 +1665,9 @@ module.exports = {
     },
     disbandFederatedLogin: 'Disband federated login',
     disbandFederatedLoginDescription: 'After disband federated login, all member site will quit federated login automatically'
+  },
+  optionsOrder: {
+    1: 'Option One',
+    2: 'Option Two'
   }
 };

package/es/locales/zh.js

@@ -925,8 +925,8 @@ module.exports = {
         recordValue: '记录值'
       },
       verify: {
-        ok: '该站点解析正常',
-        notResolved: '改站点解析异常，请检查你域名服务商的 DNS 配置'
+        ok: '该域名解析正常',
+        notResolved: '该域名解析异常，请检查你域名服务商的 DNS 配置'
       },
       https: {
         ok: '该域名已启用 HTTPS',
@@ -939,8 +939,8 @@ module.exports = {
       }
     },
     domainAlias: {
-      inputDomain: '输入域名',
-      nftDomain: 'NFT 域名',
+      inputDomain: '手动配置域名',
+      nftDomain: '通过 DID Domain 自动配置域名',
       add: {
         title: '添加额外域名',
         domainDescription: '请填写有效的域名',
@@ -1669,5 +1669,9 @@ module.exports = {
     },
     disbandFederatedLogin: '解散统一登录',
     disbandFederatedLoginDescription: '解散统一登录后，将自动让所有成员站点自动退出统一登录站点群'
+  },
+  optionsOrder: {
+    1: '选择一',
+    2: '选择二'
   }
 };

package/es/schema-form/index.js

@@ -16,6 +16,14 @@ import Uploader from '../blocklet/logo-uploader';
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
+const componentMap = {
+  input: TextInput,
+  color: ColorInput,
+  passport: PassportInput,
+  uploader: props => /*#__PURE__*/_jsx(Uploader, {
+    ...props.componentProps
+  })
+};
 function getComponent(item, {
   editing = false
 }) {
@@ -24,6 +32,7 @@ function getComponent(item, {
     render,
     renderFormItem
   } = item;
+
   // if provided renderItem and editing is true, use it
   if (editing && renderFormItem) {
     return renderFormItem;
@@ -33,14 +42,6 @@ function getComponent(item, {
   if (!editing && render) {
     return render;
   }
-  const componentMap = {
-    input: TextInput,
-    color: ColorInput,
-    passport: PassportInput,
-    uploader: props => /*#__PURE__*/_jsx(Uploader, {
-      ...props.componentProps
-    })
-  };
   return componentMap[componentType?.toLowerCase()];
 }
 export default function SchemaForm({

package/lib/blocklet/component/add-component-core.js

@@ -341,6 +341,7 @@ function AddComponentCore(_ref3) {
     component.current = {};
     onClose();
   };
+  const alreadyInstalled = did => ((blocklet === null || blocklet === void 0 ? void 0 : blocklet.children) || []).some(x => x.meta.did === did);
   const onInstall = async payload => {
     var _component$current2, _component$current3;
     const {
@@ -538,7 +539,7 @@ function AddComponentCore(_ref3) {
     } = meta;
 
     // deleted history list
-    const list = (((_blocklet$settings = blocklet.settings) === null || _blocklet$settings === void 0 ? void 0 : _blocklet$settings.children) || []).filter(x => x.status === 'deleted' && x.meta.bundleDid === bundleDid);
+    const deletedList = (((_blocklet$settings = blocklet.settings) === null || _blocklet$settings === void 0 ? void 0 : _blocklet$settings.children) || []).filter(x => x.status === 'deleted' && x.meta.bundleDid === bundleDid);
     const componentDid = componentDidValue || '';
     const newConfigs = (_meta$environments = meta.environments) === null || _meta$environments === void 0 ? void 0 : _meta$environments.map(item => {
       const {
@@ -623,20 +624,27 @@ function AddComponentCore(_ref3) {
     const hasRootPath = blocklet.children.some(x => x.mountPoint === '/');
 
     // use deleted history
-    const config = list.find(x => x.meta.bundleDid === bundleDid);
-    if (config) {
+    const deletedConfig = deletedList.find(x => x.meta.bundleDid === bundleDid);
+    const installedConfig = blocklet.children.find(x => x.meta.bundleDid === bundleDid);
+    doc.title = title || '';
+    if (deletedConfig) {
       doc = _objectSpread(_objectSpread({}, doc), {}, {
-        pathPrefix: config.mountPoint || '',
-        title: title || '',
-        componentName: config.meta.name,
+        pathPrefix: deletedConfig.mountPoint || '',
+        componentName: deletedConfig.meta.name,
         // use history's environments
         hasEnvironmentsStep: false
       });
+    } else if (installedConfig) {
+      doc = _objectSpread(_objectSpread({}, doc), {}, {
+        pathPrefix: installedConfig.mountPoint || '',
+        componentName: installedConfig.meta.name,
+        // use current's environments
+        hasEnvironmentsStep: false
+      });
     } else {
       var _component$current$me, _component$current$me2;
       doc = _objectSpread(_objectSpread({}, doc), {}, {
         pathPrefix: hasRootPath ? "/".concat((0, _urlPathFriendly.default)(title) || (0, _urlPathFriendly.default)(name)) : '/',
-        title: title || '',
         componentName: '',
         hasEnvironmentsStep: ((_component$current$me = component.current.meta) === null || _component$current$me === void 0 ? void 0 : (_component$current$me2 = _component$current$me.environments) === null || _component$current$me2 === void 0 ? void 0 : _component$current$me2.length) > 0
       });
@@ -861,7 +869,7 @@ function AddComponentCore(_ref3) {
     onCancel: () => {
       _onCancel();
     }
-  }, (0, _util.hasStartEngine)(meta) && {
+  }, (0, _util.hasStartEngine)(meta) && !alreadyInstalled(meta.did) && {
     key: 'config',
     name: t('common.config'),
     error,
@@ -909,7 +917,7 @@ function AddComponentCore(_ref3) {
     onConfirm: () => {
       _onNext();
     }
-  }, meta && (params === null || params === void 0 ? void 0 : params.hasEnvironmentsStep) && {
+  }, meta && !alreadyInstalled(meta.did) && (params === null || params === void 0 ? void 0 : params.hasEnvironmentsStep) && {
     key: 'environment',
     name: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
       children: [t('common.environment'), " ", params.hasRequiredEnvironments && /*#__PURE__*/(0, _jsxRuntime.jsx)(_required.default, {})]
@@ -955,7 +963,7 @@ function AddComponentCore(_ref3) {
     confirm: t('common.next'),
     onCancel: _onCancel,
     onConfirm: _onNext
-  }, meta && (params === null || params === void 0 ? void 0 : params.didSpaceCapability) && {
+  }, meta && !alreadyInstalled(meta.did) && (params === null || params === void 0 ? void 0 : params.didSpaceCapability) && {
     key: 'didSpace',
     name: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
       children: [t('blocklet.component.didSpaceConfig'), " ", params.didSpaceCapability === 'required' && /*#__PURE__*/(0, _jsxRuntime.jsx)(_required.default, {})]
@@ -995,7 +1003,7 @@ function AddComponentCore(_ref3) {
     onConfirm: _onNext
   }, {
     key: 'install',
-    name: t('common.install'),
+    name: alreadyInstalled(meta === null || meta === void 0 ? void 0 : meta.did) ? t('common.upgrade') : t('common.install'),
     disabled: false,
     loading: false,
     body: /*#__PURE__*/(0, _jsxRuntime.jsx)(TypographyWrapper, {

package/lib/blocklet/component/domain-list.js

@@ -74,13 +74,20 @@ function DomainListWithPermission(props) {
     loadingRuntimeInfo: loadingRuntimeInfo
   }));
 }
+DomainListWithPermission.propTypes = {
+  listOnly: _propTypes.default.bool
+};
+DomainListWithPermission.defaultProps = {
+  listOnly: false
+};
 function DomainList(_ref) {
   var _blocklet$site2, _blocklet$environment, _blocklet$environment2, _blocklet$meta;
   let {
     hasPermission,
     blocklet,
     loadingRuntimeInfo,
-    inService
+    inService,
+    listOnly
   } = _ref;
   const {
     t
@@ -115,49 +122,51 @@ function DomainList(_ref) {
     }
   });
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
-    children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
-      className: "title first",
-      display: "flex",
-      justifyContent: "space-between",
-      alignItems: "center",
-      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
-        children: t('common.domain')
-      }), hasMutatePermission && /*#__PURE__*/(0, _jsxRuntime.jsx)(_addDomainAlias.default, {
-        id: site.id,
-        title: t('router.domain.add.title'),
-        teamDid: (_blocklet$meta = blocklet.meta) === null || _blocklet$meta === void 0 ? void 0 : _blocklet$meta.did,
-        appId: blocklet.appPid,
-        appPk: appPk,
-        systemDomains: systemDomains === null || systemDomains === void 0 ? void 0 : systemDomains.map(x => x.value),
-        children: _ref2 => {
-          let {
-            open
-          } = _ref2;
-          return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Button.default, {
-            style: {
-              marginLeft: 16
-            },
-            variant: "contained",
-            color: "primary",
-            "data-cy": "add-domain-alias",
-            onClick: open,
-            disabled: (0, _util.isInProgress)(blocklet.status),
-            children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Add.default, {
+    children: [!listOnly && /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
+      children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
+        className: "title first",
+        display: "flex",
+        justifyContent: "space-between",
+        alignItems: "center",
+        children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
+          children: t('common.domain')
+        }), hasMutatePermission && /*#__PURE__*/(0, _jsxRuntime.jsx)(_addDomainAlias.default, {
+          id: site.id,
+          title: t('router.domain.add.title'),
+          teamDid: (_blocklet$meta = blocklet.meta) === null || _blocklet$meta === void 0 ? void 0 : _blocklet$meta.did,
+          appId: blocklet.appPid,
+          appPk: appPk,
+          systemDomains: systemDomains === null || systemDomains === void 0 ? void 0 : systemDomains.map(x => x.value),
+          children: _ref2 => {
+            let {
+              open
+            } = _ref2;
+            return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Button.default, {
               style: {
-                fontSize: '1.3em',
-                marginRight: 4
-              }
-            }), t('common.add')]
-          });
-        }
+                marginLeft: 16
+              },
+              variant: "contained",
+              color: "primary",
+              "data-cy": "add-domain-alias",
+              onClick: open,
+              disabled: (0, _util.isInProgress)(blocklet.status),
+              children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Add.default, {
+                style: {
+                  fontSize: '1.3em',
+                  marginRight: 4
+                }
+              }), t('common.add')]
+            });
+          }
+        })]
+      }), (0, _util.isAccessible)(blocklet.status) === false && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
+        mt: 1.5,
+        mb: 1.5,
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Alert.default, {
+          severity: "warning",
+          children: t('blocklet.router.noRunning')
+        })
       })]
-    }), (0, _util.isAccessible)(blocklet.status) === false && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
-      mt: 1.5,
-      mb: 1.5,
-      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Alert.default, {
-        severity: "warning",
-        children: t('blocklet.router.noRunning')
-      })
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
       sx: {
         display: 'flex',
@@ -272,11 +281,13 @@ DomainList.propTypes = {
   hasPermission: _propTypes.default.bool,
   blocklet: _propTypes.default.object.isRequired,
   loadingRuntimeInfo: _propTypes.default.bool,
-  inService: _propTypes.default.bool.isRequired
+  inService: _propTypes.default.bool.isRequired,
+  listOnly: _propTypes.default.bool
 };
 DomainList.defaultProps = {
   hasPermission: false,
-  loadingRuntimeInfo: false
+  loadingRuntimeInfo: false,
+  listOnly: false
 };
 function DomainLink(_ref3) {
   let {

package/lib/blocklet/component/environment.js

@@ -93,14 +93,16 @@ function ComponentEnvironment(_ref) {
       return;
     }
     data.custom = true;
-    const result = await node.api.configBlocklet({
-      input: {
-        did: dids,
-        configs: [data]
-      }
-    });
-    if (result.code === 'ok') {
+    try {
+      const result = await node.api.configBlocklet({
+        input: {
+          did: dids,
+          configs: [data]
+        }
+      });
       onConfigChanged(result.blocklet);
+    } catch (err) {
+      _Toast.default.error((0, _util2.formatError)(err));
     }
   };
   const onEditConfig = async (newData, oldData) => {
@@ -138,9 +140,7 @@ function ComponentEnvironment(_ref) {
           configs
         }
       });
-      if (result.code === 'ok') {
-        onConfigChanged(result.blocklet);
-      }
+      onConfigChanged(result.blocklet);
     } catch (err) {
       _Toast.default.error((0, _util2.formatError)(err));
     }
@@ -154,17 +154,19 @@ function ComponentEnvironment(_ref) {
       _Toast.default.error('Only key of custom env can be changed');
       return;
     }
-    const result = await node.api.configBlocklet({
-      input: {
-        did: dids,
-        configs: [{
-          key: data.key,
-          custom: true
-        }]
-      }
-    });
-    if (result.code === 'ok') {
+    try {
+      const result = await node.api.configBlocklet({
+        input: {
+          did: dids,
+          configs: [{
+            key: data.key,
+            custom: true
+          }]
+        }
+      });
       onConfigChanged(result.blocklet);
+    } catch (err) {
+      _Toast.default.error((0, _util2.formatError)(err));
     }
   };
 

package/lib/blocklet/router/add-domain.js

@@ -5,16 +5,14 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = AddDomain;
 var _Connect = _interopRequireDefault(require("@arcblock/did-connect/lib/Connect"));
+var _Button = _interopRequireDefault(require("@arcblock/ux/lib/Button"));
 var _context = require("@arcblock/ux/lib/Locale/context");
-var _Diamond = _interopRequireDefault(require("@mui/icons-material/Diamond"));
-var _Edit = _interopRequireDefault(require("@mui/icons-material/Edit"));
 var _OpenInNew = _interopRequireDefault(require("@mui/icons-material/OpenInNew"));
 var _Box = _interopRequireDefault(require("@mui/material/Box"));
-var _Button = _interopRequireDefault(require("@arcblock/ux/lib/Button"));
 var _Link = _interopRequireDefault(require("@mui/material/Link"));
 var _TextField = _interopRequireDefault(require("@mui/material/TextField"));
-var _useTheme = _interopRequireDefault(require("@mui/material/styles/useTheme"));
 var _noop = _interopRequireDefault(require("lodash/noop"));
+var _trim = _interopRequireDefault(require("lodash/trim"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _useSetState = _interopRequireDefault(require("react-use/lib/useSetState"));
 var _urlJoin = _interopRequireDefault(require("url-join"));
@@ -25,7 +23,7 @@ var _api = require("../../util/api");
 var _dnsTip = _interopRequireDefault(require("./dns-tip"));
 var _util3 = require("./util");
 var _jsxRuntime = require("react/jsx-runtime");
-const _excluded = ["siteId", "teamDid", "cnameDomain", "defaultCustomDomain", "onInputDomain", "appId", "appPk", "onSuccess"];
+const _excluded = ["siteId", "teamDid", "cnameDomain", "defaultCustomDomain", "onInputDomain", "appId", "appPk", "onSuccess", "disabled", "autoFocus"];
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 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; }
@@ -35,7 +33,6 @@ function _toPrimitive(input, hint) { if (typeof input !== "object" || input ===
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 function AddDomain(_ref) {
-  var _domainTypes$state$ty;
   let {
       siteId,
       teamDid,
@@ -44,10 +41,11 @@ function AddDomain(_ref) {
       onInputDomain,
       appId,
       appPk,
-      onSuccess
+      onSuccess,
+      disabled,
+      autoFocus
     } = _ref,
     props = _objectWithoutProperties(_ref, _excluded);
-  const theme = (0, _useTheme.default)();
   const {
     t,
     locale
@@ -101,23 +99,19 @@ function AddDomain(_ref) {
   const domainTypes = {
     inputDomain: {
       name: t('router.domainAlias.inputDomain'),
-      icon: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Edit.default, {}),
-      component: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
+      component: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
         children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_TextField.default, {
-          style: {
-            marginTop: '8px'
-          },
           label: t('router.domainAlias.add.domainDescription'),
           helperText: state.error || t('router.domainAlias.add.helperText'),
           inputProps: {
             'data-cy': 'domain-name-input'
           },
           fullWidth: true,
+          disabled: disabled,
           value: state.domain,
           onChange: e => {
-            const {
-              value
-            } = e.target;
+            var _e$target;
+            const value = (0, _trim.default)((_e$target = e.target) === null || _e$target === void 0 ? void 0 : _e$target.value);
             setState({
               domain: value
             });
@@ -131,7 +125,14 @@ function AddDomain(_ref) {
               error: errMessage
             });
           },
-          autoFocus: true,
+          autoFocus: autoFocus,
+          onBlur: () => {
+            if (!state.domain) {
+              setState({
+                error: null
+              });
+            }
+          },
           size: "small",
           variant: "outlined",
           error: !!state.error
@@ -148,11 +149,7 @@ function AddDomain(_ref) {
   if (info !== null && info !== void 0 && info.nftDomainUrl) {
     domainTypes.nftDomain = {
       name: t('router.domainAlias.nftDomain'),
-      icon: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Diamond.default, {}),
-      component: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
-        sx: {
-          marginTop: '12px'
-        },
+      component: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
         children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
           sx: {
             maxWidth: '640px',
@@ -181,6 +178,7 @@ function AddDomain(_ref) {
           sx: {
             marginTop: '8px'
           },
+          disabled: disabled,
           onClick: () => setState({
             showNFTDomainAuth: true
           }),
@@ -223,36 +221,28 @@ function AddDomain(_ref) {
     }
     return -1;
   });
-  return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, _objectSpread(_objectSpread({}, props), {}, {
-    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, _objectSpread(_objectSpread({}, props), {}, {
+    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
       sx: {
         display: 'flex',
+        flexDirection: 'column',
         justifyContent: 'flex-start',
-        gap: '16px'
+        gap: '1em'
       },
-      children: inputDomainTypes.map(type => /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
-        sx: {
-          width: '128px',
-          height: '64px',
-          padding: '8px',
-          cursor: 'pointer',
-          borderRadius: '8px',
-          display: 'flex',
-          flexDirection: 'column',
-          justifyContent: 'center',
-          alignItems: 'flex-start',
-          color: type === state.type ? theme.palette.primary.main : theme.palette.common.main,
-          border: "1px solid ".concat(type === state.type ? theme.palette.primary.main : '#E0E0E0')
-        },
-        onClick: () => setState({
-          type
-        }),
-        children: [domainTypes[type].icon, domainTypes[type].name]
-      }, type))
-    }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
-      marginTop: "12px",
-      children: (_domainTypes$state$ty = domainTypes[state.type]) === null || _domainTypes$state$ty === void 0 ? void 0 : _domainTypes$state$ty.component
-    })]
+      children: inputDomainTypes.map((type, index) => {
+        var _domainTypes$type, _domainTypes$type2;
+        return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
+          children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
+            children: "".concat(t("optionsOrder.".concat(index + 1)), ": ").concat((_domainTypes$type = domainTypes[type]) === null || _domainTypes$type === void 0 ? void 0 : _domainTypes$type.name)
+          }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
+            sx: {
+              marginTop: '8px'
+            },
+            children: (_domainTypes$type2 = domainTypes[type]) === null || _domainTypes$type2 === void 0 ? void 0 : _domainTypes$type2.component
+          })]
+        }, type);
+      })
+    })
   }));
 }
 AddDomain.propTypes = {
@@ -263,12 +253,16 @@ AddDomain.propTypes = {
   onInputDomain: _propTypes.default.func,
   onSuccess: _propTypes.default.func,
   appId: _propTypes.default.string,
-  appPk: _propTypes.default.string
+  appPk: _propTypes.default.string,
+  disabled: _propTypes.default.bool,
+  autoFocus: _propTypes.default.bool
 };
 AddDomain.defaultProps = {
   defaultCustomDomain: '',
   onInputDomain: _noop.default,
   onSuccess: _noop.default,
   appId: '',
-  appPk: ''
+  appPk: '',
+  disabled: false,
+  autoFocus: true
 };

package/lib/locales/en.js

@@ -924,8 +924,8 @@ module.exports = {
         recordValue: 'Record Value'
       },
       verify: {
-        ok: 'This site is resolved',
-        notResolved: 'This site neither resolved nor accessible, please check your DNS configuration'
+        ok: 'The domain resolution is normal',
+        notResolved: 'This domain neither resolved nor accessible, please check your DNS configuration'
       },
       https: {
         ok: 'This domain has https enabled',
@@ -938,8 +938,8 @@ module.exports = {
       }
     },
     domainAlias: {
-      inputDomain: 'Input Domain',
-      nftDomain: 'NFT Domain',
+      inputDomain: 'Manually config domain',
+      nftDomain: 'Automatic config with DID Domain',
       add: {
         title: 'Add Additional Domain',
         domainDescription: 'Please provide a valid domain name',
@@ -1667,5 +1667,9 @@ module.exports = {
     },
     disbandFederatedLogin: 'Disband federated login',
     disbandFederatedLoginDescription: 'After disband federated login, all member site will quit federated login automatically'
+  },
+  optionsOrder: {
+    1: 'Option One',
+    2: 'Option Two'
   }
 };

package/lib/locales/zh.js

@@ -927,8 +927,8 @@ module.exports = {
         recordValue: '记录值'
       },
       verify: {
-        ok: '该站点解析正常',
-        notResolved: '改站点解析异常，请检查你域名服务商的 DNS 配置'
+        ok: '该域名解析正常',
+        notResolved: '该域名解析异常，请检查你域名服务商的 DNS 配置'
       },
       https: {
         ok: '该域名已启用 HTTPS',
@@ -941,8 +941,8 @@ module.exports = {
       }
     },
     domainAlias: {
-      inputDomain: '输入域名',
-      nftDomain: 'NFT 域名',
+      inputDomain: '手动配置域名',
+      nftDomain: '通过 DID Domain 自动配置域名',
       add: {
         title: '添加额外域名',
         domainDescription: '请填写有效的域名',
@@ -1671,5 +1671,9 @@ module.exports = {
     },
     disbandFederatedLogin: '解散统一登录',
     disbandFederatedLoginDescription: '解散统一登录后，将自动让所有成员站点自动退出统一登录站点群'
+  },
+  optionsOrder: {
+    1: '选择一',
+    2: '选择二'
   }
 };

package/lib/schema-form/index.js

@@ -28,6 +28,12 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+const componentMap = {
+  input: _textInput.default,
+  color: _colorInput.default,
+  passport: _passportInput.default,
+  uploader: props => /*#__PURE__*/(0, _jsxRuntime.jsx)(_logoUploader.default, _objectSpread({}, props.componentProps))
+};
 function getComponent(item, _ref) {
   let {
     editing = false
@@ -37,6 +43,7 @@ function getComponent(item, _ref) {
     render,
     renderFormItem
   } = item;
+
   // if provided renderItem and editing is true, use it
   if (editing && renderFormItem) {
     return renderFormItem;
@@ -46,12 +53,6 @@ function getComponent(item, _ref) {
   if (!editing && render) {
     return render;
   }
-  const componentMap = {
-    input: _textInput.default,
-    color: _colorInput.default,
-    passport: _passportInput.default,
-    uploader: props => /*#__PURE__*/(0, _jsxRuntime.jsx)(_logoUploader.default, _objectSpread({}, props.componentProps))
-  };
   return componentMap[componentType === null || componentType === void 0 ? void 0 : componentType.toLowerCase()];
 }
 function SchemaForm(_ref2) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/ux",
-  "version": "1.16.19-beta-ba354e01",
+  "version": "1.16.19-beta-beb58af7",
   "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.19-beta-ba354e01",
-    "@abtnode/constant": "1.16.19-beta-ba354e01",
-    "@abtnode/util": "1.16.19-beta-ba354e01",
+    "@abtnode/auth": "1.16.19-beta-beb58af7",
+    "@abtnode/constant": "1.16.19-beta-beb58af7",
+    "@abtnode/util": "1.16.19-beta-beb58af7",
     "@ahooksjs/use-url-state": "^3.5.1",
-    "@arcblock/did": "^1.18.95",
-    "@arcblock/did-connect": "^2.8.16",
+    "@arcblock/did": "^1.18.101",
+    "@arcblock/did-connect": "^2.8.17",
     "@arcblock/did-motif": "^1.1.13",
-    "@arcblock/icons": "^2.8.16",
-    "@arcblock/nft-display": "2.8.16",
-    "@arcblock/react-hooks": "^2.8.16",
-    "@arcblock/terminal": "^2.8.16",
-    "@arcblock/ux": "^2.8.16",
-    "@blocklet/constant": "1.16.19-beta-ba354e01",
-    "@blocklet/launcher-layout": "2.2.40",
+    "@arcblock/icons": "^2.8.17",
+    "@arcblock/nft-display": "2.8.17",
+    "@arcblock/react-hooks": "^2.8.17",
+    "@arcblock/terminal": "^2.8.17",
+    "@arcblock/ux": "^2.8.17",
+    "@blocklet/constant": "1.16.19-beta-beb58af7",
+    "@blocklet/launcher-layout": "2.2.43",
     "@blocklet/list": "^0.12.53",
-    "@blocklet/meta": "1.16.19-beta-ba354e01",
-    "@blocklet/ui-react": "^2.8.16",
+    "@blocklet/meta": "1.16.19-beta-beb58af7",
+    "@blocklet/ui-react": "^2.8.17",
     "@blocklet/uploader": "^0.0.45",
     "@emotion/react": "^11.10.4",
     "@emotion/styled": "^11.10.4",
@@ -54,7 +54,7 @@
     "@mui/material": "^5.14.10",
     "@mui/styles": "^5.14.10",
     "@mui/x-date-pickers": "^6.14.0",
-    "@ocap/client": "1.18.95",
+    "@ocap/client": "1.18.101",
     "@uiw/react-markdown-preview": "4.0.6",
     "ahooks": "^3.7.1",
     "axios": "^0.27.2",
@@ -100,7 +100,7 @@
     "babel-plugin-inline-react-svg": "^1.1.2",
     "glob": "^10.3.3"
   },
-  "gitHead": "d685f8ca8f2fe49298aa0e94f2f15e1e7ebf761b",
+  "gitHead": "7b56e521b292c57251fc9f35c96dde4957f4c010",
   "exports": {
     ".": {
       "import": "./es/index.js",