From 7e6cba42a0127f4e359c3c5ea8ecf19f60269b9a Mon Sep 17 00:00:00 2001
From: vapao <live1989@foxmail.com>
Date: Fri, 28 Oct 2022 13:05:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E5=8F=91=E5=B8=83=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E6=97=B6=E5=8F=AF=E4=BB=A5=E8=B7=A8=E7=8E=AF=E5=A2=83?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E6=9E=84=E5=BB=BA=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 spug_api/apps/repository/views.py             | 6 +++---
 spug_web/src/pages/deploy/request/Ext1Form.js | 6 +++---
 spug_web/src/pages/deploy/request/store.js    | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/spug_api/apps/repository/views.py b/spug_api/apps/repository/views.py
index 578cb26..73deb2f 100644
--- a/spug_api/apps/repository/views.py
+++ b/spug_api/apps/repository/views.py
@@ -18,13 +18,13 @@ import json
 class RepositoryView(View):
     @auth('deploy.repository.view|deploy.request.add|deploy.request.edit')
     def get(self, request):
-        deploy_id = request.GET.get('deploy_id')
+        app_id = request.GET.get('app_id')
         data = Repository.objects.annotate(
             app_name=F('app__name'),
             env_name=F('env__name'),
             created_by_user=F('created_by__nickname'))
-        if deploy_id:
-            data = data.filter(deploy_id=deploy_id, status='5')
+        if app_id:
+            data = data.filter(app_id=app_id, status='5')
             return json_response([x.to_view() for x in data])
 
         response = dict()
diff --git a/spug_web/src/pages/deploy/request/Ext1Form.js b/spug_web/src/pages/deploy/request/Ext1Form.js
index 823142f..03168cc 100644
--- a/spug_web/src/pages/deploy/request/Ext1Form.js
+++ b/spug_web/src/pages/deploy/request/Ext1Form.js
@@ -49,9 +49,9 @@ export default observer(function () {
 
   function fetchVersions() {
     setFetching(true);
-    const deploy_id = store.record.deploy_id
+    const {app_id, deploy_id} = store.record
     const p1 = http.get(`/api/app/deploy/${deploy_id}/versions/`, {timeout: 300000})
-    const p2 = http.get('/api/repository/', {params: {deploy_id}})
+    const p2 = http.get('/api/repository/', {params: {app_id}})
     Promise.all([p1, p2])
       .then(([res1, res2]) => {
         if (!versions.branches) _initial(res1, res2)
@@ -193,7 +193,7 @@ export default observer(function () {
                     <Select.Option key={item.id} value={item.id} content={item.version}
                                    disabled={type === '2' && item.id >= rb_id}>
                       <div style={{display: 'flex', justifyContent: 'space-between'}}>
-                        <span>{item.version}</span>
+                        <span>{item.env_name} - {item.version}</span>
                         <span style={{color: '#999', fontSize: 12}}>构建于 {moment(item.created_at).fromNow()}</span>
                       </div>
                     </Select.Option>
diff --git a/spug_web/src/pages/deploy/request/store.js b/spug_web/src/pages/deploy/request/store.js
index e4fac4c..339d6a4 100644
--- a/spug_web/src/pages/deploy/request/store.js
+++ b/spug_web/src/pages/deploy/request/store.js
@@ -97,8 +97,8 @@ class Store {
   };
 
   confirmAdd = (deploy) => {
-    const {id, host_ids, require_upload} = deploy;
-    this.record = {deploy_id: id, app_host_ids: host_ids, require_upload};
+    const {id, app_id, host_ids, require_upload} = deploy;
+    this.record = {app_id, deploy_id: id, app_host_ids: host_ids, require_upload};
     if (deploy.extend === '1') {
       this.ext1Visible = true
     } else {
@@ -108,7 +108,7 @@ class Store {
   };
 
   rollback = (info) => {
-    this.record = lds.pick(info, ['deploy_id', 'host_ids', 'deploy_status']);
+    this.record = lds.pick(info, ['app_id', 'deploy_id', 'host_ids', 'deploy_status']);
     this.record.app_host_ids = info.host_ids;
     this.record.name = `${info.name} - 回滚`;
     this.rollbackVisible = true