Browse Source

Pull request #3173: KERNEL-13193 && BI-116019 && KERNEL-13232

Merge in VISUAL/fineui from ~DAILER/fineui:master to master

* commit '9377b4e02b84daf7e0b6b7bf23227a696075fade':
  KERNEL-13232 feat: 复选树的连接线之类的不再用图片了
  BI-116019 fix: 【6.0.4冒烟】区间滑块不绑定字段,鼠标悬浮组件应该会有提示
  KERNEL-13193 style: 调一下checobox的样式
  KERNEL-13193 style: 调一下checobox的样式
  KERNEL-13193 style: 调一下checobox的样式
es6
Dailer-刘荣歆 2 years ago
parent
commit
5ce5571c58
  1. 2
      demo/js/config/widget.js
  2. 6
      src/less/base/single/button/button.half.less
  3. 4
      src/less/base/single/input/checkbox.less
  4. 63
      src/less/base/tree/ztree.less
  5. 25
      src/less/case/tree/tree.item.less
  6. 20
      src/less/resource/background.less
  7. 17
      src/widget/intervalslider/intervalslider.js

2
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,

6
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: '';

4
src/less/base/single/input/checkbox.less

@ -6,12 +6,14 @@
border: 1px solid @color-bi-border-checkbox;
.box-sizing(border-box);
.transition(all .1s);
&:after {
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;
border-left: 0;
width: 50%;

63
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);

25
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;

20
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 {

17
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,7 +487,7 @@ 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)) {
@ -496,13 +496,14 @@ BI.IntervalSlider = BI.inherit(BI.Single, {
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);

Loading…
Cancel
Save