From 3ba249e0a2f9ddc657363cbe4b3f285adb5b3410 Mon Sep 17 00:00:00 2001
From: vapao <live1989@foxmail.com>
Date: Wed, 22 Jul 2020 18:09:23 +0800
Subject: [PATCH] =?UTF-8?q?U=20=E4=BC=98=E5=8C=96=E5=BA=94=E7=94=A8?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=BA=94=E7=94=A8=E5=B1=95=E5=BC=80=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E4=BD=93=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 spug_web/src/pages/deploy/app/Table.js | 14 ++++++++------
 spug_web/src/pages/deploy/app/store.js |  6 ++++--
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/spug_web/src/pages/deploy/app/Table.js b/spug_web/src/pages/deploy/app/Table.js
index 4c7f400..b7ec5fb 100644
--- a/spug_web/src/pages/deploy/app/Table.js
+++ b/spug_web/src/pages/deploy/app/Table.js
@@ -41,16 +41,17 @@ class ComTable extends React.Component {
     title: '操作',
     render: info => (
       <span>
-        <LinkButton auth="deploy.app.edit" onClick={() => store.showExtForm(info.id)}>新建发布</LinkButton>
+        <LinkButton auth="deploy.app.edit" onClick={e => store.showExtForm(e, info.id)}>新建发布</LinkButton>
         <Divider type="vertical"/>
-        <LinkButton auth="deploy.app.edit" onClick={() => store.showForm(info)}>编辑</LinkButton>
+        <LinkButton auth="deploy.app.edit" onClick={e => store.showForm(e, info)}>编辑</LinkButton>
         <Divider type="vertical"/>
-        <LinkButton auth="deploy.app.del" onClick={() => this.handleDelete(info)}>删除</LinkButton>
+        <LinkButton auth="deploy.app.del" onClick={e => this.handleDelete(e, info)}>删除</LinkButton>
       </span>
     )
   }];
 
-  handleDelete = (text) => {
+  handleDelete = (e, text) => {
+    e.stopPropagation();
     Modal.confirm({
       title: '删除确认',
       content: `确定要删除应用【${text['name']}】?`,
@@ -101,9 +102,9 @@ class ComTable extends React.Component {
       title: '操作',
       render: info => (
         <span>
-        <LinkButton auth="deploy.app.edit" onClick={() => store.showExtForm(record.id, info)}>编辑</LinkButton>
+        <LinkButton auth="deploy.app.edit" onClick={e => store.showExtForm(e, record.id, info)}>编辑</LinkButton>
         <Divider type="vertical"/>
-        <LinkButton auth="deploy.app.edit" onClick={() => store.showExtForm(record.id, info, true)}>克隆配置</LinkButton>
+        <LinkButton auth="deploy.app.edit" onClick={e => store.showExtForm(e, record.id, info, true)}>克隆配置</LinkButton>
         <Divider type="vertical"/>
         <LinkButton auth="deploy.app.edit" onClick={() => this.handleDeployDelete(info)}>删除</LinkButton>
       </span>
@@ -134,6 +135,7 @@ class ComTable extends React.Component {
     return (
       <Table
         rowKey="id"
+        expandRowByClick
         loading={store.isFetching}
         dataSource={data}
         expandedRowRender={this.expandedRowRender}
diff --git a/spug_web/src/pages/deploy/app/store.js b/spug_web/src/pages/deploy/app/store.js
index 6db9d91..689c4a9 100644
--- a/spug_web/src/pages/deploy/app/store.js
+++ b/spug_web/src/pages/deploy/app/store.js
@@ -39,12 +39,14 @@ class Store {
       .then(res => this.records[app_id]['deploys'] = res)
   };
 
-  showForm = (info) => {
+  showForm = (e, info) => {
+    if (e) e.stopPropagation();
     this.record = info || {};
     this.formVisible = true;
   };
 
-  showExtForm = (app_id, info, isClone) => {
+  showExtForm = (e, app_id, info, isClone) => {
+    if (e) e.stopPropagation();
     this.page = 0;
     this.app_id = app_id;
     if (info) {