From 226137871f4654a2828012a84b650a9ce6c4c0ab Mon Sep 17 00:00:00 2001 From: guy Date: Sun, 9 Oct 2022 23:40:26 +0800 Subject: [PATCH 1/7] =?UTF-8?q?chore=EF=BC=9A=20=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/component/treevaluechooser/abstract.treevaluechooser.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/component/treevaluechooser/abstract.treevaluechooser.js b/src/component/treevaluechooser/abstract.treevaluechooser.js index c85f02192..d66fcc630 100644 --- a/src/component/treevaluechooser/abstract.treevaluechooser.js +++ b/src/component/treevaluechooser/abstract.treevaluechooser.js @@ -547,7 +547,7 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, { value: nodes[i].value, text: nodes[i].text, times: 1, - isParent: node.getChildrenLength() > 0, + isParent: nodes[i].getChildrenLength() > 0, checked: state[0], half: state[1], halfCheck: openState ? false : state[1], From 3deff21666692ddb1383f8dcebdab88536a759ba Mon Sep 17 00:00:00 2001 From: data Date: Mon, 10 Oct 2022 09:06:21 +0800 Subject: [PATCH 2/7] auto upgrade version to 2.0.20221010090607 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0f1a7a51f..19686286a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20221009164825", + "version": "2.0.20221010090607", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts", From a23086af2e174ffe7ee934e50c5645641484be22 Mon Sep 17 00:00:00 2001 From: Treecat Date: Mon, 10 Oct 2022 15:02:03 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20chore:=20?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/component/treevaluechooser/abstract.treevaluechooser.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/component/treevaluechooser/abstract.treevaluechooser.js b/src/component/treevaluechooser/abstract.treevaluechooser.js index d66fcc630..68bde5473 100644 --- a/src/component/treevaluechooser/abstract.treevaluechooser.js +++ b/src/component/treevaluechooser/abstract.treevaluechooser.js @@ -547,7 +547,7 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, { value: nodes[i].value, text: nodes[i].text, times: 1, - isParent: nodes[i].getChildrenLength() > 0, + isParent: nodes[i].isParent && nodes[i].getChildrenLength() > 0, checked: state[0], half: state[1], halfCheck: openState ? false : state[1], From 2d7f3d1a893e315a97c447088a2e9e1386382f01 Mon Sep 17 00:00:00 2001 From: Treecat Date: Mon, 10 Oct 2022 15:02:03 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20chore:=20?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/component/treevaluechooser/abstract.treevaluechooser.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/component/treevaluechooser/abstract.treevaluechooser.js b/src/component/treevaluechooser/abstract.treevaluechooser.js index d66fcc630..f1a7665d5 100644 --- a/src/component/treevaluechooser/abstract.treevaluechooser.js +++ b/src/component/treevaluechooser/abstract.treevaluechooser.js @@ -547,7 +547,7 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, { value: nodes[i].value, text: nodes[i].text, times: 1, - isParent: nodes[i].getChildrenLength() > 0, + isParent: nodes[i].isParent || nodes[i].getChildrenLength() > 0, checked: state[0], half: state[1], halfCheck: openState ? false : state[1], From 190d87a4c869008b15ead545c57731dbc73328d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?treecat-=E7=BD=97=E7=BE=A4?= Date: Mon, 10 Oct 2022 15:09:19 +0800 Subject: [PATCH 5/7] =?UTF-8?q?Pull=20request=20#3114:=20=E6=97=A0JIRA?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=20chore:=20=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Merge in VISUAL/fineui from ~TREECAT/fineui:master to master * commit '6bdc954b25f019d85c952739fb40399c22905444': 无JIRA任务 chore: 优化 无JIRA任务 chore: 优化 # Conflicts: # src/component/treevaluechooser/abstract.treevaluechooser.js --- src/component/treevaluechooser/abstract.treevaluechooser.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/component/treevaluechooser/abstract.treevaluechooser.js b/src/component/treevaluechooser/abstract.treevaluechooser.js index c85f02192..f1a7665d5 100644 --- a/src/component/treevaluechooser/abstract.treevaluechooser.js +++ b/src/component/treevaluechooser/abstract.treevaluechooser.js @@ -547,7 +547,7 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, { value: nodes[i].value, text: nodes[i].text, times: 1, - isParent: node.getChildrenLength() > 0, + isParent: nodes[i].isParent || nodes[i].getChildrenLength() > 0, checked: state[0], half: state[1], halfCheck: openState ? false : state[1], From 6e1c95f9290ecb09d6b6e2b4b5d9ffb8277da93e Mon Sep 17 00:00:00 2001 From: data Date: Mon, 10 Oct 2022 15:34:48 +0800 Subject: [PATCH 6/7] auto upgrade version to 2.0.20221010153434 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 19686286a..0bbddd585 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20221010090607", + "version": "2.0.20221010153434", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts", From 608ebb3f982ece5fbe15ba60b7d4047f728c7537 Mon Sep 17 00:00:00 2001 From: data Date: Mon, 10 Oct 2022 15:45:46 +0800 Subject: [PATCH 7/7] auto upgrade version to 2.0.20221010154537 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0bbddd585..81b4875ce 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20221010153434", + "version": "2.0.20221010154537", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts",