From bc7bf75b6581696b9d68bf098f4bea42c474cbc7 Mon Sep 17 00:00:00 2001 From: zwjamnsss Date: Tue, 25 Jul 2017 13:34:48 +0800 Subject: [PATCH 1/9] =?UTF-8?q?feat:=20=E6=8E=A5=E5=8F=A3=E6=B5=8B?= =?UTF-8?q?=E5=AE=8C=E5=AE=8C=E6=88=90=E9=83=A8=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../containers/AddInterface/AddInterface.js | 9 +-- .../InterfaceTest/InterfaceTest.js | 59 +++++++++++++++++++ .../InterfaceTest/InterfaceTest.scss | 0 .../InterfaceTable/InterfaceTable.js | 3 + package.json | 1 + 5 files changed, 68 insertions(+), 4 deletions(-) create mode 100644 client/containers/AddInterface/InterfaceTest/InterfaceTest.js create mode 100644 client/containers/AddInterface/InterfaceTest/InterfaceTest.scss diff --git a/client/containers/AddInterface/AddInterface.js b/client/containers/AddInterface/AddInterface.js index 048bf5b5..95e34c25 100644 --- a/client/containers/AddInterface/AddInterface.js +++ b/client/containers/AddInterface/AddInterface.js @@ -10,7 +10,8 @@ import ReqHeader from './ReqHeader/ReqHeader.js' import ReqParams from './ReqParams/ReqParams.js' import ResParams from './ResParams/ResParams.js' import Result from './Result/Result.js' -import { +import InterfaceTest from './InterfaceTest/InterfaceTest.js' +import { saveForms, getResParams, getReqParams, @@ -202,7 +203,9 @@ class AddInterface extends Component { mock - 测试 + + +
@@ -212,5 +215,3 @@ class AddInterface extends Component { } export default AddInterface - - diff --git a/client/containers/AddInterface/InterfaceTest/InterfaceTest.js b/client/containers/AddInterface/InterfaceTest/InterfaceTest.js new file mode 100644 index 00000000..78a21744 --- /dev/null +++ b/client/containers/AddInterface/InterfaceTest/InterfaceTest.js @@ -0,0 +1,59 @@ +import React, { Component } from 'react' +// import PropTypes from 'prop-types' +// import { connect } from 'react-redux' +import { Button } from 'antd' +import { autobind } from 'core-decorators'; +import crossRequest from 'cross-request'; + +import { +} from '../../../actions/group.js' + +import './InterfaceTest.scss' + +// @connect( +// state => ({ +// }), +// { +// } +// ) +export default class InterfaceTest extends Component { + + static propTypes = { + } + + state = { + res: {} + } + + constructor(props) { + super(props) + } + + @autobind + testInterface() { + crossRequest({ + url: 'http://petstore.swagger.io/v2/swagger.json', + method: 'GET', + data: { + a:1 + }, + success: (res, header) => { + this.setState({res}) + console.log(header) + } + }) + } + + + render () { + + return ( +
+ +
+ {this.state.res.toString()} +
+
+ ) + } +} diff --git a/client/containers/AddInterface/InterfaceTest/InterfaceTest.scss b/client/containers/AddInterface/InterfaceTest/InterfaceTest.scss new file mode 100644 index 00000000..e69de29b diff --git a/client/containers/Interface/InterfaceTable/InterfaceTable.js b/client/containers/Interface/InterfaceTable/InterfaceTable.js index def13166..b1b73066 100644 --- a/client/containers/Interface/InterfaceTable/InterfaceTable.js +++ b/client/containers/Interface/InterfaceTable/InterfaceTable.js @@ -75,6 +75,9 @@ class InterfaceTable extends Component { + ) diff --git a/package.json b/package.json index f234fe0a..f1318327 100644 --- a/package.json +++ b/package.json @@ -19,6 +19,7 @@ "axios": "^0.16.2", "babel-plugin-transform-decorators-legacy": "^1.3.4", "core-decorators": "^0.17.0", + "cross-request": "^1.0.1", "fs-extra": "^3.0.1", "jsonwebtoken": "^7.4.1", "koa": "^2.0.0", From 8915a9cd1b82bc5f8a0a58976f99c20f4007a0b3 Mon Sep 17 00:00:00 2001 From: qitmac000249 Date: Tue, 25 Jul 2017 20:57:54 +0800 Subject: [PATCH 2/9] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9projectList?= =?UTF-8?q?=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/containers/ProjectGroups/ProjectList/ProjectList.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/containers/ProjectGroups/ProjectList/ProjectList.js b/client/containers/ProjectGroups/ProjectList/ProjectList.js index 6c2130c8..a886e2c3 100644 --- a/client/containers/ProjectGroups/ProjectList/ProjectList.js +++ b/client/containers/ProjectGroups/ProjectList/ProjectList.js @@ -41,7 +41,7 @@ const getColumns = (data, props) => { dataIndex: 'name', key: 'name', render: (text, record) => { - return {text} + return {text} } }, { title: '创建人', From 5c175b6e90f334e39dc057026947cf8344c82164 Mon Sep 17 00:00:00 2001 From: "yhui.yang" Date: Tue, 25 Jul 2017 21:04:11 +0800 Subject: [PATCH 3/9] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E5=88=B7=E6=96=B0?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=90=8E=E5=8F=96=E4=B8=8D=E5=88=B0uid?= =?UTF-8?q?=EF=BC=8C=E6=90=9C=E7=B4=A2=E6=A1=86=E4=B8=BA=E4=B8=AD=E6=96=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/actions/login.js | 1 - client/components/Header/Search/Search.js | 13 +++++++---- client/components/Header/Search/Search.scss | 8 +++++-- client/containers/Home/Home.js | 22 ++++++++++++------ client/containers/Home/Home.scss | 25 ++++++++++++--------- client/reducer/Login/login.js | 3 ++- client/reducer/login/login.js | 3 ++- 7 files changed, 49 insertions(+), 26 deletions(-) diff --git a/client/actions/login.js b/client/actions/login.js index 6ea78871..bf967528 100644 --- a/client/actions/login.js +++ b/client/actions/login.js @@ -11,7 +11,6 @@ import axios from 'axios'; const checkLoginState = () => { return(dispatch)=> { axios.get('/user/status').then((res) => { - console.log(res); dispatch({ type: GET_LOGIN_STATE, payload: res diff --git a/client/components/Header/Search/Search.js b/client/components/Header/Search/Search.js index 5e57b57a..84f5f1d3 100644 --- a/client/components/Header/Search/Search.js +++ b/client/components/Header/Search/Search.js @@ -31,7 +31,7 @@ export default class Srch extends Component{ } onSelect = (value) => { - if( value.split(":")[0] == "group" ){ + if( value.split(":")[0] == "分组" ){ this.props.history.push('/group/'+value.split(":")[1].trim()); } else { this.props.history.push('/project/'+value.split("(")[1].slice(0,-1)); @@ -45,7 +45,7 @@ export default class Srch extends Component{ const dataSource = []; for(let title in res.data.data){ res.data.data[title].map(item => { - title == "group" ? dataSource.push( title+": "+item.groupName ): dataSource.push( title+": "+item.name+"("+item._id+")" ); + title == "group" ? dataSource.push( "分组"+": "+item.groupName ): dataSource.push( "项目"+": "+item.name+"("+item._id+")" ); }) } this.setState({ @@ -84,8 +84,13 @@ export default class Srch extends Component{ > } - size="large" style={{ width: 200 }} - placeholder="search group/project" + size="large" + style={{ + // width: 200, + // borderColor:"#AAA", + // borderWidth:"1px", + }} + placeholder="搜索分组/项目" className="search-input" /> diff --git a/client/components/Header/Search/Search.scss b/client/components/Header/Search/Search.scss index 2a497729..5de982eb 100644 --- a/client/components/Header/Search/Search.scss +++ b/client/components/Header/Search/Search.scss @@ -2,10 +2,14 @@ $color-grey:#979DA7; .search-wrapper{ .search-input{ - border:1px solid #AAA; - background-color: rgba(255,255,255,0.5); + border:1px solid $color-grey; + color: $color-grey; + width: 2rem; + transition: width 2s; + //background-color:rgba(0,0,0,0.5); } .srch-icon{ color: $color-grey; + font-weight: bold; } } diff --git a/client/containers/Home/Home.js b/client/containers/Home/Home.js index b7aac9b0..56383d10 100644 --- a/client/containers/Home/Home.js +++ b/client/containers/Home/Home.js @@ -40,7 +40,7 @@ const HomeGuest = (props) => (
( - +
@@ -66,7 +66,7 @@ const HomeGuest = (props) => ( 接口管理

- +
@@ -74,7 +74,7 @@ const HomeGuest = (props) => ( 支持Mock

- +
@@ -82,6 +82,14 @@ const HomeGuest = (props) => ( 团队协作

+ +
+ +
+

+ 可部署 +

+ @@ -132,7 +140,7 @@ class Home extends Component {

YAPI

-

一个高效，易用，功能强大的api管理系统

+

一个高效，易用，可部署的Api管理系统

- {this.state.res.toString()} + {JSON.stringify(this.state.res, 2)}
) diff --git a/client/containers/ProjectGroups/GroupList/GroupList.js b/client/containers/ProjectGroups/GroupList/GroupList.js index 641e7819..985f8cbb 100644 --- a/client/containers/ProjectGroups/GroupList/GroupList.js +++ b/client/containers/ProjectGroups/GroupList/GroupList.js @@ -72,7 +72,6 @@ export default class GroupList extends Component { }else if(!groupName && this.props.groupList.length){ this.props.history.push(`/group/${this.props.groupList[0].group_name}`); } - console.log(currGroup); this.setState({groupList: this.props.groupList}); this.props.setCurrGroup(currGroup) }); diff --git a/client/reducer/addInterface/addInterface.js b/client/reducer/addInterface/addInterface.js index a8e06a25..1f554aa1 100644 --- a/client/reducer/addInterface/addInterface.js +++ b/client/reducer/addInterface/addInterface.js @@ -7,7 +7,8 @@ import { GET_INTERFACE_REQ_PARAMS, GET_INTERFACE_RES_PARAMS, PUSH_INTERFACE_NAME, - PUSH_INTERFACE_METHOD + PUSH_INTERFACE_METHOD, + FETCH_INTERFACE_PROJECT } from '../../constants/action-types.js' const initialState = { @@ -23,7 +24,8 @@ const initialState = { } ], reqParams: '', - resParams: '' + resParams: '', + project: {} } export default (state = initialState, action) => { @@ -73,6 +75,11 @@ export default (state = initialState, action) => { ...state, method: action.payload } + case FETCH_INTERFACE_PROJECT: + return { + ...state, + project: action.payload.data.data + } default: return state } diff --git a/package.json b/package.json index 37c52ce8..c4aeca5b 100644 --- a/package.json +++ b/package.json @@ -53,6 +53,7 @@ "sha1": "^1.1.1", "string-replace-webpack-plugin": "^0.1.3", "universal-cookie": "^2.0.8", + "url": "^0.11.0", "wangeditor": "^3.0.4", "ykit-config-antd": "^0.1.3", "ykit-config-react": "^0.4.4" From 9db330d1dd5b8194bff4aa353986797536c19dca Mon Sep 17 00:00:00 2001 From: "wenbo.dong" Date: Tue, 25 Jul 2017 21:51:14 +0800 Subject: [PATCH 6/9] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=BA=BF=E4=B8=8A=E7=8E=89=E7=B1=B3=E5=92=8C=E5=9F=BA=E6=9C=AC?= =?UTF-8?q?=E8=B7=AF=E5=BE=84=E6=97=A0=E6=B3=95=E4=BF=AE=E6=94=B9=E7=9A=84?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/controllers/project.js | 4 ++-- server_dist/controllers/project.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/server/controllers/project.js b/server/controllers/project.js index 84cf97e8..6e53388e 100644 --- a/server/controllers/project.js +++ b/server/controllers/project.js @@ -26,7 +26,7 @@ class projectController extends baseController { verifyDomain(domain){ if(!domain) return false; - if(/^[a-zA-Z0-9\-_\.]+[a-zA-Z]{2,6}$/.test(domain)){ + if(/^[a-zA-Z0-9\-_\.]+?\.[a-zA-Z0-9\-_\.]*?[a-zA-Z]{2,6}$/.test(domain)){ return true; } return false; @@ -332,7 +332,7 @@ class projectController extends baseController { let projectData = await this.Model.get(id); - if(params.basepath = (this.handleBasepath(params.basepath)) === false){ + if((params.basepath = this.handleBasepath(params.basepath)) === false){ return ctx.body = yapi.commons.resReturn(null, 401, 'basepath格式有误') } diff --git a/server_dist/controllers/project.js b/server_dist/controllers/project.js index da77135f..a93f4d3e 100644 --- a/server_dist/controllers/project.js +++ b/server_dist/controllers/project.js @@ -86,7 +86,7 @@ var projectController = function (_baseController) { key: 'verifyDomain', value: function verifyDomain(domain) { if (!domain) return false; - if (/^[a-zA-Z0-9\-_\.]+[a-zA-Z]{2,6}$/.test(domain)) { + if (/^[a-zA-Z0-9\-_\.]+?\.[a-zA-Z0-9\-_\.]*?[a-zA-Z]{2,6}$/.test(domain)) { return true; } return false; @@ -778,7 +778,7 @@ var projectController = function (_baseController) { case 12: projectData = _context8.sent; - if (!(params.basepath = this.handleBasepath(params.basepath) === false)) { + if (!((params.basepath = this.handleBasepath(params.basepath)) === false)) { _context8.next = 15; break; } From 0d2597568fbcd1ef4887a43945af2f9f5f157c38 Mon Sep 17 00:00:00 2001 From: "wenbo.dong" Date: Tue, 25 Jul 2017 22:35:47 +0800 Subject: [PATCH 7/9] =?UTF-8?q?fix:=20=E5=A4=84=E7=90=86=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=9A=84=E7=8E=AF=E5=A2=83=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=97=B6=E7=82=B9=E5=87=BB=E5=88=A0=E9=99=A4=E4=BC=9A=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E5=A4=9A=E4=B8=AA=E9=85=8D=E7=BD=AE=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../containers/ProjectGroups/ProjectList/UpDateModal.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/client/containers/ProjectGroups/ProjectList/UpDateModal.js b/client/containers/ProjectGroups/ProjectList/UpDateModal.js index 06514cbd..531e5ebe 100644 --- a/client/containers/ProjectGroups/ProjectList/UpDateModal.js +++ b/client/containers/ProjectGroups/ProjectList/UpDateModal.js @@ -141,8 +141,9 @@ class UpDateModal extends Component { // can use data-binding to set form.setFieldsValue({ envs: envs.filter(key => { + const realKey = key._id ? key._id : key console.log(key); - return key._id !== id; + return realKey !== id; }) }); } @@ -183,7 +184,7 @@ class UpDateModal extends Component { getFieldDecorator('envs', { initialValue: envMessage }); const envs = getFieldValue('envs'); const formItems = envs.map((k, index) => { - // console.log(k); + console.log(k); const secondIndex = 'next' + index; // 为保证key的唯一性 return ( @@ -229,7 +230,7 @@ class UpDateModal extends Component { > {getFieldDecorator(`envs-domain-${index}`, { validateTrigger: ['onChange', 'onBlur'], - initialValue: envMessage.length !== 0 ? k.domain.split('\/\/')[1] : '', + initialValue: envMessage.length !== 0 && k.domain ? k.domain.split('\/\/')[1] : '', rules: [{ required: false, whitespace: true, @@ -269,7 +270,7 @@ class UpDateModal extends Component { this.remove(k._id)} + onClick={() => this.remove(k._id ? k._id : k)} /> ) : null} From 53dad4f54a240c8a6876687732977b7bdd8064e1 Mon Sep 17 00:00:00 2001 From: zwjamnsss Date: Wed, 26 Jul 2017 10:26:15 +0800 Subject: [PATCH 8/9] =?UTF-8?q?fix:=20=E9=A1=B9=E7=9B=AE=E7=AE=80=E4=BB=8B?= =?UTF-8?q?=E5=A4=9A=E8=A1=8C=E6=96=87=E6=9C=AC=E6=BA=A2=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/actions/addInterface.js | 11 ++++++++++- .../AddInterface/InterfaceTest/InterfaceTest.js | 1 + .../containers/ProjectGroups/GroupList/GroupList.js | 4 ++-- .../ProjectGroups/GroupList/GroupList.scss | 13 +++++++++++++ 4 files changed, 26 insertions(+), 3 deletions(-) diff --git a/client/actions/addInterface.js b/client/actions/addInterface.js index 4675fb63..7437eb20 100644 --- a/client/actions/addInterface.js +++ b/client/actions/addInterface.js @@ -7,8 +7,10 @@ import { GET_INTERFACE_REQ_PARAMS, GET_INTERFACE_RES_PARAMS, PUSH_INTERFACE_NAME, - PUSH_INTERFACE_METHOD + PUSH_INTERFACE_METHOD, + FETCH_INTERFACE_PROJECT } from '../constants/action-types.js' +import axios from 'axios' export function pushInputValue (value) { return { @@ -72,3 +74,10 @@ export function pushInterfaceMethod (value) { payload: value } } + +export function fetchInterfaceProject(id) { + return { + type: FETCH_INTERFACE_PROJECT, + payload: axios.get('/project/get', { params: {id}}) + } +} diff --git a/client/containers/AddInterface/InterfaceTest/InterfaceTest.js b/client/containers/AddInterface/InterfaceTest/InterfaceTest.js index 9fd40912..728d6279 100644 --- a/client/containers/AddInterface/InterfaceTest/InterfaceTest.js +++ b/client/containers/AddInterface/InterfaceTest/InterfaceTest.js @@ -111,6 +111,7 @@ export default class InterfaceTest extends Component {
+ 返回结果： {JSON.stringify(this.state.res, 2)}
diff --git a/client/containers/ProjectGroups/GroupList/GroupList.js b/client/containers/ProjectGroups/GroupList/GroupList.js index 1cb57ebe..828091e0 100644 --- a/client/containers/ProjectGroups/GroupList/GroupList.js +++ b/client/containers/ProjectGroups/GroupList/GroupList.js @@ -203,11 +203,11 @@ export default class GroupList extends Component {
- {currGroup.group_name} +
{currGroup.group_name}
this.showModal(TYPE_EDIT)}/>
-
简介：{currGroup.group_desc}
+
简介：{currGroup.group_desc}
diff --git a/client/containers/ProjectGroups/GroupList/GroupList.scss b/client/containers/ProjectGroups/GroupList/GroupList.scss index c6cb57fc..47ab3822 100644 --- a/client/containers/ProjectGroups/GroupList/GroupList.scss +++ b/client/containers/ProjectGroups/GroupList/GroupList.scss @@ -5,12 +5,25 @@ border-radius: 4px 4px 0 0; padding: 32px 24px; .curr-group-name { + .text { + display: inline-block; + overflow:hidden; + white-space:nowrap; + text-overflow:ellipsis; + max-width: 150px; + } color: #fff; font-size: 24px; } .curr-group-desc { color: #fff; font-size: 12px; + max-height: 54px; + text-overflow:ellipsis; + overflow:hidden; + -webkit-line-clamp: 3; + -webkit-box-orient: vertical; + display: -webkit-box; } .delete-group, .edit-group { font-size: 18px; From f522ae85261d1f24031b48acf1172e86a138287d Mon Sep 17 00:00:00 2001 From: qitmac000249 Date: Wed, 26 Jul 2017 11:17:07 +0800 Subject: [PATCH 9/9] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9user=E9=A1=B5=20?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/containers/User/LeftMenu.js | 2 +- client/containers/User/List.js | 21 +++++++++++------- client/containers/User/index.scss | 34 ++++++++++++++++++++++-------- 3 files changed, 39 insertions(+), 18 deletions(-) diff --git a/client/containers/User/LeftMenu.js b/client/containers/User/LeftMenu.js index f8a2b8f0..2dc2d6c3 100644 --- a/client/containers/User/LeftMenu.js +++ b/client/containers/User/LeftMenu.js @@ -10,7 +10,7 @@ const Option = AutoComplete.Option; state => { console.log(state); return { - curUid: state.user.curUid + curUid: state.login.uid + '' } } ) diff --git a/client/containers/User/List.js b/client/containers/User/List.js index 2c2f2dd3..2ae46fe5 100755 --- a/client/containers/User/List.js +++ b/client/containers/User/List.js @@ -4,7 +4,6 @@ import { Link } from 'react-router-dom' //import PropTypes from 'prop-types' import { Table, - Button, Popconfirm, message } from 'antd' @@ -79,11 +78,13 @@ class List extends Component { let columns = [{ title: 'UID', dataIndex: '_id', - key: '_id' + key: '_id', + width: 70 }, { title: '用户名', dataIndex: 'username', - key: 'username' + key: 'username', + width: 150 }, { title: 'Email', dataIndex: 'email', @@ -91,20 +92,24 @@ class List extends Component { }, { title: '用户角色', dataIndex: 'role', - key: 'role' + key: 'role', + width:110 }, { title: '更新日期', dataIndex: 'up_time', - key: 'up_time' + key: 'up_time', + width: 180 }, { title: '功能', key: 'action', + width:80, render: (item) => { return ( - + 查看 + {this.confirm(item._id)}} okText="Yes" cancelText="No"> - + 删除 ) @@ -128,7 +133,7 @@ class List extends Component { return (
- +
) diff --git a/client/containers/User/index.scss b/client/containers/User/index.scss index 90157f19..6539a25b 100644 --- a/client/containers/User/index.scss +++ b/client/containers/User/index.scss @@ -4,10 +4,11 @@ display: -webkit-box; -webkit-box-flex: 1; margin: .88rem auto 0 auto; - font-size: 0.14rem; + // font-size: 0.14rem; - min-height:500px; - margin-top: 84px; + min-height:433px; + margin-top: 40px; + margin-bottom: 55px; @@ -16,6 +17,7 @@ box-shadow: 0 2px 4px 0 rgba(0,0,0,0.20); background: #FFF; border-radius:5px; + margin-top: 15px; .search{ margin: 5px; } @@ -29,20 +31,22 @@ border-radius:5px; box-shadow: 0 2px 4px 0 rgba(0,0,0,0.20); background: #FFF; + margin-top: 15px; .ant-table-wrapper table { - font-size: .14rem; + // font-size: .14rem; - button { - margin: 0 10px 0 0; + a { + // font-size: 12px; } } + } .user-profile { -webkit-box-flex: 1; margin-top: 15px; margin-left: 15px; - padding: 10px; + padding: 10px 30px; box-shadow: 0 2px 4px 0 rgba(0,0,0,0.20); background: #FFF; border-radius:5px; @@ -51,9 +55,21 @@ line-height:35px; margin: 5px; margin-bottom:10px; - + border-bottom: 1px solid #f1f3f6; + padding-bottom: 10px; + .ant-col-4{ + color: black; + padding: 0px 10px; + text-indent: .7em; + // background-color: #f1f3f6; + border-left: 5px solid #f1f3f6; + margin-right: 30px; + } + .text{ + padding-right: 15px; + } .text-button{ - font-size: 12px; + // font-size: 12px; color: #657289; cursor: pointer }