From 70f6e9a07c873003f64bc526759ee97cad928120 Mon Sep 17 00:00:00 2001 From: zsmj Date: Wed, 26 Oct 2022 11:39:47 +0800 Subject: [PATCH 1/5] =?UTF-8?q?KERNEL-13193=20style:=20=E8=B0=83=E4=B8=80?= =?UTF-8?q?=E4=B8=8Bchecobox=E7=9A=84=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/less/base/single/button/button.half.less | 6 ++++-- src/less/base/single/input/checkbox.less | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/less/base/single/button/button.half.less b/src/less/base/single/button/button.half.less index 13bb7f996..c39b9d033 100644 --- a/src/less/base/single/button/button.half.less +++ b/src/less/base/single/button/button.half.less @@ -6,10 +6,12 @@ &:after { position: absolute; + .border-radius(2px); + display: table; left: 50%; top: 50%; - width: 50%; - height: 50%; + width: 70%; + height: 70%; .transform(translate(-50%, -50%)); background-color: @color-bi-background-half-button-content; content: ''; diff --git a/src/less/base/single/input/checkbox.less b/src/less/base/single/input/checkbox.less index 9b1d66917..012e38336 100644 --- a/src/less/base/single/input/checkbox.less +++ b/src/less/base/single/input/checkbox.less @@ -3,15 +3,17 @@ .bi-checkbox { & .checkbox-content, &.checkbox-content { .border-radius(2px); - border: 1px solid @color-bi-border-checkbox; + border: 2px solid @color-bi-border-checkbox; .box-sizing(border-box); .transition(all .1s); + &:after { position: absolute; display: table; top: 45%; left: 20%; border: 2px solid transparent; + border: calc(var(--css-scale, 1) * 2px) solid transparent; border-top: 0; border-left: 0; width: 50%; From 02b37dc07b0351e167c3a12d9983406d4375ffab Mon Sep 17 00:00:00 2001 From: zsmj Date: Wed, 26 Oct 2022 14:25:29 +0800 Subject: [PATCH 2/5] =?UTF-8?q?KERNEL-13193=20style:=20=E8=B0=83=E4=B8=80?= =?UTF-8?q?=E4=B8=8Bchecobox=E7=9A=84=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/less/base/single/input/checkbox.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/less/base/single/input/checkbox.less b/src/less/base/single/input/checkbox.less index 012e38336..155c14441 100644 --- a/src/less/base/single/input/checkbox.less +++ b/src/less/base/single/input/checkbox.less @@ -3,7 +3,7 @@ .bi-checkbox { & .checkbox-content, &.checkbox-content { .border-radius(2px); - border: 2px solid @color-bi-border-checkbox; + border: 1px solid @color-bi-border-checkbox; .box-sizing(border-box); .transition(all .1s); From 3d222ea4162984fe88842c1c7bb6f5f01cd015c7 Mon Sep 17 00:00:00 2001 From: zsmj Date: Wed, 26 Oct 2022 14:29:45 +0800 Subject: [PATCH 3/5] =?UTF-8?q?KERNEL-13193=20style:=20=E8=B0=83=E4=B8=80?= =?UTF-8?q?=E4=B8=8Bchecobox=E7=9A=84=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/less/base/single/input/checkbox.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/less/base/single/input/checkbox.less b/src/less/base/single/input/checkbox.less index 155c14441..50156c323 100644 --- a/src/less/base/single/input/checkbox.less +++ b/src/less/base/single/input/checkbox.less @@ -11,7 +11,7 @@ position: absolute; display: table; top: 45%; - left: 20%; + left: 18%; border: 2px solid transparent; border: calc(var(--css-scale, 1) * 2px) solid transparent; border-top: 0; From 128c819e8392bca5cd3c6f9eb0795a24395eac8f Mon Sep 17 00:00:00 2001 From: zsmj Date: Wed, 26 Oct 2022 15:49:50 +0800 Subject: [PATCH 4/5] =?UTF-8?q?BI-116019=20fix:=20=E3=80=906.0.4=E5=86=92?= =?UTF-8?q?=E7=83=9F=E3=80=91=E5=8C=BA=E9=97=B4=E6=BB=91=E5=9D=97=E4=B8=8D?= =?UTF-8?q?=E7=BB=91=E5=AE=9A=E5=AD=97=E6=AE=B5=EF=BC=8C=E9=BC=A0=E6=A0=87?= =?UTF-8?q?=E6=82=AC=E6=B5=AE=E7=BB=84=E4=BB=B6=E5=BA=94=E8=AF=A5=E4=BC=9A?= =?UTF-8?q?=E6=9C=89=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- demo/js/config/widget.js | 4 ++-- src/widget/intervalslider/intervalslider.js | 19 ++++++++++--------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/demo/js/config/widget.js b/demo/js/config/widget.js index d2e1b1d5b..e48282492 100644 --- a/demo/js/config/widget.js +++ b/demo/js/config/widget.js @@ -192,7 +192,7 @@ Demo.WIDGET_CONFIG = [{ value: "demo.number_interval" }, { id: 420, - text: "滚动sliders", + text: "数值滑块sliders", value: "demo.slider" }, { pId: 4, @@ -202,4 +202,4 @@ Demo.WIDGET_CONFIG = [{ pId: 414, text: "bi.collapse", value: "demo.collapse" -}]; \ No newline at end of file +}]; diff --git a/src/widget/intervalslider/intervalslider.js b/src/widget/intervalslider/intervalslider.js index 71351dd71..59b1e1676 100644 --- a/src/widget/intervalslider/intervalslider.js +++ b/src/widget/intervalslider/intervalslider.js @@ -26,7 +26,7 @@ BI.IntervalSlider = BI.inherit(BI.Single, { beforeMount: function () { const { value, min, max } = this.options; - this.setMinAndMax({ + this._setMinAndMax({ min, max, }); @@ -260,12 +260,12 @@ BI.IntervalSlider = BI.inherit(BI.Single, { items: [ { el: this.sliderOne, - top: 1, + top: 0, bottom: 0, left: 0 }, { el: this.sliderTwo, - top: 1, + top: 0, bottom: 0, left: "100%" } @@ -487,22 +487,23 @@ BI.IntervalSlider = BI.inherit(BI.Single, { }, - setMinAndMax: function (v) { + _setMinAndMax: function (v) { var minNumber = BI.parseFloat(v.min); var maxNumber = BI.parseFloat(v.max); - if ((!isNaN(minNumber)) && (!isNaN(maxNumber)) && (maxNumber >= minNumber )) { + if ((!isNaN(minNumber)) && (!isNaN(maxNumber)) && (maxNumber >= minNumber)) { this.min = minNumber; this.max = maxNumber; this.valueOne = minNumber; this.valueTwo = maxNumber; this.precision = this._getPrecision(); - this.setEnable(true); - } - if (maxNumber === minNumber) { - this.setEnable(false); } }, + setMinAndMax: function (v) { + this._setMinAndMax(v); + this.setEnable(v.min <= v.max); + }, + setValue: function (v) { var o = this.options; var valueOne = BI.parseFloat(v.min); From 9377b4e02b84daf7e0b6b7bf23227a696075fade Mon Sep 17 00:00:00 2001 From: zsmj Date: Wed, 26 Oct 2022 18:41:25 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=20KERNEL-13232=20feat:=20=E5=A4=8D?= =?UTF-8?q?=E9=80=89=E6=A0=91=E7=9A=84=E8=BF=9E=E6=8E=A5=E7=BA=BF=E4=B9=8B?= =?UTF-8?q?=E7=B1=BB=E7=9A=84=E4=B8=8D=E5=86=8D=E7=94=A8=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/less/base/tree/ztree.less | 63 +++++++++++++++++++++++++++++++ src/less/case/tree/tree.item.less | 25 +++++++++++- src/less/resource/background.less | 20 ---------- 3 files changed, 87 insertions(+), 21 deletions(-) diff --git a/src/less/base/tree/ztree.less b/src/less/base/tree/ztree.less index f24569bbf..a75904add 100644 --- a/src/less/base/tree/ztree.less +++ b/src/less/base/tree/ztree.less @@ -190,6 +190,56 @@ } } +.ztree.solid li span.button.roots_docu { + background: none; + position: relative; + + &:before { + position: absolute; + bottom: 0; + left: -1px; + width: 50%; + height: 50%; + border-right: 1px solid @border-color-dark-gray-line; + content: ''; + } + + &:after { + position: absolute; + top: 0; + right: 0; + height: 50%; + width: 50%; + border-bottom: 1px solid @border-color-dark-gray-line; + content: ''; + } +} + +.ztree.solid li span.button.center_docu { + background: none; + position: relative; + + &:before { + position: absolute; + top: 0; + left: -1px; + width: 50%; + height: 100%; + border-right: 1px solid @border-color-dark-gray-line; + content: ''; + } + + &:after { + position: absolute; + top: 0; + right: 0; + height: 50%; + width: 50%; + border-bottom: 1px solid @border-color-dark-gray-line; + content: ''; + } +} + .ztree.solid li span.button.bottom_docu { background: none; position: relative; @@ -215,6 +265,19 @@ } } +.bi-theme-dark { + .ztree.solid li span.button.center_docu, .ztree.solid li span.button.bottom_docu { + &:before { + border-right: 1px solid @border-color-dark-gray-line-theme-dark; + } + + &:after { + border-bottom: 1px solid @border-color-dark-gray-line-theme-dark; + } + } +} + + .ztree li span.button.chk { position: relative; .use-scale(width, 14px); diff --git a/src/less/case/tree/tree.item.less b/src/less/case/tree/tree.item.less index 3098f664a..2d2d7a9bc 100644 --- a/src/less/case/tree/tree.item.less +++ b/src/less/case/tree/tree.item.less @@ -1,6 +1,29 @@ @import "../../index.less"; -.tree-first-solid-line-conn-background, .tree-mid-solid-line-conn-background { +.tree-first-solid-line-conn-background { + &:before { + position: absolute; + bottom: 0; + left: -1px; + width: 50%; + height: 50%; + border-right: 1px solid @border-color-dark-gray-line; + content: ''; + } + + &:after { + position: absolute; + top: 0; + right: 0; + height: 50%; + width: 50%; + border-bottom: 1px solid @border-color-dark-gray-line; + content: ''; + } +} + + +.tree-mid-solid-line-conn-background { &:before { position: absolute; top: 0; diff --git a/src/less/resource/background.less b/src/less/resource/background.less index 999255654..c204e1653 100644 --- a/src/less/resource/background.less +++ b/src/less/resource/background.less @@ -179,36 +179,20 @@ .image2xPath(@icon-tree-vertical-line-2); } -.ztree.solid li span.button.roots_docu { - .image2xPath(@icon-tree-solid-vertical-line-2); -} - .bi-theme-dark { .ztree li span.button.roots_docu { .image2xPath(@icon-tree-vertical-line-2-theme-dark); } - - .ztree.solid li span.button.roots_docu { - .image2xPath(@icon-tree-solid-vertical-line-2-theme-dark); - } } .ztree li span.button.center_docu { .image2xPath(@icon-tree-vertical-line-3); } -.ztree.solid li span.button.center_docu { - .image2xPath(@icon-tree-solid-vertical-line-3); -} - .bi-theme-dark { .ztree li span.button.center_docu { .image2xPath(@icon-tree-vertical-line-3-theme-dark); } - - .ztree.solid li span.button.center_docu { - .image2xPath(@icon-tree-solid-vertical-line-3-theme-dark); - } } .ztree li span.button.bottom_docu { @@ -220,10 +204,6 @@ .ztree li span.button.bottom_docu { .image2xPath(@icon-tree-vertical-line-4-theme-dark); } - - .ztree.solid li span.button.bottom_docu { - .image2xPath(@icon-tree-solid-vertical-line-4-theme-dark); - } } .ztree li span.button.ico_loading {