@blocklet/launcher-workflow 1.6.11 → 1.6.14

package/lib/components/instance-operation.js

@@ -85,6 +85,12 @@ function OperationPage(_ref) {
   const {
     api
   } = (0, _request.default)();
+  let createServerTime = sessionStorage.getItem("launcher-create-server-".concat(nftId, "-time"));
+
+  if (!createServerTime) {
+    createServerTime = Date.now();
+    sessionStorage.setItem("launcher-create-server-".concat(nftId, "-time"), createServerTime);
+  }
 
   const getInstanceStatus = async () => {
     try {
@@ -107,6 +113,8 @@ function OperationPage(_ref) {
         });
       }
     } catch (error) {
+      sessionStorage.removeItem("launcher-create-server-".concat(nftId, "-time"));
+
       if ((0, _lodash.default)(error, 'response.status') === 404 && launchState.status !== STATUS.launching) {
         setLaunchState(state => _objectSpread(_objectSpread({}, state), {}, {
           status: STATUS.notFoundError
@@ -139,7 +147,29 @@ function OperationPage(_ref) {
   }, [nftId]); // eslint-disable-line
 
   const successful = launchState.status === STATUS.success;
-  const message = [t('launch.waiting.starting'), t('launch.waiting.securing'), t('launch.waiting.prepare'), t('launch.waiting.waiting')];
+  const message = [/*#__PURE__*/_react.default.createElement(MessageDiv, null, /*#__PURE__*/_react.default.createElement("span", {
+    className: "msg-before"
+  }, "1/5"), t('launch.waiting.starting')), /*#__PURE__*/_react.default.createElement(MessageDiv, null, /*#__PURE__*/_react.default.createElement("span", {
+    className: "msg-before"
+  }, "2/5"), t('launch.waiting.securing')), /*#__PURE__*/_react.default.createElement(MessageDiv, null, /*#__PURE__*/_react.default.createElement("span", {
+    className: "msg-before"
+  }, "3/5"), t('launch.waiting.prepare')), /*#__PURE__*/_react.default.createElement(MessageDiv, null, /*#__PURE__*/_react.default.createElement("span", {
+    className: "msg-before"
+  }, "4/5"), t('launch.waiting.waiting'))];
+  const messageDuration = 40000; // 防止用户刷新后message进度重新开始，修正 message 展示的信息
+
+  const nowTime = Date.now();
+  const creatingTime = nowTime - createServerTime;
+  let step = Math.floor(creatingTime / messageDuration);
+
+  if (step > 0) {
+    if (step > message.length) {
+      step = message.length - 1;
+    }
+
+    message.splice(0, step);
+  }
+
   return /*#__PURE__*/_react.default.createElement(Content, null, /*#__PURE__*/_react.default.createElement(_pageHeader.default, {
     title: t("".concat(type, ".title")),
     className: "launch-page-header ".concat(successful ? 'header-hide' : '')
@@ -150,7 +180,7 @@ function OperationPage(_ref) {
     increaseSpeed: 0.3,
     messageLoop: false,
     maybeDuration: 180000,
-    messageDuration: 40000
+    messageDuration: messageDuration
   })), successful && /*#__PURE__*/_react.default.createElement(_launchResultMessage.default, {
     variant: successful ? 'success' : 'loading',
     title: successful ? t('launch.launched') : '',
@@ -189,19 +219,24 @@ function OperationPage(_ref) {
   }));
 }
 
+const MessageDiv = _styledComponents.default.div.withConfig({
+  displayName: "instance-operation__MessageDiv",
+  componentId: "sc-1fcaixs-0"
+})([".msg-before{display:inline-block;color:#aaa;font-size:14px;margin-right:6px;}"]);
+
 const LinkEle = _styledComponents.default.a.withConfig({
   displayName: "instance-operation__LinkEle",
-  componentId: "sc-1fcaixs-0"
+  componentId: "sc-1fcaixs-1"
 })(["display:flex;justify-content:center;align-items:center;height:36px;color:", ";"], props => props.theme.palette.primary.main);
 
 const WaiterContainer = _styledComponents.default.div.withConfig({
   displayName: "instance-operation__WaiterContainer",
-  componentId: "sc-1fcaixs-1"
+  componentId: "sc-1fcaixs-2"
 })(["color:#1dc1c7;"]);
 
 const Content = _styledComponents.default.div.withConfig({
   displayName: "instance-operation__Content",
-  componentId: "sc-1fcaixs-2"
+  componentId: "sc-1fcaixs-3"
 })(["margin:auto;height:100%;.link{color:", ";}.link:hover{text-decoration:underline !important;}.status{color:", ";display:flex;flex-direction:column;align-items:center;.status-spinner{color:inherit !important;}.status-text{display:inline-block;padding:0 20px;max-width:420px;margin-top:24px;text-align:center;}}.button{min-width:150px;margin-bottom:100px;}.center{display:flex;align-items:center;justify-content:center;width:100%;height:100%;}.launch-page-header{transition:all ease 0.3s;&.header-hide{opacity:0;}}"], props => props.theme.palette.primary.main, props => props.theme.palette.primary.main);
 
 OperationPage.propTypes = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/launcher-workflow",
-  "version": "1.6.11",
+  "version": "1.6.14",
   "description": "Purchase components for Launcher UI",
   "publishConfig": {
     "access": "public"
@@ -37,12 +37,12 @@
     "react": ">=16.12.0"
   },
   "dependencies": {
-    "@arcblock/did-connect": "^1.17.14",
-    "@arcblock/icons": "^1.17.14",
-    "@arcblock/license": "^1.17.14",
-    "@arcblock/ux": "^1.17.14",
-    "@blocklet/launcher-constant": "1.6.11",
-    "@blocklet/launcher-layout": "1.6.11",
+    "@arcblock/did-connect": "^1.17.17",
+    "@arcblock/icons": "^1.17.17",
+    "@arcblock/license": "^1.17.17",
+    "@arcblock/ux": "^1.17.17",
+    "@blocklet/launcher-constant": "1.6.14",
+    "@blocklet/launcher-layout": "1.6.14",
     "@material-ui/core": "^4.12.3",
     "@material-ui/icons": "^4.11.2",
     "@material-ui/lab": "^4.0.0-alpha.60",
@@ -70,5 +70,5 @@
     "babel-plugin-inline-react-svg": "^2.0.1",
     "babel-plugin-styled-components": "^1.10.7"
   },
-  "gitHead": "285191926d1cb24a720ead6d831ecf1832096a02"
+  "gitHead": "41d9da6467b3b56d0c32c257e611fa3cacd77333"
 }