Browse Source

Pull request #3169: KERNEL-13232 feat: 复选树的连接线之类的不再用图片了

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

* commit 'c181c9864d292a95a654d52b801427bba741dd96':
  无jira fix: 修复BI.isWidthOrHeight
  无jira fix: 修复BI.isWidthOrHeight
  KERNEL-13232 feat: 复选树的连接线之类的不再用图片了
es6
Dailer-刘荣歆 2 years ago
parent
commit
d338ef9c81
  1. 2
      src/core/2.base.js
  2. 24
      src/less/base/tree/ztree.less
  3. 52
      src/less/resource/background.less

2
src/core/2.base.js

@ -486,7 +486,7 @@
if (typeof w === "number") { if (typeof w === "number") {
return w >= 0; return w >= 0;
} else if (typeof w === "string") { } else if (typeof w === "string") {
return /^\d{1,3}(\.\d)?%$/.test(w) || w === "auto" || /^\d+px$/.test(w) || /^calc/.test(w); return /^\d{1,3}(\.\d)?%$/.test(w) || w === "auto" || /^\d+(\.\d+)?px$/.test(w) || /^calc/.test(w);
} }
}, },

24
src/less/base/tree/ztree.less

@ -190,6 +190,30 @@
} }
} }
.ztree.solid li span.button.bottom_docu {
background: none;
position: relative;
&:before {
position: absolute;
top: 0;
left: -1px;
width: 50%;
height: 50%;
border-right: 1px solid @border-color-dark-gray-line;
content: '';
}
&:after {
position: absolute;
top: 0;
right: 1px;
height: 50%;
width: 50%;
border-bottom: 1px solid @border-color-dark-gray-line;
content: '';
}
}
.ztree li span.button.chk { .ztree li span.button.chk {
position: relative; position: relative;

52
src/less/resource/background.less

@ -43,6 +43,7 @@
.ztree li span.button.root_open { .ztree li span.button.root_open {
.image2xPath(@icon-tree-expand-type1-theme-dark); .image2xPath(@icon-tree-expand-type1-theme-dark);
} }
.ztree.solid li span.button.root_open { .ztree.solid li span.button.root_open {
.image2xPath(@icon-tree-solid-expand-type1-theme-dark); .image2xPath(@icon-tree-solid-expand-type1-theme-dark);
} }
@ -60,6 +61,7 @@
.ztree li span.button.root_close { .ztree li span.button.root_close {
.image2xPath(@icon-tree-collapse-type1-theme-dark); .image2xPath(@icon-tree-collapse-type1-theme-dark);
} }
.ztree.solid li span.button.root_close { .ztree.solid li span.button.root_close {
.image2xPath(@icon-tree-solid-collapse-type1-theme-dark); .image2xPath(@icon-tree-solid-collapse-type1-theme-dark);
} }
@ -70,15 +72,16 @@
} }
.ztree.solid li span.button.roots_open { .ztree.solid li span.button.roots_open {
.image2xPath(@icon-tree-solid-expand-type2); .image2xPath(@icon-tree-solid-expand-type1);
} }
.bi-theme-dark { .bi-theme-dark {
.ztree li span.button.roots_open { .ztree li span.button.roots_open {
.image2xPath(@icon-tree-expand-type2-theme-dark); .image2xPath(@icon-tree-expand-type2-theme-dark);
} }
.ztree.solid li span.button.roots_open { .ztree.solid li span.button.roots_open {
.image2xPath(@icon-tree-solid-expand-type2-theme-dark); .image2xPath(@icon-tree-solid-expand-type1-theme-dark);
} }
} }
@ -87,15 +90,16 @@
} }
.ztree.solid li span.button.roots_close { .ztree.solid li span.button.roots_close {
.image2xPath(@icon-tree-solid-collapse-type2); .image2xPath(@icon-tree-solid-collapse-type1);
} }
.bi-theme-dark { .bi-theme-dark {
.ztree li span.button.roots_close { .ztree li span.button.roots_close {
.image2xPath(@icon-tree-collapse-type2-theme-dark); .image2xPath(@icon-tree-collapse-type2-theme-dark);
} }
.ztree.solid li span.button.roots_close { .ztree.solid li span.button.roots_close {
.image2xPath(@icon-tree-solid-collapse-type2-theme-dark); .image2xPath(@icon-tree-solid-collapse-type1-theme-dark);
} }
} }
@ -104,15 +108,16 @@
} }
.ztree.solid li span.button.center_open { .ztree.solid li span.button.center_open {
.image2xPath(@icon-tree-solid-expand-type3); .image2xPath(@icon-tree-solid-expand-type1);
} }
.bi-theme-dark { .bi-theme-dark {
.ztree li span.button.center_open { .ztree li span.button.center_open {
.image2xPath(@icon-tree-expand-type3-theme-dark); .image2xPath(@icon-tree-expand-type3-theme-dark);
} }
.ztree.solid li span.button.center_open { .ztree.solid li span.button.center_open {
.image2xPath(@icon-tree-solid-expand-type3-theme-dark); .image2xPath(@icon-tree-solid-expand-type1-theme-dark);
} }
} }
@ -121,15 +126,16 @@
} }
.ztree.solid li span.button.center_close { .ztree.solid li span.button.center_close {
.image2xPath(@icon-tree-solid-collapse-type3); .image2xPath(@icon-tree-solid-collapse-type1);
} }
.bi-theme-dark { .bi-theme-dark {
.ztree li span.button.center_close { .ztree li span.button.center_close {
.image2xPath(@icon-tree-collapse-type3-theme-dark); .image2xPath(@icon-tree-collapse-type3-theme-dark);
} }
.ztree.solid li span.button.center_close { .ztree.solid li span.button.center_close {
.image2xPath(@icon-tree-solid-collapse-type3-theme-dark); .image2xPath(@icon-tree-solid-collapse-type1-theme-dark);
} }
} }
@ -138,15 +144,16 @@
} }
.ztree.solid li span.button.bottom_open { .ztree.solid li span.button.bottom_open {
.image2xPath(@icon-tree-solid-expand-type4); .image2xPath(@icon-tree-solid-expand-type1);
} }
.bi-theme-dark { .bi-theme-dark {
.ztree li span.button.bottom_open { .ztree li span.button.bottom_open {
.image2xPath(@icon-tree-expand-type4-theme-dark); .image2xPath(@icon-tree-expand-type4-theme-dark);
} }
.ztree.solid li span.button.bottom_open { .ztree.solid li span.button.bottom_open {
.image2xPath(@icon-tree-solid-expand-type4-theme-dark); .image2xPath(@icon-tree-solid-expand-type1-theme-dark);
} }
} }
@ -155,15 +162,16 @@
} }
.ztree.solid li span.button.bottom_close { .ztree.solid li span.button.bottom_close {
.image2xPath(@icon-tree-solid-collapse-type4); .image2xPath(@icon-tree-solid-collapse-type1);
} }
.bi-theme-dark { .bi-theme-dark {
.ztree li span.button.bottom_close { .ztree li span.button.bottom_close {
.image2xPath(@icon-tree-collapse-type4-theme-dark); .image2xPath(@icon-tree-collapse-type4-theme-dark);
} }
.ztree.solid li span.button.bottom_close { .ztree.solid li span.button.bottom_close {
.image2xPath(@icon-tree-solid-collapse-type4-theme-dark); .image2xPath(@icon-tree-solid-collapse-type1-theme-dark);
} }
} }
@ -179,6 +187,7 @@
.ztree li span.button.roots_docu { .ztree li span.button.roots_docu {
.image2xPath(@icon-tree-vertical-line-2-theme-dark); .image2xPath(@icon-tree-vertical-line-2-theme-dark);
} }
.ztree.solid li span.button.roots_docu { .ztree.solid li span.button.roots_docu {
.image2xPath(@icon-tree-solid-vertical-line-2-theme-dark); .image2xPath(@icon-tree-solid-vertical-line-2-theme-dark);
} }
@ -196,6 +205,7 @@
.ztree li span.button.center_docu { .ztree li span.button.center_docu {
.image2xPath(@icon-tree-vertical-line-3-theme-dark); .image2xPath(@icon-tree-vertical-line-3-theme-dark);
} }
.ztree.solid li span.button.center_docu { .ztree.solid li span.button.center_docu {
.image2xPath(@icon-tree-solid-vertical-line-3-theme-dark); .image2xPath(@icon-tree-solid-vertical-line-3-theme-dark);
} }
@ -205,14 +215,12 @@
.image2xPath(@icon-tree-vertical-line-4); .image2xPath(@icon-tree-vertical-line-4);
} }
.ztree.solid li span.button.bottom_docu {
.image2xPath(@icon-tree-solid-vertical-line-4);
}
.bi-theme-dark { .bi-theme-dark {
.ztree li span.button.bottom_docu { .ztree li span.button.bottom_docu {
.image2xPath(@icon-tree-vertical-line-4-theme-dark); .image2xPath(@icon-tree-vertical-line-4-theme-dark);
} }
.ztree.solid li span.button.bottom_docu { .ztree.solid li span.button.bottom_docu {
.image2xPath(@icon-tree-solid-vertical-line-4-theme-dark); .image2xPath(@icon-tree-solid-vertical-line-4-theme-dark);
} }
@ -335,43 +343,43 @@
} }
.auto-color-background { .auto-color-background {
&.hack{ &.hack {
.imagePath(@background-auto-color); .imagePath(@background-auto-color);
} }
} }
.auto-color-normal-background { .auto-color-normal-background {
&.hack{ &.hack {
.imagePath(@background-auto-color-normal); .imagePath(@background-auto-color-normal);
} }
} }
.auto-color-normal-disabled-background { .auto-color-normal-disabled-background {
&.hack{ &.hack {
.imagePath(@background-auto-color-disabled); .imagePath(@background-auto-color-disabled);
} }
} }
.auto-color-square-normal-background { .auto-color-square-normal-background {
&.hack{ &.hack {
.imagePath(@background-auto-color-square-normal); .imagePath(@background-auto-color-square-normal);
} }
} }
.auto-color-no-square-normal-background { .auto-color-no-square-normal-background {
&.hack{ &.hack {
.imagePath(@background-auto-color-no-square-normal); .imagePath(@background-auto-color-no-square-normal);
} }
} }
.trans-color-background { .trans-color-background {
&.hack{ &.hack {
.imagePath(@background-trans-color); .imagePath(@background-trans-color);
} }
} }
.trans-color-disabled-background { .trans-color-disabled-background {
&.hack{ &.hack {
.imagePath(@background-trans-color-disabled); .imagePath(@background-trans-color-disabled);
} }
} }

Loading…
Cancel
Save