From 61e33ec3d52f513dc54ab5f5090752db94c41cff Mon Sep 17 00:00:00 2001
From: windy <1374721899@qq.com>
Date: Wed, 16 Feb 2022 14:51:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20=E6=A0=91?=
 =?UTF-8?q?=E8=8A=82=E7=82=B9=E6=96=87=E6=9C=AC=E6=8D=A2=E8=A1=8C=E9=87=8D?=
 =?UTF-8?q?=E5=BD=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/case/ztree/0.treeview.js                         |  1 +
 .../treevaluechooser/abstract.treevaluechooser.js    | 12 ++++++++----
 .../abstract.treevaluechooser.list.js                |  9 ++++++---
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/case/ztree/0.treeview.js b/src/case/ztree/0.treeview.js
index 66544e347..aa0c502a4 100644
--- a/src/case/ztree/0.treeview.js
+++ b/src/case/ztree/0.treeview.js
@@ -363,6 +363,7 @@ BI.TreeView = BI.inherit(BI.Pane, {
                 css: {
                     display: "inline"
                 },
+                whiteSpace: "nowrap",
                 root: true
             }, n));
             var fragment = BI.Widget._renderEngine.createElement("<div>");
diff --git a/src/component/treevaluechooser/abstract.treevaluechooser.js b/src/component/treevaluechooser/abstract.treevaluechooser.js
index 90c63c25e..5b3a1f580 100644
--- a/src/component/treevaluechooser/abstract.treevaluechooser.js
+++ b/src/component/treevaluechooser/abstract.treevaluechooser.js
@@ -129,7 +129,8 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
                 pId: pId,
                 text: node.text + (llen > 0 ? ("(" + BI.i18nText("BI-Basic_Altogether") + llen + BI.i18nText("BI-Basic_Count") + ")") : ""),
                 value: node.value,
-                open: true
+                open: true,
+                disabled: node.disabled
             });
         }
     },
@@ -463,7 +464,8 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
                 open: isOpen,
                 checked: checked,
                 halfCheck: half,
-                flag: flag
+                flag: flag,
+                disabled: node.disabled
             });
         }
 
@@ -546,7 +548,8 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
                 isParent: nodes[i].getChildrenLength() > 0,
                 checked: state[0],
                 halfCheck: state[1],
-                open: o.open
+                open: o.open,
+                disabled: nodes[i].disabled
             });
         }
         // 如果指定节点全部打开
@@ -584,7 +587,8 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
                     isParent: node.getChildrenLength() > 0,
                     checked: state[0],
                     halfCheck: state[1],
-                    open: self.options.open
+                    open: self.options.open,
+                    disabled: node.disabled
                 });
             });
         }
diff --git a/src/component/treevaluechooser/abstract.treevaluechooser.list.js b/src/component/treevaluechooser/abstract.treevaluechooser.list.js
index 048a656f8..0a44af0f1 100644
--- a/src/component/treevaluechooser/abstract.treevaluechooser.list.js
+++ b/src/component/treevaluechooser/abstract.treevaluechooser.list.js
@@ -145,7 +145,8 @@ BI.AbstractListTreeValueChooser = BI.inherit(BI.AbstractTreeValueChooser, {
                 open: isOpen,
                 checked: checked,
                 halfCheck: false,
-                flag: flag
+                flag: flag,
+                disabled: node.disabled
             });
         }
 
@@ -218,7 +219,8 @@ BI.AbstractListTreeValueChooser = BI.inherit(BI.AbstractTreeValueChooser, {
                 isParent: nodes[i].getChildrenLength() > 0,
                 checked: checked,
                 halfCheck: false,
-                open: o.open
+                open: o.open,
+                disabled: nodes[i].disabled
             });
         }
         // 如果指定节点全部打开
@@ -240,7 +242,8 @@ BI.AbstractListTreeValueChooser = BI.inherit(BI.AbstractTreeValueChooser, {
                     isParent: node.getChildrenLength() > 0,
                     checked: checked,
                     halfCheck: false,
-                    open: o.open
+                    open: o.open,
+                    disabled: node.disabled
                 });
             });
         }