From 46891fe7322efb540f1555c56e4fa21051381f5b Mon Sep 17 00:00:00 2001 From: "wenbo.dong" Date: Wed, 23 Aug 2017 21:01:50 +0800 Subject: [PATCH] =?UTF-8?q?opti:=20=E8=AE=BE=E7=BD=AE=E9=A1=B5=E5=B8=83?= =?UTF-8?q?=E5=B1=80=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/components/ErrMsg/ErrMsg.js | 4 ++ client/components/ProjectCard/ProjectCard.js | 4 +- .../Setting/ProjectMember/ProjectMember.js | 2 +- .../Setting/ProjectMessage/ProjectMessage.js | 32 +++++-------- .../containers/Project/Setting/Setting.scss | 45 +++++++++++++++++++ client/styles/theme.less | 8 +++- 6 files changed, 70 insertions(+), 25 deletions(-) diff --git a/client/components/ErrMsg/ErrMsg.js b/client/components/ErrMsg/ErrMsg.js index 83c60df5..5cbd7eaa 100644 --- a/client/components/ErrMsg/ErrMsg.js +++ b/client/components/ErrMsg/ErrMsg.js @@ -46,6 +46,10 @@ class ErrMsg extends Component { title = '你还没有关注项目呢'; desc = 先去 this.props.history.push('/group')}>“项目广场” 逛逛吧, 那里可以添加关注。; break; + case 'noInterface': + title = '该项目还没有接口呢'; + desc = '在左侧 “接口列表” 中添加接口'; + break; case 'noMemberInProject': title = '该项目还没有成员呢'; break; diff --git a/client/components/ProjectCard/ProjectCard.js b/client/components/ProjectCard/ProjectCard.js index f82740b9..f6f93cf7 100644 --- a/client/components/ProjectCard/ProjectCard.js +++ b/client/components/ProjectCard/ProjectCard.js @@ -54,8 +54,8 @@ class ProjectCard extends Component { uid, projectid: projectData._id, projectname: projectData.name, - icon: projectData.icon, - color: projectData.color + icon: projectData.icon || constants.PROJECT_ICON[0], + color: projectData.color || constants.PROJECT_COLOR.blue } this.props.addFollow(param).then((res) => { if (res.payload.data.errcode === 0) { diff --git a/client/containers/Project/Setting/ProjectMember/ProjectMember.js b/client/containers/Project/Setting/ProjectMember/ProjectMember.js index b9401943..82f54cca 100644 --- a/client/containers/Project/Setting/ProjectMember/ProjectMember.js +++ b/client/containers/Project/Setting/ProjectMember/ProjectMember.js @@ -215,7 +215,7 @@ class ProjectMember extends Component { - }} /> +
}} className="setting-project-member"/> {this.state.groupMemberList.length ? this.state.groupMemberList.map((item, index) => { return (
diff --git a/client/containers/Project/Setting/ProjectMessage/ProjectMessage.js b/client/containers/Project/Setting/ProjectMessage/ProjectMessage.js index 1512d385..6f16605c 100644 --- a/client/containers/Project/Setting/ProjectMessage/ProjectMessage.js +++ b/client/containers/Project/Setting/ProjectMessage/ProjectMessage.js @@ -1,5 +1,5 @@ import React, { Component } from 'react' -import { Form, Input, Icon, Tooltip, Select, Button, Row, Col, message, Card, Radio, Alert, Modal, Popover } from 'antd'; +import { Form, Input, Icon, Tooltip, Select, Button, Row, Col, message, Card, Radio, Alert, Modal, Popover, Affix } from 'antd'; import PropTypes from 'prop-types'; import { updateProject, delProject, getProjectMsg, upsetProject } from '../../../../reducer/modules/project'; import { fetchGroupMsg } from '../../../../reducer/modules/group'; @@ -214,7 +214,7 @@ class ProjectMessage extends Component { const secondIndex = 'next' + index; // 为保证key的唯一性 return ( -
+ 环境名称) : ''} @@ -248,7 +248,7 @@ class ProjectMessage extends Component { )} - + 环境域名) : ''} @@ -395,16 +395,11 @@ class ProjectMessage extends Component { label="环境配置" > {envSettingItems} + - - - - - - - - - - - - -
+ +
+ +
+
diff --git a/client/containers/Project/Setting/Setting.scss b/client/containers/Project/Setting/Setting.scss index f8bea47e..3dd3eb2e 100644 --- a/client/containers/Project/Setting/Setting.scss +++ b/client/containers/Project/Setting/Setting.scss @@ -14,6 +14,7 @@ .ant-card-body { display: flex; align-items: center; + padding: .24rem !important; } .card-danger-content { flex: 1; @@ -24,7 +25,14 @@ } } +.setting-project-member { + border: 1px solid #e9e9e9; + border-radius: 2px; +} + .setting-group { + margin-top: .48rem; + border-radius: 2px; .ant-card-head { background-color: #eee; } @@ -150,3 +158,40 @@ } } } + +.danger-container { + margin-top: .48rem; +} +.btnwrap-changeproject { + text-align: center; + padding: .24rem 0; + margin: 0 -.24rem; + background: #fff; + background-image: linear-gradient(45deg, #d9d9d9 25%, transparent 0),linear-gradient(45deg, transparent 75%, #d9d9d9 0); + background-size: 4px 4px; + .btn-save { + background-color: #32325d; + font-size: .15rem; + font-weight: 200; + letter-spacing: 1px; + border: none; + line-height: .4rem; + height: .4rem; + padding: 0 .24rem; + margin-right: .24rem; + box-shadow: 0 4px 6px rgba(50, 50, 93, 0.11), 0 1px 3px rgba(0, 0, 0, 0.08); + transform: translateY(0); + transition: all .2s; + &:focus { + background-color: #43458b; + } + &:hover { + transform: translateY(-1px); + background-color: #43458b; + } + &:active { + transform: translateY(1px); + background-color: #32325d; + } + } +} diff --git a/client/styles/theme.less b/client/styles/theme.less index 454fe57d..d9396356 100644 --- a/client/styles/theme.less +++ b/client/styles/theme.less @@ -174,6 +174,10 @@ @label-required-color : @highlight-color; @label-color : @heading-color; @form-item-margin-bottom : 24px; +// 处理添加环境配置下边距重合的 bug +.ant-form-item > .ant-form-item, .ant-form-item :not(.ant-form) > .ant-form-item { + margin-bottom: 16px; +} @form-item-trailing-colon : true; // Input @@ -250,11 +254,11 @@ // Table // -- -@table-header-bg: @background-color-base; +@table-header-bg: #eee; @table-header-sort-bg: @background-color-active; @table-row-hover-bg: @primary-1; @table-selected-row-bg: #fafafa; -@table-padding-vertical: 16px + 2px; +@table-padding-vertical: 16px; @table-padding-horizontal: 8px + 2px; // Tag