Skip to content

Commit 129ed9a

Browse files
vapaovapao
committed
# Release v3.3.3
1 parent b847e04 commit 129ed9a

File tree

19 files changed

+55
-41
lines changed

19 files changed

+55
-41
lines changed

‎spug_web/src/layout/Footer.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ export default function () {
1818
rel="noopener noreferrer">官网</a>
1919
<a className={styles.item} title="Github" href="https://github.com/openspug/spug" target="_blank"
2020
rel="noopener noreferrer"><GithubOutlined/></a>
21-
<a title="文档" href="https://spug.cc/docs/about-spug/" target="_blank"
21+
<a title="文档" href="https://ops.spug.cc/docs/about-spug/" target="_blank"
2222
rel="noopener noreferrer">文档</a>
2323
</div>
2424
<div style={{color: 'rgba(0, 0, 0, .45)'}}>

‎spug_web/src/layout/Header.js‎

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66
import React from 'react';
77
import { Link } from 'react-router-dom';
8-
import { Layout, Dropdown, Menu, Avatar } from 'antd';
8+
import { Layout, Dropdown, Menu, Avatar, Divider } from 'antd';
99
import { MenuFoldOutlined, MenuUnfoldOutlined, UserOutlined, LogoutOutlined, CodeOutlined } from '@ant-design/icons';
1010
import { AuthDiv } from 'components';
1111
import Notification from './Notification';
@@ -41,22 +41,26 @@ export default function (props) {
4141

4242
return (
4343
<Layout.Header className={styles.header}>
44-
<div className={styles.left}>
45-
<div className={styles.trigger} onClick={props.toggle}>
46-
{props.collapsed ? <MenuUnfoldOutlined/> : <MenuFoldOutlined/>}
47-
</div>
44+
<div className={styles.trigger} onClick={props.toggle}>
45+
{props.collapsed ? <MenuUnfoldOutlined/> : <MenuFoldOutlined/>}
4846
</div>
49-
<Notification/>
50-
<AuthDiv className={styles.terminal} auth="host.console.view|host.console.list" onClick={openTerminal}>
51-
<CodeOutlined style={{fontSize: 16}}/>
52-
</AuthDiv>
53-
<div className={styles.user}>
54-
<Dropdown overlay={UserMenu} style={{background: '#000'}}>
55-
<span className={styles.action}>
56-
<Avatar size="small" src={avatar} style={{marginRight: 8}}/>
57-
{localStorage.getItem('nickname')}
58-
</span>
59-
</Dropdown>
47+
<div className={styles.right}>
48+
<div className={styles.link} onClick={() => window.open('https://spug.cc/')}>官网</div>
49+
<div className={styles.link} onClick={() => window.open('https://ops.spug.cc/docs/about-spug/')}>文档</div>
50+
<div className={styles.link} onClick={() => window.open('https://ssl.spug.cc/')}>证书申请</div>
51+
<Divider type="vertical"/>
52+
<Notification/>
53+
<AuthDiv className={styles.terminal} auth="host.console.view|host.console.list" onClick={openTerminal}>
54+
<CodeOutlined style={{fontSize: 16}}/>
55+
</AuthDiv>
56+
<div className={styles.user}>
57+
<Dropdown overlay={UserMenu} style={{background: '#000'}}>
58+
<span className={styles.action}>
59+
<Avatar size="small" src={avatar} style={{marginRight: 8}}/>
60+
{localStorage.getItem('nickname')}
61+
</span>
62+
</Dropdown>
63+
</div>
6064
</div>
6165
</Layout.Header>
6266
)

‎spug_web/src/layout/index.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ export default function () {
5050
{Routes}
5151
<Route component={NotFound}/>
5252
</Switch>
53-
<Footer/>
5453
</Layout.Content>
5554
</Layout>
5655
</Layout>

‎spug_web/src/layout/layout.module.less‎

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,28 @@
11
.header {
22
display: flex;
33
flex-direction: row;
4+
justify-content: space-between;
45
padding: 0 12px 0 0;;
56
height: 48px;
67
line-height: 48px;
78
background: #fff;
89
box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08);
910
z-index: 2;
1011

11-
.left {
12-
flex: 1;
12+
.right {
13+
display: flex;
14+
flex-direction: row;
15+
align-items: center;
16+
17+
.link {
18+
color: #333333;
19+
cursor: pointer;
20+
padding: 0 16px;
21+
22+
&:hover {
23+
background: rgba(0, 0, 0, 0.025);
24+
}
25+
}
1326
}
1427

1528
.terminal {
@@ -80,7 +93,7 @@
8093
display: flex;
8194
flex-direction: column;
8295
justify-content: space-between;
83-
padding: 24px 24px 0;
96+
padding: 24px;
8497
overflow-y: scroll;
8598
}
8699

‎spug_web/src/pages/alarm/contact/Form.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ export default observer(function () {
7979
<Form.Item label="钉钉" extra={<span>
8080
钉钉收不到通知？请参考
8181
<a target="_blank" rel="noopener noreferrer"
82-
href="https://spug.cc/docs/use-problem#use-dd">官方文档</a>
82+
href="https://ops.spug.cc/docs/use-problem#use-dd">官方文档</a>
8383
</span>}>
8484
<Form.Item noStyle name="ding">
8585
<Input placeholder="https://oapi.dingtalk.com/robot/send?access_token=xxx"/>

‎spug_web/src/pages/config/setting/Form.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ export default observer(function () {
7878
valuePropName="checked"
7979
initialValue={store.record.is_public === undefined || store.record.is_public}
8080
tooltip={<a target="_blank" rel="noopener noreferrer"
81-
href="https://spug.cc/docs/conf-app">什么是公共/私有配置？</a>}>
81+
href="https://ops.spug.cc/docs/conf-app">什么是公共/私有配置？</a>}>
8282
<Switch checkedChildren="公共" unCheckedChildren="私有"/>
8383
</Form.Item>
8484
)}

‎spug_web/src/pages/deploy/app/AutoDeploy.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ export default observer(function AutoDeploy() {
6969
<Form.Item hidden={tagMode} required={!tagMode} label="选择分支" extra={<span>
7070
根据你的网络情况，首次刷新可能会很慢，请耐心等待。
7171
<a target="_blank" rel="noopener noreferrer"
72-
href="https://spug.cc/docs/use-problem#clone">刷新失败？</a>
72+
href="https://ops.spug.cc/docs/use-problem#clone">刷新失败？</a>
7373
</span>}>
7474
<Form.Item style={{display: 'inline-block', marginBottom: 0, width: '246px'}}>
7575
<Select placeholder="仅指定分支的事件触发自动发布" value={branch} onChange={setBranch}>

‎spug_web/src/pages/deploy/app/Ext1Setup1.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ export default observer(function Ext1Setup1() {
8989
<Form.Item label="消息通知" extra={<span>
9090
应用审核及发布成功或失败结果通知，
9191
<a target="_blank" rel="noopener noreferrer"
92-
href="https://spug.cc/docs/use-problem#use-dd">钉钉收不到通知？</a>
92+
href="https://ops.spug.cc/docs/use-problem#use-dd">钉钉收不到通知？</a>
9393
</span>}>
9494
<Input
9595
addonBefore={(

‎spug_web/src/pages/deploy/app/Ext2Setup1.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ export default observer(function Ext2Setup1() {
8383
<Form.Item label="消息通知" extra={<span>
8484
应用审核及发布成功或失败结果通知，
8585
<a target="_blank" rel="noopener noreferrer"
86-
href="https://spug.cc/docs/use-problem#use-dd">钉钉收不到通知？</a>
86+
href="https://ops.spug.cc/docs/use-problem#use-dd">钉钉收不到通知？</a>
8787
</span>}>
8888
<Input
8989
addonBefore={(

‎spug_web/src/pages/deploy/app/Ext2Setup2.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ class Ext2Setup2 extends React.Component {
165165
) : null,
166166
<Form.Item key={2} required label="目标路径" extra={<a
167167
target="_blank" rel="noopener noreferrer"
168-
href="https://spug.cc/docs/deploy-config#transfer">使用前请务必阅读官方文档。</a>}>
168+
href="https://ops.spug.cc/docs/deploy-config#transfer">使用前请务必阅读官方文档。</a>}>
169169
<Input
170170
disabled={store.isReadOnly}
171171
spellCheck={false}

0 commit comments

Comments
 (0)