Browse Source

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

es6
windy 6 years ago
parent
commit
6f774a1ed9
  1. 10
      dist/base.js
  2. 4
      dist/bundle.css
  3. 12
      dist/bundle.js
  4. 2
      dist/bundle.min.css
  5. 6
      dist/bundle.min.js
  6. 4
      dist/core.css
  7. 2
      dist/core.js
  8. 4
      dist/core_without_normalize.css
  9. 4
      dist/fineui.css
  10. 12
      dist/fineui.js
  11. 2
      dist/fineui.min.css
  12. 6
      dist/fineui.min.js
  13. 2
      dist/utils.js
  14. 4
      dist/utils.min.js
  15. 5
      src/base/tree/asynctree.js
  16. 5
      src/base/tree/treeview.js
  17. 2
      src/core/alias.js
  18. 4
      src/css/core/utils/common.css
  19. 4
      src/less/core/utils/common.less

10
dist/base.js vendored

@ -1798,6 +1798,11 @@ BI.TreeView = BI.inherit(BI.Pane, {
node.halfCheck = false; 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) { function onCheck (event, treeId, treeNode) {
@ -2199,6 +2204,11 @@ BI.AsyncTree = BI.inherit(BI.TreeView, {
node.halfCheck = false; 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) { function beforeExpand (treeId, treeNode) {

4
dist/bundle.css vendored

@ -481,10 +481,10 @@ textarea {
.bi-theme-dark .bi-split-top { .bi-theme-dark .bi-split-top {
border-top: 1px solid #2F3149; border-top: 1px solid #2F3149;
} }
.bi-border-bottom { .bi-split-bottom {
border-bottom: 1px solid #f2f4f7; border-bottom: 1px solid #f2f4f7;
} }
.bi-theme-dark .bi-border-bottom { .bi-theme-dark .bi-split-bottom {
border-bottom: 1px solid #2F3149; border-bottom: 1px solid #2F3149;
} }
.bi-keyword-red-mark { .bi-keyword-red-mark {

12
dist/bundle.js vendored

@ -25567,6 +25567,7 @@ BI.ShowAction = BI.inherit(BI.Action, {
BI.encodeURIComponent = function (url) { BI.encodeURIComponent = function (url) {
BI.specialCharsMap = BI.specialCharsMap || {}; BI.specialCharsMap = BI.specialCharsMap || {};
url = url || "";
url = url.replaceAll(BI.keys(BI.specialCharsMap || []).join("|"), function (str) { url = url.replaceAll(BI.keys(BI.specialCharsMap || []).join("|"), function (str) {
return BI.specialCharsMap[str] || str; return BI.specialCharsMap[str] || str;
}); });
@ -25578,6 +25579,7 @@ BI.ShowAction = BI.inherit(BI.Action, {
BI.each(BI.specialCharsMap, function (initialChar, encodeChar) { BI.each(BI.specialCharsMap, function (initialChar, encodeChar) {
reserveSpecialCharsMap[encodeChar] = initialChar; reserveSpecialCharsMap[encodeChar] = initialChar;
}); });
url = url || "";
url = url.replaceAll(BI.keys(reserveSpecialCharsMap || []).join("|"), function (str) { url = url.replaceAll(BI.keys(reserveSpecialCharsMap || []).join("|"), function (str) {
return reserveSpecialCharsMap[str] || str; return reserveSpecialCharsMap[str] || str;
}); });
@ -37068,6 +37070,11 @@ BI.TreeView = BI.inherit(BI.Pane, {
node.halfCheck = false; 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) { function onCheck (event, treeId, treeNode) {
@ -37469,6 +37476,11 @@ BI.AsyncTree = BI.inherit(BI.TreeView, {
node.halfCheck = false; 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) { function beforeExpand (treeId, treeNode) {

2
dist/bundle.min.css vendored

File diff suppressed because one or more lines are too long

6
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

4
dist/core.css vendored

@ -481,10 +481,10 @@ textarea {
.bi-theme-dark .bi-split-top { .bi-theme-dark .bi-split-top {
border-top: 1px solid #2F3149; border-top: 1px solid #2F3149;
} }
.bi-border-bottom { .bi-split-bottom {
border-bottom: 1px solid #f2f4f7; border-bottom: 1px solid #f2f4f7;
} }
.bi-theme-dark .bi-border-bottom { .bi-theme-dark .bi-split-bottom {
border-bottom: 1px solid #2F3149; border-bottom: 1px solid #2F3149;
} }
.bi-keyword-red-mark { .bi-keyword-red-mark {

2
dist/core.js vendored

@ -25567,6 +25567,7 @@ BI.ShowAction = BI.inherit(BI.Action, {
BI.encodeURIComponent = function (url) { BI.encodeURIComponent = function (url) {
BI.specialCharsMap = BI.specialCharsMap || {}; BI.specialCharsMap = BI.specialCharsMap || {};
url = url || "";
url = url.replaceAll(BI.keys(BI.specialCharsMap || []).join("|"), function (str) { url = url.replaceAll(BI.keys(BI.specialCharsMap || []).join("|"), function (str) {
return BI.specialCharsMap[str] || str; return BI.specialCharsMap[str] || str;
}); });
@ -25578,6 +25579,7 @@ BI.ShowAction = BI.inherit(BI.Action, {
BI.each(BI.specialCharsMap, function (initialChar, encodeChar) { BI.each(BI.specialCharsMap, function (initialChar, encodeChar) {
reserveSpecialCharsMap[encodeChar] = initialChar; reserveSpecialCharsMap[encodeChar] = initialChar;
}); });
url = url || "";
url = url.replaceAll(BI.keys(reserveSpecialCharsMap || []).join("|"), function (str) { url = url.replaceAll(BI.keys(reserveSpecialCharsMap || []).join("|"), function (str) {
return reserveSpecialCharsMap[str] || str; return reserveSpecialCharsMap[str] || str;
}); });

4
dist/core_without_normalize.css vendored

@ -200,10 +200,10 @@ textarea {
.bi-theme-dark .bi-split-top { .bi-theme-dark .bi-split-top {
border-top: 1px solid #2F3149; border-top: 1px solid #2F3149;
} }
.bi-border-bottom { .bi-split-bottom {
border-bottom: 1px solid #f2f4f7; border-bottom: 1px solid #f2f4f7;
} }
.bi-theme-dark .bi-border-bottom { .bi-theme-dark .bi-split-bottom {
border-bottom: 1px solid #2F3149; border-bottom: 1px solid #2F3149;
} }
.bi-keyword-red-mark { .bi-keyword-red-mark {

4
dist/fineui.css vendored

@ -481,10 +481,10 @@ textarea {
.bi-theme-dark .bi-split-top { .bi-theme-dark .bi-split-top {
border-top: 1px solid #2F3149; border-top: 1px solid #2F3149;
} }
.bi-border-bottom { .bi-split-bottom {
border-bottom: 1px solid #f2f4f7; border-bottom: 1px solid #f2f4f7;
} }
.bi-theme-dark .bi-border-bottom { .bi-theme-dark .bi-split-bottom {
border-bottom: 1px solid #2F3149; border-bottom: 1px solid #2F3149;
} }
.bi-keyword-red-mark { .bi-keyword-red-mark {

12
dist/fineui.js vendored

@ -25788,6 +25788,7 @@ BI.ShowAction = BI.inherit(BI.Action, {
BI.encodeURIComponent = function (url) { BI.encodeURIComponent = function (url) {
BI.specialCharsMap = BI.specialCharsMap || {}; BI.specialCharsMap = BI.specialCharsMap || {};
url = url || "";
url = url.replaceAll(BI.keys(BI.specialCharsMap || []).join("|"), function (str) { url = url.replaceAll(BI.keys(BI.specialCharsMap || []).join("|"), function (str) {
return BI.specialCharsMap[str] || str; return BI.specialCharsMap[str] || str;
}); });
@ -25799,6 +25800,7 @@ BI.ShowAction = BI.inherit(BI.Action, {
BI.each(BI.specialCharsMap, function (initialChar, encodeChar) { BI.each(BI.specialCharsMap, function (initialChar, encodeChar) {
reserveSpecialCharsMap[encodeChar] = initialChar; reserveSpecialCharsMap[encodeChar] = initialChar;
}); });
url = url || "";
url = url.replaceAll(BI.keys(reserveSpecialCharsMap || []).join("|"), function (str) { url = url.replaceAll(BI.keys(reserveSpecialCharsMap || []).join("|"), function (str) {
return reserveSpecialCharsMap[str] || str; return reserveSpecialCharsMap[str] || str;
}); });
@ -37289,6 +37291,11 @@ BI.TreeView = BI.inherit(BI.Pane, {
node.halfCheck = false; 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) { function onCheck (event, treeId, treeNode) {
@ -37690,6 +37697,11 @@ BI.AsyncTree = BI.inherit(BI.TreeView, {
node.halfCheck = false; 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) { function beforeExpand (treeId, treeNode) {

2
dist/fineui.min.css vendored

File diff suppressed because one or more lines are too long

6
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/utils.js vendored

@ -13138,6 +13138,7 @@ _.extend(BI.OB.prototype, {
BI.encodeURIComponent = function (url) { BI.encodeURIComponent = function (url) {
BI.specialCharsMap = BI.specialCharsMap || {}; BI.specialCharsMap = BI.specialCharsMap || {};
url = url || "";
url = url.replaceAll(BI.keys(BI.specialCharsMap || []).join("|"), function (str) { url = url.replaceAll(BI.keys(BI.specialCharsMap || []).join("|"), function (str) {
return BI.specialCharsMap[str] || str; return BI.specialCharsMap[str] || str;
}); });
@ -13149,6 +13150,7 @@ _.extend(BI.OB.prototype, {
BI.each(BI.specialCharsMap, function (initialChar, encodeChar) { BI.each(BI.specialCharsMap, function (initialChar, encodeChar) {
reserveSpecialCharsMap[encodeChar] = initialChar; reserveSpecialCharsMap[encodeChar] = initialChar;
}); });
url = url || "";
url = url.replaceAll(BI.keys(reserveSpecialCharsMap || []).join("|"), function (str) { url = url.replaceAll(BI.keys(reserveSpecialCharsMap || []).join("|"), function (str) {
return reserveSpecialCharsMap[str] || str; return reserveSpecialCharsMap[str] || str;
}); });

4
dist/utils.min.js vendored

File diff suppressed because one or more lines are too long

5
src/base/tree/asynctree.js

@ -76,6 +76,11 @@ BI.AsyncTree = BI.inherit(BI.TreeView, {
node.halfCheck = false; 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) { function beforeExpand (treeId, treeNode) {

5
src/base/tree/treeview.js

@ -192,6 +192,11 @@ BI.TreeView = BI.inherit(BI.Pane, {
node.halfCheck = false; 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) { function onCheck (event, treeId, treeNode) {

2
src/core/alias.js

@ -577,6 +577,7 @@
BI.encodeURIComponent = function (url) { BI.encodeURIComponent = function (url) {
BI.specialCharsMap = BI.specialCharsMap || {}; BI.specialCharsMap = BI.specialCharsMap || {};
url = url || "";
url = url.replaceAll(BI.keys(BI.specialCharsMap || []).join("|"), function (str) { url = url.replaceAll(BI.keys(BI.specialCharsMap || []).join("|"), function (str) {
return BI.specialCharsMap[str] || str; return BI.specialCharsMap[str] || str;
}); });
@ -588,6 +589,7 @@
BI.each(BI.specialCharsMap, function (initialChar, encodeChar) { BI.each(BI.specialCharsMap, function (initialChar, encodeChar) {
reserveSpecialCharsMap[encodeChar] = initialChar; reserveSpecialCharsMap[encodeChar] = initialChar;
}); });
url = url || "";
url = url.replaceAll(BI.keys(reserveSpecialCharsMap || []).join("|"), function (str) { url = url.replaceAll(BI.keys(reserveSpecialCharsMap || []).join("|"), function (str) {
return reserveSpecialCharsMap[str] || str; return reserveSpecialCharsMap[str] || str;
}); });

4
src/css/core/utils/common.css

@ -200,10 +200,10 @@ textarea {
.bi-theme-dark .bi-split-top { .bi-theme-dark .bi-split-top {
border-top: 1px solid #2F3149; border-top: 1px solid #2F3149;
} }
.bi-border-bottom { .bi-split-bottom {
border-bottom: 1px solid #f2f4f7; border-bottom: 1px solid #f2f4f7;
} }
.bi-theme-dark .bi-border-bottom { .bi-theme-dark .bi-split-bottom {
border-bottom: 1px solid #2F3149; border-bottom: 1px solid #2F3149;
} }
.bi-keyword-red-mark { .bi-keyword-red-mark {

4
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; border-bottom: 1px solid @border-color-light-line;
} }
.bi-theme-dark { .bi-theme-dark {
.bi-border-bottom { .bi-split-bottom {
border-bottom: 1px solid @border-color-light-line-theme-dark; border-bottom: 1px solid @border-color-light-line-theme-dark;
} }
} }

Loading…
Cancel
Save