提交 e140c94a 编写于 作者: Z ztree

fixed issue: The setting's data is wrong which in zTree's method. Example:...

fixed issue: The setting's data is wrong which in zTree's method.  Example: checkNode and updateNode...
这个 bug 会导致 设置为 radio 且 radioType=‘all’ 时,checkNode、updateNode方法出现异常
上级 7327b0c0
jQuery Tree Plugin ---- zTree jQuery Tree Plugin ---- zTree
============ ============
last verson : 3.5.16-beta.4 last verson : 3.5.16-beta.5
**Donate to zTree** : http://www.ztree.me/v3/donate.php **Donate to zTree** : http://www.ztree.me/v3/donate.php
......
/* /*
* JQuery zTree core v3.5.16-beta.4 * JQuery zTree core v3.5.16-beta.5
* http://zTree.me/ * http://zTree.me/
* *
* Copyright (c) 2010 Hunter.z * Copyright (c) 2010 Hunter.z
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* http://www.opensource.org/licenses/mit-license.php * http://www.opensource.org/licenses/mit-license.php
* *
* email: hunter.z@263.net * email: hunter.z@263.net
* Date: 2013-12-13 * Date: 2013-12-29
*/ */
(function(p){var G,H,I,J,K,L,r={},u={},v={},M={treeId:"",treeObj:null,view:{addDiyDom:null,autoCancelSelected:!0,dblClickExpand:!0,expandSpeed:"fast",fontCss:{},nameIsHTML:!1,selectedMulti:!0,showIcon:!0,showLine:!0,showTitle:!0,txtSelectedEnable:!1},data:{key:{children:"children",name:"name",title:"",url:"url"},simpleData:{enable:!1,idKey:"id",pIdKey:"pId",rootPId:null},keep:{parent:!1,leaf:!1}},async:{enable:!1,contentType:"application/x-www-form-urlencoded",type:"post",dataType:"text",url:"",autoParam:[], (function(p){var G,H,I,J,K,L,r={},u={},v={},M={treeId:"",treeObj:null,view:{addDiyDom:null,autoCancelSelected:!0,dblClickExpand:!0,expandSpeed:"fast",fontCss:{},nameIsHTML:!1,selectedMulti:!0,showIcon:!0,showLine:!0,showTitle:!0,txtSelectedEnable:!1},data:{key:{children:"children",name:"name",title:"",url:"url"},simpleData:{enable:!1,idKey:"id",pIdKey:"pId",rootPId:null},keep:{parent:!1,leaf:!1}},async:{enable:!1,contentType:"application/x-www-form-urlencoded",type:"post",dataType:"text",url:"",autoParam:[],
otherParam:[],dataFilter:null},callback:{beforeAsync:null,beforeClick:null,beforeDblClick:null,beforeRightClick:null,beforeMouseDown:null,beforeMouseUp:null,beforeExpand:null,beforeCollapse:null,beforeRemove:null,onAsyncError:null,onAsyncSuccess:null,onNodeCreated:null,onClick:null,onDblClick:null,onRightClick:null,onMouseDown:null,onMouseUp:null,onExpand:null,onCollapse:null,onRemove:null}},w=[function(b){var a=b.treeObj,c=e.event;a.bind(c.NODECREATED,function(a,c,g){j.apply(b.callback.onNodeCreated, otherParam:[],dataFilter:null},callback:{beforeAsync:null,beforeClick:null,beforeDblClick:null,beforeRightClick:null,beforeMouseDown:null,beforeMouseUp:null,beforeExpand:null,beforeCollapse:null,beforeRemove:null,onAsyncError:null,onAsyncSuccess:null,onNodeCreated:null,onClick:null,onDblClick:null,onRightClick:null,onMouseDown:null,onMouseUp:null,onExpand:null,onCollapse:null,onRemove:null}},w=[function(b){var a=b.treeObj,c=e.event;a.bind(c.NODECREATED,function(a,c,g){j.apply(b.callback.onNodeCreated,
......
...@@ -40,7 +40,7 @@ treeObj.moveNode(nodes[0], nodes[1], "inner"); ...@@ -40,7 +40,7 @@ treeObj.moveNode(nodes[0], nodes[1], "inner");
<h4>2. 将根节点中第二个节点 移动成为 第一个节点的前一个节点</h4> <h4>2. 将根节点中第二个节点 移动成为 第一个节点的前一个节点</h4>
<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree"); <pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
var nodes = treeObj.getNodes(); var nodes = treeObj.getNodes();
treeObj.moveNode(nodes[0], nodes[1], "before"); treeObj.moveNode(nodes[0], nodes[1], "prev");
</code></pre> </code></pre>
</div> </div>
</div> </div>
\ No newline at end of file
...@@ -43,7 +43,7 @@ treeObj.moveNode(nodes[0], nodes[1], "inner"); ...@@ -43,7 +43,7 @@ treeObj.moveNode(nodes[0], nodes[1], "inner");
<h4>2. Move the second root node to the first root node's previous sibling node.</h4> <h4>2. Move the second root node to the first root node's previous sibling node.</h4>
<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree"); <pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
var nodes = treeObj.getNodes(); var nodes = treeObj.getNodes();
treeObj.moveNode(nodes[0], nodes[1], "before"); treeObj.moveNode(nodes[0], nodes[1], "prev");
</code></pre> </code></pre>
</div> </div>
</div> </div>
\ No newline at end of file
/* /*
* JQuery zTree core v3.5.16-beta.4 * JQuery zTree core v3.5.16-beta.5
* http://zTree.me/ * http://zTree.me/
* *
* Copyright (c) 2010 Hunter.z * Copyright (c) 2010 Hunter.z
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
* http://www.opensource.org/licenses/mit-license.php * http://www.opensource.org/licenses/mit-license.php
* *
* email: hunter.z@263.net * email: hunter.z@263.net
* Date: 2013-12-13 * Date: 2013-12-29
*/ */
(function($){ (function($){
var settings = {}, roots = {}, caches = {}, var settings = {}, roots = {}, caches = {},
...@@ -1678,7 +1678,7 @@ ...@@ -1678,7 +1678,7 @@
consts = zt.consts; consts = zt.consts;
})(jQuery); })(jQuery);
/* /*
* JQuery zTree excheck v3.5.16-beta.4 * JQuery zTree excheck v3.5.16-beta.5
* http://zTree.me/ * http://zTree.me/
* *
* Copyright (c) 2010 Hunter.z * Copyright (c) 2010 Hunter.z
...@@ -1687,7 +1687,7 @@ ...@@ -1687,7 +1687,7 @@
* http://www.opensource.org/licenses/mit-license.php * http://www.opensource.org/licenses/mit-license.php
* *
* email: hunter.z@263.net * email: hunter.z@263.net
* Date: 2013-12-13 * Date: 2013-12-29
*/ */
(function($){ (function($){
//default consts of excheck //default consts of excheck
...@@ -1840,7 +1840,7 @@ ...@@ -1840,7 +1840,7 @@
//update zTreeObj, add method of check //update zTreeObj, add method of check
_zTreeTools = function(setting, zTreeTools) { _zTreeTools = function(setting, zTreeTools) {
zTreeTools.checkNode = function(node, checked, checkTypeFlag, callbackFlag) { zTreeTools.checkNode = function(node, checked, checkTypeFlag, callbackFlag) {
var checkedKey = setting.data.key.checked; var checkedKey = this.setting.data.key.checked;
if (node.chkDisabled === true) return; if (node.chkDisabled === true) return;
if (checked !== true && checked !== false) { if (checked !== true && checked !== false) {
checked = !node[checkedKey]; checked = !node[checkedKey];
...@@ -1849,54 +1849,54 @@ ...@@ -1849,54 +1849,54 @@
if (node[checkedKey] === checked && !checkTypeFlag) { if (node[checkedKey] === checked && !checkTypeFlag) {
return; return;
} else if (callbackFlag && tools.apply(this.setting.callback.beforeCheck, [setting.treeId, node], true) == false) { } else if (callbackFlag && tools.apply(this.setting.callback.beforeCheck, [this.setting.treeId, node], true) == false) {
return; return;
} }
if (tools.uCanDo(this.setting) && setting.check.enable && node.nocheck !== true) { if (tools.uCanDo(this.setting) && this.setting.check.enable && node.nocheck !== true) {
node[checkedKey] = checked; node[checkedKey] = checked;
var checkObj = $$(node, consts.id.CHECK, setting); var checkObj = $$(node, consts.id.CHECK, this.setting);
if (checkTypeFlag || setting.check.chkStyle === consts.radio.STYLE) view.checkNodeRelation(setting, node); if (checkTypeFlag || this.setting.check.chkStyle === consts.radio.STYLE) view.checkNodeRelation(this.setting, node);
view.setChkClass(setting, checkObj, node); view.setChkClass(this.setting, checkObj, node);
view.repairParentChkClassWithSelf(setting, node); view.repairParentChkClassWithSelf(this.setting, node);
if (callbackFlag) { if (callbackFlag) {
setting.treeObj.trigger(consts.event.CHECK, [null, setting.treeId, node]); this.setting.treeObj.trigger(consts.event.CHECK, [null, this.setting.treeId, node]);
} }
} }
} }
zTreeTools.checkAllNodes = function(checked) { zTreeTools.checkAllNodes = function(checked) {
view.repairAllChk(setting, !!checked); view.repairAllChk(this.setting, !!checked);
} }
zTreeTools.getCheckedNodes = function(checked) { zTreeTools.getCheckedNodes = function(checked) {
var childKey = setting.data.key.children; var childKey = this.setting.data.key.children;
checked = (checked !== false); checked = (checked !== false);
return data.getTreeCheckedNodes(setting, data.getRoot(setting)[childKey], checked); return data.getTreeCheckedNodes(this.setting, data.getRoot(this.setting)[childKey], checked);
} }
zTreeTools.getChangeCheckedNodes = function() { zTreeTools.getChangeCheckedNodes = function() {
var childKey = setting.data.key.children; var childKey = this.setting.data.key.children;
return data.getTreeChangeCheckedNodes(setting, data.getRoot(setting)[childKey]); return data.getTreeChangeCheckedNodes(this.setting, data.getRoot(this.setting)[childKey]);
} }
zTreeTools.setChkDisabled = function(node, disabled, inheritParent, inheritChildren) { zTreeTools.setChkDisabled = function(node, disabled, inheritParent, inheritChildren) {
disabled = !!disabled; disabled = !!disabled;
inheritParent = !!inheritParent; inheritParent = !!inheritParent;
inheritChildren = !!inheritChildren; inheritChildren = !!inheritChildren;
view.repairSonChkDisabled(setting, node, disabled, inheritChildren); view.repairSonChkDisabled(this.setting, node, disabled, inheritChildren);
view.repairParentChkDisabled(setting, node.getParentNode(), disabled, inheritParent); view.repairParentChkDisabled(this.setting, node.getParentNode(), disabled, inheritParent);
} }
var _updateNode = zTreeTools.updateNode; var _updateNode = zTreeTools.updateNode;
zTreeTools.updateNode = function(node, checkTypeFlag) { zTreeTools.updateNode = function(node, checkTypeFlag) {
if (_updateNode) _updateNode.apply(zTreeTools, arguments); if (_updateNode) _updateNode.apply(zTreeTools, arguments);
if (!node || !setting.check.enable) return; if (!node || !this.setting.check.enable) return;
var nObj = $$(node, setting); var nObj = $$(node, this.setting);
if (nObj.get(0) && tools.uCanDo(setting)) { if (nObj.get(0) && tools.uCanDo(this.setting)) {
var checkObj = $$(node, consts.id.CHECK, setting); var checkObj = $$(node, consts.id.CHECK, this.setting);
if (checkTypeFlag == true || setting.check.chkStyle === consts.radio.STYLE) view.checkNodeRelation(setting, node); if (checkTypeFlag == true || this.setting.check.chkStyle === consts.radio.STYLE) view.checkNodeRelation(this.setting, node);
view.setChkClass(setting, checkObj, node); view.setChkClass(this.setting, checkObj, node);
view.repairParentChkClassWithSelf(setting, node); view.repairParentChkClassWithSelf(this.setting, node);
} }
} }
}, },
...@@ -2305,7 +2305,7 @@ ...@@ -2305,7 +2305,7 @@
} }
})(jQuery); })(jQuery);
/* /*
* JQuery zTree exedit v3.5.16-beta.4 * JQuery zTree exedit v3.5.16-beta.5
* http://zTree.me/ * http://zTree.me/
* *
* Copyright (c) 2010 Hunter.z * Copyright (c) 2010 Hunter.z
...@@ -2314,7 +2314,7 @@ ...@@ -2314,7 +2314,7 @@
* http://www.opensource.org/licenses/mit-license.php * http://www.opensource.org/licenses/mit-license.php
* *
* email: hunter.z@263.net * email: hunter.z@263.net
* Date: 2013-12-13 * Date: 2013-12-29
*/ */
(function($){ (function($){
//default consts of exedit //default consts of exedit
...@@ -2489,13 +2489,13 @@ ...@@ -2489,13 +2489,13 @@
//update zTreeObj, add method of edit //update zTreeObj, add method of edit
_zTreeTools = function(setting, zTreeTools) { _zTreeTools = function(setting, zTreeTools) {
zTreeTools.cancelEditName = function(newName) { zTreeTools.cancelEditName = function(newName) {
var root = data.getRoot(setting); var root = data.getRoot(this.setting);
if (!root.curEditNode) return; if (!root.curEditNode) return;
view.cancelCurEditNode(setting, newName?newName:null, true); view.cancelCurEditNode(this.setting, newName?newName:null, true);
} }
zTreeTools.copyNode = function(targetNode, node, moveType, isSilent) { zTreeTools.copyNode = function(targetNode, node, moveType, isSilent) {
if (!node) return null; if (!node) return null;
if (targetNode && !targetNode.isParent && setting.data.keep.leaf && moveType === consts.move.TYPE_INNER) return null; if (targetNode && !targetNode.isParent && this.setting.data.keep.leaf && moveType === consts.move.TYPE_INNER) return null;
var newNode = tools.clone(node); var newNode = tools.clone(node);
if (!targetNode) { if (!targetNode) {
targetNode = null; targetNode = null;
...@@ -2503,46 +2503,46 @@ ...@@ -2503,46 +2503,46 @@
} }
if (moveType == consts.move.TYPE_INNER) { if (moveType == consts.move.TYPE_INNER) {
function copyCallback() { function copyCallback() {
view.addNodes(setting, targetNode, [newNode], isSilent); view.addNodes(this.setting, targetNode, [newNode], isSilent);
} }
if (tools.canAsync(setting, targetNode)) { if (tools.canAsync(this.setting, targetNode)) {
view.asyncNode(setting, targetNode, isSilent, copyCallback); view.asyncNode(this.setting, targetNode, isSilent, copyCallback);
} else { } else {
copyCallback(); copyCallback();
} }
} else { } else {
view.addNodes(setting, targetNode.parentNode, [newNode], isSilent); view.addNodes(this.setting, targetNode.parentNode, [newNode], isSilent);
view.moveNode(setting, targetNode, newNode, moveType, false, isSilent); view.moveNode(this.setting, targetNode, newNode, moveType, false, isSilent);
} }
return newNode; return newNode;
} }
zTreeTools.editName = function(node) { zTreeTools.editName = function(node) {
if (!node || !node.tId || node !== data.getNodeCache(setting, node.tId)) return; if (!node || !node.tId || node !== data.getNodeCache(this.setting, node.tId)) return;
if (node.parentTId) view.expandCollapseParentNode(setting, node.getParentNode(), true); if (node.parentTId) view.expandCollapseParentNode(this.setting, node.getParentNode(), true);
view.editNode(setting, node) view.editNode(this.setting, node)
} }
zTreeTools.moveNode = function(targetNode, node, moveType, isSilent) { zTreeTools.moveNode = function(targetNode, node, moveType, isSilent) {
if (!node) return node; if (!node) return node;
if (targetNode && !targetNode.isParent && setting.data.keep.leaf && moveType === consts.move.TYPE_INNER) { if (targetNode && !targetNode.isParent && this.setting.data.keep.leaf && moveType === consts.move.TYPE_INNER) {
return null; return null;
} else if (targetNode && ((node.parentTId == targetNode.tId && moveType == consts.move.TYPE_INNER) || $$(node, setting).find("#" + targetNode.tId).length > 0)) { } else if (targetNode && ((node.parentTId == targetNode.tId && moveType == consts.move.TYPE_INNER) || $$(node, this.setting).find("#" + targetNode.tId).length > 0)) {
return null; return null;
} else if (!targetNode) { } else if (!targetNode) {
targetNode = null; targetNode = null;
} }
function moveCallback() { function moveCallback() {
view.moveNode(setting, targetNode, node, moveType, false, isSilent); view.moveNode(this.setting, targetNode, node, moveType, false, isSilent);
} }
if (tools.canAsync(setting, targetNode) && moveType === consts.move.TYPE_INNER) { if (tools.canAsync(this.setting, targetNode) && moveType === consts.move.TYPE_INNER) {
view.asyncNode(setting, targetNode, isSilent, moveCallback); view.asyncNode(this.setting, targetNode, isSilent, moveCallback);
} else { } else {
moveCallback(); moveCallback();
} }
return node; return node;
} }
zTreeTools.setEditable = function(editable) { zTreeTools.setEditable = function(editable) {
setting.edit.enable = editable; this.setting.edit.enable = editable;
return this.refresh(); return this.refresh();
} }
}, },
...@@ -2692,6 +2692,10 @@ ...@@ -2692,6 +2692,10 @@
view.selectNode(setting, tmpNode, i>0); view.selectNode(setting, tmpNode, i>0);
view.removeTreeDom(setting, tmpNode); view.removeTreeDom(setting, tmpNode);
if (i > setting.edit.drag.maxShowNodeNum-1) {
continue;
}
tmpDom = $$("<li id='"+ tmpNode.tId +"_tmp'></li>", setting); tmpDom = $$("<li id='"+ tmpNode.tId +"_tmp'></li>", setting);
tmpDom.append($$(tmpNode, consts.id.A, setting).clone()); tmpDom.append($$(tmpNode, consts.id.A, setting).clone());
tmpDom.css("padding", "0"); tmpDom.css("padding", "0");
......
此差异已折叠。
/* /*
* JQuery zTree core v3.5.16-beta.4 * JQuery zTree core v3.5.16-beta.5
* http://zTree.me/ * http://zTree.me/
* *
* Copyright (c) 2010 Hunter.z * Copyright (c) 2010 Hunter.z
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* http://www.opensource.org/licenses/mit-license.php * http://www.opensource.org/licenses/mit-license.php
* *
* email: hunter.z@263.net * email: hunter.z@263.net
* Date: 2013-12-13 * Date: 2013-12-29
*/ */
(function($){ (function($){
var settings = {}, roots = {}, caches = {}, var settings = {}, roots = {}, caches = {},
......
/* /*
* JQuery zTree core v3.5.16-beta.4 * JQuery zTree core v3.5.16-beta.5
* http://zTree.me/ * http://zTree.me/
* *
* Copyright (c) 2010 Hunter.z * Copyright (c) 2010 Hunter.z
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* http://www.opensource.org/licenses/mit-license.php * http://www.opensource.org/licenses/mit-license.php
* *
* email: hunter.z@263.net * email: hunter.z@263.net
* Date: 2013-12-13 * Date: 2013-12-29
*/ */
(function(p){var G,H,I,J,K,L,r={},u={},v={},M={treeId:"",treeObj:null,view:{addDiyDom:null,autoCancelSelected:!0,dblClickExpand:!0,expandSpeed:"fast",fontCss:{},nameIsHTML:!1,selectedMulti:!0,showIcon:!0,showLine:!0,showTitle:!0,txtSelectedEnable:!1},data:{key:{children:"children",name:"name",title:"",url:"url"},simpleData:{enable:!1,idKey:"id",pIdKey:"pId",rootPId:null},keep:{parent:!1,leaf:!1}},async:{enable:!1,contentType:"application/x-www-form-urlencoded",type:"post",dataType:"text",url:"",autoParam:[], (function(p){var G,H,I,J,K,L,r={},u={},v={},M={treeId:"",treeObj:null,view:{addDiyDom:null,autoCancelSelected:!0,dblClickExpand:!0,expandSpeed:"fast",fontCss:{},nameIsHTML:!1,selectedMulti:!0,showIcon:!0,showLine:!0,showTitle:!0,txtSelectedEnable:!1},data:{key:{children:"children",name:"name",title:"",url:"url"},simpleData:{enable:!1,idKey:"id",pIdKey:"pId",rootPId:null},keep:{parent:!1,leaf:!1}},async:{enable:!1,contentType:"application/x-www-form-urlencoded",type:"post",dataType:"text",url:"",autoParam:[],
otherParam:[],dataFilter:null},callback:{beforeAsync:null,beforeClick:null,beforeDblClick:null,beforeRightClick:null,beforeMouseDown:null,beforeMouseUp:null,beforeExpand:null,beforeCollapse:null,beforeRemove:null,onAsyncError:null,onAsyncSuccess:null,onNodeCreated:null,onClick:null,onDblClick:null,onRightClick:null,onMouseDown:null,onMouseUp:null,onExpand:null,onCollapse:null,onRemove:null}},w=[function(b){var a=b.treeObj,c=e.event;a.bind(c.NODECREATED,function(a,c,g){j.apply(b.callback.onNodeCreated, otherParam:[],dataFilter:null},callback:{beforeAsync:null,beforeClick:null,beforeDblClick:null,beforeRightClick:null,beforeMouseDown:null,beforeMouseUp:null,beforeExpand:null,beforeCollapse:null,beforeRemove:null,onAsyncError:null,onAsyncSuccess:null,onNodeCreated:null,onClick:null,onDblClick:null,onRightClick:null,onMouseDown:null,onMouseUp:null,onExpand:null,onCollapse:null,onRemove:null}},w=[function(b){var a=b.treeObj,c=e.event;a.bind(c.NODECREATED,function(a,c,g){j.apply(b.callback.onNodeCreated,
......
/* /*
* JQuery zTree excheck v3.5.16-beta.4 * JQuery zTree excheck v3.5.16-beta.5
* http://zTree.me/ * http://zTree.me/
* *
* Copyright (c) 2010 Hunter.z * Copyright (c) 2010 Hunter.z
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* http://www.opensource.org/licenses/mit-license.php * http://www.opensource.org/licenses/mit-license.php
* *
* email: hunter.z@263.net * email: hunter.z@263.net
* Date: 2013-12-13 * Date: 2013-12-29
*/ */
(function($){ (function($){
//default consts of excheck //default consts of excheck
...@@ -161,7 +161,7 @@ ...@@ -161,7 +161,7 @@
//update zTreeObj, add method of check //update zTreeObj, add method of check
_zTreeTools = function(setting, zTreeTools) { _zTreeTools = function(setting, zTreeTools) {
zTreeTools.checkNode = function(node, checked, checkTypeFlag, callbackFlag) { zTreeTools.checkNode = function(node, checked, checkTypeFlag, callbackFlag) {
var checkedKey = setting.data.key.checked; var checkedKey = this.setting.data.key.checked;
if (node.chkDisabled === true) return; if (node.chkDisabled === true) return;
if (checked !== true && checked !== false) { if (checked !== true && checked !== false) {
checked = !node[checkedKey]; checked = !node[checkedKey];
...@@ -170,54 +170,54 @@ ...@@ -170,54 +170,54 @@
if (node[checkedKey] === checked && !checkTypeFlag) { if (node[checkedKey] === checked && !checkTypeFlag) {
return; return;
} else if (callbackFlag && tools.apply(this.setting.callback.beforeCheck, [setting.treeId, node], true) == false) { } else if (callbackFlag && tools.apply(this.setting.callback.beforeCheck, [this.setting.treeId, node], true) == false) {
return; return;
} }
if (tools.uCanDo(this.setting) && setting.check.enable && node.nocheck !== true) { if (tools.uCanDo(this.setting) && this.setting.check.enable && node.nocheck !== true) {
node[checkedKey] = checked; node[checkedKey] = checked;
var checkObj = $$(node, consts.id.CHECK, setting); var checkObj = $$(node, consts.id.CHECK, this.setting);
if (checkTypeFlag || setting.check.chkStyle === consts.radio.STYLE) view.checkNodeRelation(setting, node); if (checkTypeFlag || this.setting.check.chkStyle === consts.radio.STYLE) view.checkNodeRelation(this.setting, node);
view.setChkClass(setting, checkObj, node); view.setChkClass(this.setting, checkObj, node);
view.repairParentChkClassWithSelf(setting, node); view.repairParentChkClassWithSelf(this.setting, node);
if (callbackFlag) { if (callbackFlag) {
setting.treeObj.trigger(consts.event.CHECK, [null, setting.treeId, node]); this.setting.treeObj.trigger(consts.event.CHECK, [null, this.setting.treeId, node]);
} }
} }
} }
zTreeTools.checkAllNodes = function(checked) { zTreeTools.checkAllNodes = function(checked) {
view.repairAllChk(setting, !!checked); view.repairAllChk(this.setting, !!checked);
} }
zTreeTools.getCheckedNodes = function(checked) { zTreeTools.getCheckedNodes = function(checked) {
var childKey = setting.data.key.children; var childKey = this.setting.data.key.children;
checked = (checked !== false); checked = (checked !== false);
return data.getTreeCheckedNodes(setting, data.getRoot(setting)[childKey], checked); return data.getTreeCheckedNodes(this.setting, data.getRoot(this.setting)[childKey], checked);
} }
zTreeTools.getChangeCheckedNodes = function() { zTreeTools.getChangeCheckedNodes = function() {
var childKey = setting.data.key.children; var childKey = this.setting.data.key.children;
return data.getTreeChangeCheckedNodes(setting, data.getRoot(setting)[childKey]); return data.getTreeChangeCheckedNodes(this.setting, data.getRoot(this.setting)[childKey]);
} }
zTreeTools.setChkDisabled = function(node, disabled, inheritParent, inheritChildren) { zTreeTools.setChkDisabled = function(node, disabled, inheritParent, inheritChildren) {
disabled = !!disabled; disabled = !!disabled;
inheritParent = !!inheritParent; inheritParent = !!inheritParent;
inheritChildren = !!inheritChildren; inheritChildren = !!inheritChildren;
view.repairSonChkDisabled(setting, node, disabled, inheritChildren); view.repairSonChkDisabled(this.setting, node, disabled, inheritChildren);
view.repairParentChkDisabled(setting, node.getParentNode(), disabled, inheritParent); view.repairParentChkDisabled(this.setting, node.getParentNode(), disabled, inheritParent);
} }
var _updateNode = zTreeTools.updateNode; var _updateNode = zTreeTools.updateNode;
zTreeTools.updateNode = function(node, checkTypeFlag) { zTreeTools.updateNode = function(node, checkTypeFlag) {
if (_updateNode) _updateNode.apply(zTreeTools, arguments); if (_updateNode) _updateNode.apply(zTreeTools, arguments);
if (!node || !setting.check.enable) return; if (!node || !this.setting.check.enable) return;
var nObj = $$(node, setting); var nObj = $$(node, this.setting);
if (nObj.get(0) && tools.uCanDo(setting)) { if (nObj.get(0) && tools.uCanDo(this.setting)) {
var checkObj = $$(node, consts.id.CHECK, setting); var checkObj = $$(node, consts.id.CHECK, this.setting);
if (checkTypeFlag == true || setting.check.chkStyle === consts.radio.STYLE) view.checkNodeRelation(setting, node); if (checkTypeFlag == true || this.setting.check.chkStyle === consts.radio.STYLE) view.checkNodeRelation(this.setting, node);
view.setChkClass(setting, checkObj, node); view.setChkClass(this.setting, checkObj, node);
view.repairParentChkClassWithSelf(setting, node); view.repairParentChkClassWithSelf(this.setting, node);
} }
} }
}, },
......
此差异已折叠。
/* /*
* JQuery zTree exedit v3.5.16-beta.4 * JQuery zTree exedit v3.5.16-beta.5
* http://zTree.me/ * http://zTree.me/
* *
* Copyright (c) 2010 Hunter.z * Copyright (c) 2010 Hunter.z
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* http://www.opensource.org/licenses/mit-license.php * http://www.opensource.org/licenses/mit-license.php
* *
* email: hunter.z@263.net * email: hunter.z@263.net
* Date: 2013-12-13 * Date: 2013-12-29
*/ */
(function($){ (function($){
//default consts of exedit //default consts of exedit
...@@ -183,13 +183,13 @@ ...@@ -183,13 +183,13 @@
//update zTreeObj, add method of edit //update zTreeObj, add method of edit
_zTreeTools = function(setting, zTreeTools) { _zTreeTools = function(setting, zTreeTools) {
zTreeTools.cancelEditName = function(newName) { zTreeTools.cancelEditName = function(newName) {
var root = data.getRoot(setting); var root = data.getRoot(this.setting);
if (!root.curEditNode) return; if (!root.curEditNode) return;
view.cancelCurEditNode(setting, newName?newName:null, true); view.cancelCurEditNode(this.setting, newName?newName:null, true);
} }
zTreeTools.copyNode = function(targetNode, node, moveType, isSilent) { zTreeTools.copyNode = function(targetNode, node, moveType, isSilent) {
if (!node) return null; if (!node) return null;
if (targetNode && !targetNode.isParent && setting.data.keep.leaf && moveType === consts.move.TYPE_INNER) return null; if (targetNode && !targetNode.isParent && this.setting.data.keep.leaf && moveType === consts.move.TYPE_INNER) return null;
var newNode = tools.clone(node); var newNode = tools.clone(node);
if (!targetNode) { if (!targetNode) {
targetNode = null; targetNode = null;
...@@ -197,46 +197,46 @@ ...@@ -197,46 +197,46 @@
} }
if (moveType == consts.move.TYPE_INNER) { if (moveType == consts.move.TYPE_INNER) {
function copyCallback() { function copyCallback() {
view.addNodes(setting, targetNode, [newNode], isSilent); view.addNodes(this.setting, targetNode, [newNode], isSilent);
} }
if (tools.canAsync(setting, targetNode)) { if (tools.canAsync(this.setting, targetNode)) {
view.asyncNode(setting, targetNode, isSilent, copyCallback); view.asyncNode(this.setting, targetNode, isSilent, copyCallback);
} else { } else {
copyCallback(); copyCallback();
} }
} else { } else {
view.addNodes(setting, targetNode.parentNode, [newNode], isSilent); view.addNodes(this.setting, targetNode.parentNode, [newNode], isSilent);
view.moveNode(setting, targetNode, newNode, moveType, false, isSilent); view.moveNode(this.setting, targetNode, newNode, moveType, false, isSilent);
} }
return newNode; return newNode;
} }
zTreeTools.editName = function(node) { zTreeTools.editName = function(node) {
if (!node || !node.tId || node !== data.getNodeCache(setting, node.tId)) return; if (!node || !node.tId || node !== data.getNodeCache(this.setting, node.tId)) return;
if (node.parentTId) view.expandCollapseParentNode(setting, node.getParentNode(), true); if (node.parentTId) view.expandCollapseParentNode(this.setting, node.getParentNode(), true);
view.editNode(setting, node) view.editNode(this.setting, node)
} }
zTreeTools.moveNode = function(targetNode, node, moveType, isSilent) { zTreeTools.moveNode = function(targetNode, node, moveType, isSilent) {
if (!node) return node; if (!node) return node;
if (targetNode && !targetNode.isParent && setting.data.keep.leaf && moveType === consts.move.TYPE_INNER) { if (targetNode && !targetNode.isParent && this.setting.data.keep.leaf && moveType === consts.move.TYPE_INNER) {
return null; return null;
} else if (targetNode && ((node.parentTId == targetNode.tId && moveType == consts.move.TYPE_INNER) || $$(node, setting).find("#" + targetNode.tId).length > 0)) { } else if (targetNode && ((node.parentTId == targetNode.tId && moveType == consts.move.TYPE_INNER) || $$(node, this.setting).find("#" + targetNode.tId).length > 0)) {
return null; return null;
} else if (!targetNode) { } else if (!targetNode) {
targetNode = null; targetNode = null;
} }
function moveCallback() { function moveCallback() {
view.moveNode(setting, targetNode, node, moveType, false, isSilent); view.moveNode(this.setting, targetNode, node, moveType, false, isSilent);
} }
if (tools.canAsync(setting, targetNode) && moveType === consts.move.TYPE_INNER) { if (tools.canAsync(this.setting, targetNode) && moveType === consts.move.TYPE_INNER) {
view.asyncNode(setting, targetNode, isSilent, moveCallback); view.asyncNode(this.setting, targetNode, isSilent, moveCallback);
} else { } else {
moveCallback(); moveCallback();
} }
return node; return node;
} }
zTreeTools.setEditable = function(editable) { zTreeTools.setEditable = function(editable) {
setting.edit.enable = editable; this.setting.edit.enable = editable;
return this.refresh(); return this.refresh();
} }
}, },
...@@ -386,6 +386,10 @@ ...@@ -386,6 +386,10 @@
view.selectNode(setting, tmpNode, i>0); view.selectNode(setting, tmpNode, i>0);
view.removeTreeDom(setting, tmpNode); view.removeTreeDom(setting, tmpNode);
if (i > setting.edit.drag.maxShowNodeNum-1) {
continue;
}
tmpDom = $$("<li id='"+ tmpNode.tId +"_tmp'></li>", setting); tmpDom = $$("<li id='"+ tmpNode.tId +"_tmp'></li>", setting);
tmpDom.append($$(tmpNode, consts.id.A, setting).clone()); tmpDom.append($$(tmpNode, consts.id.A, setting).clone());
tmpDom.css("padding", "0"); tmpDom.css("padding", "0");
......
此差异已折叠。
/* /*
* JQuery zTree exHideNodes v3.5.16-beta.4 * JQuery zTree exHideNodes v3.5.16-beta.5
* http://zTree.me/ * http://zTree.me/
* *
* Copyright (c) 2010 Hunter.z * Copyright (c) 2010 Hunter.z
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* http://www.opensource.org/licenses/mit-license.php * http://www.opensource.org/licenses/mit-license.php
* *
* email: hunter.z@263.net * email: hunter.z@263.net
* Date: 2013-12-13 * Date: 2013-12-29
*/ */
(function($){ (function($){
//default init node of exLib //default init node of exLib
......
/* /*
* JQuery zTree exHideNodes v3.5.16-beta.4 * JQuery zTree exHideNodes v3.5.16-beta.5
* http://zTree.me/ * http://zTree.me/
* *
* Copyright (c) 2010 Hunter.z * Copyright (c) 2010 Hunter.z
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* http://www.opensource.org/licenses/mit-license.php * http://www.opensource.org/licenses/mit-license.php
* *
* email: hunter.z@263.net * email: hunter.z@263.net
* Date: 2013-12-13 * Date: 2013-12-29
*/ */
(function(i){i.extend(!0,i.fn.zTree._z,{view:{clearOldFirstNode:function(c,a){for(var b=a.getNextNode();b;){if(b.isFirstNode){b.isFirstNode=!1;d.setNodeLineIcos(c,b);break}if(b.isLastNode)break;b=b.getNextNode()}},clearOldLastNode:function(c,a){for(var b=a.getPreNode();b;){if(b.isLastNode){b.isLastNode=!1;d.setNodeLineIcos(c,b);break}if(b.isFirstNode)break;b=b.getPreNode()}},makeDOMNodeMainBefore:function(c,a,b){c.push("<li ",b.isHidden?"style='display:none;' ":"","id='",b.tId,"' class='",l.className.LEVEL, (function(i){i.extend(!0,i.fn.zTree._z,{view:{clearOldFirstNode:function(c,a){for(var b=a.getNextNode();b;){if(b.isFirstNode){b.isFirstNode=!1;d.setNodeLineIcos(c,b);break}if(b.isLastNode)break;b=b.getNextNode()}},clearOldLastNode:function(c,a){for(var b=a.getPreNode();b;){if(b.isLastNode){b.isLastNode=!1;d.setNodeLineIcos(c,b);break}if(b.isFirstNode)break;b=b.getPreNode()}},makeDOMNodeMainBefore:function(c,a,b){c.push("<li ",b.isHidden?"style='display:none;' ":"","id='",b.tId,"' class='",l.className.LEVEL,
b.level,"' tabindex='0' hidefocus='true' treenode>")},showNode:function(c,a){a.isHidden=!1;f.initShowForExCheck(c,a);j(a,c).show()},showNodes:function(c,a,b){if(a&&a.length!=0){var e={},g,k;for(g=0,k=a.length;g<k;g++){var h=a[g];if(!e[h.parentTId]){var i=h.getParentNode();e[h.parentTId]=i===null?f.getRoot(c):h.getParentNode()}d.showNode(c,h,b)}for(var j in e)a=e[j][c.data.key.children],d.setFirstNodeForShow(c,a),d.setLastNodeForShow(c,a)}},hideNode:function(c,a){a.isHidden=!0;a.isFirstNode=!1;a.isLastNode= b.level,"' tabindex='0' hidefocus='true' treenode>")},showNode:function(c,a){a.isHidden=!1;f.initShowForExCheck(c,a);j(a,c).show()},showNodes:function(c,a,b){if(a&&a.length!=0){var e={},g,k;for(g=0,k=a.length;g<k;g++){var h=a[g];if(!e[h.parentTId]){var i=h.getParentNode();e[h.parentTId]=i===null?f.getRoot(c):h.getParentNode()}d.showNode(c,h,b)}for(var j in e)a=e[j][c.data.key.children],d.setFirstNodeForShow(c,a),d.setLastNodeForShow(c,a)}},hideNode:function(c,a){a.isHidden=!0;a.isFirstNode=!1;a.isLastNode=
......
...@@ -14,13 +14,14 @@ ...@@ -14,13 +14,14 @@
</font> </font>
*2013.12.13* v3.5.16-beta.4 *2013.12.29* v3.5.16-beta.5
* 【增加】onDragMove 回调,便于控制 zTree 节点与其他 DOM 的拖拽操作。(感谢 yumi301) * 【增加】onDragMove 回调,便于控制 zTree 节点与其他 DOM 的拖拽操作。(感谢 yumi301)
* 【增加】针对 Mac 系统 Cmd 键的支持, Cmd 键 + 左键 也可以多选节点 * 【增加】针对 Mac 系统 Cmd 键的支持, Cmd 键 + 左键 也可以多选节点
* 【修改】使用 destory 方法销毁树以后,依然可以从 getZTreeObj 方法中获取到 zTree 对象的 bug。 * 【修改】使用 destory 方法销毁树以后,依然可以从 getZTreeObj 方法中获取到 zTree 对象的 bug。
* 【修改】onCheck 回调的 event,恢复为 zTree 自身的 event 事件,同时利用 srcEvent 传递原始 event 对象。(感谢 yumi301) * 【修改】onCheck 回调的 event,恢复为 zTree 自身的 event 事件,同时利用 srcEvent 传递原始 event 对象。(感谢 yumi301)
* 【修改】拖拽多个节点时,超出 maxShowNodeNum 设置个数的节点会失去 被选择状态的 bug
* 【修改】excheck & exedit 扩展包的 zTree 方法中 setting 数据错误导致 checkNode、updateNode 等方法操作 radio 失效的 bug
*2013.10.19* v3.5.15 *2013.10.19* v3.5.15
* 【增加】setting.view.txtSelectedEnable 属性,满足部分项目中客户对于可以选择节点文本信息的强烈欲望。 * 【增加】setting.view.txtSelectedEnable 属性,满足部分项目中客户对于可以选择节点文本信息的强烈欲望。
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册