Browse Source

fix: label设置了height的情况下居中 && ztree半选到全选少改了

es6
windy 6 years ago
parent
commit
3478f1aa2f
  1. 17
      dist/base.js
  2. 17
      dist/bundle.ie.js
  3. 56
      dist/bundle.ie.min.js
  4. 17
      dist/bundle.js
  5. 2
      dist/bundle.min.css
  6. 16
      dist/bundle.min.js
  7. 25
      dist/demo.js
  8. 17
      dist/fineui.ie.js
  9. 54
      dist/fineui.ie.min.js
  10. 17
      dist/fineui.js
  11. 2
      dist/fineui.min.css
  12. 16
      dist/fineui.min.js
  13. 1
      dist/fineui_without_jquery_polyfill.js
  14. 2
      dist/utils.min.js
  15. 1
      src/base/single/label/label.js
  16. 8
      src/base/tree/ztree/asynctree.js
  17. 8
      src/base/tree/ztree/treeview.js

17
dist/base.js vendored

@ -1757,7 +1757,13 @@ BI.TreeView = BI.inherit(BI.Pane, {
var className = "dark", perTime = 100; var className = "dark", perTime = 100;
function onClick (event, treeId, treeNode) { function onClick (event, treeId, treeNode) {
self.nodes.checkNode(treeNode, !treeNode.checked, true, true); // 当前点击节点的状态是半选,且为true_part, 则将其改为false_part,使得点击半选后切换到的是全选
var checked = treeNode.checked;
var status = treeNode.getCheckStatus();
if(status.half === true && status.checked === true) {
checked = false;
}
self.nodes.checkNode(treeNode, !checked, true, true);
} }
function getUrl (treeId, treeNode) { function getUrl (treeId, treeNode) {
@ -2225,7 +2231,13 @@ BI.AsyncTree = BI.inherit(BI.TreeView, {
function onClick (event, treeId, treeNode) { function onClick (event, treeId, treeNode) {
var zTree = $.fn.zTree.getZTreeObj(treeId); var zTree = $.fn.zTree.getZTreeObj(treeId);
zTree.checkNode(treeNode, !treeNode.checked, true, true); // 当前点击节点的状态是半选,且为true_part, 则将其改为false_part,使得点击半选后切换到的是全选
var checked = treeNode.checked;
var status = treeNode.getCheckStatus();
if(status.half === true && status.checked === true) {
checked = false;
}
zTree.checkNode(treeNode, !checked, true, true);
} }
function beforeCheck (treeId, treeNode) { function beforeCheck (treeId, treeNode) {
@ -10955,6 +10967,7 @@ BI.Label = BI.inherit(BI.Single, {
this.element.css({ this.element.css({
"line-height": o.height + "px" "line-height": o.height + "px"
}); });
json.textAlign = o.textAlign;
BI.createWidget({ BI.createWidget({
type: "bi.adaptive", type: "bi.adaptive",
height: o.height, height: o.height,

17
dist/bundle.ie.js vendored

@ -36881,7 +36881,13 @@ BI.TreeView = BI.inherit(BI.Pane, {
var className = "dark", perTime = 100; var className = "dark", perTime = 100;
function onClick (event, treeId, treeNode) { function onClick (event, treeId, treeNode) {
self.nodes.checkNode(treeNode, !treeNode.checked, true, true); // 当前点击节点的状态是半选,且为true_part, 则将其改为false_part,使得点击半选后切换到的是全选
var checked = treeNode.checked;
var status = treeNode.getCheckStatus();
if(status.half === true && status.checked === true) {
checked = false;
}
self.nodes.checkNode(treeNode, !checked, true, true);
} }
function getUrl (treeId, treeNode) { function getUrl (treeId, treeNode) {
@ -37349,7 +37355,13 @@ BI.AsyncTree = BI.inherit(BI.TreeView, {
function onClick (event, treeId, treeNode) { function onClick (event, treeId, treeNode) {
var zTree = $.fn.zTree.getZTreeObj(treeId); var zTree = $.fn.zTree.getZTreeObj(treeId);
zTree.checkNode(treeNode, !treeNode.checked, true, true); // 当前点击节点的状态是半选,且为true_part, 则将其改为false_part,使得点击半选后切换到的是全选
var checked = treeNode.checked;
var status = treeNode.getCheckStatus();
if(status.half === true && status.checked === true) {
checked = false;
}
zTree.checkNode(treeNode, !checked, true, true);
} }
function beforeCheck (treeId, treeNode) { function beforeCheck (treeId, treeNode) {
@ -46079,6 +46091,7 @@ BI.Label = BI.inherit(BI.Single, {
this.element.css({ this.element.css({
"line-height": o.height + "px" "line-height": o.height + "px"
}); });
json.textAlign = o.textAlign;
BI.createWidget({ BI.createWidget({
type: "bi.adaptive", type: "bi.adaptive",
height: o.height, height: o.height,

56
dist/bundle.ie.min.js vendored

File diff suppressed because one or more lines are too long

17
dist/bundle.js vendored

@ -37285,7 +37285,13 @@ BI.TreeView = BI.inherit(BI.Pane, {
var className = "dark", perTime = 100; var className = "dark", perTime = 100;
function onClick (event, treeId, treeNode) { function onClick (event, treeId, treeNode) {
self.nodes.checkNode(treeNode, !treeNode.checked, true, true); // 当前点击节点的状态是半选,且为true_part, 则将其改为false_part,使得点击半选后切换到的是全选
var checked = treeNode.checked;
var status = treeNode.getCheckStatus();
if(status.half === true && status.checked === true) {
checked = false;
}
self.nodes.checkNode(treeNode, !checked, true, true);
} }
function getUrl (treeId, treeNode) { function getUrl (treeId, treeNode) {
@ -37753,7 +37759,13 @@ BI.AsyncTree = BI.inherit(BI.TreeView, {
function onClick (event, treeId, treeNode) { function onClick (event, treeId, treeNode) {
var zTree = $.fn.zTree.getZTreeObj(treeId); var zTree = $.fn.zTree.getZTreeObj(treeId);
zTree.checkNode(treeNode, !treeNode.checked, true, true); // 当前点击节点的状态是半选,且为true_part, 则将其改为false_part,使得点击半选后切换到的是全选
var checked = treeNode.checked;
var status = treeNode.getCheckStatus();
if(status.half === true && status.checked === true) {
checked = false;
}
zTree.checkNode(treeNode, !checked, true, true);
} }
function beforeCheck (treeId, treeNode) { function beforeCheck (treeId, treeNode) {
@ -46483,6 +46495,7 @@ BI.Label = BI.inherit(BI.Single, {
this.element.css({ this.element.css({
"line-height": o.height + "px" "line-height": o.height + "px"
}); });
json.textAlign = o.textAlign;
BI.createWidget({ BI.createWidget({
type: "bi.adaptive", type: "bi.adaptive",
height: o.height, height: o.height,

2
dist/bundle.min.css vendored

File diff suppressed because one or more lines are too long

16
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

25
dist/demo.js vendored

@ -6158,30 +6158,7 @@ Demo.HtapeLayout = BI.inherit(BI.Widget, {
}; };
} }
}); });
BI.shortcut("demo.htape", Demo.HtapeLayout);Demo.InlineVerticalLayout = BI.inherit(BI.Widget, { BI.shortcut("demo.htape", Demo.HtapeLayout);/**
props: {
baseCls: "demo-absolute"
},
render: function () {
return {
type: "bi.inline_vertical_adapt",
items: [{
type: "bi.label",
text: "绝对布局",
cls: "layout-bg1",
width: 300,
height: 200
}, {
type: "bi.label",
text: "绝对布局",
cls: "layout-bg1",
width: 300,
height: 100
}]
};
}
});
BI.shortcut("demo.inline_vertical", Demo.InlineVerticalLayout);/**
* Created by User on 2017/3/22. * Created by User on 2017/3/22.
*/ */
Demo.LeftRightVerticalAdaptLayout = BI.inherit(BI.Widget, { Demo.LeftRightVerticalAdaptLayout = BI.inherit(BI.Widget, {

17
dist/fineui.ie.js vendored

@ -37126,7 +37126,13 @@ BI.TreeView = BI.inherit(BI.Pane, {
var className = "dark", perTime = 100; var className = "dark", perTime = 100;
function onClick (event, treeId, treeNode) { function onClick (event, treeId, treeNode) {
self.nodes.checkNode(treeNode, !treeNode.checked, true, true); // 当前点击节点的状态是半选,且为true_part, 则将其改为false_part,使得点击半选后切换到的是全选
var checked = treeNode.checked;
var status = treeNode.getCheckStatus();
if(status.half === true && status.checked === true) {
checked = false;
}
self.nodes.checkNode(treeNode, !checked, true, true);
} }
function getUrl (treeId, treeNode) { function getUrl (treeId, treeNode) {
@ -37594,7 +37600,13 @@ BI.AsyncTree = BI.inherit(BI.TreeView, {
function onClick (event, treeId, treeNode) { function onClick (event, treeId, treeNode) {
var zTree = $.fn.zTree.getZTreeObj(treeId); var zTree = $.fn.zTree.getZTreeObj(treeId);
zTree.checkNode(treeNode, !treeNode.checked, true, true); // 当前点击节点的状态是半选,且为true_part, 则将其改为false_part,使得点击半选后切换到的是全选
var checked = treeNode.checked;
var status = treeNode.getCheckStatus();
if(status.half === true && status.checked === true) {
checked = false;
}
zTree.checkNode(treeNode, !checked, true, true);
} }
function beforeCheck (treeId, treeNode) { function beforeCheck (treeId, treeNode) {
@ -46324,6 +46336,7 @@ BI.Label = BI.inherit(BI.Single, {
this.element.css({ this.element.css({
"line-height": o.height + "px" "line-height": o.height + "px"
}); });
json.textAlign = o.textAlign;
BI.createWidget({ BI.createWidget({
type: "bi.adaptive", type: "bi.adaptive",
height: o.height, height: o.height,

54
dist/fineui.ie.min.js vendored

File diff suppressed because one or more lines are too long

17
dist/fineui.js vendored

@ -37530,7 +37530,13 @@ BI.TreeView = BI.inherit(BI.Pane, {
var className = "dark", perTime = 100; var className = "dark", perTime = 100;
function onClick (event, treeId, treeNode) { function onClick (event, treeId, treeNode) {
self.nodes.checkNode(treeNode, !treeNode.checked, true, true); // 当前点击节点的状态是半选,且为true_part, 则将其改为false_part,使得点击半选后切换到的是全选
var checked = treeNode.checked;
var status = treeNode.getCheckStatus();
if(status.half === true && status.checked === true) {
checked = false;
}
self.nodes.checkNode(treeNode, !checked, true, true);
} }
function getUrl (treeId, treeNode) { function getUrl (treeId, treeNode) {
@ -37998,7 +38004,13 @@ BI.AsyncTree = BI.inherit(BI.TreeView, {
function onClick (event, treeId, treeNode) { function onClick (event, treeId, treeNode) {
var zTree = $.fn.zTree.getZTreeObj(treeId); var zTree = $.fn.zTree.getZTreeObj(treeId);
zTree.checkNode(treeNode, !treeNode.checked, true, true); // 当前点击节点的状态是半选,且为true_part, 则将其改为false_part,使得点击半选后切换到的是全选
var checked = treeNode.checked;
var status = treeNode.getCheckStatus();
if(status.half === true && status.checked === true) {
checked = false;
}
zTree.checkNode(treeNode, !checked, true, true);
} }
function beforeCheck (treeId, treeNode) { function beforeCheck (treeId, treeNode) {
@ -46728,6 +46740,7 @@ BI.Label = BI.inherit(BI.Single, {
this.element.css({ this.element.css({
"line-height": o.height + "px" "line-height": o.height + "px"
}); });
json.textAlign = o.textAlign;
BI.createWidget({ BI.createWidget({
type: "bi.adaptive", type: "bi.adaptive",
height: o.height, height: o.height,

2
dist/fineui.min.css vendored

File diff suppressed because one or more lines are too long

16
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

1
dist/fineui_without_jquery_polyfill.js vendored

@ -33710,6 +33710,7 @@ BI.Label = BI.inherit(BI.Single, {
this.element.css({ this.element.css({
"line-height": o.height + "px" "line-height": o.height + "px"
}); });
json.textAlign = o.textAlign;
BI.createWidget({ BI.createWidget({
type: "bi.adaptive", type: "bi.adaptive",
height: o.height, height: o.height,

2
dist/utils.min.js vendored

File diff suppressed because one or more lines are too long

1
src/base/single/label/label.js

@ -174,6 +174,7 @@ BI.Label = BI.inherit(BI.Single, {
this.element.css({ this.element.css({
"line-height": o.height + "px" "line-height": o.height + "px"
}); });
json.textAlign = o.textAlign;
BI.createWidget({ BI.createWidget({
type: "bi.adaptive", type: "bi.adaptive",
height: o.height, height: o.height,

8
src/base/tree/ztree/asynctree.js

@ -51,7 +51,13 @@ BI.AsyncTree = BI.inherit(BI.TreeView, {
function onClick (event, treeId, treeNode) { function onClick (event, treeId, treeNode) {
var zTree = $.fn.zTree.getZTreeObj(treeId); var zTree = $.fn.zTree.getZTreeObj(treeId);
zTree.checkNode(treeNode, !treeNode.checked, true, true); // 当前点击节点的状态是半选,且为true_part, 则将其改为false_part,使得点击半选后切换到的是全选
var checked = treeNode.checked;
var status = treeNode.getCheckStatus();
if(status.half === true && status.checked === true) {
checked = false;
}
zTree.checkNode(treeNode, !checked, true, true);
} }
function beforeCheck (treeId, treeNode) { function beforeCheck (treeId, treeNode) {

8
src/base/tree/ztree/treeview.js

@ -106,7 +106,13 @@ BI.TreeView = BI.inherit(BI.Pane, {
var className = "dark", perTime = 100; var className = "dark", perTime = 100;
function onClick (event, treeId, treeNode) { function onClick (event, treeId, treeNode) {
self.nodes.checkNode(treeNode, !treeNode.checked, true, true); // 当前点击节点的状态是半选,且为true_part, 则将其改为false_part,使得点击半选后切换到的是全选
var checked = treeNode.checked;
var status = treeNode.getCheckStatus();
if(status.half === true && status.checked === true) {
checked = false;
}
self.nodes.checkNode(treeNode, !checked, true, true);
} }
function getUrl (treeId, treeNode) { function getUrl (treeId, treeNode) {

Loading…
Cancel
Save