fix issue

spug_api/apps/deploy/models.py

@@ -47,7 +47,7 @@ class DeployRequest(models.Model, ModelMixin):
 
     @property
     def is_quick_deploy(self):
-        if self.deploy.extend == '1' and self.extra:
+        if self.type == '1' and self.deploy.extend == '1' and self.extra:
             extra = json.loads(self.extra)
             return extra[0] in ('branch', 'tag')
         return False

spug_api/apps/deploy/urls.py

@@ -7,6 +7,7 @@ from .views import *
 
 urlpatterns = [
     path('request/', RequestView.as_view()),
+    path('request/info/', get_request_info),
     path('request/ext1/', post_request_ext1),
     path('request/ext1/rollback/', post_request_ext1_rollback),
     path('request/ext2/', post_request_ext2),

spug_api/apps/deploy/utils.py

@@ -173,6 +173,7 @@ def _deploy_ext1_host(req, helper, h_id, env):
             f'mkdir -p {extend.dst_repo} && [ -e {extend.dst_dir} ] && [ ! -L {extend.dst_dir} ]')
         if code == 0:
             helper.send_error(host.id, f'检测到该主机的发布目录 {extend.dst_dir!r} 已存在，为了数据安全请自行备份后删除该目录，Spug 将会创建并接管该目录。')
+        if req.type == '1':
             # clean
             clean_command = f'ls -d {extend.deploy_id}_* 2> /dev/null | sort -t _ -rnk2 | tail -n +{extend.versions + 1} | xargs rm -rf'
             helper.remote_raw(host.id, ssh, f'cd {extend.dst_repo} && {clean_command}')
@@ -186,12 +187,14 @@ def _deploy_ext1_host(req, helper, h_id, env):
             command = f'cd {extend.dst_repo} && rm -rf {req.spug_version} && tar xf {tar_gz_file} && rm -f {req.deploy_id}_*.tar.gz'
             helper.remote_raw(host.id, ssh, command)
             helper.send_step(h_id, 1, '\033[32m完成√\033[0m\r\n')
+        else:
+            helper.send_step(h_id, 1, '\033[33m跳过√\033[0m\r\n')
 
         # pre host
         repo_dir = os.path.join(extend.dst_repo, req.spug_version)
         if extend.hook_pre_host:
             helper.send_step(h_id, 2, f'{human_time()} 发布前任务...       \r\n')
-            command = f'cd {repo_dir} ; {extend.hook_pre_host}'
+            command = f'cd {repo_dir} && {extend.hook_pre_host}'
             helper.remote(host.id, ssh, command)
 
         # do deploy
@@ -202,7 +205,7 @@ def _deploy_ext1_host(req, helper, h_id, env):
         # post host
         if extend.hook_post_host:
             helper.send_step(h_id, 4, f'{human_time()} 发布后任务...       \r\n')
-            command = f'cd {extend.dst_dir} ; {extend.hook_post_host}'
+            command = f'cd {extend.dst_dir} && {extend.hook_post_host}'
             helper.remote(host.id, ssh, command)
 
         helper.send_step(h_id, 100, f'\r\n{human_time()} ** \033[32m发布成功\033[0m **')
@@ -237,7 +240,7 @@ def _deploy_ext2_host(helper, h_id, actions, env, spug_version):
                     command += f'&& rm -rf {action["dst"]} && mv /tmp/{spug_version}/{sd_dst} {action["dst"]} '
                     command += f'&& rm -rf /tmp/{spug_version}* && echo "transfer completed"'
             else:
-                command = f'cd /tmp ; {action["data"]}'
+                command = f'cd /tmp && {action["data"]}'
             helper.remote(host.id, ssh, command)
 
     helper.send_step(h_id, 100, f'\r\n{human_time()} ** \033[32m发布成功\033[0m **')

spug_api/apps/deploy/views.py

@@ -334,6 +334,18 @@ def post_request_ext2(request):
     return json_response(error=error)
 
 
+def get_request_info(request):
+    form, error = JsonParser(
+        Argument('id', type=int, help='参数错误')
+    ).parse(request.GET)
+    if error is None:
+        req = DeployRequest.objects.get(pk=form.id)
+        response = req.to_dict(selects=('status', 'reason'))
+        response['status_alias'] = req.get_status_display()
+        return json_response(response)
+    return json_response(error=error)
+
+
 def do_upload(request):
     repos_dir = settings.REPOS_DIR
     file = request.FILES['file']

spug_web/src/pages/deploy/request/Ext1Console.js

@@ -15,6 +15,8 @@ import store from './store';
 function Ext1Console(props) {
   const outputs = useLocalStore(() => ({}));
   const terms = useLocalStore(() => ({}));
+  const [mini, setMini] = useState(false);
+  const [visible, setVisible] = useState(true);
   const [fetching, setFetching] = useState(true);
 
   useEffect(props.request.mode === 'read' ? readDeploy : doDeploy, [])
@@ -39,7 +41,7 @@ function Ext1Console(props) {
         Object.assign(outputs, res.outputs)
         setTimeout(() => setFetching(false), 100)
         socket = _makeSocket()
-        store.fetchRecords()
+        store.fetchInfo(props.request.id)
       })
     return () => socket && socket.close()
   }
@@ -85,8 +87,8 @@ function Ext1Console(props) {
   }
 
   function switchMiniMode() {
-    const value = store.tabModes[props.request.id];
+    setMini(true)
-    store.tabModes[props.request.id] = !value
+    setVisible(false)
   }
 
   function handleSetTerm(term, key) {
@@ -97,11 +99,13 @@ function Ext1Console(props) {
   }
 
   let {local, ...hosts} = outputs;
-  return store.tabModes[props.request.id] ? (
+  return (
+    <div>
+      {mini && (
         <Card
           className={styles.item}
           bodyStyle={{padding: '8px 12px'}}
-      onClick={switchMiniMode}>
+          onClick={() => setVisible(true)}>
           <div className={styles.header}>
             <div className={styles.title}>{props.request.name}</div>
             <CloseOutlined onClick={() => store.showConsole(props.request, true)}/>
@@ -118,9 +122,9 @@ function Ext1Console(props) {
               status={item.step === 100 ? 'success' : item.status === 'error' ? 'exception' : 'active'}/>
           ))}
         </Card>
-  ) : (
+      )}
       <Modal
-      visible
+        visible={visible}
         width={1000}
         footer={null}
         maskClosable={false}
@@ -176,7 +180,9 @@ function Ext1Console(props) {
           </Collapse>
         </Skeleton>
       </Modal>
+    </div>
   )
+
 }
 
 export default observer(Ext1Console)

spug_web/src/pages/deploy/request/Ext2Console.js

@@ -17,6 +17,8 @@ function Ext2Console(props) {
   const outputs = useLocalStore(() => ({local: {id: 'local'}}));
   const [sActions, setSActions] = useState([]);
   const [hActions, setHActions] = useState([]);
+  const [mini, setMini] = useState(false);
+  const [visible, setVisible] = useState(true);
   const [fetching, setFetching] = useState(true);
 
   useEffect(props.request.mode === 'read' ? readDeploy : doDeploy, [])
@@ -45,6 +47,7 @@ function Ext2Console(props) {
         Object.assign(outputs, res.outputs)
         setTimeout(() => setFetching(false), 100)
         socket = _makeSocket()
+        store.fetchInfo(props.request.id)
       })
     return () => socket && socket.close()
   }
@@ -92,8 +95,8 @@ function Ext2Console(props) {
   }
 
   function switchMiniMode() {
-    const value = store.tabModes[props.request.id];
+    setMini(true)
-    store.tabModes[props.request.id] = !value
+    setVisible(false)
   }
 
   function handleSetTerm(term, key) {
@@ -104,11 +107,13 @@ function Ext2Console(props) {
   }
 
   const hostOutputs = Object.values(outputs).filter(x => x.id !== 'local');
-  return store.tabModes[props.request.id] ? (
+  return (
+    <div>
+      {mini && (
         <Card
           className={styles.item}
           bodyStyle={{padding: '8px 12px'}}
-      onClick={switchMiniMode}>
+          onClick={() => setVisible(true)}>
           <div className={styles.header}>
             <div className={styles.title}>{props.request.name}</div>
             <CloseOutlined onClick={() => store.showConsole(props.request, true)}/>
@@ -122,9 +127,9 @@ function Ext2Console(props) {
               status={item.step === 100 ? 'success' : item.status === 'error' ? 'exception' : 'active'}/>
           ))}
         </Card>
-  ) : (
+      )}
       <Modal
-      visible
+        visible={visible}
         width={1000}
         footer={null}
         maskClosable={false}
@@ -179,6 +184,7 @@ function Ext2Console(props) {
           )}
         </Skeleton>
       </Modal>
+    </div>
   )
 }
 

spug_web/src/pages/deploy/request/Table.js

@@ -9,7 +9,6 @@ import { BranchesOutlined, BuildOutlined, TagOutlined, PlusOutlined, TagsOutline
 import { Radio, Modal, Popover, Tag, Popconfirm, Tooltip, message } from 'antd';
 import { http, hasPermission } from 'libs';
 import { Action, AuthButton, TableCard } from 'components';
-import styles from './index.module.less';
 import store from './store';
 
 function ComTable() {
@@ -146,18 +145,7 @@ function ComTable() {
   }
 
   function handleDeploy(e, info) {
-    const right = document.body.clientWidth - 25 - e.target.getBoundingClientRect().x;
-    const bottom = document.body.clientHeight - 40 - e.target.getBoundingClientRect().y;
-    store.box.setAttribute('style', `display: block; bottom: ${bottom}px; right: ${right}px;`);
-    setTimeout(() => {
-      store.box.setAttribute('class', `${styles.floatBox} ${styles.floatBoxAnimate}`)
-    }, 10);
-    setTimeout(() => {
     store.showConsole(info);
-      store.box.setAttribute('style', 'display: none');
-      store.box.setAttribute('class', styles.floatBox)
-    }, 300)
-
   }
 
   return (

spug_web/src/pages/deploy/request/index.js

@@ -90,16 +90,14 @@ function Index() {
       {store.rollbackVisible && <Rollback/>}
       {store.tabs.length > 0 && (
         <Space className={styles.miniConsole}>
-          {store.tabs.map(item => (
+          {store.tabs.map(item => item.id ?
             item.app_extend === '1' ? (
               <Ext1Console key={item.id} request={item}/>
             ) : (
               <Ext2Console key={item.id} request={item}/>
-            )
+            ) : null)}
-          ))}
         </Space>
       )}
-      <div ref={el => store.box = el} id='floatBox' className={styles.floatBox}/>
     </AuthDiv>
   )
 }

spug_web/src/pages/deploy/request/index.module.less

@@ -101,20 +101,3 @@
 .upload :global(.ant-upload-list-item) {
     margin: 0;
 }
-
-.floatBox {
-  display: none;
-  position: fixed;
-  width: 20px;
-  height: 10px;
-  transition: right 0.3s, width 0.3s, height0 .3s, bottom 0.3s ease-in-out;
-  background: rgba(0, 0, 0, 0.1);
-  border-radius: 5px;
-}
-
-.floatBoxAnimate {
-  width: 180px;
-  height: 64px;
-  bottom: 12px !important;
-  right: 24px !important;
-}

spug_web/src/pages/deploy/request/store.js

@@ -12,9 +12,7 @@ class Store {
   @observable records = [];
   @observable record = {};
   @observable counter = {};
-  @observable box = null;
   @observable tabs = [];
-  @observable tabModes = {};
   @observable isFetching = false;
   @observable addVisible = false;
   @observable ext1Visible = false;
@@ -55,6 +53,19 @@ class Store {
       .finally(() => this.isFetching = false)
   };
 
+  fetchInfo = (id) => {
+    http.get('/api/deploy/request/info/', {params: {id}})
+      .then(res => {
+        for (let item of this.records) {
+          if (item.id === id) {
+            Object.assign(item, res)
+            break
+          }
+        }
+      })
+      .then(this._updateCounter)
+  }
+
   _updateCounter = () => {
     const counter = {'all': 0, '-3': 0, '0': 0, '1': 0, '3': 0, '99': 0};
     for (let item of this.records) {
@@ -122,18 +133,15 @@ class Store {
     const index = lds.findIndex(this.tabs, x => x.id === info.id);
     if (isClose) {
       if (index !== -1) {
-        this.tabs.splice(index, 1)
+        this.tabs[index] = {}
-        delete this.tabModes[info.id]
       }
-      this.fetchRecords()
+      this.fetchInfo(info.id)
     } else if (index === -1) {
-      this.tabModes[info.id] = true
       this.tabs.push(info)
     }
   };
 
   readConsole = (info) => {
-    this.tabModes[info.id] = false
     const index = lds.findIndex(this.tabs, x => x.id === info.id);
     if (index === -1) {
       info = Object.assign({}, info, {mode: 'read'})
@@ -142,9 +150,7 @@ class Store {
   };
 
   leaveConsole = () => {
-    for (let item of this.tabs) {
+    this.tabs = []
-      item.mode = 'read'
-    }
   }
 }