From fe5478e4844f3725927e2dd6729bac077d91524b Mon Sep 17 00:00:00 2001 From: zsmj Date: Tue, 25 Oct 2022 17:25:46 +0800 Subject: [PATCH 1/3] =?UTF-8?q?KERNEL-13232=20feat:=20=E5=A4=8D=E9=80=89?= =?UTF-8?q?=E6=A0=91=E7=9A=84=E8=BF=9E=E6=8E=A5=E7=BA=BF=E4=B9=8B=E7=B1=BB?= =?UTF-8?q?=E7=9A=84=E4=B8=8D=E5=86=8D=E7=94=A8=E5=9B=BE=E7=89=87=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/less/base/tree/ztree.less | 24 ++++++++++++++ src/less/resource/background.less | 52 ++++++++++++++++++------------- 2 files changed, 54 insertions(+), 22 deletions(-) diff --git a/src/less/base/tree/ztree.less b/src/less/base/tree/ztree.less index 341ab05f5..f24569bbf 100644 --- a/src/less/base/tree/ztree.less +++ b/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 { position: relative; diff --git a/src/less/resource/background.less b/src/less/resource/background.less index 8aca40b17..999255654 100644 --- a/src/less/resource/background.less +++ b/src/less/resource/background.less @@ -43,6 +43,7 @@ .ztree li span.button.root_open { .image2xPath(@icon-tree-expand-type1-theme-dark); } + .ztree.solid li span.button.root_open { .image2xPath(@icon-tree-solid-expand-type1-theme-dark); } @@ -60,6 +61,7 @@ .ztree li span.button.root_close { .image2xPath(@icon-tree-collapse-type1-theme-dark); } + .ztree.solid li span.button.root_close { .image2xPath(@icon-tree-solid-collapse-type1-theme-dark); } @@ -70,15 +72,16 @@ } .ztree.solid li span.button.roots_open { - .image2xPath(@icon-tree-solid-expand-type2); + .image2xPath(@icon-tree-solid-expand-type1); } .bi-theme-dark { .ztree li span.button.roots_open { .image2xPath(@icon-tree-expand-type2-theme-dark); } + .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 { - .image2xPath(@icon-tree-solid-collapse-type2); + .image2xPath(@icon-tree-solid-collapse-type1); } .bi-theme-dark { .ztree li span.button.roots_close { .image2xPath(@icon-tree-collapse-type2-theme-dark); } + .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 { - .image2xPath(@icon-tree-solid-expand-type3); + .image2xPath(@icon-tree-solid-expand-type1); } .bi-theme-dark { .ztree li span.button.center_open { .image2xPath(@icon-tree-expand-type3-theme-dark); } + .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 { - .image2xPath(@icon-tree-solid-collapse-type3); + .image2xPath(@icon-tree-solid-collapse-type1); } .bi-theme-dark { .ztree li span.button.center_close { .image2xPath(@icon-tree-collapse-type3-theme-dark); } + .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 { - .image2xPath(@icon-tree-solid-expand-type4); + .image2xPath(@icon-tree-solid-expand-type1); } .bi-theme-dark { .ztree li span.button.bottom_open { .image2xPath(@icon-tree-expand-type4-theme-dark); } + .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 { - .image2xPath(@icon-tree-solid-collapse-type4); + .image2xPath(@icon-tree-solid-collapse-type1); } .bi-theme-dark { .ztree li span.button.bottom_close { .image2xPath(@icon-tree-collapse-type4-theme-dark); } + .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 { .image2xPath(@icon-tree-vertical-line-2-theme-dark); } + .ztree.solid li span.button.roots_docu { .image2xPath(@icon-tree-solid-vertical-line-2-theme-dark); } @@ -196,6 +205,7 @@ .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); } @@ -205,14 +215,12 @@ .image2xPath(@icon-tree-vertical-line-4); } -.ztree.solid li span.button.bottom_docu { - .image2xPath(@icon-tree-solid-vertical-line-4); -} .bi-theme-dark { .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); } @@ -335,43 +343,43 @@ } .auto-color-background { - &.hack{ + &.hack { .imagePath(@background-auto-color); } } .auto-color-normal-background { - &.hack{ + &.hack { .imagePath(@background-auto-color-normal); } } .auto-color-normal-disabled-background { - &.hack{ + &.hack { .imagePath(@background-auto-color-disabled); } } .auto-color-square-normal-background { - &.hack{ + &.hack { .imagePath(@background-auto-color-square-normal); } } .auto-color-no-square-normal-background { - &.hack{ + &.hack { .imagePath(@background-auto-color-no-square-normal); } } .trans-color-background { - &.hack{ + &.hack { .imagePath(@background-trans-color); } } .trans-color-disabled-background { - &.hack{ + &.hack { .imagePath(@background-trans-color-disabled); } } From ee824ad8d528af7f462ed6500cfac7d34d09b41e Mon Sep 17 00:00:00 2001 From: zsmj Date: Tue, 25 Oct 2022 17:26:12 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=97=A0jira=20fix:=20=E4=BF=AE=E5=A4=8DBI?= =?UTF-8?q?.isWidthOrHeight?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/core/2.base.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/2.base.js b/src/core/2.base.js index cc00f828c..61d9487cc 100644 --- a/src/core/2.base.js +++ b/src/core/2.base.js @@ -486,7 +486,7 @@ if (typeof w === "number") { return w >= 0; } 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); } }, From c181c9864d292a95a654d52b801427bba741dd96 Mon Sep 17 00:00:00 2001 From: zsmj Date: Tue, 25 Oct 2022 17:27:15 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=97=A0jira=20fix:=20=E4=BF=AE=E5=A4=8DBI?= =?UTF-8?q?.isWidthOrHeight?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/core/2.base.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/2.base.js b/src/core/2.base.js index 61d9487cc..d7007de52 100644 --- a/src/core/2.base.js +++ b/src/core/2.base.js @@ -486,7 +486,7 @@ if (typeof w === "number") { return w >= 0; } else if (typeof w === "string") { - return /^\d{1,3}(\.\d)?%$/.test(w) || w === "auto" || /^\d+(\.\d+)px$/.test(w) || /^calc/.test(w); + return /^\d{1,3}(\.\d)?%$/.test(w) || w === "auto" || /^\d+(\.\d+)?px$/.test(w) || /^calc/.test(w); } },