From 3dc27635b265d2bb2b5c1bf509c05770a0ca8c78 Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Tue, 14 Sep 2021 17:37:07 +0800 Subject: [PATCH 1/2] =?UTF-8?q?BI-94052=20fix:=20=E5=B9=B4=E5=AD=A3?= =?UTF-8?q?=E5=BA=A6check=E8=8C=83=E5=9B=B4=E4=B8=8D=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/widget/yearquarter/trigger.yearquarter.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/widget/yearquarter/trigger.yearquarter.js b/src/widget/yearquarter/trigger.yearquarter.js index 419e4b160..097d65110 100644 --- a/src/widget/yearquarter/trigger.yearquarter.js +++ b/src/widget/yearquarter/trigger.yearquarter.js @@ -69,7 +69,7 @@ BI.DynamicYearQuarterTrigger = BI.inherit(BI.Trigger, { if(BI.isEmptyString(month)) { month = parseInt(v, 10) === BI.parseDateTime(o.min, "%Y-%X-%d").getFullYear() ? BI.parseDateTime(o.min, "%Y-%X-%d").getMonth() + 1 : 1; } else { - month = (v - 1) * 3 + 1; + month = (parseInt(month, 10) - 1) * 3 + 1; } return v === "" || (BI.isPositiveInteger(v) && !BI.checkDateVoid(v, month, 1, o.min, o.max)[0]); } From 5ba9739935aba378701e89de8b86871466bb2a5a Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Wed, 15 Sep 2021 13:53:45 +0800 Subject: [PATCH 2/2] =?UTF-8?q?BI-93324=20=E9=80=89=E8=89=B2=E6=8E=A7?= =?UTF-8?q?=E4=BB=B6=E8=A7=86=E8=A7=89=E9=AA=8C=E6=94=B6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/images/1x/icon/auto_square_normal.png | Bin 0 -> 508 bytes .../1x/icon/dark/auto_square_normal.png | Bin 0 -> 500 bytes dist/images/1x/icon/dark/trans_disable.png | Bin 535 -> 0 bytes dist/images/1x/icon/trans_disable.png | Bin 535 -> 0 bytes dist/images/2x/icon/auto_disable.png | Bin 1368 -> 0 bytes dist/images/2x/icon/auto_square_normal.png | Bin 0 -> 996 bytes .../2x/icon/dark/auto_square_normal.png | Bin 0 -> 980 bytes dist/images/2x/icon/dark/trans_disable.png | Bin 1018 -> 0 bytes dist/images/2x/icon/trans_disable.png | Bin 1018 -> 0 bytes src/case/colorchooser/colorchooser.js | 2 +- .../colorchooser/colorchooser.popup.hex.js | 6 +++--- .../colorpicker/button/button.colorpicker.js | 2 +- .../colorpicker/editor.colorpicker.hex.js | 18 +++++++++--------- .../editor.colorpicker.hex.simple.js | 14 +++++++------- .../colorpicker/editor.colorpicker.less | 8 -------- src/less/lib/background.less | 2 +- src/less/lib/icon.less | 4 ++-- src/less/resource/background.less | 14 ++++++++++++-- src/less/resource/icon.less | 7 +++++-- 19 files changed, 41 insertions(+), 36 deletions(-) create mode 100644 dist/images/1x/icon/auto_square_normal.png create mode 100644 dist/images/1x/icon/dark/auto_square_normal.png delete mode 100644 dist/images/1x/icon/dark/trans_disable.png delete mode 100644 dist/images/1x/icon/trans_disable.png delete mode 100644 dist/images/2x/icon/auto_disable.png create mode 100644 dist/images/2x/icon/auto_square_normal.png create mode 100644 dist/images/2x/icon/dark/auto_square_normal.png delete mode 100644 dist/images/2x/icon/dark/trans_disable.png delete mode 100644 dist/images/2x/icon/trans_disable.png diff --git a/dist/images/1x/icon/auto_square_normal.png b/dist/images/1x/icon/auto_square_normal.png new file mode 100644 index 0000000000000000000000000000000000000000..1b90b9bb0e48508e77f3059c3e237f565ea6069c GIT binary patch literal 508 zcmVPx$wn;=mR7gwhma$74Q5?s=zq`aD0bN{bLJJNKf^!xNbrf_EnyJvC+?_5$-Z{kP z3C)maif9fOp_e=9+Cn=NbQEj_{R4E6IEmW1gP>L4uiPd!^%6Bs{?^~)^Wl9TKi-dQ zSN&wh5ZX{g*d$9R4m?S1;3Hx`3T{lc<%sNj+0~|z2p5a<&AeGlg4a`}uFgdA7yub3 zX0Pwh{Em~fB(U8%o0XNLg&2t1jKfVNPd z85lNBdeXi>asEF^Q#Y_hd7MGt0RF%*HzF8;UjSUx#IIJWvtREdu!Q;!V5|{@fYq8O zM{g}~^6IH38~_LmlRjMq@g=`uz|qOX^OgBRG#~#|Y(%!J3RPx$u1Q2eR7gwh)-h-kVHn2o=lPOgq|#k07Ho2cyEAvtK$jNkDCkgV*KUeS2fGMG za1kov;v!TWx;p3}=vZhgm?6XEdY5v!OrmvmYfbXKlDepzy`*iNdg~qkANL%`9qU1J zTYzZ{;UMslUeFZRHaLVndhIjd$Ylqf$P1!nrI;<7#?yYD*+4+G8jt2L$R0p;_SL0I zW#W4pG7#YJw(jVzet8(By60MjwNnM^Ve=Ef5fRY<4qV%qIyE2+W3w$1Qt>{7T0}pm zQr8``5FCZ{J(0H)KLcgyd``x+)^gCzdK{ zbgbg)F@Y!|`OUG6+2laH0phZ26^(%b5y|*rt4gIFmCcC{NdZ5MZVJ@nvRRlS+4=jL q)QQsG)U@+wK-xn8>6<+4-EbO>3WXm+l=3t8Zq@{o~NwtEjHw#;U8kMhA#;_^)&{ab8q%`M5Z+$=>md z{D$pUB;Mui-Ci!OcQD3b`OU=dd(F*_-*^0zymNMXP|?N`d(S6%g28Tky;lj(^gB4O zHZ4u^c?pM1xLh00`cUOZZH|vra(VVK-uYs8+~$*c$CHd(UN^rz`m$Rrlebz1XMA$;`#uXCr&^^ZJ~ zT778C*8>b)$6r3ZE3$d_{%P?N?b@N-9uEv=sGQ)RbmGXn)^whftxIqFxl9fES}39B zxyk6n?42|D|Axvk?QpR+;M}9w{8cOA(D@~;|7!j*9M!*gT}xABB`8unUHx3vIVCg! E06cxoCIA2c diff --git a/dist/images/1x/icon/trans_disable.png b/dist/images/1x/icon/trans_disable.png deleted file mode 100644 index c1d4dfe79d3f86690aaa9d41ef30ef5aee21e465..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 535 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|Tv8)E(|mmy zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uuz(rC1}QWNE&K#j*68Wt7-Au~ zG}zXg*->EbO>3WXm+l=3t8Zq@{o~NwtEjHw#;U8kMhA#;_^)&{ab8q%`M5Z+$=>md z{D$pUB;Mui-Ci!OcQD3b`OU=dd(F*_-*^0zymNMXP|?N`d(S6%g28Tky;lj(^gB4O zHZ4u^c?pM1xLh00`cUOZZH|vra(VVK-uYs8+~$*c$CHd(UN^rz`m$Rrlebz1XMA$;`#uXCr&^^ZJ~ zT778C*8>b)$6r3ZE3$d_{%P?N?b@N-9uEv=sGQ)RbmGXn)^whftxIqFxl9fES}39B zxyk6n?42|D|Axvk?QpR+;M}9w{8cOA(D@~;|7!j*9M!*gT}xABB`8unUHx3vIVCg! E06cxoCIA2c diff --git a/dist/images/2x/icon/auto_disable.png b/dist/images/2x/icon/auto_disable.png deleted file mode 100644 index 8fca5adc1b82106faa63618896e1d9a9781d79ab..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1368 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 SJa<(90000Px&j!8s8RA@u(npC(7X`aPu|C*S%1 z&iO7UX)wji4McR6fI6X$8UhX?;y%<3o~t+Ur8qkfNh3pcMc|K?F;i3IYlvw1)LeFZ-~f7>?D(|j&fP6mR z`tj4~FcHiiFBSp5HR0S2Rh>Ut4T!)ppd0260&&xs`vCobSR|sDyO{TAihRAc0a)e< z5v&^%EcK$Gq5wKSCK{h7V)B}r1z^k!7f5hdU@_F%)Y(#)X?-t@<^iDD?w6XIqw%GS z`~5-$GKF-;PZH4)ck8^bsqz;4S~vI|0@^m#4`($s(pz%?L=@5)e+vK$U4YG+DnGEV zQ|atRA*@Gk|8QIhcOhcY4@A{7Fqz27;HC;ub%62H1VB2Ih=mW07pF6Rf{2d(IlXEE zU|=BM{kkq^)r!e9xU8S zNwk8nZDb&bs8%v&BLkI0D+t^FCj)i=u}8gsZu1MDbiXN$#{#wh0000Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91AfN*P1ONa40RR91AOHXW0IY^$^8f$?WJyFpR9Fe+S3zqNK@^_ZP0}{n zqA6ZNd#VSa2QP{q^x#d})DV;)ScD)_Jb3UIi2p#mNGYWv6*MR%OW#Ov0n_<>G`wYAWZX`0 zCPoDlXK_Dg{EJ|Gg$bij?YBNmO-z)7;sz2h|7Llpx?7tOf?W*)%sG1-j)d+`ULPy^ z`TtYE^z`R&WMKU%5#NzOyhz|VgNr4`%+)?4x{mRRU5+zmjo5;ZlW&qSF@$mQo!#Ax z-g@qG*+x%n;cAEBhozNa0HxhH{G`Cs-sj+NUn7{2ph6(YA2^Qy^ zubN@w*6kbPAC-^Zw-f+!Q8BT)J|bQmjGmlKCNFL2H~QJR-247gxs;WUjaNev<8mtz zMl%q$9V>UqpJZ+(Qtgrhb7yC>m%3rt^hm;1)qVkNd0qeCBLL4_ZaZHj@&~kqcHKRg zmCY`n`eW7J(dtL(9IW6_3L!>--Hgy60H@tKaP-Wv?cE?hW`?fBqOmm25wO9bi)avl zSIwEE19y;ZZ(cdb)9JAv4i;eo+v9Lmcmfb)+yhg@X?N!Xcl(hm0Ex+q-~g8z_XIc* zjz;mG`@L%FX4U(V!w;CihOM|@djb$%odGAvzzWuakSin^!05{5!nh{@v0XZvtFrh1 zZ--pRu5)PuRAN!#)sMb?a*Aqh=vG|d@OHqDP@g{txqd$v_1NMGKuU#^Of0&4qumL) zht1hnh3W}#^0_l=ji|}yz7ukZC9&&V`XiuX0!~P&&BVCwoLs|pxq$2K04f;_P@qU6 zrNUON8|1(QHZT(#Z49>m-8ytGuBLD>?YB&nms*qgk=^5D8Zwg{# z+vi>u7KF|2lYd3@TIX98rwwO72Y&u~=>p0qR5G0urC2%0GpW=s9beh|3V_3*mgPzz o`a}CL(M7=iAD?E;97pf^FK^y50h%Otk^lez07*qoM6N<$f@}Q26#xJL diff --git a/dist/images/2x/icon/trans_disable.png b/dist/images/2x/icon/trans_disable.png deleted file mode 100644 index 95041189f22eca5c46a6fd740c5ba209e1815ed4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1018 zcmVPx#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91AfN*P1ONa40RR91AOHXW0IY^$^8f$?WJyFpR9Fe+S3zqNK@^_ZP0}{n zqA6ZNd#VSa2QP{q^x#d})DV;)ScD)_Jb3UIi2p#mNGYWv6*MR%OW#Ov0n_<>G`wYAWZX`0 zCPoDlXK_Dg{EJ|Gg$bij?YBNmO-z)7;sz2h|7Llpx?7tOf?W*)%sG1-j)d+`ULPy^ z`TtYE^z`R&WMKU%5#NzOyhz|VgNr4`%+)?4x{mRRU5+zmjo5;ZlW&qSF@$mQo!#Ax z-g@qG*+x%n;cAEBhozNa0HxhH{G`Cs-sj+NUn7{2ph6(YA2^Qy^ zubN@w*6kbPAC-^Zw-f+!Q8BT)J|bQmjGmlKCNFL2H~QJR-247gxs;WUjaNev<8mtz zMl%q$9V>UqpJZ+(Qtgrhb7yC>m%3rt^hm;1)qVkNd0qeCBLL4_ZaZHj@&~kqcHKRg zmCY`n`eW7J(dtL(9IW6_3L!>--Hgy60H@tKaP-Wv?cE?hW`?fBqOmm25wO9bi)avl zSIwEE19y;ZZ(cdb)9JAv4i;eo+v9Lmcmfb)+yhg@X?N!Xcl(hm0Ex+q-~g8z_XIc* zjz;mG`@L%FX4U(V!w;CihOM|@djb$%odGAvzzWuakSin^!05{5!nh{@v0XZvtFrh1 zZ--pRu5)PuRAN!#)sMb?a*Aqh=vG|d@OHqDP@g{txqd$v_1NMGKuU#^Of0&4qumL) zht1hnh3W}#^0_l=ji|}yz7ukZC9&&V`XiuX0!~P&&BVCwoLs|pxq$2K04f;_P@qU6 zrNUON8|1(QHZT(#Z49>m-8ytGuBLD>?YB&nms*qgk=^5D8Zwg{# z+vi>u7KF|2lYd3@TIX98rwwO72Y&u~=>p0qR5G0urC2%0GpW=s9beh|3V_3*mgPzz o`a}CL(M7=iAD?E;97pf^FK^y50h%Otk^lez07*qoM6N<$f@}Q26#xJL diff --git a/src/case/colorchooser/colorchooser.js b/src/case/colorchooser/colorchooser.js index 21b124534..698afa714 100644 --- a/src/case/colorchooser/colorchooser.js +++ b/src/case/colorchooser/colorchooser.js @@ -60,7 +60,7 @@ BI.ColorChooser = BI.inherit(BI.Widget, { }] }, o.popup), value: o.value, - width: 292 + width: 300 }, value: o.value }); diff --git a/src/case/colorchooser/colorchooser.popup.hex.js b/src/case/colorchooser/colorchooser.popup.hex.js index 47778f691..347dd0401 100644 --- a/src/case/colorchooser/colorchooser.popup.hex.js +++ b/src/case/colorchooser/colorchooser.popup.hex.js @@ -7,7 +7,7 @@ BI.HexColorChooserPopup = BI.inherit(BI.Widget, { props: { baseCls: "bi-color-chooser-popup", - width: 292, + width: 300, recommendColorsGetter: BI.emptyFn, // 推荐色获取接口 simple: false // 简单模式, popup中没有自动和透明 }, @@ -21,11 +21,11 @@ BI.HexColorChooserPopup = BI.inherit(BI.Widget, { items: [{ el: { type: "bi.vertical", - hgap: 10, + hgap: 15, items: [BI.extend({ type: o.simple ? "bi.simple_hex_color_picker_editor" : "bi.hex_color_picker_editor", value: o.value, - height: o.simple ? 30 : 64, + height: o.simple ? 36 : 70, listeners: [{ eventName: BI.ColorPickerEditor.EVENT_CHANGE, action: function () { diff --git a/src/case/colorchooser/colorpicker/button/button.colorpicker.js b/src/case/colorchooser/colorpicker/button/button.colorpicker.js index f2630a785..a50f3d57e 100644 --- a/src/case/colorchooser/colorpicker/button/button.colorpicker.js +++ b/src/case/colorchooser/colorpicker/button/button.colorpicker.js @@ -19,7 +19,7 @@ BI.ColorPickerButton = BI.inherit(BI.BasicButton, { var self = this, o = this.options; if (BI.isNotNull(o.value)) { if (o.value === '') { - this.element.addClass("auto-color-normal-background"); + this.element.addClass("auto-color-square-normal-background"); } else if (o.value === "transparent") { this.element.addClass("trans-color-background"); } else { diff --git a/src/case/colorchooser/colorpicker/editor.colorpicker.hex.js b/src/case/colorchooser/colorpicker/editor.colorpicker.hex.js index c706c35fc..6aa07afe8 100644 --- a/src/case/colorchooser/colorpicker/editor.colorpicker.hex.js +++ b/src/case/colorchooser/colorpicker/editor.colorpicker.hex.js @@ -39,7 +39,7 @@ BI.HexColorPickerEditor = BI.inherit(BI.Widget, { allowBlank: true, value: 255, width: c.RGB_WIDTH, - height: 20, + height: 24, listeners: [{ eventName: BI.TextEditor.EVENT_CHANGE, action: function () { @@ -122,20 +122,20 @@ BI.HexColorPickerEditor = BI.inherit(BI.Widget, { }, { el: { type: "bi.vertical_adapt", - columnSize: [16, 10, 'fill', 12, c.RGB_WIDTH, 12, c.RGB_WIDTH, 12, c.RGB_WIDTH], + columnSize: [22, 10, 'fill', 12, c.RGB_WIDTH, 12, c.RGB_WIDTH, 12, c.RGB_WIDTH], rgap: 5, items: [{ el: { type: "bi.layout", cls: "color-picker-editor-display bi-card bi-border", - height: 16, - width: 16, + height: 22, + width: 22, ref: function (_ref) { self.colorShow = _ref; } }, - width: 16 + width: 18 }, { type: "bi.label", text: "#", @@ -150,7 +150,7 @@ BI.HexColorPickerEditor = BI.inherit(BI.Widget, { allowBlank: true, errorText: BI.i18nText("BI-Color_Picker_Error_Text_Hex"), width: c.HEX_WIDTH, - height: 20, + height: 24, listeners: [{ eventName: "EVENT_CHANGE", action: function () { @@ -239,11 +239,11 @@ BI.HexColorPickerEditor = BI.inherit(BI.Widget, { _showPreColor: function (color) { if (color === "") { - this.colorShow.element.css("background-color", "").removeClass("trans-color-background").addClass("auto-color-normal-background"); + this.colorShow.element.css("background-color", "").removeClass("trans-color-background").addClass("auto-color-square-normal-background"); } else if (color === "transparent") { - this.colorShow.element.css("background-color", "").removeClass("auto-color-normal-background").addClass("trans-color-background"); + this.colorShow.element.css("background-color", "").removeClass("auto-color-square-normal-background").addClass("trans-color-background"); } else { - this.colorShow.element.css({"background-color": color}).removeClass("auto-color-normal-background").removeClass("trans-color-background"); + this.colorShow.element.css({"background-color": color}).removeClass("auto-color-square-normal-background").removeClass("trans-color-background"); } }, diff --git a/src/case/colorchooser/colorpicker/editor.colorpicker.hex.simple.js b/src/case/colorchooser/colorpicker/editor.colorpicker.hex.simple.js index 1a5b361af..9e9c33e90 100644 --- a/src/case/colorchooser/colorpicker/editor.colorpicker.hex.simple.js +++ b/src/case/colorchooser/colorpicker/editor.colorpicker.hex.simple.js @@ -13,7 +13,7 @@ BI.SimpleHexColorPickerEditor = BI.inherit(BI.Widget, { props: { baseCls: "bi-color-picker-editor", - height: 30 + height: 36 }, render: function () { @@ -37,7 +37,7 @@ BI.SimpleHexColorPickerEditor = BI.inherit(BI.Widget, { allowBlank: true, value: 255, width: c.RGB_WIDTH, - height: 20, + height: 24, listeners: [{ eventName: BI.TextEditor.EVENT_CHANGE, action: function () { @@ -58,18 +58,18 @@ BI.SimpleHexColorPickerEditor = BI.inherit(BI.Widget, { el: { type: "bi.vertical_adapt", rgap: 5, - columnSize: [16, 10, 'fill', 12, c.RGB_WIDTH, 12, c.RGB_WIDTH, 12, c.RGB_WIDTH], + columnSize: [22, 10, 'fill', 12, c.RGB_WIDTH, 12, c.RGB_WIDTH, 12, c.RGB_WIDTH], items: [{ el: { type: "bi.layout", cls: "color-picker-editor-display bi-card bi-border", - height: 16, - width: 16, + height: 22, + width: 22, ref: function (_ref) { self.colorShow = _ref; } }, - width: 16, + width: 18, }, { type: "bi.label", text: "#", @@ -84,7 +84,7 @@ BI.SimpleHexColorPickerEditor = BI.inherit(BI.Widget, { allowBlank: true, errorText: BI.i18nText("BI-Color_Picker_Error_Text_Hex"), width: c.HEX_WIDTH, - height: 20, + height: 24, listeners: [{ eventName: "EVENT_CHANGE", action: function () { diff --git a/src/less/base/colorchooser/colorpicker/editor.colorpicker.less b/src/less/base/colorchooser/colorpicker/editor.colorpicker.less index 1d5cb570d..1aded34ca 100644 --- a/src/less/base/colorchooser/colorpicker/editor.colorpicker.less +++ b/src/less/base/colorchooser/colorpicker/editor.colorpicker.less @@ -5,12 +5,4 @@ & .color-picker-editor-display { .border-radius(2px); } - &.disabled { - & .auto-color-normal-background { - .auto-color-normal-disabled-background(); - } - & .trans-color-background { - .trans-color-disabled-background(); - } - } } \ No newline at end of file diff --git a/src/less/lib/background.less b/src/less/lib/background.less index 409a23f38..bfaa4213f 100644 --- a/src/less/lib/background.less +++ b/src/less/lib/background.less @@ -4,9 +4,9 @@ //右下角没有小三角 @background-auto-color-normal: "icon/auto_normal.png"; -@background-auto-color-normal-disabled: "icon/auto_disable.png"; @background-trans-color: "background/trans_normal.png"; @background-trans-color-disabled: "background/trans_disable.png"; +@background-auto-color-square-normal: "icon/auto_square_normal.png"; @background-farbtastic-wheel:"background/wheel.png"; @background-farbtastic-overlay:"background/mask.png"; diff --git a/src/less/lib/icon.less b/src/less/lib/icon.less index b40d3d984..5c62fc736 100644 --- a/src/less/lib/icon.less +++ b/src/less/lib/icon.less @@ -50,12 +50,12 @@ //颜色自动、透明 @icon-auto-normal: "icon/auto_normal.png"; +@icon-auto-square-normal: "icon/auto_square_normal.png"; @icon-auto-select: "icon/auto_select.png"; -@icon-auto-disable: "icon/auto_disable.png"; @icon-trans-normal: "icon/trans_normal.png"; @icon-trans-select: "icon/trans_select.png"; -@icon-trans-disable: "icon/trans_disable.png"; +@icon-auto-square-normal-dark: "icon/dark/auto_square_normal.png"; @icon-trans-normal-dark: "icon/dark/trans_normal.png"; @icon-trans-select-dark: "icon/dark/trans_select.png"; @icon-trans-disable-dark: "icon/dark/trans_disable.png"; \ No newline at end of file diff --git a/src/less/resource/background.less b/src/less/resource/background.less index 21c157665..cd85f0337 100644 --- a/src/less/resource/background.less +++ b/src/less/resource/background.less @@ -318,7 +318,11 @@ } .auto-color-normal-disabled-background { - .image2xPath(@background-auto-color-normal-disabled); + .image2xPath(@background-auto-color-disabled); +} + +.auto-color-square-normal-background { + .image2xPath(@background-auto-color-square-normal); } .trans-color-background { @@ -343,7 +347,13 @@ .auto-color-normal-disabled-background { &.hack{ - .imagePath(@background-auto-color-normal-disabled); + .imagePath(@background-auto-color-disabled); + } +} + +.auto-color-square-normal-background { + &.hack{ + .imagePath(@background-auto-color-square-normal); } } diff --git a/src/less/resource/icon.less b/src/less/resource/icon.less index 1cab7bd5e..1ca769404 100644 --- a/src/less/resource/icon.less +++ b/src/less/resource/icon.less @@ -26,8 +26,10 @@ .icon_hover(slider-icon, @icon-slider-normal, @icon-slider-active); //颜色自动、透明 -.icon_select(auto-color-icon, @icon-auto-normal, @icon-auto-select, @icon-auto-disable); -.icon_select(trans-color-icon, @icon-trans-normal, @icon-trans-select, @icon-trans-disable); +.icon_select(auto-color-icon, @icon-auto-normal, @icon-auto-select); +.icon_select(trans-color-icon, @icon-trans-normal, @icon-trans-select); +// 方形的自动 +.icon(auto-square-color-icon, @icon-auto-square-normal); .bi-theme-dark { .icon(tree-collapse-icon-type1, @icon-tree-collapse-type1-theme-dark); @@ -43,4 +45,5 @@ .icon(tree-vertical-line-type4, @icon-tree-vertical-line-4-theme-dark); .icon_select(trans-color-icon, @icon-trans-normal-dark, @icon-trans-select-dark, @icon-trans-disable-dark); + .icon(auto-square-color-icon, @icon-auto-square-normal-dark); } \ No newline at end of file