From 7750e40069848557e807923809a15beb98ae9801 Mon Sep 17 00:00:00 2001
From: vapao <live1989@foxmail.com>
Date: Thu, 3 Jun 2021 16:37:14 +0800
Subject: [PATCH] fix issues

---
 .../src/pages/deploy/repository/Detail.js     |   7 +-
 spug_web/src/pages/deploy/repository/Table.js |   6 +-
 spug_web/src/pages/deploy/request/Ext1Form.js |   2 +-
 spug_web/src/pages/deploy/request/Ext2Form.js |   2 +-
 .../src/pages/deploy/request/HostSelector.js  |   2 +
 spug_web/src/pages/exec/task/HostSelector.js  | 123 ------------------
 spug_web/src/pages/system/role/codes.js       |   6 +-
 7 files changed, 15 insertions(+), 133 deletions(-)
 delete mode 100644 spug_web/src/pages/exec/task/HostSelector.js

diff --git a/spug_web/src/pages/deploy/repository/Detail.js b/spug_web/src/pages/deploy/repository/Detail.js
index 3a5334e..285aff9 100644
--- a/spug_web/src/pages/deploy/repository/Detail.js
+++ b/spug_web/src/pages/deploy/repository/Detail.js
@@ -1,6 +1,7 @@
 import React, { useState, useEffect } from 'react';
 import { observer } from 'mobx-react';
 import { Drawer, Descriptions, Table, Button } from 'antd';
+import { AuthDiv } from 'components';
 import { http } from 'libs';
 import store from './store';
 
@@ -35,10 +36,12 @@ export default observer(function (props) {
       visible={props.visible}
       onClose={() => store.detailVisible = false}
       footer={(
-        <div style={{display: 'flex', justifyContent: 'flex-end', alignItems: 'flex-end'}}>
+        <AuthDiv
+          auth="deploy.repository.del"
+          style={{display: 'flex', justifyContent: 'flex-end', alignItems: 'flex-end'}}>
           <span style={{color: '#999', fontSize: 12}}>Tips: 已关联发布申请的构建版本无法删除。</span>
           <Button danger loading={loading} disabled={requests.length > 0} onClick={handleDelete}>删除</Button>
-        </div>
+        </AuthDiv>
       )}>
       <Descriptions column={1} title={<span style={{fontSize: 22}}>基本信息</span>}>
         <Descriptions.Item label="应用">{record.app_name}</Descriptions.Item>
diff --git a/spug_web/src/pages/deploy/repository/Table.js b/spug_web/src/pages/deploy/repository/Table.js
index e274b15..7e48569 100644
--- a/spug_web/src/pages/deploy/repository/Table.js
+++ b/spug_web/src/pages/deploy/repository/Table.js
@@ -45,7 +45,7 @@ function ComTable() {
       onReload={store.fetchRecords}
       actions={[
         <AuthButton
-          auth="config.env.add"
+          auth="deploy.repository.add"
           type="primary"
           icon={<PlusOutlined/>}
           onClick={store.showForm}>新建</AuthButton>
@@ -68,12 +68,12 @@ function ComTable() {
       {hasPermission('deploy.repository.detail|deploy.repository.build|deploy.repository.log') && (
         <Table.Column width={180} title="操作" render={info => (
           <Action>
-            <Action.Button auth="deploy.repository.detail" onClick={() => store.showDetail(info)}>详情</Action.Button>
+            <Action.Button auth="deploy.repository.view" onClick={() => store.showDetail(info)}>详情</Action.Button>
             <Action.Button
               auth="deploy.repository.build"
               loading={loading === info.id}
               onClick={() => handleRebuild(info)}>构建</Action.Button>
-            <Action.Button auth="deploy.repository.log" onClick={() => store.showConsole(info)}>日志</Action.Button>
+            <Action.Button auth="deploy.repository.build" onClick={() => store.showConsole(info)}>日志</Action.Button>
           </Action>
         )}/>
       )}
diff --git a/spug_web/src/pages/deploy/request/Ext1Form.js b/spug_web/src/pages/deploy/request/Ext1Form.js
index 3b1e9fc..d4f42bb 100644
--- a/spug_web/src/pages/deploy/request/Ext1Form.js
+++ b/spug_web/src/pages/deploy/request/Ext1Form.js
@@ -52,7 +52,7 @@ export default observer(function () {
   return (
     <Modal
       visible
-      width={600}
+      width={700}
       maskClosable={false}
       title={`${store.record.id ? '编辑' : '新建'}发布申请`}
       onCancel={() => store.ext1Visible = false}
diff --git a/spug_web/src/pages/deploy/request/Ext2Form.js b/spug_web/src/pages/deploy/request/Ext2Form.js
index 82dc47b..992cee2 100644
--- a/spug_web/src/pages/deploy/request/Ext2Form.js
+++ b/spug_web/src/pages/deploy/request/Ext2Form.js
@@ -73,7 +73,7 @@ export default observer(function () {
   return (
     <Modal
       visible
-      width={600}
+      width={700}
       maskClosable={false}
       title={`${store.record.id ? '编辑' : '新建'}发布申请`}
       onCancel={() => store.ext2Visible = false}
diff --git a/spug_web/src/pages/deploy/request/HostSelector.js b/spug_web/src/pages/deploy/request/HostSelector.js
index 2379b04..7addafb 100644
--- a/spug_web/src/pages/deploy/request/HostSelector.js
+++ b/spug_web/src/pages/deploy/request/HostSelector.js
@@ -44,6 +44,8 @@ export default observer(function (props) {
       <Table
         rowKey="id"
         dataSource={props.app_host_ids.map(id => ({id}))}
+        pagination={false}
+        scroll={{y: 480}}
         onRow={record => {
           return {
             onClick: () => handleClickRow(record)
diff --git a/spug_web/src/pages/exec/task/HostSelector.js b/spug_web/src/pages/exec/task/HostSelector.js
deleted file mode 100644
index ec7f50f..0000000
--- a/spug_web/src/pages/exec/task/HostSelector.js
+++ /dev/null
@@ -1,123 +0,0 @@
-/**
- * Copyright (c) OpenSpug Organization. https://github.com/openspug/spug
- * Copyright (c) <spug.dev@gmail.com>
- * Released under the AGPL-3.0 License.
- */
-import React from 'react';
-import { observer } from 'mobx-react';
-import { SyncOutlined } from '@ant-design/icons';
-import { Modal, Table, Input, Button, Select } from 'antd';
-import { SearchForm } from 'components';
-import store from '../../host/store';
-
-@observer
-class HostSelector extends React.Component {
-  constructor(props) {
-    super(props);
-    this.state = {
-      selectedRows: []
-    }
-  }
-
-  componentDidMount() {
-    if (store.records.length === 0) {
-      store.fetchRecords()
-    }
-  }
-
-  handleClick = (record) => {
-    const {selectedRows} = this.state;
-    const index = selectedRows.indexOf(record);
-    if (index > -1) {
-      selectedRows.splice(index, 1)
-    } else {
-      selectedRows.push(record)
-    }
-    this.setState({selectedRows});
-  };
-
-  handleSubmit = () => {
-    this.props.onOk(this.state.selectedRows);
-    this.props.onCancel()
-  };
-
-  columns = [{
-    title: '类别',
-    dataIndex: 'zone',
-  }, {
-    title: '主机名称',
-    dataIndex: 'name',
-    ellipsis: true
-  }, {
-    title: '连接地址',
-    dataIndex: 'hostname',
-  }, {
-    title: '端口',
-    dataIndex: 'port'
-  }, {
-    title: '备注',
-    dataIndex: 'desc',
-    ellipsis: true
-  }];
-
-  render() {
-    const {selectedRows} = this.state;
-    let data = store.permRecords;
-    if (store.f_name) {
-      data = data.filter(item => item['name'].toLowerCase().includes(store.f_name.toLowerCase()))
-    }
-    if (store.f_zone) {
-      data = data.filter(item => item['zone'].toLowerCase().includes(store.f_zone.toLowerCase()))
-    }
-    const dataIds = data.map(x => x.id);
-    return (
-      <Modal
-        visible
-        width={1000}
-        title="选择执行主机"
-        onCancel={this.props.onCancel}
-        onOk={this.handleSubmit}
-        maskClosable={false}>
-        <SearchForm>
-          <SearchForm.Item span={8} title="主机类别">
-            <Select allowClear placeholder="请选择" value={store.f_zone} onChange={v => store.f_zone = v}>
-              {store.zones.map(item => (
-                <Select.Option value={item} key={item}>{item}</Select.Option>
-              ))}
-            </Select>
-          </SearchForm.Item>
-          <SearchForm.Item span={8} title="主机别名">
-            <Input allowClear value={store.f_name} onChange={e => store.f_name = e.target.value} placeholder="请输入"/>
-          </SearchForm.Item>
-          <SearchForm.Item span={4} title="已选">
-            {selectedRows.length} 台
-          </SearchForm.Item>
-          <SearchForm.Item span={4}>
-            <Button type="primary" icon={<SyncOutlined />} onClick={store.fetchRecords}>刷新</Button>
-          </SearchForm.Item>
-        </SearchForm>
-        <Table
-          rowKey="id"
-          rowSelection={{
-            selectedRowKeys: selectedRows.map(item => item.id),
-            onChange: (_, rows) => {
-              let tmp = selectedRows.filter(x => !dataIds.includes(x.id))
-              this.setState({selectedRows: tmp.concat(rows)})
-            }
-          }}
-          dataSource={data}
-          loading={store.isFetching}
-          onRow={record => {
-            return {
-              onClick: () => this.handleClick(record)
-            }
-          }}
-          pagination={false}
-          scroll={{y: 480}}
-          columns={this.columns}/>
-      </Modal>
-    )
-  }
-}
-
-export default HostSelector
diff --git a/spug_web/src/pages/system/role/codes.js b/spug_web/src/pages/system/role/codes.js
index f7b9950..2d98118 100644
--- a/spug_web/src/pages/system/role/codes.js
+++ b/spug_web/src/pages/system/role/codes.js
@@ -73,9 +73,9 @@ export default [{
     label: '构建仓库',
     perms: [
       {key: 'view', label: '查看构建'},
-      {key: 'detail', label: '构建详情'},
-      {key: 'build', label: '构建仓库'},
-      {key: 'log', label: '构建日志'},
+      {key: 'add', label: '新建版本'},
+      {key: 'build', label: '执行构建'},
+      {key: 'del', label: '删除版本'},
     ]
   },{
     key: 'request',