From c2defdb567cfaf93f877bf90c2637b40d04a04d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=95=AC=E5=B3=A5?= Date: Fri, 25 Mar 2022 16:39:39 +0800 Subject: [PATCH 1/8] =?UTF-8?q?REPORT-63368=20=E4=BF=AE=E5=A4=8D=E6=A0=91?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=B1=95=E5=BC=80=E5=90=8E=E5=B7=A6=E8=BE=B9?= =?UTF-8?q?=E7=BA=BF=E5=AF=B9=E4=B8=8D=E9=BD=90=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/case/button/node/node.first.plus.js | 2 +- src/case/button/node/node.last.plus.js | 2 +- src/case/button/node/node.mid.plus.js | 2 +- src/less/base/tree/tree.expander.less | 6 ++++-- src/less/resource/background.less | 1 + src/widget/selecttree/nodes/node.first.plus.js | 2 +- src/widget/selecttree/nodes/node.last.plus.js | 2 +- src/widget/selecttree/nodes/node.mid.plus.js | 2 +- 8 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/case/button/node/node.first.plus.js b/src/case/button/node/node.first.plus.js index 3489f2a32..989cdec0b 100644 --- a/src/case/button/node/node.first.plus.js +++ b/src/case/button/node/node.first.plus.js @@ -50,7 +50,7 @@ BI.FirstPlusGroupNode = BI.inherit(BI.NodeButton, { }); var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left); var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, { - width: 24, + width: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT, el: this.checkbox }, this.text); BI.createWidget(BI.extend({ diff --git a/src/case/button/node/node.last.plus.js b/src/case/button/node/node.last.plus.js index b7bedc519..c1a949e3b 100644 --- a/src/case/button/node/node.last.plus.js +++ b/src/case/button/node/node.last.plus.js @@ -50,7 +50,7 @@ BI.LastPlusGroupNode = BI.inherit(BI.NodeButton, { }); var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left); var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, { - width: 24, + width: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT, el: this.checkbox }, this.text); BI.createWidget(BI.extend({ diff --git a/src/case/button/node/node.mid.plus.js b/src/case/button/node/node.mid.plus.js index 6286db826..839565114 100644 --- a/src/case/button/node/node.mid.plus.js +++ b/src/case/button/node/node.mid.plus.js @@ -50,7 +50,7 @@ BI.MidPlusGroupNode = BI.inherit(BI.NodeButton, { }); var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left); var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, { - width: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT / 2, + width: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT, el: this.checkbox }, this.text); BI.createWidget(BI.extend({ diff --git a/src/less/base/tree/tree.expander.less b/src/less/base/tree/tree.expander.less index 76a77a655..b75f0205b 100644 --- a/src/less/base/tree/tree.expander.less +++ b/src/less/base/tree/tree.expander.less @@ -1,10 +1,12 @@ @import "../../index"; +@import "../../image"; +@import "../../lib/icon"; .bi-tree-expander-popup.line:before { position: absolute; content: ""; - border-left: 1px dashed @color-bi-border-tree-expander-popup-line; height: 100%; - left: 11px; + width: 24px; + .imagePath(@icon-tree-vertical-line-1, 0, 0, repeat-y); } .bi-tree-expander-popup.line.solid:before { diff --git a/src/less/resource/background.less b/src/less/resource/background.less index 28fd5f1c0..4e1c6a51e 100644 --- a/src/less/resource/background.less +++ b/src/less/resource/background.less @@ -1,6 +1,7 @@ @import "../image"; @import "../lib/icon"; @import "../lib/background"; +@import "../base/tree/tree.expander.less"; .bi-display-tree { & .ztree li span.button.switch.center_open { diff --git a/src/widget/selecttree/nodes/node.first.plus.js b/src/widget/selecttree/nodes/node.first.plus.js index f975ea00e..f8f23c2b5 100644 --- a/src/widget/selecttree/nodes/node.first.plus.js +++ b/src/widget/selecttree/nodes/node.first.plus.js @@ -49,7 +49,7 @@ BI.SelectTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, { }); var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left); var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, { - width: 24, + width: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT, el: this.checkbox }, this.text); BI.createWidget(BI.extend({ diff --git a/src/widget/selecttree/nodes/node.last.plus.js b/src/widget/selecttree/nodes/node.last.plus.js index 0cab47f4b..2c4cca80c 100644 --- a/src/widget/selecttree/nodes/node.last.plus.js +++ b/src/widget/selecttree/nodes/node.last.plus.js @@ -49,7 +49,7 @@ BI.SelectTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, { }); var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left); var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, { - width: 24, + width: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT, el: this.checkbox }, this.text); BI.createWidget(BI.extend({ diff --git a/src/widget/selecttree/nodes/node.mid.plus.js b/src/widget/selecttree/nodes/node.mid.plus.js index b2ec407d0..289136242 100644 --- a/src/widget/selecttree/nodes/node.mid.plus.js +++ b/src/widget/selecttree/nodes/node.mid.plus.js @@ -49,7 +49,7 @@ BI.SelectTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, { }); var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left); var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, { - width: 24, + width: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT, el: this.checkbox }, this.text); BI.createWidget(BI.extend({ From faccb42bbf021749c6858fbfe7a11c4b4fe7582c Mon Sep 17 00:00:00 2001 From: iapyang Date: Wed, 13 Apr 2022 16:49:54 +0800 Subject: [PATCH 2/8] =?UTF-8?q?fix:=20=E8=A1=A5=E5=85=A8=E4=B8=80=E4=B8=8B?= =?UTF-8?q?=EF=BC=8C=E6=B2=A1=E4=BF=AE=E6=94=B9=E5=85=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/less/base/tree/tree.expander.less | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/less/base/tree/tree.expander.less b/src/less/base/tree/tree.expander.less index b75f0205b..b2e5b0c85 100644 --- a/src/less/base/tree/tree.expander.less +++ b/src/less/base/tree/tree.expander.less @@ -10,15 +10,19 @@ } .bi-tree-expander-popup.line.solid:before { - border-left: 1px solid @color-bi-border-tree-expander-popup-line; - left: 15px; + .imagePath(@icon-tree-solid-vertical-line-1, 0, 0, repeat-y); + width: 24px; + left:4px; } .bi-theme-dark { .bi-tree-expander-popup.line:before { - border-left: 1px dashed @color-bi-border-tree-expander-popup-line-theme-dark; + width: 24px; + .imagePath(@icon-tree-vertical-line-1-theme-dark, 0, 0, repeat-y); } .bi-tree-expander-popup.line.solid:before { - border-left: 1px solid @color-bi-border-tree-expander-popup-line-theme-dark; + .imagePath(@icon-tree-solid-vertical-line-1-theme-dark, 0, 0, repeat-y); + width: 24px; + left:4px; } } From d4f6fd30beb15552dc862a9e12eeac29dc2f8318 Mon Sep 17 00:00:00 2001 From: data Date: Wed, 13 Apr 2022 17:24:02 +0800 Subject: [PATCH 3/8] auto upgrade version to 2.0.20220413172348 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0bce32fbb..3740833eb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20220413141541", + "version": "2.0.20220413172348", "description": "fineui", "main": "dist/fineui.min.js", "types": "dist/lib/index.d.ts", From a29a2f3b0b0a810b93b480082e444016ae13b0de Mon Sep 17 00:00:00 2001 From: data Date: Wed, 13 Apr 2022 19:34:31 +0800 Subject: [PATCH 4/8] auto upgrade version to 2.0.20220413193425 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3740833eb..c4fbf47a9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20220413172348", + "version": "2.0.20220413193425", "description": "fineui", "main": "dist/fineui.min.js", "types": "dist/lib/index.d.ts", From a082ee531fd474c13541266a97a4726897d97910 Mon Sep 17 00:00:00 2001 From: iapyang Date: Thu, 14 Apr 2022 10:02:46 +0800 Subject: [PATCH 5/8] chore: test file --- lodash copy.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 lodash copy.md diff --git a/lodash copy.md b/lodash copy.md new file mode 100644 index 000000000..770200a82 --- /dev/null +++ b/lodash copy.md @@ -0,0 +1 @@ +lodash core plus="debounce,throttle,get,set,findIndex,findLastIndex,findKey,findLastKey,isArrayLike,invert,invertBy,uniq,uniqBy,omit,omitBy,zip,unzip,rest,range,random,reject,intersection,drop,countBy,union,zipObject,initial,cloneDeep,clamp,isPlainObject,take,takeRight,without,difference,defaultsDeep,trim,merge,groupBy,uniqBy,before,after,unescape" From 7362b8d3aa8053d327081d104c438ba9f88e5e3c Mon Sep 17 00:00:00 2001 From: data Date: Thu, 14 Apr 2022 10:25:07 +0800 Subject: [PATCH 6/8] auto upgrade version to 2.0.20220414102452 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c4fbf47a9..eca19c335 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20220413193425", + "version": "2.0.20220414102452", "description": "fineui", "main": "dist/fineui.min.js", "types": "dist/lib/index.d.ts", From 9186e5d9429100065d98f68b9f1b75bb91c520b5 Mon Sep 17 00:00:00 2001 From: iapyang Date: Thu, 14 Apr 2022 10:35:51 +0800 Subject: [PATCH 7/8] chore: delete test file --- lodash copy.md | 1 - 1 file changed, 1 deletion(-) delete mode 100644 lodash copy.md diff --git a/lodash copy.md b/lodash copy.md deleted file mode 100644 index 770200a82..000000000 --- a/lodash copy.md +++ /dev/null @@ -1 +0,0 @@ -lodash core plus="debounce,throttle,get,set,findIndex,findLastIndex,findKey,findLastKey,isArrayLike,invert,invertBy,uniq,uniqBy,omit,omitBy,zip,unzip,rest,range,random,reject,intersection,drop,countBy,union,zipObject,initial,cloneDeep,clamp,isPlainObject,take,takeRight,without,difference,defaultsDeep,trim,merge,groupBy,uniqBy,before,after,unescape" From e4eafbd843afb64d527e3a13b33bdf28b51c8a0a Mon Sep 17 00:00:00 2001 From: data Date: Thu, 14 Apr 2022 11:05:55 +0800 Subject: [PATCH 8/8] auto upgrade version to 2.0.20220414110543 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index eca19c335..0da637080 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20220414102452", + "version": "2.0.20220414110543", "description": "fineui", "main": "dist/fineui.min.js", "types": "dist/lib/index.d.ts",