diff --git a/mock/api.js b/mock/api.js index e53d1824d4b7a327c74ceb8884a6c4aaa517e7ec..654530bf5e363494c32e21832af5bdd5b9e524d5 100644 --- a/mock/api.js +++ b/mock/api.js @@ -18,10 +18,10 @@ export function fakeList(count) { 'https://gw.alipayobjects.com/zos/rmsportal/VcmdbCBcwPTGYgbYeMzX.png', // DesignLab ]; const covers = [ - 'https://gw.alipayobjects.com/zos/rmsportal/nQIAJyTLNeVJfUpTskWk.png', - 'https://gw.alipayobjects.com/zos/rmsportal/pnhtvpOTzypPvmHVrfKN.png', - 'https://gw.alipayobjects.com/zos/rmsportal/SVrKVZEFDnhDTNpkplZj.png', - 'https://gw.alipayobjects.com/zos/rmsportal/bUIOUkPTHgfGdDhgsAgE.png', + 'https://gw.alipayobjects.com/zos/rmsportal/HrxcVbrKnCJOZvtzSqjN.png', + 'https://gw.alipayobjects.com/zos/rmsportal/alaPpKWajEbIYEUvvVNf.png', + 'https://gw.alipayobjects.com/zos/rmsportal/RLwlKSYGSXGHuWSojyvp.png', + 'https://gw.alipayobjects.com/zos/rmsportal/gLaIAoVWTtLbBWZNYEMg.png', ]; const list = []; @@ -31,7 +31,7 @@ export function fakeList(count) { owner: '曲丽丽', title: titles[i % 8], avatar: avatars[i % 4], - cover: covers[i % 4], + cover: Math.floor(i / 4) % 2 === 0 ? covers[i % 4] : covers[3 - (i % 4)], status: ['active', 'exception', 'normal'][i % 3], percent: Math.ceil(Math.random() * 50) + 50, logo: ['https://gw.alipayobjects.com/zos/rmsportal/KoJjkdbuTFxzJmmjuDVR.png', 'https://gw.alipayobjects.com/zos/rmsportal/UxGORCvEXJEsxOfEKZiA.png'][i % 2], diff --git a/src/components/AvatarList/index.js b/src/components/AvatarList/index.js index 7ae1857786f3b00a5db95b4dfd4d9f61004faf5e..fcd0f020745e9f288a9b5b350f7bfa75ce038a26 100644 --- a/src/components/AvatarList/index.js +++ b/src/components/AvatarList/index.js @@ -22,6 +22,7 @@ const Item = ({ src, size, tips, onClick = (() => {}) }) => { const cls = classNames(styles.avatarItem, { [styles.avatarItemLarge]: size === 'large', [styles.avatarItemSmall]: size === 'small', + [styles.avatarItemMini]: size === 'mini', }); return ( diff --git a/src/components/AvatarList/index.less b/src/components/AvatarList/index.less index 531e673d3cdb2d40c03c9dea2cf299b8152298e5..6330297e8005a4f5576e9ed5bf0b57b439bf2803 100644 --- a/src/components/AvatarList/index.less +++ b/src/components/AvatarList/index.less @@ -27,3 +27,15 @@ width: @avatar-size-sm; height: @avatar-size-sm; } + +.avatarItemMini { + width: 20px; + height: 20px; + :global { + .ant-avatar { + width: 20px; + height: 20px; + line-height: 20px; + } + } +} diff --git a/src/components/Charts/Bar/index.js b/src/components/Charts/Bar/index.js index eaa57739982ca272a079b96c10546930c28b2a4e..d6cb8e076767d20268b94a65924c34aa78bffe2c 100644 --- a/src/components/Charts/Bar/index.js +++ b/src/components/Charts/Bar/index.js @@ -72,7 +72,9 @@ class Bar extends PureComponent { name: 'x', }, }); - chart.interval().position('x*y').color(color); + chart.interval().position('x*y').color(color).style({ + fillOpacity: 1, + }); chart.render(); this.chart = chart; diff --git a/src/components/Charts/ChartCard/index.less b/src/components/Charts/ChartCard/index.less index d204e63a1e0a2034e13e26d09b821ef18d8f0bea..59d4eb5bec605d3f1f8d72bdafd5f4261b37858a 100644 --- a/src/components/Charts/ChartCard/index.less +++ b/src/components/Charts/ChartCard/index.less @@ -19,7 +19,7 @@ .total { .textOverflow(); color: @heading-color; - margin-top: 8px; + margin-top: 4px; font-size: 30px; line-height: 38px; height: 38px; @@ -37,7 +37,8 @@ .footer { border-top: 1px solid @border-color-split; padding-top: 8px; - margin-top: 11px; + margin-top: 20px; + margin-bottom: 10px; & > * { position: relative; } diff --git a/src/components/Charts/Gauge/index.js b/src/components/Charts/Gauge/index.js index c59cfee5238a5aadbc6a74c9dc9e57db7b6c5e81..50de76e880970d0b82e665e48ce942cfa2958fba 100644 --- a/src/components/Charts/Gauge/index.js +++ b/src/components/Charts/Gauge/index.js @@ -121,7 +121,7 @@ class Gauge extends PureComponent { height, animate: false, plotCfg: { - margin: [10, 0, 30, 0], + margin: [10, 10, 30, 10], }, }); diff --git a/src/components/Charts/MiniArea/index.js b/src/components/Charts/MiniArea/index.js index 7f67e1bfd2c5dac73ea73a4cfd73dfdf8a68c4c9..bb8b5be0d6a4704a47b38f63aa1a66e79d919c2b 100644 --- a/src/components/Charts/MiniArea/index.js +++ b/src/components/Charts/MiniArea/index.js @@ -85,7 +85,8 @@ class MiniArea extends PureComponent { view.source(data, dataConfig); - view.area().position('x*y').color(color).shape('smooth'); + view.area().position('x*y').color(color).shape('smooth') + .style({ fillOpacity: 1 }); chart.on('tooltipchange', (ev) => { const item = ev.items[0]; diff --git a/src/components/Charts/MiniBar/index.js b/src/components/Charts/MiniBar/index.js index 7153cf3c475689aa3fc7865afcabc1ea15352ac3..023aff087c01113f6070484d63ef81f1f0b3f6a4 100644 --- a/src/components/Charts/MiniBar/index.js +++ b/src/components/Charts/MiniBar/index.js @@ -25,7 +25,7 @@ class MiniBar extends PureComponent { } renderChart(data) { - const { height = 0, fit = true, color = '#33ABFB' } = this.props; + const { height = 0, fit = true, color = '#1890FF' } = this.props; if (!data || (data && data.length < 1)) { return; diff --git a/src/components/Charts/Pie/index.js b/src/components/Charts/Pie/index.js index 5d068caa41dd8da32a2acdc576031a6f383a4cc2..ad180265b85761f1ac27ef92a1be4103f38dc471 100644 --- a/src/components/Charts/Pie/index.js +++ b/src/components/Charts/Pie/index.js @@ -59,8 +59,11 @@ class Pie extends Component { margin, percent, color, inner = 0.75, animate = true, + colors, } = this.props; + const defaultColors = colors || ['#8543E0', '#F04864', '#FACC14', '#1890FF', '#13C2C2', '#2FC25B']; + let selected = this.props.selected || true; let tooltip = this.props.tooltips || true; @@ -146,7 +149,11 @@ class Pie extends Component { inner, }); - chart.intervalStack().position(Stat.summary.percent('y')).color('x', formatColor).selected(selected); + if (percent) { + chart.intervalStack().position(Stat.summary.percent('y')).color('x', formatColor).selected(selected); + } else { + chart.intervalStack().position(Stat.summary.percent('y')).color('x', defaultColors).selected(selected); + } chart.render(); this.chart = chart; diff --git a/src/components/Charts/Pie/index.less b/src/components/Charts/Pie/index.less index 37392d19672b044482da3a503f59d2f804490d7c..bbfcc56da23b87c28588ef75ab9568f2cfb8538f 100644 --- a/src/components/Charts/Pie/index.less +++ b/src/components/Charts/Pie/index.less @@ -62,7 +62,7 @@ & > p { color: @heading-color; display: block; - font-size: 24px; + font-size: 30px; height: 32px; line-height: 32px; } diff --git a/src/components/Charts/Radar/index.less b/src/components/Charts/Radar/index.less index 5e33468047ec35b18089a703d5632a631cbaec72..1978111f4561b4306665d657109425c3bf0602d3 100644 --- a/src/components/Charts/Radar/index.less +++ b/src/components/Charts/Radar/index.less @@ -12,6 +12,7 @@ } h6 { color: @heading-color; + padding-left: 16px; font-size: 24px; line-height: 32px; margin-top: 2px; diff --git a/src/components/Charts/TimelineChart/index.js b/src/components/Charts/TimelineChart/index.js index 3e319aeb7757713d61945c17c64b3eda027436e3..3924012302cbf762cbbdf71a107bdd8807dd4442 100644 --- a/src/components/Charts/TimelineChart/index.js +++ b/src/components/Charts/TimelineChart/index.js @@ -30,7 +30,7 @@ class TimelineChart extends Component { } renderChart(data) { - const { height = 400, margin = [60, 40, 40, 40], titleMap } = this.props; + const { height = 400, margin = [60, 20, 40, 40], titleMap } = this.props; if (!data || (data && data.length < 1)) { return; @@ -81,8 +81,8 @@ class TimelineChart extends Component { }, }); - chart.line().position('x*y1').color('#4FAAEB'); - chart.line().position('x*y2').color('#9AD681'); + chart.line().position('x*y1').color('#1890FF'); + chart.line().position('x*y2').color('#2FC25B'); this.chart = chart; diff --git a/src/components/Charts/Trend/index.less b/src/components/Charts/Trend/index.less index d383fa53a4235a1be1a2347e12174b241df3da69..8f11e0464501c6bf5d015fa24526e0ff168d36ad 100644 --- a/src/components/Charts/Trend/index.less +++ b/src/components/Charts/Trend/index.less @@ -23,7 +23,7 @@ display: none; } .title { - margin-right: 4px; + margin-right: 8px; } .value { color: @text-color; diff --git a/src/components/EditableLinkGroup/index.js b/src/components/EditableLinkGroup/index.js index 68c0c42f5b394feda572aca88e6d628f652b1618..c1876ab5e611563de9da6b341af261cc1e13ec6a 100644 --- a/src/components/EditableLinkGroup/index.js +++ b/src/components/EditableLinkGroup/index.js @@ -30,7 +30,7 @@ class EditableLinkGroup extends PureComponent { } { } diff --git a/src/components/EditableLinkGroup/index.less b/src/components/EditableLinkGroup/index.less index 16a3e18aeb3925391938abb817ab5bf4c71ea4e8..0d86f264a3ba1c235926ef8e87cc967484361b72 100644 --- a/src/components/EditableLinkGroup/index.less +++ b/src/components/EditableLinkGroup/index.less @@ -16,12 +16,13 @@ & > button { border-color: @primary-color; color: @primary-color; + padding-left: 12px; + padding-right: 12px; i { position: relative; top: -1px; } span { - margin-left: 0 !important; position: relative; top: -1px; } diff --git a/src/components/StandardTable/index.js b/src/components/StandardTable/index.js index 80979b75699831de17b154d638d67267f8e1084a..f117da239a45cbc1717b8223e5d1962acc3e5d8f 100644 --- a/src/components/StandardTable/index.js +++ b/src/components/StandardTable/index.js @@ -130,7 +130,7 @@ class StandardTable extends PureComponent {
已选择 {selectedRowKeys.length} 项 服务调用总计 {totalCallNo} 万 - 清空 + 清空
)} type="info" diff --git a/src/routes/Dashboard/Analysis.js b/src/routes/Dashboard/Analysis.js index 4a9dca74d1fc81dd9dfeb6362803d88dbfd95867..553e1225ed04be471f50ae9b62f8a6ec8ac9f7ee 100644 --- a/src/routes/Dashboard/Analysis.js +++ b/src/routes/Dashboard/Analysis.js @@ -148,7 +148,7 @@ export default class Analysis extends Component { const activeKey = currentTabKey || (offlineData[0] && offlineData[0].name); const CustomTab = ({ data, currentTabKey: currentKey }) => ( -早安,曲丽丽,祝你开心每一天
+早安,曲丽丽,祝你开心每一天!
交互专家 | 蚂蚁金服-某某某事业群-某某平台部-某某技术部-UED
项目数
56
团队内排名
8 / 24
项目访问
2,223
- {item.user.name} 在 xx 新建了项目 xxxx + {item.user.name} 在 xx 新建了项目 xxxx
} description={moment(item.updatedAt).fromNow()} diff --git a/src/routes/Dashboard/Workplace.less b/src/routes/Dashboard/Workplace.less index 467242f4e504fee3e0053b1de453a9e46f009a12..b9101ede51a7194b44b1a4ee144b2c1715f368ed 100644 --- a/src/routes/Dashboard/Workplace.less +++ b/src/routes/Dashboard/Workplace.less @@ -13,18 +13,19 @@ .pageHeaderContent { display: flex; .avatar { - flex: 0 1 80px; + flex: 0 1 72px; + margin-bottom: 12px; & > span { - border-radius: 80px; + border-radius: 72px; display: block; - width: 80px; - height: 80px; + width: 72px; + height: 72px; } } .content { position: relative; top: 8px; - margin-left: 32px; + margin-left: 24px; flex: 1 1 auto; color: @text-color-secondary; .contentTitle { @@ -38,18 +39,20 @@ .pageHeaderExtra { .clearfix(); + float: right; + margin-right: 8px; & > div { - padding: 0 24px; + padding: 0 32px; position: relative; float: left; & > p:first-child { color: @text-color-secondary; font-size: @font-size-base; line-height: 22px; - margin-bottom: 2px; + margin-bottom: 4px; } & > p { - color: @text-color; + color: @heading-color; font-size: 30px; line-height: 38px; & > span { @@ -108,11 +111,11 @@ :global { .ant-card-meta-description { color: @text-color-secondary; - font-size: 12px; - min-height: 36px; + min-height: 42px; } } .cardTitle { + font-size: 14px; :global { .ant-avatar { position: relative; @@ -178,6 +181,8 @@ margin-bottom: 0; } .pageHeaderExtra { + float: none; + margin-right: 0; & > div { padding: 0 16px; text-align: left; diff --git a/src/routes/List/BasicList.js b/src/routes/List/BasicList.js index 87c370c8036178a9a509dd236d9f2ba2957cd299..379b82696d486ca7c7a44f105e659c98fdb61490 100644 --- a/src/routes/List/BasicList.js +++ b/src/routes/List/BasicList.js @@ -110,16 +110,18 @@ export default class BasicList extends PureComponent {