From 581034faf3ce3114fc0a552fc53e3b995faf9550 Mon Sep 17 00:00:00 2001
From: jiaming <743192023@qq.com>
Date: Fri, 21 Dec 2018 18:29:49 +0800
Subject: [PATCH] some modify

---
 .svn/wc.db               | Bin 200704 -> 200704 bytes
 src/mixins/axisMixin.js  |  14 +++++++-----
 src/views/demo/chart.vue |   1 +
 src/views/demo/other.vue |  46 +++++++++++++++++++++++++++++++++++++++
 4 files changed, 56 insertions(+), 5 deletions(-)

diff --git a/.svn/wc.db b/.svn/wc.db
index 391cc8a3974d0f0dabc6c4200e6cff1ce5cdc4b5..0e9a7200e1a245aab7a9792534a8cf572fe311b2 100644
GIT binary patch
delta 7862
zcmbVR3y@URnZD=Te%yPz``#Jm0RzK4V4}{z^xXG@VVD6Q1ft>?l%O-heGW~ShYS$n
zip{he4O>(eYJw;6fsCjmR#c3ot?L@lXf|6sBw2z9LV{~Wv#G4Yu2!wJmhQRT)6+dn
z16>PM)92j#pYQzV`(NjryM14D`@ZO|nUI{jyLJiw`@-7qb%OOTe%Lu@dw~6v{dBbK
zaP?@z;lPVm9X`&6M@U#k_bnUkIyP(cmZMCW)|Tk+Yja$CaHF{?F*txOd;u!_H$WR@
zkHv$;0|nAR9ew}keEgR^Hb2S`_+J@8aF1}0jFz3ibDY3)oY>5fVt^j){&?2Ri?QQF
z1APz=66w*!M{6=*6?vFmu6MNT9ELfEVa{n>pgTw}^KpQNx;-#^)}`RO`^NDyVp-Uq
zpQjpT#2zdDKiyCUw#9<+^(0}T#wsuaJzoi`NGN?P+xt@`C`&@>j%&Qc2DjB7?C(!(
zY8c*VxAiBsCI*Jv?7<C#8;5W5JMs0y%>)6?Tw2x~*kVqSJ$U=2aLuiW3CWNT`@jZt
zp&HcIY%nc%!;Ognw=FT?xLe~}HoN}o?%Ol3QP&fY3i=POM(3-+Y~Om*Fj)nn#Q71J
zk@erz6eAK3C!Ws_S0@kOS};6Ius<K6Wd>AXJ~sCcT)WQPxG6s@{Z&0U%gqJ>x*qs{
zJAlt1CUc0xy~a#0{dpVsGdDXxFRKgGVi7tgGRR_)Os_xvznvh`K&A0?#2hZ2X4itB
zask|FMCEm`9?f0{ni%3~CVD&ZgUFich#CSH=KVu#L2ORs!^qjl$;gq&n~_%|2O|d}
zdn0>de~s*n+#k6oa(851WKHy!(brxqFI&JQsc?`cC<qos#~U5F#==~qJ=a)}YZ$qP
zmTRcFhLUT@xrUT$h`EN4Yw*$X@mbq)kK*X#zXK=fuJPxc=_B`os{qi`|FsQFO9gHL
zCcTG(t>Ew;8H!!8@~{;;8hkytDqxU@qJN4$3v~{{2z>;c1_!`*;5PCHu_er%)OV@B
zMDL2$M^0lFZi-OMKXI>dTR36&*flSmfO{}L@*rGxb>;OGoG`_JJ5XH}qAMCR&+=ga
z+S8{XJQ1!Wsyo4iaR;&Zrr}}KUyp6mZ~+9<hw9*BfZ~4tbUmy^4bxyC`+C6!&`J_}
zSagVl@qh;8@s<ksOsi>HfoFlZ6r!7#q8A_rdafL@=}j>>4Frh$t_P?b!a8)q0xWu&
zg*T#Y5H>|7f(95_PdUC5a;R-5tU_EJ+?ixzUne?<Q)Kk3=qphx+K5ScAkxWv$)p*Z
zsiohee@J&xU$N!XGqDrgtFe2zEz}Stg#QxWAMOd4hmMAJgq8$93%(P(m0Ql$1;>IL
zgVzOX1AhzrOJFRpEwC~m2Uzl5@*&bDWs-o$;p1=!E`c%dTQCY%f~qRwR5l=d&nAea
zA$sv`05#5pGjW9B{Kyu>U;xZTYo@_30t-U4g5IA7r=!kkupubpZU<_tfYpA#n(pr-
zK5E4@wWDMurs?$>$e?>FVbeoLA&ow$fDeH#zaI~EidgFUtQ1=XVj<#OSBP#$z02WD
z#ExR=`>Js3i%O`WT@~;ubfywdcTI?{Z%6M};_1G<97e;$*}3?MkbQD<6{OQ|RKb-1
z{iqz?gv?qj_WVi^K`VX<S@hgW5KZ4Q9nOa!hGMm_0jLG}It;`ZR$wt2Ghl6Y{b9WR
z{yrdNgweq`Ue8}!VMV%TCj1(SF?{?`)<Mv|K2TL%EDM1)v}iV5CbQonm~UnrxH&{O
zwrAZto6hqd-By@@!NRPT+2T{QmH{=dvgVsCoXM;}@pZ%N^B*M(tOz7*=U;V#Ol(b=
zd~#JGK`R!1`;x+w$_feQW8t^jiy$Zcf>pRK63oN0Kkm-T`uR8;vTYObQW*K0hV#$!
zxqTkyu=5fePF@B`F1oDnq-B7PB_X<_I}7~((+n)Q!H=Un1RAP^<#;cHO%W@oi9ma~
z0S3wfOTsG{MDcLLjPSj<SwnwFzeVq*6Sx-5qCTOHQ3ujHdH7}s%txQ-uxds@Ldw$t
z+Bmdp1+0n{yan;}UJZKGHQxxnR8G}!f8>77?c&yR3P-aag})!ZHT<<O480e6Dzue7
z5Ly+Qk7jhi7AjN|{5<$>@FldQ3wGhsR2@t<HU#NOWM8!Z0E?KZ5*P8x)CK8DPCv;d
zz(S@xNN4l=_#OweGtEKTHwAj|M#yRt&QY-H1x$UA?#NSpu^$10@ky&MpTs*O2WeDZ
z3u~tr+lBy@L3<5YPmM<s;}cu&*M@PdN#QhsmEDt&K+KNLrH=G-OJO$zT@NjX^`JA|
zupDj;;0-8x_+~gStY<kv&(**h|Dit-iAzsLXB4jik+ie|9&a$i`w5LWO9Y+{#DW{S
z<H0C#HZV;64x9;efuFL8;8P?^pM*=oL($(*3t2Mq+t9l)E%^KJDR3>hDa^q4LQir^
zxFhx$c^Z^aG`Tp~2|4yrumx_0KVjb?4~%y0t4wbhf`}ZAJ;^llqUD&Xr3$KJS+=9u
zj^oIZ=b56a8jh-prXm}TYpogWdUB|l=LOkQb;r_8o9A6k<t<CaQjVg_5-&KmqFOwL
zTRZxPCx==US9DxMv0cM3T+<S5(NPq^795e61w&VCTf!5Yt|^iUfWG`TjQ1&ivuSvp
zDKv?SBU_rt8@%BecnVK;WJA$R({}N%VDW-vX$GDmKSZ{5iT6~GH+4bRb=fp5-VkNo
z)OCl)3p9Dfb_Cn8M<Y+4YL*SpRdrrBR6*A?S5Op%H&ofSWYbnG%aeFn^la61N0|d1
z&59@)yk#nmWMH){(-uV2F?HUwRa^E<#d2Lto2Pqd=sQpa5*qktX!OXgV#^lKi?*Vx
zJdbfDS$17h5GC8<RZn#>q9qE6{2~;rk7kLU=IExW;UC2?uw67o&;{PbW)U=3a(T5c
zy>Ki1wbmkpItcC<_b}JT$sAyhvyX%aLqqI3RtZ1B!qBPMJK=?~M`MXl2WmM8Yhh@A
z`i6t>LNJ-1(o!7HG9^VfB*l{q(K8HDl61qcbj!94yh>ZuG|5?)A7VI;CpkPehw1rT
z=#rwTwxPMUtMjfP@s6XKj;31qA&wwg*eIHb!EN2F!`>h(nuph`*dnhemL`juXF1kg
z{uuPeF&Ix%Y4|x6h;<XwQSdNq3jq?4M9=QAIq9Cm@Uy7DHGd5qd>ild4u6V^zkfJE
ziD#jhe)$-@8OE!qr3Ci`cOCm7`+c@Kb|lsx<DxG_zZv-~f+7a<9<z<9qYu*-O;S%$
zOK}RUqLMv{P=bK;>Z})*YC!VUrhZ3hXi^1H6l82aU6&k5_jJv~f#i9rW15a4NImNc
z(TfnDEXsUnYZl(rU0sq@Ua(vbJAz?3im7U<jH6iAW!~-W!|-HI`BGhp_};@=cuTO8
zlI9tbjS~Ql1j&>H9S4G|s<vifm+0{d)h{(B#M9&Cc(SMPo@}VtXFQiT6wk9HRWL-s
zR9u_yaYKn@0rw>aC^(;mcMabkb-`9_)v{en<^@cRZHp3*(~_n1I)&t1BEKZ3BpC8n
zuV?Xj31=?XGqAVoqM?|I=?D(ahPENdJbu+<7m`zIGMeLzbFav%WoSuB$0^Zr3{CS?
ziC1`8GA!4^!QW#Q!j~F=U@QwS2sqYsLpE_5;|-jWRUB@Ds^N6(>8fh>m|65>*6&Nr
z-QdtTH?k?qHcoMlX5qwv>wsoRs^~eoph-CY_N*;b{xWqWIjN8^R2E*t<p%o<PKY@D
z;*2QjxPoZd1QISkiYE4~nFL>AQ3GTa-E}0Jw;fs26)C9*7+DZ3+b?LMEeV$6_1skm
ze^Da4WFCv1%);Zcqhh`t-LD;*E9$BwVsGa~N#|7;E8kmyj(%|lu7cF+O#VaHpM`P1
zvo}W0Lc7kw#{re*{|J8rD&R+i3=9JN8MZSGv3tQk!ZO63gL)G=Ej*Jw$$W$TD!PK(
z9#~Iygx;b*qwAm-{7+_#emsb{Q|X~|a5G4@kgLJC`L5vFPG0m%j%4LU`O7;+t8V6H
zuVmr1X!pOv)nFcK{2U55UMbBc^1$j9l8%>N_W^t~+8~FoBe>sj&u~d<7PpdXX1@$y
z$Nn4p6Lwp8ki9khHmW@jTgt)@Ge?+x%w}deQ%`>yKA*nzJp3?Jz~q%O^t!xeINM$}
z+4ki{uaMf3ikp|UvWeu9dBo0(7CL@0zh9FVy{r=luovHzzTto1YheMG<SJr4!F93s
z#XgS3qT3>WU|yl$rI%9s!}o`t2!0g2Gq62SOS<qG@Cguz^`qrwdSK+*R2RDYXR!Z{
zhJnG2{pJS$Iy9S#N)5LLBDn4TdzhvVY;$mZ!t75B^u<p4&o-NH438{Gb)vs#N!yx&
zUuu;sf{zQQKf$sK1N%p`)S?;q?9@oFM%@p>s@kIWx8vu3G!`W*lSL(_s8?#DFQOh8
z!`f~8{VOZp!rFC=YX@q40}%-V-SHrdPN+HQ5LZ;qNfJ}kEOnz)L{0KltmfdVF)lJ9
zr54V>hsQ?xw#jPF9OtU=a-o=#h3}`RSn77Ah>GHAtYYfHmLt!YsrDK8_*y}?`x;gd
zv+-4Us1Xf30_jjzNp$y{u!0{y+m0*YBsL}nyu?6a(|3!YkE}{9K*D42YI@@6i^_Mv
znu2cQm!LK|@iu=jp0dayTgsw4$|7onw))O2zfieigi0AR@Nv7DURAJ4bo2pORiM+z
zT-YK`=v3NDwUl0LzdkkUFSA9Mv_mMe4u<mAv9|6<fsx*nhIa3R6=+urti#`Sd{(m`
zoRH6`-*gLZ45qMI>Nco|7T}Pt#c*d^bE-C_qBX5hyxa#cbf^`!R293XXh6aRpf4-+
zxLQn=^S&x~4xg<aX-Fw38Hd97cP{*s;~}1zyEH3CQ!*NR6ka_}rSAxSvqdXycyCH7
zu!@?uiaMc<TX6R>#VVy<S`?###8f2y<NUw=IyE~bqMNrvF>{}TKQv}6kiFaiS<aVV
z;*2omh)`rAd}{D#I^(Q*7LzVyNzdIvPb@Q@xpyv&wP=dZldhr(($&(2_omt=NUzM@
zWgq?_tjo299dOP-v3u<){Fi#PDMHH}2eXp;+p63CdnB5QXV#OO|NIWfx8>(AX;o+u
jN4^;uS(utRgT9uUOZR4KFWQChM}=QRNf!M$O78eSS!eFR

delta 2544
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
KKD}xQC;ts2x3eVx

diff --git a/src/mixins/axisMixin.js b/src/mixins/axisMixin.js
index 9e56477..0ebc8ed 100644
--- a/src/mixins/axisMixin.js
+++ b/src/mixins/axisMixin.js
@@ -44,7 +44,7 @@ export default {
   },
   methods: {
     initAxis () {
-      const { calcMaxMinValue, calcValueAxisTag, calcLabelAxisTag, calcXYAxisFS } = this
+      const { calcMaxMinValue, calcValueAxisTag, calcLabelAxisTag } = this
 
       calcMaxMinValue()
 
@@ -52,28 +52,32 @@ export default {
 
       calcLabelAxisTag()
 
-      calcXYAxisFS()
+      const { calcXYAxisFS, calcXYLabelMaxWidth, calcAxisMargin } = this
 
-      const { calcXYLabelMaxWidth, calcAxisMargin, calcAxisOriginPos } = this
+      calcXYAxisFS()
 
       calcXYLabelMaxWidth()
 
       calcAxisMargin()
 
-      calcAxisOriginPos()
+      const { calcAxisOriginPos, calcAxisWH, calcValueTagPos } = this
 
-      const { calcAxisWH, calcValueTagPos, calcLabelTagPos, calcTagGap, calcTagColor, calcGridColor } = this
+      calcAxisOriginPos()
 
       calcAxisWH()
 
       calcValueTagPos()
 
+      const { calcLabelTagPos, calcTagGap, calcTagColor } = this
+
       calcLabelTagPos()
 
       calcTagGap()
 
       calcTagColor()
 
+      const { calcGridColor } = this
+
       calcGridColor()
     },
     calcMaxMinValue () {
diff --git a/src/views/demo/chart.vue b/src/views/demo/chart.vue
index 3dcb6b1..c6d95f6 100644
--- a/src/views/demo/chart.vue
+++ b/src/views/demo/chart.vue
@@ -1270,6 +1270,7 @@ export default {
     width: 80%;
     margin-left: 20%;
     text-align: center;
+    margin-bottom: 20px;
 
     .highlight-code {
       margin: -40px 0px;
diff --git a/src/views/demo/other.vue b/src/views/demo/other.vue
index 2e21fa2..5a6bd95 100644
--- a/src/views/demo/other.vue
+++ b/src/views/demo/other.vue
@@ -146,6 +146,45 @@ textAlign: ['center', 'center']
       </div>
     </border-box-7>
 
+    <border-box-7 class="other-item">
+      <div class="component">
+        <percent-arc :percent="66" :ringLineWidth="10" :arcLineWidth="20" arcType="round">66</percent-arc>
+      </div>
+
+      <div class="config-info">
+        <div class="title">Percent-Arc</div>
+
+        <highlight-code>
+&lt;percent-arc :percent="66" :ringLineWidth="10" :arcLineWidth="20" arcType="round"&gt;66&lt;percent-arc/&gt;
+        </highlight-code>
+
+        <highlight-code>
+// 内置slot 可以置入任意元素
+// percent 必须 设置弧度程度
+// arcType 非必须 设置是否为圆角弧形 round | butt
+// raidus 非必须 设置环半径
+// ringLineWidth 非必须 设置环线宽度
+// arcLineWidth 非必须 设置弧线宽度
+// ringColor 非必须 设置环线颜色 只能设置一种颜色
+// arcColor 非必须 设置弧线颜色 可以设置多种 多种自动渐变
+        </highlight-code>
+      </div>
+    </border-box-7>
+
+    <border-box-7 class="other-item">
+      <div class="component">
+        <percent-arc :percent="66" ringColor="#c7166f" :arcColor="['#2755fe', '#ff12cb']">66</percent-arc>
+      </div>
+
+      <div class="config-info">
+        <div class="title">Percent-Arc</div>
+
+        <highlight-code>
+&lt;percent-arc :percent="66" ringColor="#c7166f" :arcColor="['#2755fe', '#ff12cb']"&gt;66&lt;percent-arc/&gt;
+        </highlight-code>
+      </div>
+    </border-box-7>
+
     <border-box-7 class="other-item">
       <div class="component">
         <number-show :number="1399" />
@@ -245,5 +284,12 @@ export default {
     width: 300px;
     height: 80px;
   }
+
+  .percent-arc {
+    width: 200px;
+    height: 200px;
+    font-size: 50px;
+    color: aqua;
+  }
 }
 </style>