diff --git a/src/components/Charts/Radar/index.js b/src/components/Charts/Radar/index.js
index 1da52c3813c1a8770ad788c0a06d7d45606a3466..b3c1afcfe2bc13f05ecddd2c7efeccaae0a9508a 100644
--- a/src/components/Charts/Radar/index.js
+++ b/src/components/Charts/Radar/index.js
@@ -53,9 +53,11 @@ class Radar extends PureComponent {
hasLegend = true,
fit = true,
tickCount = 4,
- margin = [16, 30, 16, 30] } = this.props;
+ margin = [24, 30, 16, 30] } = this.props;
- const colors = ['#1890FF', '#FACC14', '#2FC25B'];
+ const colors = [
+ '#1890FF', '#FACC14', '#2FC25B', '#8543E0', '#F04864', '#13C2C2', '#fa8c16', '#a0d911',
+ ];
if (!data || (data && data.length < 1)) {
return;
@@ -87,16 +89,40 @@ class Radar extends PureComponent {
chart.axis('label', {
line: null,
+ labelOffset: 8,
+ labels: {
+ label: {
+ fill: 'rgba(0, 0, 0, .65)',
+ },
+ },
+ grid: {
+ line: {
+ stroke: '#e9e9e9',
+ lineWidth: 1,
+ lineDash: [0, 0],
+ },
+ },
});
chart.axis('value', {
grid: {
type: 'polygon',
+ line: {
+ stroke: '#e9e9e9',
+ lineWidth: 1,
+ lineDash: [0, 0],
+ },
+ },
+ labels: {
+ label: {
+ fill: 'rgba(0, 0, 0, .65)',
+ },
},
});
chart.line().position('label*value').color('name', colors);
- chart.point().position('label*value').color('name', colors).shape('circle');
+ chart.point().position('label*value').color('name', colors).shape('circle')
+ .size(3);
chart.render();
@@ -129,7 +155,7 @@ class Radar extends PureComponent {
return (
- { title &&
{title}
}
+ {title &&
{title}
}
{
hasLegend && (
@@ -147,9 +173,6 @@ class Radar extends PureComponent {
{item.name}
{item.value}
- {
- i !== (legendData.length - 1) &&
- }
))
diff --git a/src/components/Charts/Radar/index.less b/src/components/Charts/Radar/index.less
index 1978111f4561b4306665d657109425c3bf0602d3..a3e85eeb44f4f5f87e1d510a559902f4d33d3020 100644
--- a/src/components/Charts/Radar/index.less
+++ b/src/components/Charts/Radar/index.less
@@ -7,33 +7,37 @@
.legendItem {
position: relative;
text-align: center;
- p {
- cursor: pointer;
- }
+ cursor: pointer;
+ color: @text-color-secondary;
+ line-height: 22px;
h6 {
color: @heading-color;
padding-left: 16px;
font-size: 24px;
line-height: 32px;
- margin-top: 2px;
+ margin-top: 4px;
}
- .split {
+ &:after {
background-color: @border-color-split;
position: absolute;
top: 8px;
right: 0;
height: 40px;
width: 1px;
+ content: '';
}
}
+ > :last-child .legendItem:after {
+ display: none;
+ }
.dot {
- border-radius: 8px;
+ border-radius: 6px;
display: inline-block;
- margin-right: 8px;
+ margin-right: 6px;
position: relative;
top: -1px;
- height: 8px;
- width: 8px;
+ height: 6px;
+ width: 6px;
}
}
}
diff --git a/src/components/EditableLinkGroup/index.js b/src/components/EditableLinkGroup/index.js
index c876103b9f6be4be91da8f140b493639d15bcef8..97d70fc1fee38aa71bd899b2581b6d7ec2f27c04 100644
--- a/src/components/EditableLinkGroup/index.js
+++ b/src/components/EditableLinkGroup/index.js
@@ -1,6 +1,6 @@
import React, { PureComponent, createElement } from 'react';
import PropTypes from 'prop-types';
-import { Button, Icon } from 'antd';
+import { Button } from 'antd';
import styles from './index.less';
// TODO: 添加逻辑
@@ -32,8 +32,8 @@ class EditableLinkGroup extends PureComponent {
))
}
{
-
diff --git a/src/components/EditableLinkGroup/index.less b/src/components/EditableLinkGroup/index.less
index 0d86f264a3ba1c235926ef8e87cc967484361b72..c3d0b58b75a23c8280e4dd9ea0d64af562e4a0da 100644
--- a/src/components/EditableLinkGroup/index.less
+++ b/src/components/EditableLinkGroup/index.less
@@ -8,23 +8,9 @@
display: inline-block;
font-size: @font-size-base;
margin-bottom: 13px;
- margin-right: 32px;
+ width: 25%;
&:hover {
color: @primary-color;
}
}
- & > button {
- border-color: @primary-color;
- color: @primary-color;
- padding-left: 12px;
- padding-right: 12px;
- i {
- position: relative;
- top: -1px;
- }
- span {
- position: relative;
- top: -1px;
- }
- }
}
diff --git a/src/routes/Dashboard/Workplace.js b/src/routes/Dashboard/Workplace.js
index d964fc478de43c35b5fbc839c273ef9645750997..935a3a58d4abe2e077cf903b60629bf6b257695f 100644
--- a/src/routes/Dashboard/Workplace.js
+++ b/src/routes/Dashboard/Workplace.js
@@ -106,7 +106,7 @@ export default class Workplace extends PureComponent {
const pageHeaderContent = (
早安,曲丽丽,祝你开心每一天!
@@ -120,12 +120,10 @@ export default class Workplace extends PureComponent {
项目访问
@@ -156,18 +154,20 @@ export default class Workplace extends PureComponent {
+
)}
description={item.description}
/>
{item.member || ''}
- {
- item.updatedAt && {moment(item.updatedAt).fromNow()}
- }
+ {item.updatedAt && (
+
+ {moment(item.updatedAt).fromNow()}
+
+ )}
@@ -189,11 +189,19 @@ export default class Workplace extends PureComponent {
}
title={
-
- {item.user.name} 在 xx 新建了项目 xxxx
-
+
+ {item.user.name}
+
+
+ 在 xx 新建了项目 xxxx
+
+
+ }
+ description={
+
+ {moment(item.updatedAt).fromNow()}
+
}
- description={moment(item.updatedAt).fromNow()}
/>
))
@@ -218,21 +226,15 @@ export default class Workplace extends PureComponent {
- {
-
- }
+
@@ -242,8 +244,8 @@ export default class Workplace extends PureComponent {
members.map(item => (
-
- {item.title}
+
+ {item.title}
))
diff --git a/src/routes/Dashboard/Workplace.less b/src/routes/Dashboard/Workplace.less
index b9101ede51a7194b44b1a4ee144b2c1715f368ed..0174a3170b30a92b4673c8fc150171d6ad4014c5 100644
--- a/src/routes/Dashboard/Workplace.less
+++ b/src/routes/Dashboard/Workplace.less
@@ -2,11 +2,12 @@
@import "../../utils/utils.less";
.activitiesList {
- padding: 0 24px 24px 24px;
- :global {
- .ant-list-item-meta-title:hover {
- color: @text-color;
- }
+ padding: 0 24px 8px 24px;
+ .username {
+ color: @text-color;
+ }
+ .operation {
+ font-weight: normal;
}
}
@@ -14,7 +15,7 @@
display: flex;
.avatar {
flex: 0 1 72px;
- margin-bottom: 12px;
+ margin-bottom: 8px;
& > span {
border-radius: 72px;
display: block;
@@ -24,12 +25,14 @@
}
.content {
position: relative;
- top: 8px;
+ top: 4px;
margin-left: 24px;
flex: 1 1 auto;
color: @text-color-secondary;
+ line-height: 22px;
.contentTitle {
font-size: 20px;
+ line-height: 28px;
font-weight: 500;
color: @heading-color;
margin-bottom: 12px;
@@ -40,7 +43,6 @@
.pageHeaderExtra {
.clearfix();
float: right;
- margin-right: 8px;
& > div {
padding: 0 32px;
position: relative;
@@ -60,43 +62,40 @@
font-size: 20px;
}
}
- & > em {
+ &:after {
background-color: @border-color-split;
position: absolute;
top: 8px;
right: 0;
width: 1px;
height: 40px;
+ content: '';
}
}
& > div:last-child {
padding-right: 0;
+ &:after {
+ display: none;
+ }
}
}
.members {
- margin-bottom: 35px;
a {
display: block;
- margin-bottom: 24px;
+ margin: 12px 0;
line-height: 24px;
height: 24px;
.textOverflow();
- img {
- border-radius: 24px;
- display: inline;
- position: relative;
- top: -2px;
- width: 24px;
- height: 24px;
- margin-right: 12px;
- vertical-align: middle;
- }
- span {
+ .member {
font-size: @font-size-base;
color: @text-color;
line-height: 24px;
max-width: 100px;
+ vertical-align: top;
+ margin-left: 12px;
+ transition: all .3s;
+ display: inline-block;
.textOverflow();
}
&:hover {
@@ -111,20 +110,21 @@
:global {
.ant-card-meta-description {
color: @text-color-secondary;
- min-height: 42px;
+ height: 44px;
+ line-height: 22px;
+ overflow: hidden;
}
}
.cardTitle {
- font-size: 14px;
- :global {
- .ant-avatar {
- position: relative;
- top: 5px;
- }
- }
+ font-size: 0;
a {
color: @heading-color;
margin-left: 12px;
+ line-height: 24px;
+ height: 24px;
+ display: inline-block;
+ vertical-align: top;
+ font-size: @font-size-base;
&:hover {
color: @primary-color;
}
@@ -135,7 +135,7 @@
}
.projectItemContent {
display: flex;
- margin-top: 12px;
+ margin-top: 8px;
overflow: hidden;
font-size: 12px;
height: 20px;
@@ -150,14 +150,18 @@
color: @primary-color;
}
}
- span {
- color: @text-color-secondary;
+ .datetime {
+ color: @disabled-color;
flex: 0 0 auto;
float: right;
}
}
}
+.datetime {
+ color: @disabled-color;
+}
+
@media screen and (max-width: @screen-xl) and (min-width: @screen-lg) {
.activeCard {
margin-bottom: 24px;
@@ -186,7 +190,7 @@
& > div {
padding: 0 16px;
text-align: left;
- & > em {
+ &:after {
display: none;
}
}