diff --git a/spug_web/src/pages/deploy/repository/Form.js b/spug_web/src/pages/deploy/repository/Form.js index cbdcc45..0671d0e 100644 --- a/spug_web/src/pages/deploy/repository/Form.js +++ b/spug_web/src/pages/deploy/repository/Form.js @@ -94,9 +94,8 @@ export default observer(function () { http.post('/api/repository/', formData) .then(res => { message.success('操作成功'); - store.record = res; store.formVisible = false; - store.fetchRecords() + store.showConsole(res) }, () => setLoading(false)) } diff --git a/spug_web/src/pages/deploy/repository/Table.js b/spug_web/src/pages/deploy/repository/Table.js index 7e48569..0c02603 100644 --- a/spug_web/src/pages/deploy/repository/Table.js +++ b/spug_web/src/pages/deploy/repository/Table.js @@ -35,6 +35,31 @@ function ComTable() { .finally(() => setLoading(null)) } + function expandedRowRender(record) { + return ( + + ( +
store.showDetail(info)}>{info.version}
+ )}/> + + + + {info.status_alias}}/> + {hasPermission('deploy.repository.detail|deploy.repository.build|deploy.repository.log') && ( + ( + + handleRebuild(info)}>构建 + store.showConsole(info)}>日志 + + )}/> + )} +
+ ) + } + const statusColorMap = {'0': 'cyan', '1': 'blue', '2': 'red', '5': 'green'}; return ( } onClick={store.showForm}>新建 ]} + expandable={{expandedRowRender, expandRowByClick: true}} pagination={{ showSizeChanger: true, showLessItems: true, @@ -58,25 +84,12 @@ function ComTable() { pageSizeOptions: ['10', '20', '50', '100'] }}> - - - - - + `${info.version}(${info.env_name})`}/> + + {info.status_alias}}/> - {hasPermission('deploy.repository.detail|deploy.repository.build|deploy.repository.log') && ( - ( - - store.showDetail(info)}>详情 - handleRebuild(info)}>构建 - store.showConsole(info)}>日志 - - )}/> - )} + ) } diff --git a/spug_web/src/pages/deploy/repository/index.module.less b/spug_web/src/pages/deploy/repository/index.module.less index 6b487a5..a629f88 100644 --- a/spug_web/src/pages/deploy/repository/index.module.less +++ b/spug_web/src/pages/deploy/repository/index.module.less @@ -19,7 +19,7 @@ .out { margin-top: 24px; - padding: 8px 0 0 15px; + padding: 8px 0 8px 15px; border: 1px solid #d9d9d9; border-radius: 4px; background-color: #fafafa;