BI-18810 树节点的半选-->全选

6 years ago · 6f774a1ed9
19 changed files with 72 additions and 22 deletions
--- a/dist/base.js
+++ b/dist/base.js
@ -1798,6 +1798,11 @@ BI.TreeView = BI.inherit(BI.Pane, {
                    node.halfCheck = false;
                });
            }
+            var status = treeNode.getCheckStatus();
+            // 当前点击节点的状态是半选，且为true_part, 则将其改为false_part,使得点击半选后切换到的是全选
+            if(status.half === true && status.checked === true) {
+                treeNode.checked = false;
+            }
        }

        function onCheck (event, treeId, treeNode) {
@ -2199,6 +2204,11 @@ BI.AsyncTree = BI.inherit(BI.TreeView, {
                    node.halfCheck = false;
                });
            }
+            var status = treeNode.getCheckStatus();
+            // 当前点击节点的状态是半选，且为true_part, 则将其改为false_part,使得点击半选后切换到的是全选
+            if(status.half === true && status.checked === true) {
+                treeNode.checked = false;
+            }
        }

        function beforeExpand (treeId, treeNode) {
--- a/dist/bundle.css
+++ b/dist/bundle.css
@ -481,10 +481,10 @@ textarea {
 .bi-theme-dark .bi-split-top {
  border-top: 1px solid #2F3149;
 }
-.bi-border-bottom {
+.bi-split-bottom {
  border-bottom: 1px solid #f2f4f7;
 }
-.bi-theme-dark .bi-border-bottom {
+.bi-theme-dark .bi-split-bottom {
  border-bottom: 1px solid #2F3149;
 }
 .bi-keyword-red-mark {
--- a/dist/bundle.js
+++ b/dist/bundle.js
@ -25567,6 +25567,7 @@ BI.ShowAction = BI.inherit(BI.Action, {

    BI.encodeURIComponent = function (url) {
        BI.specialCharsMap = BI.specialCharsMap || {};
+        url = url || "";
        url = url.replaceAll(BI.keys(BI.specialCharsMap || []).join("|"), function (str) {
            return BI.specialCharsMap[str] || str;
        });
@ -25578,6 +25579,7 @@ BI.ShowAction = BI.inherit(BI.Action, {
        BI.each(BI.specialCharsMap, function (initialChar, encodeChar) {
            reserveSpecialCharsMap[encodeChar] = initialChar;
        });
+        url = url || "";
        url = url.replaceAll(BI.keys(reserveSpecialCharsMap || []).join("|"), function (str) {
            return reserveSpecialCharsMap[str] || str;
        });
@ -37068,6 +37070,11 @@ BI.TreeView = BI.inherit(BI.Pane, {
                    node.halfCheck = false;
                });
            }
+            var status = treeNode.getCheckStatus();
+            // 当前点击节点的状态是半选，且为true_part, 则将其改为false_part,使得点击半选后切换到的是全选
+            if(status.half === true && status.checked === true) {
+                treeNode.checked = false;
+            }
        }

        function onCheck (event, treeId, treeNode) {
@ -37469,6 +37476,11 @@ BI.AsyncTree = BI.inherit(BI.TreeView, {
                    node.halfCheck = false;
                });
            }
+            var status = treeNode.getCheckStatus();
+            // 当前点击节点的状态是半选，且为true_part, 则将其改为false_part,使得点击半选后切换到的是全选
+            if(status.half === true && status.checked === true) {
+                treeNode.checked = false;
+            }
        }

        function beforeExpand (treeId, treeNode) {
--- a/dist/bundle.min.css
+++ b/dist/bundle.min.css
--- a/dist/bundle.min.js
+++ b/dist/bundle.min.js
--- a/dist/core.css
+++ b/dist/core.css
@ -481,10 +481,10 @@ textarea {
 .bi-theme-dark .bi-split-top {
  border-top: 1px solid #2F3149;
 }
-.bi-border-bottom {
+.bi-split-bottom {
  border-bottom: 1px solid #f2f4f7;
 }
-.bi-theme-dark .bi-border-bottom {
+.bi-theme-dark .bi-split-bottom {
  border-bottom: 1px solid #2F3149;
 }
 .bi-keyword-red-mark {
--- a/dist/core.js
+++ b/dist/core.js
@ -25567,6 +25567,7 @@ BI.ShowAction = BI.inherit(BI.Action, {

    BI.encodeURIComponent = function (url) {
        BI.specialCharsMap = BI.specialCharsMap || {};
+        url = url || "";
        url = url.replaceAll(BI.keys(BI.specialCharsMap || []).join("|"), function (str) {
            return BI.specialCharsMap[str] || str;
        });
@ -25578,6 +25579,7 @@ BI.ShowAction = BI.inherit(BI.Action, {
        BI.each(BI.specialCharsMap, function (initialChar, encodeChar) {
            reserveSpecialCharsMap[encodeChar] = initialChar;
        });
+        url = url || "";
        url = url.replaceAll(BI.keys(reserveSpecialCharsMap || []).join("|"), function (str) {
            return reserveSpecialCharsMap[str] || str;
        });
--- a/dist/core_without_normalize.css
+++ b/dist/core_without_normalize.css
@ -200,10 +200,10 @@ textarea {
 .bi-theme-dark .bi-split-top {
  border-top: 1px solid #2F3149;
 }
-.bi-border-bottom {
+.bi-split-bottom {
  border-bottom: 1px solid #f2f4f7;
 }
-.bi-theme-dark .bi-border-bottom {
+.bi-theme-dark .bi-split-bottom {
  border-bottom: 1px solid #2F3149;
 }
 .bi-keyword-red-mark {
--- a/dist/fineui.css
+++ b/dist/fineui.css
@ -481,10 +481,10 @@ textarea {
 .bi-theme-dark .bi-split-top {
  border-top: 1px solid #2F3149;
 }
-.bi-border-bottom {
+.bi-split-bottom {
  border-bottom: 1px solid #f2f4f7;
 }
-.bi-theme-dark .bi-border-bottom {
+.bi-theme-dark .bi-split-bottom {
  border-bottom: 1px solid #2F3149;
 }
 .bi-keyword-red-mark {
--- a/dist/fineui.js
+++ b/dist/fineui.js
@ -25788,6 +25788,7 @@ BI.ShowAction = BI.inherit(BI.Action, {

    BI.encodeURIComponent = function (url) {
        BI.specialCharsMap = BI.specialCharsMap || {};
+        url = url || "";
        url = url.replaceAll(BI.keys(BI.specialCharsMap || []).join("|"), function (str) {
            return BI.specialCharsMap[str] || str;
        });
@ -25799,6 +25800,7 @@ BI.ShowAction = BI.inherit(BI.Action, {
        BI.each(BI.specialCharsMap, function (initialChar, encodeChar) {
            reserveSpecialCharsMap[encodeChar] = initialChar;
        });
+        url = url || "";
        url = url.replaceAll(BI.keys(reserveSpecialCharsMap || []).join("|"), function (str) {
            return reserveSpecialCharsMap[str] || str;
        });
@ -37289,6 +37291,11 @@ BI.TreeView = BI.inherit(BI.Pane, {
                    node.halfCheck = false;
                });
            }
+            var status = treeNode.getCheckStatus();
+            // 当前点击节点的状态是半选，且为true_part, 则将其改为false_part,使得点击半选后切换到的是全选
+            if(status.half === true && status.checked === true) {
+                treeNode.checked = false;
+            }
        }

        function onCheck (event, treeId, treeNode) {
@ -37690,6 +37697,11 @@ BI.AsyncTree = BI.inherit(BI.TreeView, {
                    node.halfCheck = false;
                });
            }
+            var status = treeNode.getCheckStatus();
+            // 当前点击节点的状态是半选，且为true_part, 则将其改为false_part,使得点击半选后切换到的是全选
+            if(status.half === true && status.checked === true) {
+                treeNode.checked = false;
+            }
        }

        function beforeExpand (treeId, treeNode) {
--- a/dist/fineui.min.css
+++ b/dist/fineui.min.css
--- a/dist/fineui.min.js
+++ b/dist/fineui.min.js
--- a/dist/utils.js
+++ b/dist/utils.js
@ -13138,6 +13138,7 @@ _.extend(BI.OB.prototype, {

    BI.encodeURIComponent = function (url) {
        BI.specialCharsMap = BI.specialCharsMap || {};
+        url = url || "";
        url = url.replaceAll(BI.keys(BI.specialCharsMap || []).join("|"), function (str) {
            return BI.specialCharsMap[str] || str;
        });
@ -13149,6 +13150,7 @@ _.extend(BI.OB.prototype, {
        BI.each(BI.specialCharsMap, function (initialChar, encodeChar) {
            reserveSpecialCharsMap[encodeChar] = initialChar;
        });
+        url = url || "";
        url = url.replaceAll(BI.keys(reserveSpecialCharsMap || []).join("|"), function (str) {
            return reserveSpecialCharsMap[str] || str;
        });
--- a/dist/utils.min.js
+++ b/dist/utils.min.js
--- a/src/base/tree/asynctree.js
+++ b/src/base/tree/asynctree.js
@ -76,6 +76,11 @@ BI.AsyncTree = BI.inherit(BI.TreeView, {
                    node.halfCheck = false;
                });
            }
+            var status = treeNode.getCheckStatus();
+            // 当前点击节点的状态是半选，且为true_part, 则将其改为false_part,使得点击半选后切换到的是全选
+            if(status.half === true && status.checked === true) {
+                treeNode.checked = false;
+            }
        }

        function beforeExpand (treeId, treeNode) {
--- a/src/base/tree/treeview.js
+++ b/src/base/tree/treeview.js
@ -192,6 +192,11 @@ BI.TreeView = BI.inherit(BI.Pane, {
                    node.halfCheck = false;
                });
            }
+            var status = treeNode.getCheckStatus();
+            // 当前点击节点的状态是半选，且为true_part, 则将其改为false_part,使得点击半选后切换到的是全选
+            if(status.half === true && status.checked === true) {
+                treeNode.checked = false;
+            }
        }

        function onCheck (event, treeId, treeNode) {
--- a/src/core/alias.js
+++ b/src/core/alias.js
@ -577,6 +577,7 @@

    BI.encodeURIComponent = function (url) {
        BI.specialCharsMap = BI.specialCharsMap || {};
+        url = url || "";
        url = url.replaceAll(BI.keys(BI.specialCharsMap || []).join("|"), function (str) {
            return BI.specialCharsMap[str] || str;
        });
@ -588,6 +589,7 @@
        BI.each(BI.specialCharsMap, function (initialChar, encodeChar) {
            reserveSpecialCharsMap[encodeChar] = initialChar;
        });
+        url = url || "";
        url = url.replaceAll(BI.keys(reserveSpecialCharsMap || []).join("|"), function (str) {
            return reserveSpecialCharsMap[str] || str;
        });
--- a/src/css/core/utils/common.css
+++ b/src/css/core/utils/common.css
@ -200,10 +200,10 @@ textarea {
 .bi-theme-dark .bi-split-top {
  border-top: 1px solid #2F3149;
 }
-.bi-border-bottom {
+.bi-split-bottom {
  border-bottom: 1px solid #f2f4f7;
 }
-.bi-theme-dark .bi-border-bottom {
+.bi-theme-dark .bi-split-bottom {
  border-bottom: 1px solid #2F3149;
 }
 .bi-keyword-red-mark {
--- a/src/less/core/utils/common.less
+++ b/src/less/core/utils/common.less
@ -262,12 +262,12 @@ textarea {
  }
 }

-.bi-border-bottom {
+.bi-split-bottom {
  border-bottom: 1px solid @border-color-light-line;
 }

 .bi-theme-dark {
-  .bi-border-bottom {
+  .bi-split-bottom {
    border-bottom: 1px solid @border-color-light-line-theme-dark;
  }
 }