From d372bb977f57b244faf635e21af458bf2e8a98ef Mon Sep 17 00:00:00 2001
From: Ri Xu <xuri.me@gmail.com>
Date: Tue, 30 May 2017 12:13:13 +0800
Subject: [PATCH] Priority cell style, when the cell and the column at the same
 time with the style attribute. Relate issue #54 and #56.

---
 excelize.go         |  15 +++++++--------
 test/Workbook1.xlsx | Bin 22954 -> 22968 bytes
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/excelize.go b/excelize.go
index cd5e86e..fa9c004 100644
--- a/excelize.go
+++ b/excelize.go
@@ -135,23 +135,22 @@ func (f *File) SetCellInt(sheet, axis string, value int) {
 	completeRow(xlsx, rows, cell)
 	completeCol(xlsx, rows, cell)
 
-	xlsx.SheetData.Row[xAxis].C[yAxis].S = f.prepareCellStyle(xlsx, cell)
+	xlsx.SheetData.Row[xAxis].C[yAxis].S = f.prepareCellStyle(xlsx, cell, xlsx.SheetData.Row[xAxis].C[yAxis].S)
 	xlsx.SheetData.Row[xAxis].C[yAxis].T = ""
 	xlsx.SheetData.Row[xAxis].C[yAxis].V = strconv.Itoa(value)
 }
 
 // prepareCellStyle provides function to prepare style index of cell in
 // worksheet by given column index.
-func (f *File) prepareCellStyle(xlsx *xlsxWorksheet, col int) int {
-	s := 0
-	if xlsx.Cols != nil {
+func (f *File) prepareCellStyle(xlsx *xlsxWorksheet, col, style int) int {
+	if xlsx.Cols != nil && style == 0 {
 		for _, v := range xlsx.Cols.Col {
 			if v.Min <= col && col <= v.Max {
-				s = v.Style
+				style = v.Style
 			}
 		}
 	}
-	return s
+	return style
 }
 
 // SetCellStr provides function to set string type value of a cell. Total number
@@ -183,7 +182,7 @@ func (f *File) SetCellStr(sheet, axis, value string) {
 			}
 		}
 	}
-	xlsx.SheetData.Row[xAxis].C[yAxis].S = f.prepareCellStyle(xlsx, cell)
+	xlsx.SheetData.Row[xAxis].C[yAxis].S = f.prepareCellStyle(xlsx, cell, xlsx.SheetData.Row[xAxis].C[yAxis].S)
 	xlsx.SheetData.Row[xAxis].C[yAxis].T = "str"
 	xlsx.SheetData.Row[xAxis].C[yAxis].V = value
 }
@@ -205,7 +204,7 @@ func (f *File) SetCellDefault(sheet, axis, value string) {
 	completeRow(xlsx, rows, cell)
 	completeCol(xlsx, rows, cell)
 
-	xlsx.SheetData.Row[xAxis].C[yAxis].S = f.prepareCellStyle(xlsx, cell)
+	xlsx.SheetData.Row[xAxis].C[yAxis].S = f.prepareCellStyle(xlsx, cell, xlsx.SheetData.Row[xAxis].C[yAxis].S)
 	xlsx.SheetData.Row[xAxis].C[yAxis].T = ""
 	xlsx.SheetData.Row[xAxis].C[yAxis].V = value
 }
diff --git a/test/Workbook1.xlsx b/test/Workbook1.xlsx
index 909887af20296dd73d1d3030f2b929cf8c8784e7..8e7c88ac1696a75407cad55a88358839b6639464 100644
GIT binary patch
delta 1446
zcmZ3rnQ_Nv#tm#t%#{iIHghtWGJ+Y7%pS}j#^fG0Ik3Q5HeayJ<c$_0BFPzvMJ2`h
z0p83kA`Bn^(yPjmF9X&xT}2(N<)F$sRxqPT%Z3lk*l3XeF<!)K7YA7FMJG+L%wH!L
z7GBQ8eO~4Md!0WrF))0b?B}jnA3J%Lfk@kX>&yQSJlW^;L!j`;+_mTYzAw7$w_N_Z
zV3PrNi(26I`umd^PO-h+anHl<T;+ZB_T-X}AEKsSn^zRL!OE@TkwW)1PVeq2>BaH(
z^X<+~P*qtO9JFcHu@@e!RS|W6Hdq+^Q!4UW%F4C1BTz5Zczf=|CtH+~4oO8F_B&Qz
z;i}^E^O_j%a+Rx|p_#k;jJIkBU0D%2<8!o0#57UP*v%>77o)Z*&6(!HwEsl6+n21+
zqV5>iAE(#-oU&mRW2bMR*rye)6GK%$KhHgDadS$+yYM%Yms}5<ys;)!We(@Glbk0?
z7d$q0FH32@R5VenfGM=B`?8K(f5pCI5;sq`^40%~z0fStqZ|63H(5XH)0|@`95;A-
z&+<@pe6Vr3cGNV(s6_F5H{%1YCaY%7FFE&k^S{Y@C(843I~Hh%{nHGZ>1^zvzr;j&
zchJ9tcKt0ko(Y95H2L-C^OqgVlp41)7zpQ1-VpS{U;8HK$yIS2k?f{Hg^VK8_8dFW
zoE~_1^XcsH`onpqA-?4yrR53#_jk>WyOQemYsZ8O@_D{0k$M)^5i!p@+g9WqEtZe`
zW%KaqXBLi{&~uBuF0I_4m{7X^2zT}Rm|Y#`Yg_K>uDQipKH<?m-^g;oSz-_TTHe{V
zyz3~)5-1bYt^HC~d^NAC`OAd`xym(r*=_H<m3nc{_QgGpyT<hwc6VI6ZGK^|;IA_d
z-`QT&6|mmj&wf{a;cvEG_742ZfTUADPs#sjtJuFUSgkU(>Kh-=mxPGYoCWO4C2yqP
z9Bi;X5PoC1^Ed75UhgestE<|cmppj+@WH0^AAIKvp1hQp_V9qv?uV(TZ(8f5uYK@g
z#<QyzTesYmi`~|fx8cpYEA^L;-ZSejcIrH)al@grP4s*E^vDgx%x7LcD>=3<?PBPe
zojdnvulr%UuHuE(&ai)K#ix9;ZEOlFj^5gPa@X07?E8awZ(ds8lHVN_p?bDNr9`4#
z{7S!S_7{$Q@zQD!zkb~;^Dix6UD}29lF6H9zlfi4dH&X?_5t3EO!f?*e8n+2+A9s5
zO^$dOikQuLzW3*iON=m@eb2w|lMi}}OqTVI1S@*yBRzSFx1><`D~LiEJ&Sd+qL0|*
zOlH2xkG(g8mCp3hQ$Otb8f+en&UX9v{d4psMuh#~d_DP{j|pFe#S5@n2tC=rw+U>_
z#!%_W7ks7o<o3S=OGD_%3XvkL5WRwa)*>_8AbMf6#+UzKcW*B7TLvj(WP{Ar3!7en
zjeyZ0RoGlp9b_xwZvs&Zqv0k#2=agwQlOx43z6ijfA<t@Dumvg8{!Bp#6nGl7JY}9
z0;4<cO?L1Xo6HxM1P{%=FiF16a*$wx&_KV5O)l_bnS4I%5Lnria7%TzM-U}2`h7Td
rw|@z@=X*LCq836=c8vInR_r-PTCzo+kdFIxV{%iZ5?h=XsC)$g=>)x`

delta 1405
zcmdn7nQ_%-#tm#t%)T?0Zsue%Wdt)EnLU_6jLAK0a$teAY`$Qb$r~+1M3OTSi%N?1
z1H748L>NE-q*s+AUk0pYx{5kj%R!ZOtYAiwmJJ`6vC$#{V!VjeE)KBTi%yzgnZHgh
zEW8tDEcMFGc*p#hiGktbWIuPsdf)!p1_EvGr~Z<k@IKZ+-m}9g?6%A5cMG#ZzdnA`
zz?s1qeA~0^f9-KLq4l1ta`X-!Gk*WOVupm+cm2|*Z#2bKvxQpT+dR3TmKu38NBGO@
z=Z}|57PYAOx@ldzz_K@}@!fQJdmX+W`|hTomkmzJLLnYE&&7r>VO`s~BUv{$LA5@8
zkDAc3n%7;^f+xLPva6`}{Old3n$lM^&-^r%(m8*6%DTv1t233Y1^u*@8skM$wb`~>
z?R8tH_NVfComb@DrX$PNc>P@EIx%?p=jFMFEpCQvcrPw9spLY~<c&44%jR%SJ8eDT
zwd3*XzPmSAmp)a}PGn#8hHrUgliY`zUc;j4-1V}5b}wO1?2!$9&zpQc>(dm~6V4mF
zv}bv#IzHI6Tstb1Gb&Mj-p%-ctI4V_<x2e?PyV-9??m~#oQ?(BVShD^BOQz#^ixdK
zcYFOyXxHCzM@;CQQ|6a{&u_k-)g>~I>A;=L*;7KD{#(8D^9bX2I$^nDVpsQq4Np`Z
z8Dmbn#oqm2pZ?`zp}hR-w+@FG_Nz_O5uYO~v+lEtcZm6;$_|;c*0$%R6+eVp@@si6
zKh)H)`?qS`j_RkE+-u~N?)*EpYWG8F&40J2l*%v6WPIoG;=a?1ehzi9MEQ#skLQbr
z-%Uzb;;(y4Pw7hbg~fkYwaVRTlIyv^%)Ph&#U5vFTZx6|b-vUeaNu9e{o<kSi-#Px
zTP`>=+s=vrF}GbfoV`l!ZqvF+A+JtaZ@Qqo`PB`lezzAETW%;f+a40Xp|1A3H97gi
zoE}@|)5S>@Y!+7UEo<AKmppkHIW73G(C^Eir)@5eIA`TpJp0?li|r+M<>qhiS-;^;
z|CPrF@0#|PyL2AcxZ%{9cDAd1^JkqKyP2L<6jddM?|z~6>`Kf**6=@a;W@j!)=k}i
zvZ?5{)NJc{aT~s^-}J61=CSV8NxFZ%er(HW3BDNP?$lmb;cz%&Q&|6l|63D<<n9}2
zKQL}8GHtFqD>?bE%l^bZ`Q+2}ljFP!!MWj*mm!~h=N{qyqn8*V^khNrVz5+WnDpdD
z-jYK88z9m!dKT+seIK#Onaq5XKYDKlD_!oRr@s2hey}MpI@|5v_s`Ln7z4Z+nd}+h
znRYVBSaDxTzJ%)#V<GfpJKrX-QTs!sC*SjxQa^lfFW5L3{iE(bR^#OTtoa&MA!;G?
z<boiP$@V^Mo16TWK}r<uAalMa{QJP>L1>^FF|c)=LAHEXUO==%Xt?%wK^~Cu2jt?A
z5J^5>5r~T+^ycaiM~M9XP*c9HX%OE-=*b)W#U>~CvrLu=OM-@_3E%9!5G4?LvR))a
z$=$F+U?q#fE!FpM9{@WNM!yfo?rEk7dp=k=L+Hu=5ns_tv%pA8wjcq<`2M4lCqyc-
J1$cpqO#qbveY^kw