@abtnode/ux 1.16.19-beta-7b2db880 → 1.16.19-beta-7d3ef675

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

@@ -108,7 +108,7 @@ const StepContent = /*#__PURE__*/forwardRef(({
     component: "div",
     className: isMobile ? 'mobileStyle' : '',
     sx: {
-      height: '100%'
+      height: 'calc(100% - 56px)'
     },
     children: /*#__PURE__*/_jsx(Layout, {
       locale: locale,
@@ -138,19 +138,22 @@ StepContent.propTypes = {
 StepContent.defaultProps = {
   meta: null
 };
-const postInstalledMessage = componentDid => {
+const postInstalledMessage = (componentDid, timeout = 1000) => {
   // send event to parent window
-  window.parent.postMessage({
-    event: 'component.installed',
-    componentDid
-  }, '*');
+  setTimeout(() => {
+    window.parent.postMessage({
+      event: 'component.installed',
+      componentDid
+    }, '*');
+  }, timeout);
 };
 export default function AddComponentCore({
   onClose,
   mode,
   stores,
   resourceType,
-  storageKey
+  storageKey,
+  inDialog
 }) {
   const {
     t,
@@ -1032,7 +1035,7 @@ export default function AddComponentCore({
       height: window.innerHeight
     } : {
       width: '100%',
-      height: mode === 'embed' ? '100vh' : '72vh'
+      height: inDialog ? '72vh' : '100vh'
     },
     children: [/*#__PURE__*/_jsx(StepProvider, {
       steps: steps,
@@ -1092,6 +1095,7 @@ export default function AddComponentCore({
 AddComponentCore.propTypes = {
   onClose: PropTypes.func,
   mode: PropTypes.oneOf(['normal', 'embed']),
+  inDialog: PropTypes.bool,
   stores: PropTypes.arrayOf(PropTypes.string),
   resourceType: PropTypes.string,
   storageKey: PropTypes.string
@@ -1101,7 +1105,8 @@ AddComponentCore.defaultProps = {
   mode: 'normal',
   stores: [],
   resourceType: '',
-  storageKey: ''
+  storageKey: '',
+  inDialog: true
 };
 const Wrapper = styled(Box)`
   .action-bar {

package/es/blocklet/publish/create-project.js

@@ -53,7 +53,7 @@ export default function CreateProject({
   const [blockletDid, setBlockletDid] = useState();
   const [openConnect, setOpenConnect] = useState(false);
   const {
-    componentDid
+    componentDid = ''
   } = useParams();
   const handleCreateBlockletDidError = err => {
     Toast.error(err.message);

package/es/blocklet/publish/create-release.js

@@ -13,6 +13,7 @@ import Box from '@mui/material/Box';
 import IconButton from '@mui/material/IconButton';
 import DeleteOutlineIcon from '@mui/icons-material/DeleteOutline';
 import InputAdornment from '@mui/material/InputAdornment';
+import Spinner from '@mui/material/CircularProgress';
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
 import Button from '@arcblock/ux/lib/Button';
 import Toast from '@arcblock/ux/lib/Toast';
@@ -120,6 +121,7 @@ export default function CreateRelease({
   const [params, setParams] = useSetState(null);
   const [paramsErrTip, setParamsErrTip] = useState({});
   const [loading, setLoading] = useState(false);
+  const [createLoading, setCreateLoading] = useState(false);
   const [release, setRelease] = useState(null);
   const {
     api
@@ -218,6 +220,8 @@ export default function CreateRelease({
     _params.blockletDescription = (_params.blockletDescription || '').trim();
     _params.blockletIntroduction = (_params.blockletIntroduction || '').trim();
     _params.note = (_params.note || '').trim();
+    setCreateLoading(status);
+    setLoading(true);
     api.createRelease({
       input: {
         ..._params,
@@ -226,21 +230,24 @@ export default function CreateRelease({
         releaseId,
         status
       }
-    }).then(() => {
+    }).then(res => {
+      setCreateLoading(false);
+      setLoading(false);
       if (status === 'draft') {
         Toast.success('Save draft success');
         if (mode === 'create') {
-          navigate(`../${projectId}`, {
+          const id = res?.release?.id;
+          navigate(`../${projectId}/${id}`, {
             replace: true
           });
         }
       } else {
         Toast.success('Create Release success');
-        navigate(`../${projectId}`, {
-          replace: true
-        });
+        getRelease();
       }
     }).catch(err => {
+      setCreateLoading(false);
+      setLoading(false);
       Toast.error(formatError(err));
     });
   };
@@ -295,19 +302,30 @@ export default function CreateRelease({
       }), /*#__PURE__*/_jsxs(Box, {
         display: "flex",
         children: [!isPublished && /*#__PURE__*/_jsxs(_Fragment, {
-          children: [/*#__PURE__*/_jsx(Button, {
+          children: [/*#__PURE__*/_jsxs(Button, {
             variant: "outlined",
-            disabled: loading,
+            disabled: loading || createLoading,
             onClick: () => onRelease(PROJECT.RELEASE_STATUS.draft),
             style: {
               marginRight: 12
             },
-            children: t('blocklet.publish.saveDraft')
-          }), /*#__PURE__*/_jsx(Button, {
+            children: [createLoading === PROJECT.RELEASE_STATUS.draft && /*#__PURE__*/_jsx(Spinner, {
+              size: 14,
+              sx: {
+                mr: 0.5
+              }
+            }), t('blocklet.publish.saveDraft')]
+          }), /*#__PURE__*/_jsxs(Button, {
             variant: "contained",
-            disabled: loading,
+            disabled: loading || createLoading,
             onClick: () => onRelease(PROJECT.RELEASE_STATUS.published),
-            children: t('common.release')
+            children: [createLoading === PROJECT.RELEASE_STATUS.published && /*#__PURE__*/_jsx(Spinner, {
+              size: 14,
+              sx: {
+                mr: 0.5
+              },
+              color: "inherit"
+            }), t('common.release')]
           })]
         }), isPublished && /*#__PURE__*/_jsx(Button, {
           variant: "contained",

package/es/blocklet/publish/index.js

@@ -1,4 +1,5 @@
 import React, { useEffect } from 'react';
+import PropTypes from 'prop-types';
 import { Routes, Route, useLocation, useParams } from 'react-router-dom';
 import styled from '@emotion/styled';
 import Box from '@mui/material/Box';
@@ -9,7 +10,9 @@ import ReleasesList from './release-list';
 import CreateRelease from './create-release';
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
-export default function BlockletPublish() {
+export default function BlockletPublish({
+  padding
+}) {
   const {
     blocklet
   } = useBlockletContext();
@@ -33,7 +36,12 @@ export default function BlockletPublish() {
   if (!blocklet) {
     return null;
   }
+  const style = {};
+  if (padding) {
+    style.padding = padding;
+  }
   return /*#__PURE__*/_jsx(Main, {
+    style: style,
     children: /*#__PURE__*/_jsxs(Routes, {
       children: [/*#__PURE__*/_jsx(Route, {
         path: "/",
@@ -51,7 +59,12 @@ export default function BlockletPublish() {
     })
   });
 }
-BlockletPublish.propTypes = {};
+BlockletPublish.propTypes = {
+  padding: PropTypes.oneOfType([PropTypes.string, PropTypes.number])
+};
+BlockletPublish.defaultProps = {
+  padding: ''
+};
 const Main = styled(Box)`
   a {
     color: ${({

package/es/blocklet/publish/project-list.js

@@ -16,6 +16,7 @@ import { useNodeContext } from '../../contexts/node';
 import EmptySpinner from '../../empty-spinner';
 import DidAddress from '../../did-address';
 import Confirm from '../../confirm';
+import BlockletBundleAvatar from '../bundle-avatar';
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 export default function ProjectList() {
@@ -144,6 +145,35 @@ export default function ProjectList() {
         }) : '';
       }
     }
+  }, componentDid ? null : {
+    label: t('common.scope'),
+    name: 'componentDid',
+    options: {
+      customBodyRender: value => {
+        const component = (blocklet.children || []).find(x => x.meta.did === value);
+        if (!component) {
+          return '';
+        }
+        return /*#__PURE__*/_jsxs(Box, {
+          display: "flex",
+          alignItems: "center",
+          justifyContent: "flex-start",
+          children: [/*#__PURE__*/_jsx(BlockletBundleAvatar, {
+            size: 14,
+            blocklet: component,
+            ancestors: [blocklet]
+          }), /*#__PURE__*/_jsx(Box, {
+            ml: 0.5,
+            sx: {
+              ml: 0.5,
+              color: 'text.primary',
+              fontSize: 14
+            },
+            children: component.meta.title
+          })]
+        }, value);
+      }
+    }
   }, {
     label: t('common.updatedAt'),
     name: 'updatedAt',
@@ -176,7 +206,7 @@ export default function ProjectList() {
         });
       }
     }
-  }];
+  }].filter(Boolean);
   return /*#__PURE__*/_jsxs(Main, {
     children: [/*#__PURE__*/_jsx(Box, {
       sx: {

package/es/blocklet/publish/resource.js

@@ -1,7 +1,6 @@
-import { useState, useEffect, useMemo } from 'react';
+import { useState, useEffect } from 'react';
 import PropTypes from 'prop-types';
 import styled from '@emotion/styled';
-import difference from 'lodash/difference';
 import joinUrl from 'url-join';
 import Box from '@mui/material/Box';
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
@@ -24,12 +23,6 @@ const fillParent = (nodes, parentId) => {
   });
   return nodes;
 };
-const checkDiff = (a, b) => {
-  if (a.length !== b.length) {
-    return true;
-  }
-  return !!difference(a, b || []).length;
-};
 export default function Resource({
   app,
   component,
@@ -45,14 +38,12 @@ export default function Resource({
   } = useNodeContext();
   const [resources, setResources] = useState([]);
   const [selectedResourceIds, setSelectedResourceIds] = useState([]);
-  const [savedResourceIds, setSavedResourceIds] = useState([]);
   const [loading, setLoading] = useState(false);
   const releaseId = release.id;
   const readonly = release.status === 'published';
   const {
     resourceExportApi = '/'
   } = component?.meta.capabilities || {};
-  const hasDiff = useMemo(() => checkDiff(savedResourceIds, selectedResourceIds), [savedResourceIds, selectedResourceIds]);
   const urlObj = new URL(joinUrl('http://127.0.0.1', component.mountPoint, resourceExportApi || '/').replace(/\/+/g, '/'));
   urlObj.searchParams.set('projectId', projectId);
   urlObj.searchParams.set('releaseId', releaseId);
@@ -69,7 +60,6 @@ export default function Resource({
           resources: data
         }
       });
-      setSavedResourceIds(data);
     } catch (err) {
       Toast.error(err.message);
     }
@@ -109,7 +99,6 @@ export default function Resource({
     }).then(res => {
       const list = res?.resources || [];
       setSelectedResourceIds(list);
-      setSavedResourceIds(list);
     }).catch(err => {
       Toast.error(err.message);
     });
@@ -138,7 +127,7 @@ export default function Resource({
         className: "footer",
         children: /*#__PURE__*/_jsx(Button, {
           variant: "contained",
-          disabled: loading || !hasDiff,
+          disabled: loading,
           onClick: () => onSave(),
           children: t('common.save')
         })

package/es/locales/en.js

@@ -271,6 +271,7 @@ module.exports = {
     saveSuccess: 'Saved successfully',
     scheduleFailed: 'schedule failed',
     scheduleSuccess: 'successfully scheduled',
+    scope: 'Scope',
     screenshot: 'Screenshot',
     search: 'Search',
     security: 'Security',
@@ -621,6 +622,8 @@ module.exports = {
       isInProgress: 'Blocklet is in progress, please wait for it to finish'
     },
     publish: {
+      createResource: 'Create Resource',
+      addResource: 'Add Release',
       productTitle: 'Product',
       versionTitle: 'Version',
       imgTitle: 'Images',

package/es/locales/zh.js

@@ -276,6 +276,7 @@ module.exports = {
     saveSuccess: '保存成功',
     scheduleFailed: '加入任务队列失败',
     scheduleSuccess: '成功加入任务队列',
+    scope: '范围',
     screenshot: '截图',
     search: '搜索',
     security: '安全',
@@ -628,6 +629,8 @@ module.exports = {
       isInProgress: '应用正在进行中，请等待完成'
     },
     publish: {
+      createResource: '创建资源',
+      addResource: '添加资源',
       productTitle: 'Blocklet 详情',
       versionTitle: '版本信息',
       imgTitle: '图片资源',

package/es/util/constants.js

@@ -1,2 +1,3 @@
 export const STORAGE_KEY_STORE_BLOCKLET = 'blocklet-add-component-registry';
-export const STORAGE_KEY_STORE_SERVER = 'server-add-registry';
+export const STORAGE_KEY_STORE_SERVER = 'server-add-registry';
+export const STORAGE_KEY_STORE_RESOURCE = resource => `resource-${resource}-add-registry`;

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

@@ -127,7 +127,7 @@ const StepContent = /*#__PURE__*/(0, _react.forwardRef)((_ref2, ref) => {
     component: "div",
     className: isMobile ? 'mobileStyle' : '',
     sx: {
-      height: '100%'
+      height: 'calc(100% - 56px)'
     },
     children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_launcherLayout.default, {
       locale: locale,
@@ -156,12 +156,15 @@ StepContent.propTypes = {
 StepContent.defaultProps = {
   meta: null
 };
-const postInstalledMessage = componentDid => {
+const postInstalledMessage = function postInstalledMessage(componentDid) {
+  let timeout = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 1000;
   // send event to parent window
-  window.parent.postMessage({
-    event: 'component.installed',
-    componentDid
-  }, '*');
+  setTimeout(() => {
+    window.parent.postMessage({
+      event: 'component.installed',
+      componentDid
+    }, '*');
+  }, timeout);
 };
 function AddComponentCore(_ref3) {
   var _blocklet$meta2, _blocklet$meta3, _blocklet$meta4, _purchaseRef$current, _purchaseRef$current$, _purchaseRef$current2, _purchaseRef$current3;
@@ -170,7 +173,8 @@ function AddComponentCore(_ref3) {
     mode,
     stores,
     resourceType,
-    storageKey
+    storageKey,
+    inDialog
   } = _ref3;
   const {
     t,
@@ -1039,7 +1043,7 @@ function AddComponentCore(_ref3) {
       height: window.innerHeight
     } : {
       width: '100%',
-      height: mode === 'embed' ? '100vh' : '72vh'
+      height: inDialog ? '72vh' : '100vh'
     },
     children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_step.StepProvider, {
       steps: steps,
@@ -1099,6 +1103,7 @@ function AddComponentCore(_ref3) {
 AddComponentCore.propTypes = {
   onClose: _propTypes.default.func,
   mode: _propTypes.default.oneOf(['normal', 'embed']),
+  inDialog: _propTypes.default.bool,
   stores: _propTypes.default.arrayOf(_propTypes.default.string),
   resourceType: _propTypes.default.string,
   storageKey: _propTypes.default.string
@@ -1108,7 +1113,8 @@ AddComponentCore.defaultProps = {
   mode: 'normal',
   stores: [],
   resourceType: '',
-  storageKey: ''
+  storageKey: '',
+  inDialog: true
 };
 const Wrapper = (0, _styled.default)(_Box.default)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  .action-bar {\n    display: flex;\n    justify-content: flex-end;\n    position: sticky;\n    bottom: 0;\n    padding-top: 16px;\n    z-index: 100;\n    width: 100%;\n    background: #fff;\n    border-top: 1px solid #eee;\n  }\n"])));
 const TypographyWrapper = (0, _styled.default)(_Typography.default)(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  width: 100%;\n  height: 100%;\n"])));

package/lib/blocklet/publish/create-project.js

@@ -66,7 +66,7 @@ function CreateProject(_ref) {
   const [blockletDid, setBlockletDid] = (0, _react.useState)();
   const [openConnect, setOpenConnect] = (0, _react.useState)(false);
   const {
-    componentDid
+    componentDid = ''
   } = (0, _reactRouterDom.useParams)();
   const handleCreateBlockletDidError = err => {
     _Toast.default.error(err.message);

package/lib/blocklet/publish/create-release.js

@@ -19,6 +19,7 @@ var _Box = _interopRequireDefault(require("@mui/material/Box"));
 var _IconButton = _interopRequireDefault(require("@mui/material/IconButton"));
 var _DeleteOutline = _interopRequireDefault(require("@mui/icons-material/DeleteOutline"));
 var _InputAdornment = _interopRequireDefault(require("@mui/material/InputAdornment"));
+var _CircularProgress = _interopRequireDefault(require("@mui/material/CircularProgress"));
 var _context = require("@arcblock/ux/lib/Locale/context");
 var _Button = _interopRequireDefault(require("@arcblock/ux/lib/Button"));
 var _Toast = _interopRequireDefault(require("@arcblock/ux/lib/Toast"));
@@ -136,6 +137,7 @@ function CreateRelease(_ref2) {
   const [params, setParams] = (0, _useSetState.default)(null);
   const [paramsErrTip, setParamsErrTip] = (0, _react.useState)({});
   const [loading, setLoading] = (0, _react.useState)(false);
+  const [createLoading, setCreateLoading] = (0, _react.useState)(false);
   const [release, setRelease] = (0, _react.useState)(null);
   const {
     api
@@ -231,6 +233,8 @@ function CreateRelease(_ref2) {
     _params.blockletDescription = (_params.blockletDescription || '').trim();
     _params.blockletIntroduction = (_params.blockletIntroduction || '').trim();
     _params.note = (_params.note || '').trim();
+    setCreateLoading(status);
+    setLoading(true);
     api.createRelease({
       input: _objectSpread(_objectSpread({}, _params), {}, {
         did: blocklet.meta.did,
@@ -238,21 +242,25 @@ function CreateRelease(_ref2) {
         releaseId,
         status
       })
-    }).then(() => {
+    }).then(res => {
+      setCreateLoading(false);
+      setLoading(false);
       if (status === 'draft') {
         _Toast.default.success('Save draft success');
         if (mode === 'create') {
-          navigate("../".concat(projectId), {
+          var _res$release;
+          const id = res === null || res === void 0 ? void 0 : (_res$release = res.release) === null || _res$release === void 0 ? void 0 : _res$release.id;
+          navigate("../".concat(projectId, "/").concat(id), {
             replace: true
           });
         }
       } else {
         _Toast.default.success('Create Release success');
-        navigate("../".concat(projectId), {
-          replace: true
-        });
+        getRelease();
       }
     }).catch(err => {
+      setCreateLoading(false);
+      setLoading(false);
       _Toast.default.error((0, _util.formatError)(err));
     });
   };
@@ -305,19 +313,30 @@ function CreateRelease(_ref2) {
       }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
         display: "flex",
         children: [!isPublished && /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
-          children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Button.default, {
+          children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_Button.default, {
             variant: "outlined",
-            disabled: loading,
+            disabled: loading || createLoading,
             onClick: () => onRelease(_constant.PROJECT.RELEASE_STATUS.draft),
             style: {
               marginRight: 12
             },
-            children: t('blocklet.publish.saveDraft')
-          }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Button.default, {
+            children: [createLoading === _constant.PROJECT.RELEASE_STATUS.draft && /*#__PURE__*/(0, _jsxRuntime.jsx)(_CircularProgress.default, {
+              size: 14,
+              sx: {
+                mr: 0.5
+              }
+            }), t('blocklet.publish.saveDraft')]
+          }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Button.default, {
             variant: "contained",
-            disabled: loading,
+            disabled: loading || createLoading,
             onClick: () => onRelease(_constant.PROJECT.RELEASE_STATUS.published),
-            children: t('common.release')
+            children: [createLoading === _constant.PROJECT.RELEASE_STATUS.published && /*#__PURE__*/(0, _jsxRuntime.jsx)(_CircularProgress.default, {
+              size: 14,
+              sx: {
+                mr: 0.5
+              },
+              color: "inherit"
+            }), t('common.release')]
           })]
         }), isPublished && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Button.default, {
           variant: "contained",

package/lib/blocklet/publish/index.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = BlockletPublish;
 var _react = _interopRequireWildcard(require("react"));
+var _propTypes = _interopRequireDefault(require("prop-types"));
 var _reactRouterDom = require("react-router-dom");
 var _styled = _interopRequireDefault(require("@emotion/styled"));
 var _Box = _interopRequireDefault(require("@mui/material/Box"));
@@ -19,7 +20,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 BlockletPublish() {
+function BlockletPublish(_ref) {
+  let {
+    padding
+  } = _ref;
   const {
     blocklet
   } = (0, _blocklet.useBlockletContext)();
@@ -43,7 +47,12 @@ function BlockletPublish() {
   if (!blocklet) {
     return null;
   }
+  const style = {};
+  if (padding) {
+    style.padding = padding;
+  }
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(Main, {
+    style: style,
     children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactRouterDom.Routes, {
       children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_reactRouterDom.Route, {
         path: "/",
@@ -61,10 +70,15 @@ function BlockletPublish() {
     })
   });
 }
-BlockletPublish.propTypes = {};
-const Main = (0, _styled.default)(_Box.default)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  a {\n    color: ", ";\n  }\n"])), _ref => {
+BlockletPublish.propTypes = {
+  padding: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.number])
+};
+BlockletPublish.defaultProps = {
+  padding: ''
+};
+const Main = (0, _styled.default)(_Box.default)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  a {\n    color: ", ";\n  }\n"])), _ref2 => {
   let {
     theme
-  } = _ref;
+  } = _ref2;
   return theme.palette.primary.main;
 });

package/lib/blocklet/publish/project-list.js

@@ -21,6 +21,7 @@ var _node = require("../../contexts/node");
 var _emptySpinner = _interopRequireDefault(require("../../empty-spinner"));
 var _didAddress = _interopRequireDefault(require("../../did-address"));
 var _confirm = _interopRequireDefault(require("../../confirm"));
+var _bundleAvatar = _interopRequireDefault(require("../bundle-avatar"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _templateObject;
 /* eslint-disable react/no-unstable-nested-components */
@@ -154,6 +155,35 @@ function ProjectList() {
         }) : '';
       }
     }
+  }, componentDid ? null : {
+    label: t('common.scope'),
+    name: 'componentDid',
+    options: {
+      customBodyRender: value => {
+        const component = (blocklet.children || []).find(x => x.meta.did === value);
+        if (!component) {
+          return '';
+        }
+        return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
+          display: "flex",
+          alignItems: "center",
+          justifyContent: "flex-start",
+          children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_bundleAvatar.default, {
+            size: 14,
+            blocklet: component,
+            ancestors: [blocklet]
+          }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
+            ml: 0.5,
+            sx: {
+              ml: 0.5,
+              color: 'text.primary',
+              fontSize: 14
+            },
+            children: component.meta.title
+          })]
+        }, value);
+      }
+    }
   }, {
     label: t('common.updatedAt'),
     name: 'updatedAt',
@@ -186,7 +216,7 @@ function ProjectList() {
         });
       }
     }
-  }];
+  }].filter(Boolean);
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(Main, {
     children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
       sx: {

package/lib/blocklet/publish/resource.js

@@ -7,7 +7,6 @@ exports.default = Resource;
 var _react = require("react");
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _styled = _interopRequireDefault(require("@emotion/styled"));
-var _difference = _interopRequireDefault(require("lodash/difference"));
 var _urlJoin = _interopRequireDefault(require("url-join"));
 var _Box = _interopRequireDefault(require("@mui/material/Box"));
 var _context = require("@arcblock/ux/lib/Locale/context");
@@ -32,12 +31,6 @@ const fillParent = (nodes, parentId) => {
   });
   return nodes;
 };
-const checkDiff = (a, b) => {
-  if (a.length !== b.length) {
-    return true;
-  }
-  return !!(0, _difference.default)(a, b || []).length;
-};
 function Resource(_ref) {
   let {
     app,
@@ -54,14 +47,12 @@ function Resource(_ref) {
   } = (0, _node.useNodeContext)();
   const [resources, setResources] = (0, _react.useState)([]);
   const [selectedResourceIds, setSelectedResourceIds] = (0, _react.useState)([]);
-  const [savedResourceIds, setSavedResourceIds] = (0, _react.useState)([]);
   const [loading, setLoading] = (0, _react.useState)(false);
   const releaseId = release.id;
   const readonly = release.status === 'published';
   const {
     resourceExportApi = '/'
   } = (component === null || component === void 0 ? void 0 : component.meta.capabilities) || {};
-  const hasDiff = (0, _react.useMemo)(() => checkDiff(savedResourceIds, selectedResourceIds), [savedResourceIds, selectedResourceIds]);
   const urlObj = new URL((0, _urlJoin.default)('http://127.0.0.1', component.mountPoint, resourceExportApi || '/').replace(/\/+/g, '/'));
   urlObj.searchParams.set('projectId', projectId);
   urlObj.searchParams.set('releaseId', releaseId);
@@ -78,7 +69,6 @@ function Resource(_ref) {
           resources: data
         }
       });
-      setSavedResourceIds(data);
     } catch (err) {
       _Toast.default.error(err.message);
     }
@@ -119,7 +109,6 @@ function Resource(_ref) {
     }).then(res => {
       const list = (res === null || res === void 0 ? void 0 : res.resources) || [];
       setSelectedResourceIds(list);
-      setSavedResourceIds(list);
     }).catch(err => {
       _Toast.default.error(err.message);
     });
@@ -148,7 +137,7 @@ function Resource(_ref) {
         className: "footer",
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Button.default, {
           variant: "contained",
-          disabled: loading || !hasDiff,
+          disabled: loading,
           onClick: () => onSave(),
           children: t('common.save')
         })

package/lib/locales/en.js

@@ -273,6 +273,7 @@ module.exports = {
     saveSuccess: 'Saved successfully',
     scheduleFailed: 'schedule failed',
     scheduleSuccess: 'successfully scheduled',
+    scope: 'Scope',
     screenshot: 'Screenshot',
     search: 'Search',
     security: 'Security',
@@ -623,6 +624,8 @@ module.exports = {
       isInProgress: 'Blocklet is in progress, please wait for it to finish'
     },
     publish: {
+      createResource: 'Create Resource',
+      addResource: 'Add Release',
       productTitle: 'Product',
       versionTitle: 'Version',
       imgTitle: 'Images',

package/lib/locales/zh.js

@@ -278,6 +278,7 @@ module.exports = {
     saveSuccess: '保存成功',
     scheduleFailed: '加入任务队列失败',
     scheduleSuccess: '成功加入任务队列',
+    scope: '范围',
     screenshot: '截图',
     search: '搜索',
     security: '安全',
@@ -630,6 +631,8 @@ module.exports = {
       isInProgress: '应用正在进行中，请等待完成'
     },
     publish: {
+      createResource: '创建资源',
+      addResource: '添加资源',
       productTitle: 'Blocklet 详情',
       versionTitle: '版本信息',
       imgTitle: '图片资源',

package/lib/util/constants.js

@@ -3,8 +3,10 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.STORAGE_KEY_STORE_SERVER = exports.STORAGE_KEY_STORE_BLOCKLET = void 0;
+exports.STORAGE_KEY_STORE_SERVER = exports.STORAGE_KEY_STORE_RESOURCE = exports.STORAGE_KEY_STORE_BLOCKLET = void 0;
 const STORAGE_KEY_STORE_BLOCKLET = 'blocklet-add-component-registry';
 exports.STORAGE_KEY_STORE_BLOCKLET = STORAGE_KEY_STORE_BLOCKLET;
 const STORAGE_KEY_STORE_SERVER = 'server-add-registry';
-exports.STORAGE_KEY_STORE_SERVER = STORAGE_KEY_STORE_SERVER;
+exports.STORAGE_KEY_STORE_SERVER = STORAGE_KEY_STORE_SERVER;
+const STORAGE_KEY_STORE_RESOURCE = resource => "resource-".concat(resource, "-add-registry");
+exports.STORAGE_KEY_STORE_RESOURCE = STORAGE_KEY_STORE_RESOURCE;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/ux",
-  "version": "1.16.19-beta-7b2db880",
+  "version": "1.16.19-beta-7d3ef675",
   "description": "UX components shared across abtnode packages",
   "publishConfig": {
     "access": "public"
@@ -27,24 +27,24 @@
   "author": "linchen <linchen1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/auth": "1.16.19-beta-7b2db880",
-    "@abtnode/constant": "1.16.19-beta-7b2db880",
-    "@abtnode/util": "1.16.19-beta-7b2db880",
+    "@abtnode/auth": "1.16.19-beta-7d3ef675",
+    "@abtnode/constant": "1.16.19-beta-7d3ef675",
+    "@abtnode/util": "1.16.19-beta-7d3ef675",
     "@ahooksjs/use-url-state": "^3.5.1",
     "@arcblock/did": "^1.18.95",
-    "@arcblock/did-connect": "^2.8.14",
+    "@arcblock/did-connect": "^2.8.16",
     "@arcblock/did-motif": "^1.1.13",
-    "@arcblock/icons": "^2.8.14",
-    "@arcblock/nft-display": "2.8.14",
-    "@arcblock/react-hooks": "^2.8.14",
-    "@arcblock/terminal": "^2.8.14",
-    "@arcblock/ux": "^2.8.14",
-    "@blocklet/constant": "1.16.19-beta-7b2db880",
-    "@blocklet/launcher-layout": "2.2.36",
-    "@blocklet/list": "^0.12.52",
-    "@blocklet/meta": "1.16.19-beta-7b2db880",
-    "@blocklet/ui-react": "^2.8.14",
-    "@blocklet/uploader": "^0.0.40",
+    "@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-7d3ef675",
+    "@blocklet/launcher-layout": "2.2.40",
+    "@blocklet/list": "^0.12.53",
+    "@blocklet/meta": "1.16.19-beta-7d3ef675",
+    "@blocklet/ui-react": "^2.8.16",
+    "@blocklet/uploader": "^0.0.45",
     "@emotion/react": "^11.10.4",
     "@emotion/styled": "^11.10.4",
     "@iconify/react": "^4.0.0",
@@ -100,7 +100,7 @@
     "babel-plugin-inline-react-svg": "^1.1.2",
     "glob": "^10.3.3"
   },
-  "gitHead": "598b576b97dd7accbfa1bb509b75e423ad27e5e2",
+  "gitHead": "af968e7bab22e67bd42d3dc93ff3ce827b9a91fe",
   "exports": {
     ".": {
       "import": "./es/index.js",