提交 7327b0c0 编写于 作者: Z ztree

Support Cmd-key ( in Mac System)

上级 367ee2bf
jQuery Tree Plugin ---- zTree jQuery Tree Plugin ---- zTree
============ ============
last verson : 3.5.16-beta.3 last verson : 3.5.16-beta.4
**Donate to zTree** : http://www.ztree.me/v3/donate.php **Donate to zTree** : http://www.ztree.me/v3/donate.php
......
此差异已折叠。
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<h4 class="topLine"><b>clickFlag</b><span>Number</span></h4> <h4 class="topLine"><b>clickFlag</b><span>Number</span></h4>
<p>节点被点击后的选中操作类型,详细看下表</p> <p>节点被点击后的选中操作类型,详细看下表</p>
<table width="100%" border="0" cellspacing="1" cellpadding="0"> <table width="100%" border="0" cellspacing="1" cellpadding="0">
<thead><tr><td>clickFlag</td><td title="是否允许多点选中">selectedMulti</td><td title="是否按下 Ctrl 键">autoCancelSelected<br/>&&<br/>event.ctrlKey</td><td title="节点当前选择状态">isSelected</td><td>选中操作</td></tr></thead> <thead><tr><td>clickFlag</td><td title="是否允许多点选中">selectedMulti</td><td title="是否按下 Ctrl 或 Cmd 键">autoCancelSelected<br/>&&<br/>event.ctrlKey / metaKey</td><td title="节点当前选择状态">isSelected</td><td>选中操作</td></tr></thead>
<tbody> <tbody>
<tr><td>1</td><td>true</td><td>false</td><td>false</td><td>普通选中</td></tr> <tr><td>1</td><td>true</td><td>false</td><td>false</td><td>普通选中</td></tr>
<tr><td>1</td><td>true</td><td>false</td><td>true</td><td>普通选中</td></tr> <tr><td>1</td><td>true</td><td>false</td><td>true</td><td>普通选中</td></tr>
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<h4 class="topLine"><b>clickFlag</b><span>Number</span></h4> <h4 class="topLine"><b>clickFlag</b><span>Number</span></h4>
<p>节点被点击后的选中操作类型,详细看下表</p> <p>节点被点击后的选中操作类型,详细看下表</p>
<table width="100%" border="0" cellspacing="1" cellpadding="0"> <table width="100%" border="0" cellspacing="1" cellpadding="0">
<thead><tr><td>clickFlag</td><td title="是否允许多点选中">selectedMulti</td><td title="是否按下 Ctrl 键">autoCancelSelected<br/>&&<br/>event.ctrlKey</td><td title="节点当前选择状态">isSelected</td><td>选中操作</td></tr></thead> <thead><tr><td>clickFlag</td><td title="是否允许多点选中">selectedMulti</td><td title="是否按下 Ctrl 或 Cmd 键">autoCancelSelected<br/>&&<br/>event.ctrlKey / metaKey</td><td title="节点当前选择状态">isSelected</td><td>选中操作</td></tr></thead>
<tbody> <tbody>
<tr><td>1</td><td>true</td><td>false</td><td>false</td><td>普通选中</td></tr> <tr><td>1</td><td>true</td><td>false</td><td>false</td><td>普通选中</td></tr>
<tr><td>1</td><td>true</td><td>false</td><td>true</td><td>普通选中</td></tr> <tr><td>1</td><td>true</td><td>false</td><td>true</td><td>普通选中</td></tr>
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
</div> </div>
<h3>规则说明</h3> <h3>规则说明</h3>
<div class="desc"> <div class="desc">
<p>1、isCopy = true; isMove = true 时,拖拽节点按下 Ctrl 键表示 copy; 否则为 move</p> <p>1、isCopy = true; isMove = true 时,拖拽节点按下 Ctrl 或 Cmd 键表示 copy; 否则为 move</p>
<p>2、isCopy = true; isMove = false 时,所有拖拽操作都是 copy</p> <p>2、isCopy = true; isMove = false 时,所有拖拽操作都是 copy</p>
<p>3、isCopy = false; isMove = true 时,所有拖拽操作都是 move</p> <p>3、isCopy = false; isMove = true 时,所有拖拽操作都是 move</p>
<p>4、isCopy = false; isMove = false 时,禁止拖拽操作</p> <p>4、isCopy = false; isMove = false 时,禁止拖拽操作</p>
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
</div> </div>
<h3>规则说明</h3> <h3>规则说明</h3>
<div class="desc"> <div class="desc">
<p>1、isCopy = true; isMove = true 时,拖拽节点按下 Ctrl 键表示 copy; 否则为 move</p> <p>1、isCopy = true; isMove = true 时,拖拽节点按下 Ctrl 或 Cmd 键表示 copy; 否则为 move</p>
<p>2、isCopy = true; isMove = false 时,所有拖拽操作都是 copy</p> <p>2、isCopy = true; isMove = false 时,所有拖拽操作都是 copy</p>
<p>3、isCopy = false; isMove = true 时,所有拖拽操作都是 move</p> <p>3、isCopy = false; isMove = true 时,所有拖拽操作都是 move</p>
<p>4、isCopy = false; isMove = false 时,禁止拖拽操作</p> <p>4、isCopy = false; isMove = false 时,禁止拖拽操作</p>
......
...@@ -5,17 +5,17 @@ ...@@ -5,17 +5,17 @@
<div class="desc"> <div class="desc">
<p></p> <p></p>
<div class="longdesc"> <div class="longdesc">
<p>点击节点时,按下 Ctrl 键是否允许取消选择操作。</p> <p>点击节点时,按下 Ctrl 或 Cmd 键是否允许取消选择操作。</p>
<p class="highlight_red">如果不需要此功能,请设置为 false。</p> <p class="highlight_red">如果不需要此功能,请设置为 false。</p>
<p>默认值: true</p> <p>默认值: true</p>
</div> </div>
</div> </div>
<h3>Boolean 格式说明</h3> <h3>Boolean 格式说明</h3>
<div class="desc"> <div class="desc">
<p> true / false 分别表示 支持 / 不支持 配合 Ctrl 键进行取消节点选择的操作</p> <p> true / false 分别表示 支持 / 不支持 配合 Ctrl 或 Cmd 键进行取消节点选择的操作</p>
</div> </div>
<h3>setting 举例</h3> <h3>setting 举例</h3>
<h4>1. 禁止配合 Ctrl 键进行取消节点选择的操作</h4> <h4>1. 禁止配合 Ctrl 或 Cmd 键进行取消节点选择的操作</h4>
<pre xmlns=""><code>var setting = { <pre xmlns=""><code>var setting = {
view: { view: {
autoCancelSelected: false autoCancelSelected: false
......
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
<h3>Boolean 格式说明</h3> <h3>Boolean 格式说明</h3>
<div class="desc"> <div class="desc">
<p> true / false 分别表示 支持 / 不支持 同时选中多个节点</p> <p> true / false 分别表示 支持 / 不支持 同时选中多个节点</p>
<p class="highlight_red">1、设置为 true时,按下 Ctrl 键可以选中多个节点</p> <p class="highlight_red">1、设置为 true时,按下 Ctrl 或 Cmd 键可以选中多个节点</p>
<p class="highlight_red">2、设置为 true / false 都不影响按下 Ctrl 键可以让已选中的节点取消选中状态( 取消选中状态可以参考 setting.view.autoCancelSelected )</p> <p class="highlight_red">2、设置为 true / false 都不影响按下 Ctrl 或 Cmd 键可以让已选中的节点取消选中状态( 取消选中状态可以参考 setting.view.autoCancelSelected )</p>
</div> </div>
<h3>setting 举例</h3> <h3>setting 举例</h3>
<h4>1. 禁止多点同时选中的功能</h4> <h4>1. 禁止多点同时选中的功能</h4>
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<h4 class="topLine"><b>clickFlag</b><span>Number</span></h4> <h4 class="topLine"><b>clickFlag</b><span>Number</span></h4>
<p>Node is selected or deselected state, please see table below for details</p> <p>Node is selected or deselected state, please see table below for details</p>
<table width="100%" border="0" cellspacing="1" cellpadding="0"> <table width="100%" border="0" cellspacing="1" cellpadding="0">
<thead><tr><td>clickFlag</td><td title="Whether to allow multi-select">selectedMulti</td><td title="Whether to press Ctrl-key">autoCancelSelected<br/>&&<br/>event.ctrlKey</td><td title="Node's selection state">isSelected</td><td>operate for selected</td></tr></thead> <thead><tr><td>clickFlag</td><td title="Whether to allow multi-select">selectedMulti</td><td title="Whether to press Ctrl-key or Cmd-key">autoCancelSelected<br/>&&<br/>event.ctrlKey / metaKey</td><td title="Node's selection state">isSelected</td><td>operate for selected</td></tr></thead>
<tbody> <tbody>
<tr><td>1</td><td>true</td><td>false</td><td>false</td><td>node is selected (single)</td></tr> <tr><td>1</td><td>true</td><td>false</td><td>false</td><td>node is selected (single)</td></tr>
<tr><td>1</td><td>true</td><td>false</td><td>true</td><td>node is selected (single)</td></tr> <tr><td>1</td><td>true</td><td>false</td><td>true</td><td>node is selected (single)</td></tr>
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<h4 class="topLine"><b>clickFlag</b><span>Number</span></h4> <h4 class="topLine"><b>clickFlag</b><span>Number</span></h4>
<p>Node is selected or deselected state, please see table below for details</p> <p>Node is selected or deselected state, please see table below for details</p>
<table width="100%" border="0" cellspacing="1" cellpadding="0"> <table width="100%" border="0" cellspacing="1" cellpadding="0">
<thead><tr><td>clickFlag</td><td title="Whether to allow multi-select">selectedMulti</td><td title="Whether to press Ctrl-key">autoCancelSelected<br/>&&<br/>event.ctrlKey</td><td title="Node's selection state">isSelected</td><td>operate for selected</td></tr></thead> <thead><tr><td>clickFlag</td><td title="Whether to allow multi-select">selectedMulti</td><td title="Whether to press Ctrl-key or Cmd-key">autoCancelSelected<br/>&&<br/>event.ctrlKey / metaKey</td><td title="Node's selection state">isSelected</td><td>operate for selected</td></tr></thead>
<tbody> <tbody>
<tr><td>1</td><td>true</td><td>false</td><td>false</td><td>node is selected (single)</td></tr> <tr><td>1</td><td>true</td><td>false</td><td>false</td><td>node is selected (single)</td></tr>
<tr><td>1</td><td>true</td><td>false</td><td>true</td><td>node is selected (single)</td></tr> <tr><td>1</td><td>true</td><td>false</td><td>true</td><td>node is selected (single)</td></tr>
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
</div> </div>
<h3>Rules Description</h3> <h3>Rules Description</h3>
<div class="desc"> <div class="desc">
<p>1. If isCopy = true and isMove = true, when drag-drop node, press Ctrl-Key can copy node, don't press Ctrl-Key can move node.</p> <p>1. If isCopy = true and isMove = true, when drag-drop node, press Ctrl-Key or Cmd-key can copy node, don't press Ctrl-Key or Cmd-key can move node.</p>
<p>2. If isCopy = true and isMove = false, when drag-drop node, will copy node.</p> <p>2. If isCopy = true and isMove = false, when drag-drop node, will copy node.</p>
<p>3. If isCopy = false and isMove = true, when drag-drop node, will move node.</p> <p>3. If isCopy = false and isMove = true, when drag-drop node, will move node.</p>
<p>4. If isCopy = false and isMove = false, so disable to drag-drop node.</p> <p>4. If isCopy = false and isMove = false, so disable to drag-drop node.</p>
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
</div> </div>
<h3>Rules Description</h3> <h3>Rules Description</h3>
<div class="desc"> <div class="desc">
<p>1. If isCopy = true and isMove = true, when drag-drop node, press Ctrl-Key can copy node, don't press Ctrl-Key can move node.</p> <p>1. If isCopy = true and isMove = true, when drag-drop node, press Ctrl-Key or Cmd-key can copy node, don't press Ctrl-Key or Cmd-key can move node.</p>
<p>2. If isCopy = true and isMove = false, when drag-drop node, will copy node.</p> <p>2. If isCopy = true and isMove = false, when drag-drop node, will copy node.</p>
<p>3. If isCopy = false and isMove = true, when drag-drop node, will move node.</p> <p>3. If isCopy = false and isMove = true, when drag-drop node, will move node.</p>
<p>4. If isCopy = false and isMove = false, so disable to drag-drop node.</p> <p>4. If isCopy = false and isMove = false, so disable to drag-drop node.</p>
......
...@@ -5,18 +5,18 @@ ...@@ -5,18 +5,18 @@
<div class="desc"> <div class="desc">
<p></p> <p></p>
<div class="longdesc"> <div class="longdesc">
<p>When click the selected node while pressing the Ctrl key, allow to cancel selected the node.</p> <p>When click the selected node while pressing the Ctrl-key or Cmd-key, allow to cancel selected the node.</p>
<p class="highlight_red">If you don't need this function, please set to false.</p> <p class="highlight_red">If you don't need this function, please set to false.</p>
<p>Default: true</p> <p>Default: true</p>
</div> </div>
</div> </div>
<h3>Boolean Format</h3> <h3>Boolean Format</h3>
<div class="desc"> <div class="desc">
<p> true means: press the Ctrl key, can cancel selected node.</p> <p> true means: press the Ctrl-key or Cmd-key, can cancel selected node.</p>
<p> false means: press the Ctrl key, can't cancel selected node.</p> <p> false means: press the Ctrl-key or Cmd-key, can't cancel selected node.</p>
</div> </div>
<h3>Examples of setting</h3> <h3>Examples of setting</h3>
<h4>1. Press the Ctrl key, can't cancel selected node.</h4> <h4>1. Press the Ctrl-key or Cmd-key, can't cancel selected node.</h4>
<pre xmlns=""><code>var setting = { <pre xmlns=""><code>var setting = {
view: { view: {
autoCancelSelected: false autoCancelSelected: false
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<div class="desc"> <div class="desc">
<p> true mean: you can select multiple nodes.</p> <p> true mean: you can select multiple nodes.</p>
<p> false mean: you can only select one node.</p> <p> false mean: you can only select one node.</p>
<p class="highlight_red">1. Press Ctrl key, you can select multiple nodes.</p> <p class="highlight_red">1. Press Ctrl-key or Cmd-key, you can select multiple nodes.</p>
<p class="highlight_red">2、This attribute don't affect the feature of cancel select node. ( please see setting.view.autoCancelSelected )</p> <p class="highlight_red">2、This attribute don't affect the feature of cancel select node. ( please see setting.view.autoCancelSelected )</p>
</div> </div>
<h3>Examples of setting</h3> <h3>Examples of setting</h3>
......
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
<li class="title"><h2>1、beforeClick / onClick 事件回调函数控制</h2> <li class="title"><h2>1、beforeClick / onClick 事件回调函数控制</h2>
<ul class="list"> <ul class="list">
<li>利用 click 事件回调函数 可以进行各种其他的附加操作,这里简单演示如何监控此事件</li> <li>利用 click 事件回调函数 可以进行各种其他的附加操作,这里简单演示如何监控此事件</li>
<li><p><span class="highlight_red">请尝试按下 <b>Ctrl</b> 键进行 多节点选择 和 取消选择</span><br/> <li><p><span class="highlight_red">请尝试按下 <b>Ctrl</b> <b>Cmd</b> 键进行 多节点选择 和 取消选择</span><br/>
click log:<br/> click log:<br/>
<ul id="log" class="log"></ul></p> <ul id="log" class="log"></ul></p>
</li> </li>
......
...@@ -99,7 +99,7 @@ ...@@ -99,7 +99,7 @@
<div class="content_wrap"> <div class="content_wrap">
<div class="zTreeDemoBackground left"> <div class="zTreeDemoBackground left">
<ul class="list"> <ul class="list">
<li class="title">&nbsp;&nbsp;<span class="highlight_red">选择城市时,按下 Ctrl 键可以进行多选</span></li> <li class="title">&nbsp;&nbsp;<span class="highlight_red">选择城市时,按下 Ctrl 或 Cmd 键可以进行多选</span></li>
<li class="title">&nbsp;&nbsp;城市:<input id="citySel" type="text" readonly value="" style="width:120px;"/> <li class="title">&nbsp;&nbsp;城市:<input id="citySel" type="text" readonly value="" style="width:120px;"/>
&nbsp;<a id="menuBtn" href="#" onclick="showMenu(); return false;">选择</a></li> &nbsp;<a id="menuBtn" href="#" onclick="showMenu(); return false;">选择</a></li>
</ul> </ul>
......
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
<li class="title"><h2>1, 'beforeClick / onClick' callback function</h2> <li class="title"><h2>1, 'beforeClick / onClick' callback function</h2>
<ul class="list"> <ul class="list">
<li>Use 'beforeClick / onClick' callback function can be achieved with the click on the various functions. This simple demo shows how to monitor the click event.</li> <li>Use 'beforeClick / onClick' callback function can be achieved with the click on the various functions. This simple demo shows how to monitor the click event.</li>
<li><p><span class="highlight_red">Try pressing the <b>Ctrl</b> key for multi-node selection and deselection.</span><br/> <li><p><span class="highlight_red">Try pressing the <b>Ctrl</b> or <b>Cmd</b> key for multi-node selection and deselection.</span><br/>
click log:<br/> click log:<br/>
<ul id="log" class="log"></ul></p> <ul id="log" class="log"></ul></p>
</li> </li>
......
...@@ -99,7 +99,7 @@ ...@@ -99,7 +99,7 @@
<div class="content_wrap"> <div class="content_wrap">
<div class="zTreeDemoBackground left"> <div class="zTreeDemoBackground left">
<ul class="list"> <ul class="list">
<li class="title">&nbsp;&nbsp;<span class="highlight_red">Press Ctrl key to select multiple cities</span></li> <li class="title">&nbsp;&nbsp;<span class="highlight_red">Press Ctrl or Cmd key to select multiple cities</span></li>
<li class="title">&nbsp;&nbsp;city: <input id="citySel" type="text" readonly value="" style="width:120px;"/> <li class="title">&nbsp;&nbsp;city: <input id="citySel" type="text" readonly value="" style="width:120px;"/>
&nbsp;<a id="menuBtn" href="#" onclick="showMenu(); return false;">select</a></li> &nbsp;<a id="menuBtn" href="#" onclick="showMenu(); return false;">select</a></li>
</ul> </ul>
......
/* /*
* JQuery zTree core v3.5.16-beta.3 * JQuery zTree core v3.5.16-beta.4
* 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-11-24 * Date: 2013-12-13
*/ */
(function($){ (function($){
var settings = {}, roots = {}, caches = {}, var settings = {}, roots = {}, caches = {},
...@@ -698,7 +698,7 @@ ...@@ -698,7 +698,7 @@
}, },
onClickNode: function (event, node) { onClickNode: function (event, node) {
var setting = data.getSetting(event.data.treeId), var setting = data.getSetting(event.data.treeId),
clickFlag = ( (setting.view.autoCancelSelected && event.ctrlKey) && data.isSelectedNode(setting, node)) ? 0 : (setting.view.autoCancelSelected && event.ctrlKey && setting.view.selectedMulti) ? 2 : 1; clickFlag = ( (setting.view.autoCancelSelected && (event.ctrlKey || event.metaKey)) && data.isSelectedNode(setting, node)) ? 0 : (setting.view.autoCancelSelected && (event.ctrlKey || event.metaKey) && setting.view.selectedMulti) ? 2 : 1;
if (tools.apply(setting.callback.beforeClick, [setting.treeId, node, clickFlag], true) == false) return true; if (tools.apply(setting.callback.beforeClick, [setting.treeId, node, clickFlag], true) == false) return true;
if (clickFlag === 0) { if (clickFlag === 0) {
view.cancelPreSelectedNode(setting, node); view.cancelPreSelectedNode(setting, node);
...@@ -1678,7 +1678,7 @@ ...@@ -1678,7 +1678,7 @@
consts = zt.consts; consts = zt.consts;
})(jQuery); })(jQuery);
/* /*
* JQuery zTree excheck v3.5.16-beta.3 * JQuery zTree excheck v3.5.16-beta.4
* 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-11-24 * Date: 2013-12-13
*/ */
(function($){ (function($){
//default consts of excheck //default consts of excheck
...@@ -2305,7 +2305,7 @@ ...@@ -2305,7 +2305,7 @@
} }
})(jQuery); })(jQuery);
/* /*
* JQuery zTree exedit v3.5.16-beta.3 * JQuery zTree exedit v3.5.16-beta.4
* 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-11-24 * Date: 2013-12-13
*/ */
(function($){ (function($){
//default consts of exedit //default consts of exedit
...@@ -2815,7 +2815,7 @@ ...@@ -2815,7 +2815,7 @@
var dY = 0; var dY = 0;
if (tmpTarget && tmpTarget.attr("id")!=targetSetting.treeId) { if (tmpTarget && tmpTarget.attr("id")!=targetSetting.treeId) {
var tmpTargetNode = tmpTargetNodeId == null ? null: data.getNodeCache(targetSetting, tmpTargetNodeId), var tmpTargetNode = tmpTargetNodeId == null ? null: data.getNodeCache(targetSetting, tmpTargetNodeId),
isCopy = (event.ctrlKey && setting.edit.drag.isMove && setting.edit.drag.isCopy) || (!setting.edit.drag.isMove && setting.edit.drag.isCopy), isCopy = ((event.ctrlKey || event.metaKey) && setting.edit.drag.isMove && setting.edit.drag.isCopy) || (!setting.edit.drag.isMove && setting.edit.drag.isCopy),
isPrev = !!(preNode && tmpTargetNodeId === preNode.tId), isPrev = !!(preNode && tmpTargetNodeId === preNode.tId),
isNext = !!(nextNode && tmpTargetNodeId === nextNode.tId), isNext = !!(nextNode && tmpTargetNodeId === nextNode.tId),
isInner = (tmpNode.parentTId && tmpNode.parentTId == tmpTargetNodeId), isInner = (tmpNode.parentTId && tmpNode.parentTId == tmpTargetNodeId),
...@@ -2945,7 +2945,7 @@ ...@@ -2945,7 +2945,7 @@
if (curNode) curNode.remove(); if (curNode) curNode.remove();
if (tmpArrow) tmpArrow.remove(); if (tmpArrow) tmpArrow.remove();
var isCopy = (event.ctrlKey && setting.edit.drag.isMove && setting.edit.drag.isCopy) || (!setting.edit.drag.isMove && setting.edit.drag.isCopy); var isCopy = ((event.ctrlKey || event.metaKey) && setting.edit.drag.isMove && setting.edit.drag.isCopy) || (!setting.edit.drag.isMove && setting.edit.drag.isCopy);
if (!isCopy && tmpTarget && tmpTargetNodeId && nodes[0].parentTId && tmpTargetNodeId==nodes[0].parentTId && moveType == consts.move.TYPE_INNER) { if (!isCopy && tmpTarget && tmpTargetNodeId && nodes[0].parentTId && tmpTargetNodeId==nodes[0].parentTId && moveType == consts.move.TYPE_INNER) {
tmpTarget = null; tmpTarget = null;
} }
......
此差异已折叠。
/* /*
* JQuery zTree core v3.5.16-beta.3 * JQuery zTree core v3.5.16-beta.4
* 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-11-24 * Date: 2013-12-13
*/ */
(function($){ (function($){
var settings = {}, roots = {}, caches = {}, var settings = {}, roots = {}, caches = {},
...@@ -697,7 +697,7 @@ ...@@ -697,7 +697,7 @@
}, },
onClickNode: function (event, node) { onClickNode: function (event, node) {
var setting = data.getSetting(event.data.treeId), var setting = data.getSetting(event.data.treeId),
clickFlag = ( (setting.view.autoCancelSelected && event.ctrlKey) && data.isSelectedNode(setting, node)) ? 0 : (setting.view.autoCancelSelected && event.ctrlKey && setting.view.selectedMulti) ? 2 : 1; clickFlag = ( (setting.view.autoCancelSelected && (event.ctrlKey || event.metaKey)) && data.isSelectedNode(setting, node)) ? 0 : (setting.view.autoCancelSelected && (event.ctrlKey || event.metaKey) && setting.view.selectedMulti) ? 2 : 1;
if (tools.apply(setting.callback.beforeClick, [setting.treeId, node, clickFlag], true) == false) return true; if (tools.apply(setting.callback.beforeClick, [setting.treeId, node, clickFlag], true) == false) return true;
if (clickFlag === 0) { if (clickFlag === 0) {
view.cancelPreSelectedNode(setting, node); view.cancelPreSelectedNode(setting, node);
......
此差异已折叠。
/* /*
* JQuery zTree excheck v3.5.16-beta.3 * JQuery zTree excheck v3.5.16-beta.4
* 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-11-24 * Date: 2013-12-13
*/ */
(function($){ (function($){
//default consts of excheck //default consts of excheck
......
/* /*
* JQuery zTree excheck v3.5.16-beta.3 * JQuery zTree excheck v3.5.16-beta.4
* 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-11-24 * Date: 2013-12-13
*/ */
(function(m){var p,q,r,o={event:{CHECK:"ztree_check"},id:{CHECK:"_check"},checkbox:{STYLE:"checkbox",DEFAULT:"chk",DISABLED:"disable",FALSE:"false",TRUE:"true",FULL:"full",PART:"part",FOCUS:"focus"},radio:{STYLE:"radio",TYPE_ALL:"all",TYPE_LEVEL:"level"}},v={check:{enable:!1,autoCheckTrigger:!1,chkStyle:o.checkbox.STYLE,nocheckInherit:!1,chkDisabledInherit:!1,radioType:o.radio.TYPE_LEVEL,chkboxType:{Y:"ps",N:"ps"}},data:{key:{checked:"checked"}},callback:{beforeCheck:null,onCheck:null}};p=function(b, (function(m){var p,q,r,o={event:{CHECK:"ztree_check"},id:{CHECK:"_check"},checkbox:{STYLE:"checkbox",DEFAULT:"chk",DISABLED:"disable",FALSE:"false",TRUE:"true",FULL:"full",PART:"part",FOCUS:"focus"},radio:{STYLE:"radio",TYPE_ALL:"all",TYPE_LEVEL:"level"}},v={check:{enable:!1,autoCheckTrigger:!1,chkStyle:o.checkbox.STYLE,nocheckInherit:!1,chkDisabledInherit:!1,radioType:o.radio.TYPE_LEVEL,chkboxType:{Y:"ps",N:"ps"}},data:{key:{checked:"checked"}},callback:{beforeCheck:null,onCheck:null}};p=function(b,
a){if(a.chkDisabled===!0)return!1;var c=f.getSetting(b.data.treeId),d=c.data.key.checked;if(k.apply(c.callback.beforeCheck,[c.treeId,a],!0)==!1)return!0;a[d]=!a[d];e.checkNodeRelation(c,a);d=n(a,j.id.CHECK,c);e.setChkClass(c,d,a);e.repairParentChkClassWithSelf(c,a);c.treeObj.trigger(j.event.CHECK,[b,c.treeId,a]);return!0};q=function(b,a){if(a.chkDisabled===!0)return!1;var c=f.getSetting(b.data.treeId),d=n(a,j.id.CHECK,c);a.check_Focus=!0;e.setChkClass(c,d,a);return!0};r=function(b,a){if(a.chkDisabled=== a){if(a.chkDisabled===!0)return!1;var c=f.getSetting(b.data.treeId),d=c.data.key.checked;if(k.apply(c.callback.beforeCheck,[c.treeId,a],!0)==!1)return!0;a[d]=!a[d];e.checkNodeRelation(c,a);d=n(a,j.id.CHECK,c);e.setChkClass(c,d,a);e.repairParentChkClassWithSelf(c,a);c.treeObj.trigger(j.event.CHECK,[b,c.treeId,a]);return!0};q=function(b,a){if(a.chkDisabled===!0)return!1;var c=f.getSetting(b.data.treeId),d=n(a,j.id.CHECK,c);a.check_Focus=!0;e.setChkClass(c,d,a);return!0};r=function(b,a){if(a.chkDisabled===
......
/* /*
* JQuery zTree exedit v3.5.16-beta.3 * JQuery zTree exedit v3.5.16-beta.4
* 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-11-24 * Date: 2013-12-13
*/ */
(function($){ (function($){
//default consts of exedit //default consts of exedit
...@@ -509,7 +509,7 @@ ...@@ -509,7 +509,7 @@
var dY = 0; var dY = 0;
if (tmpTarget && tmpTarget.attr("id")!=targetSetting.treeId) { if (tmpTarget && tmpTarget.attr("id")!=targetSetting.treeId) {
var tmpTargetNode = tmpTargetNodeId == null ? null: data.getNodeCache(targetSetting, tmpTargetNodeId), var tmpTargetNode = tmpTargetNodeId == null ? null: data.getNodeCache(targetSetting, tmpTargetNodeId),
isCopy = (event.ctrlKey && setting.edit.drag.isMove && setting.edit.drag.isCopy) || (!setting.edit.drag.isMove && setting.edit.drag.isCopy), isCopy = ((event.ctrlKey || event.metaKey) && setting.edit.drag.isMove && setting.edit.drag.isCopy) || (!setting.edit.drag.isMove && setting.edit.drag.isCopy),
isPrev = !!(preNode && tmpTargetNodeId === preNode.tId), isPrev = !!(preNode && tmpTargetNodeId === preNode.tId),
isNext = !!(nextNode && tmpTargetNodeId === nextNode.tId), isNext = !!(nextNode && tmpTargetNodeId === nextNode.tId),
isInner = (tmpNode.parentTId && tmpNode.parentTId == tmpTargetNodeId), isInner = (tmpNode.parentTId && tmpNode.parentTId == tmpTargetNodeId),
...@@ -639,7 +639,7 @@ ...@@ -639,7 +639,7 @@
if (curNode) curNode.remove(); if (curNode) curNode.remove();
if (tmpArrow) tmpArrow.remove(); if (tmpArrow) tmpArrow.remove();
var isCopy = (event.ctrlKey && setting.edit.drag.isMove && setting.edit.drag.isCopy) || (!setting.edit.drag.isMove && setting.edit.drag.isCopy); var isCopy = ((event.ctrlKey || event.metaKey) && setting.edit.drag.isMove && setting.edit.drag.isCopy) || (!setting.edit.drag.isMove && setting.edit.drag.isCopy);
if (!isCopy && tmpTarget && tmpTargetNodeId && nodes[0].parentTId && tmpTargetNodeId==nodes[0].parentTId && moveType == consts.move.TYPE_INNER) { if (!isCopy && tmpTarget && tmpTargetNodeId && nodes[0].parentTId && tmpTargetNodeId==nodes[0].parentTId && moveType == consts.move.TYPE_INNER) {
tmpTarget = null; tmpTarget = null;
} }
......
/* /*
* JQuery zTree exedit v3.5.16-beta.3 * JQuery zTree exedit v3.5.16-beta.4
* 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-11-24 * Date: 2013-12-13
*/ */
(function(w){var I={event:{DRAG:"ztree_drag",DROP:"ztree_drop",REMOVE:"ztree_remove",RENAME:"ztree_rename",DRAGMOVE:"ztree_dragmove"},id:{EDIT:"_edit",INPUT:"_input",REMOVE:"_remove"},move:{TYPE_INNER:"inner",TYPE_PREV:"prev",TYPE_NEXT:"next"},node:{CURSELECTED_EDIT:"curSelectedNode_Edit",TMPTARGET_TREE:"tmpTargetzTree",TMPTARGET_NODE:"tmpTargetNode"}},x={onHoverOverNode:function(b,a){var c=n.getSetting(b.data.treeId),d=n.getRoot(c);if(d.curHoverNode!=a)x.onHoverOutNode(b);d.curHoverNode=a;e.addHoverDom(c, (function(w){var I={event:{DRAG:"ztree_drag",DROP:"ztree_drop",REMOVE:"ztree_remove",RENAME:"ztree_rename",DRAGMOVE:"ztree_dragmove"},id:{EDIT:"_edit",INPUT:"_input",REMOVE:"_remove"},move:{TYPE_INNER:"inner",TYPE_PREV:"prev",TYPE_NEXT:"next"},node:{CURSELECTED_EDIT:"curSelectedNode_Edit",TMPTARGET_TREE:"tmpTargetzTree",TMPTARGET_NODE:"tmpTargetNode"}},x={onHoverOverNode:function(b,a){var c=n.getSetting(b.data.treeId),d=n.getRoot(c);if(d.curHoverNode!=a)x.onHoverOutNode(b);d.curHoverNode=a;e.addHoverDom(c,
a)},onHoverOutNode:function(b){var b=n.getSetting(b.data.treeId),a=n.getRoot(b);if(a.curHoverNode&&!n.isSelectedNode(b,a.curHoverNode))e.removeTreeDom(b,a.curHoverNode),a.curHoverNode=null},onMousedownNode:function(b,a){function c(b){if(C.dragFlag==0&&Math.abs(N-b.clientX)<f.edit.drag.minMoveSize&&Math.abs(O-b.clientY)<f.edit.drag.minMoveSize)return!0;var a,c,o,k,i;i=f.data.key.children;M.css("cursor","pointer");if(C.dragFlag==0){if(g.apply(f.callback.beforeDrag,[f.treeId,m],!0)==!1)return l(b),!0; a)},onHoverOutNode:function(b){var b=n.getSetting(b.data.treeId),a=n.getRoot(b);if(a.curHoverNode&&!n.isSelectedNode(b,a.curHoverNode))e.removeTreeDom(b,a.curHoverNode),a.curHoverNode=null},onMousedownNode:function(b,a){function c(b){if(C.dragFlag==0&&Math.abs(N-b.clientX)<f.edit.drag.minMoveSize&&Math.abs(O-b.clientY)<f.edit.drag.minMoveSize)return!0;var a,c,o,k,i;i=f.data.key.children;M.css("cursor","pointer");if(C.dragFlag==0){if(g.apply(f.callback.beforeDrag,[f.treeId,m],!0)==!1)return l(b),!0;
...@@ -18,15 +18,15 @@ B=p("<span class='tmpzTreeMove_arrow'></span>",f);B.attr("id","zTreeMove_arrow_t ...@@ -18,15 +18,15 @@ B=p("<span class='tmpzTreeMove_arrow'></span>",f);B.attr("id","zTreeMove_arrow_t
"_"+I.move.TYPE_INNER));u=s=null;J=!1;h=f;o=n.getSettings();for(var y in o)if(o[y].treeId&&o[y].edit.enable&&o[y].treeId!=f.treeId&&(b.target.id==o[y].treeId||w(b.target).parents("#"+o[y].treeId).length>0))J=!0,h=o[y];y=F.scrollTop();k=F.scrollLeft();i=h.treeObj.offset();a=h.treeObj.get(0).scrollHeight;o=h.treeObj.get(0).scrollWidth;c=b.clientY+y-i.top;var q=h.treeObj.height()+i.top-b.clientY-y,r=b.clientX+k-i.left,x=h.treeObj.width()+i.left-b.clientX-k;i=c<f.edit.drag.borderMax&&c>f.edit.drag.borderMin; "_"+I.move.TYPE_INNER));u=s=null;J=!1;h=f;o=n.getSettings();for(var y in o)if(o[y].treeId&&o[y].edit.enable&&o[y].treeId!=f.treeId&&(b.target.id==o[y].treeId||w(b.target).parents("#"+o[y].treeId).length>0))J=!0,h=o[y];y=F.scrollTop();k=F.scrollLeft();i=h.treeObj.offset();a=h.treeObj.get(0).scrollHeight;o=h.treeObj.get(0).scrollWidth;c=b.clientY+y-i.top;var q=h.treeObj.height()+i.top-b.clientY-y,r=b.clientX+k-i.left,x=h.treeObj.width()+i.left-b.clientX-k;i=c<f.edit.drag.borderMax&&c>f.edit.drag.borderMin;
var j=q<f.edit.drag.borderMax&&q>f.edit.drag.borderMin,K=r<f.edit.drag.borderMax&&r>f.edit.drag.borderMin,G=x<f.edit.drag.borderMax&&x>f.edit.drag.borderMin,q=c>f.edit.drag.borderMin&&q>f.edit.drag.borderMin&&r>f.edit.drag.borderMin&&x>f.edit.drag.borderMin,r=i&&h.treeObj.scrollTop()<=0,x=j&&h.treeObj.scrollTop()+h.treeObj.height()+10>=a,P=K&&h.treeObj.scrollLeft()<=0,Q=G&&h.treeObj.scrollLeft()+h.treeObj.width()+10>=o;if(b.target&&g.isChildOrSelf(b.target,h.treeId)){for(var E=b.target;E&&E.tagName&& var j=q<f.edit.drag.borderMax&&q>f.edit.drag.borderMin,K=r<f.edit.drag.borderMax&&r>f.edit.drag.borderMin,G=x<f.edit.drag.borderMax&&x>f.edit.drag.borderMin,q=c>f.edit.drag.borderMin&&q>f.edit.drag.borderMin&&r>f.edit.drag.borderMin&&x>f.edit.drag.borderMin,r=i&&h.treeObj.scrollTop()<=0,x=j&&h.treeObj.scrollTop()+h.treeObj.height()+10>=a,P=K&&h.treeObj.scrollLeft()<=0,Q=G&&h.treeObj.scrollLeft()+h.treeObj.width()+10>=o;if(b.target&&g.isChildOrSelf(b.target,h.treeId)){for(var E=b.target;E&&E.tagName&&
!g.eqs(E.tagName,"li")&&E.id!=h.treeId;)E=E.parentNode;var S=!0;for(a=0,c=m.length;a<c;a++)if(o=m[a],E.id===o.tId){S=!1;break}else if(p(o,f).find("#"+E.id).length>0){S=!1;break}if(S&&b.target&&g.isChildOrSelf(b.target,E.id+d.id.A))s=w(E),u=E.id}o=m[0];if(q&&g.isChildOrSelf(b.target,h.treeId)){if(!s&&(b.target.id==h.treeId||r||x||P||Q)&&(J||!J&&o.parentTId))s=h.treeObj;i?h.treeObj.scrollTop(h.treeObj.scrollTop()-10):j&&h.treeObj.scrollTop(h.treeObj.scrollTop()+10);K?h.treeObj.scrollLeft(h.treeObj.scrollLeft()- !g.eqs(E.tagName,"li")&&E.id!=h.treeId;)E=E.parentNode;var S=!0;for(a=0,c=m.length;a<c;a++)if(o=m[a],E.id===o.tId){S=!1;break}else if(p(o,f).find("#"+E.id).length>0){S=!1;break}if(S&&b.target&&g.isChildOrSelf(b.target,E.id+d.id.A))s=w(E),u=E.id}o=m[0];if(q&&g.isChildOrSelf(b.target,h.treeId)){if(!s&&(b.target.id==h.treeId||r||x||P||Q)&&(J||!J&&o.parentTId))s=h.treeObj;i?h.treeObj.scrollTop(h.treeObj.scrollTop()-10):j&&h.treeObj.scrollTop(h.treeObj.scrollTop()+10);K?h.treeObj.scrollLeft(h.treeObj.scrollLeft()-
10):G&&h.treeObj.scrollLeft(h.treeObj.scrollLeft()+10);s&&s!=h.treeObj&&s.offset().left<h.treeObj.offset().left&&h.treeObj.scrollLeft(h.treeObj.scrollLeft()+s.offset().left-h.treeObj.offset().left)}D.css({top:b.clientY+y+3+"px",left:b.clientX+k+3+"px"});i=a=0;if(s&&s.attr("id")!=h.treeId){var z=u==null?null:n.getNodeCache(h,u);c=b.ctrlKey&&f.edit.drag.isMove&&f.edit.drag.isCopy||!f.edit.drag.isMove&&f.edit.drag.isCopy;a=!!(H&&u===H.tId);i=!!(R&&u===R.tId);k=o.parentTId&&o.parentTId==u;o=(c||!i)&& 10):G&&h.treeObj.scrollLeft(h.treeObj.scrollLeft()+10);s&&s!=h.treeObj&&s.offset().left<h.treeObj.offset().left&&h.treeObj.scrollLeft(h.treeObj.scrollLeft()+s.offset().left-h.treeObj.offset().left)}D.css({top:b.clientY+y+3+"px",left:b.clientX+k+3+"px"});i=a=0;if(s&&s.attr("id")!=h.treeId){var z=u==null?null:n.getNodeCache(h,u);c=(b.ctrlKey||b.metaKey)&&f.edit.drag.isMove&&f.edit.drag.isCopy||!f.edit.drag.isMove&&f.edit.drag.isCopy;a=!!(H&&u===H.tId);i=!!(R&&u===R.tId);k=o.parentTId&&o.parentTId==
g.apply(h.edit.drag.prev,[h.treeId,m,z],!!h.edit.drag.prev);a=(c||!a)&&g.apply(h.edit.drag.next,[h.treeId,m,z],!!h.edit.drag.next);G=(c||!k)&&!(h.data.keep.leaf&&!z.isParent)&&g.apply(h.edit.drag.inner,[h.treeId,m,z],!!h.edit.drag.inner);if(!o&&!a&&!G){if(s=null,u="",v=d.move.TYPE_INNER,B.css({display:"none"}),window.zTreeMoveTimer)clearTimeout(window.zTreeMoveTimer),window.zTreeMoveTargetNodeTId=null}else{c=w("#"+u+d.id.A,s);i=z.isLastNode?null:w("#"+z.getNextNode().tId+d.id.A,s.next());j=c.offset().top; u;o=(c||!i)&&g.apply(h.edit.drag.prev,[h.treeId,m,z],!!h.edit.drag.prev);a=(c||!a)&&g.apply(h.edit.drag.next,[h.treeId,m,z],!!h.edit.drag.next);G=(c||!k)&&!(h.data.keep.leaf&&!z.isParent)&&g.apply(h.edit.drag.inner,[h.treeId,m,z],!!h.edit.drag.inner);if(!o&&!a&&!G){if(s=null,u="",v=d.move.TYPE_INNER,B.css({display:"none"}),window.zTreeMoveTimer)clearTimeout(window.zTreeMoveTimer),window.zTreeMoveTargetNodeTId=null}else{c=w("#"+u+d.id.A,s);i=z.isLastNode?null:w("#"+z.getNextNode().tId+d.id.A,s.next());
k=c.offset().left;K=o?G?0.25:a?0.5:1:-1;G=a?G?0.75:o?0.5:0:-1;y=(b.clientY+y-j)/c.height();(K==1||y<=K&&y>=-0.2)&&o?(a=1-B.width(),i=j-B.height()/2,v=d.move.TYPE_PREV):(G==0||y>=G&&y<=1.2)&&a?(a=1-B.width(),i=i==null||z.isParent&&z.open?j+c.height()-B.height()/2:i.offset().top-B.height()/2,v=d.move.TYPE_NEXT):(a=5-B.width(),i=j,v=d.move.TYPE_INNER);B.css({display:"block",top:i+"px",left:k+a+"px"});c.addClass(d.node.TMPTARGET_NODE+"_"+v);if(T!=u||U!=v)L=(new Date).getTime();if(z&&z.isParent&&v==d.move.TYPE_INNER&& j=c.offset().top;k=c.offset().left;K=o?G?0.25:a?0.5:1:-1;G=a?G?0.75:o?0.5:0:-1;y=(b.clientY+y-j)/c.height();(K==1||y<=K&&y>=-0.2)&&o?(a=1-B.width(),i=j-B.height()/2,v=d.move.TYPE_PREV):(G==0||y>=G&&y<=1.2)&&a?(a=1-B.width(),i=i==null||z.isParent&&z.open?j+c.height()-B.height()/2:i.offset().top-B.height()/2,v=d.move.TYPE_NEXT):(a=5-B.width(),i=j,v=d.move.TYPE_INNER);B.css({display:"block",top:i+"px",left:k+a+"px"});c.addClass(d.node.TMPTARGET_NODE+"_"+v);if(T!=u||U!=v)L=(new Date).getTime();if(z&&
(y=!0,window.zTreeMoveTimer&&window.zTreeMoveTargetNodeTId!==z.tId?(clearTimeout(window.zTreeMoveTimer),window.zTreeMoveTargetNodeTId=null):window.zTreeMoveTimer&&window.zTreeMoveTargetNodeTId===z.tId&&(y=!1),y))window.zTreeMoveTimer=setTimeout(function(){v==d.move.TYPE_INNER&&z&&z.isParent&&!z.open&&(new Date).getTime()-L>h.edit.drag.autoOpenTime&&g.apply(h.callback.beforeDragOpen,[h.treeId,z],!0)&&(e.switchNode(h,z),h.edit.drag.autoExpandTrigger&&h.treeObj.trigger(d.event.EXPAND,[h.treeId,z]))}, z.isParent&&v==d.move.TYPE_INNER&&(y=!0,window.zTreeMoveTimer&&window.zTreeMoveTargetNodeTId!==z.tId?(clearTimeout(window.zTreeMoveTimer),window.zTreeMoveTargetNodeTId=null):window.zTreeMoveTimer&&window.zTreeMoveTargetNodeTId===z.tId&&(y=!1),y))window.zTreeMoveTimer=setTimeout(function(){v==d.move.TYPE_INNER&&z&&z.isParent&&!z.open&&(new Date).getTime()-L>h.edit.drag.autoOpenTime&&g.apply(h.callback.beforeDragOpen,[h.treeId,z],!0)&&(e.switchNode(h,z),h.edit.drag.autoExpandTrigger&&h.treeObj.trigger(d.event.EXPAND,
h.edit.drag.autoOpenTime+50),window.zTreeMoveTargetNodeTId=z.tId}}else if(v=d.move.TYPE_INNER,s&&g.apply(h.edit.drag.inner,[h.treeId,m,null],!!h.edit.drag.inner)?s.addClass(d.node.TMPTARGET_TREE):s=null,B.css({display:"none"}),window.zTreeMoveTimer)clearTimeout(window.zTreeMoveTimer),window.zTreeMoveTargetNodeTId=null;T=u;U=v;f.treeObj.trigger(d.event.DRAGMOVE,[b,f.treeId,m])}return!1}function l(b){if(window.zTreeMoveTimer)clearTimeout(window.zTreeMoveTimer),window.zTreeMoveTargetNodeTId=null;U=T= [h.treeId,z]))},h.edit.drag.autoOpenTime+50),window.zTreeMoveTargetNodeTId=z.tId}}else if(v=d.move.TYPE_INNER,s&&g.apply(h.edit.drag.inner,[h.treeId,m,null],!!h.edit.drag.inner)?s.addClass(d.node.TMPTARGET_TREE):s=null,B.css({display:"none"}),window.zTreeMoveTimer)clearTimeout(window.zTreeMoveTimer),window.zTreeMoveTargetNodeTId=null;T=u;U=v;f.treeObj.trigger(d.event.DRAGMOVE,[b,f.treeId,m])}return!1}function l(b){if(window.zTreeMoveTimer)clearTimeout(window.zTreeMoveTimer),window.zTreeMoveTargetNodeTId=
null;F.unbind("mousemove",c);F.unbind("mouseup",l);F.unbind("selectstart",k);M.css("cursor","auto");s&&(s.removeClass(d.node.TMPTARGET_TREE),u&&w("#"+u+d.id.A,s).removeClass(d.node.TMPTARGET_NODE+"_"+d.move.TYPE_PREV).removeClass(d.node.TMPTARGET_NODE+"_"+I.move.TYPE_NEXT).removeClass(d.node.TMPTARGET_NODE+"_"+I.move.TYPE_INNER));g.showIfameMask(f,!1);t.showHoverDom=!0;if(C.dragFlag!=0){C.dragFlag=0;var a,i,j;for(a=0,i=m.length;a<i;a++)j=m[a],j.isParent&&C.dragNodeShowBefore[j.tId]&&!j.open&&(e.expandCollapseNode(f, null;U=T=null;F.unbind("mousemove",c);F.unbind("mouseup",l);F.unbind("selectstart",k);M.css("cursor","auto");s&&(s.removeClass(d.node.TMPTARGET_TREE),u&&w("#"+u+d.id.A,s).removeClass(d.node.TMPTARGET_NODE+"_"+d.move.TYPE_PREV).removeClass(d.node.TMPTARGET_NODE+"_"+I.move.TYPE_NEXT).removeClass(d.node.TMPTARGET_NODE+"_"+I.move.TYPE_INNER));g.showIfameMask(f,!1);t.showHoverDom=!0;if(C.dragFlag!=0){C.dragFlag=0;var a,i,j;for(a=0,i=m.length;a<i;a++)j=m[a],j.isParent&&C.dragNodeShowBefore[j.tId]&&!j.open&&
j,!j.open),delete C.dragNodeShowBefore[j.tId]);D&&D.remove();B&&B.remove();var q=b.ctrlKey&&f.edit.drag.isMove&&f.edit.drag.isCopy||!f.edit.drag.isMove&&f.edit.drag.isCopy;!q&&s&&u&&m[0].parentTId&&u==m[0].parentTId&&v==d.move.TYPE_INNER&&(s=null);if(s){var r=u==null?null:n.getNodeCache(h,u);if(g.apply(f.callback.beforeDrop,[h.treeId,m,r,v,q],!0)==!1)e.selectNodes(x,m);else{var A=q?g.clone(m):m;a=function(){if(J){if(!q)for(var a=0,c=m.length;a<c;a++)e.removeNode(f,m[a]);if(v==d.move.TYPE_INNER)e.addNodes(h, (e.expandCollapseNode(f,j,!j.open),delete C.dragNodeShowBefore[j.tId]);D&&D.remove();B&&B.remove();var q=(b.ctrlKey||b.metaKey)&&f.edit.drag.isMove&&f.edit.drag.isCopy||!f.edit.drag.isMove&&f.edit.drag.isCopy;!q&&s&&u&&m[0].parentTId&&u==m[0].parentTId&&v==d.move.TYPE_INNER&&(s=null);if(s){var r=u==null?null:n.getNodeCache(h,u);if(g.apply(f.callback.beforeDrop,[h.treeId,m,r,v,q],!0)==!1)e.selectNodes(x,m);else{var A=q?g.clone(m):m;a=function(){if(J){if(!q)for(var a=0,c=m.length;a<c;a++)e.removeNode(f,
r,A);else if(e.addNodes(h,r.getParentNode(),A),v==d.move.TYPE_PREV)for(a=0,c=A.length;a<c;a++)e.moveNode(h,r,A[a],v,!1);else for(a=-1,c=A.length-1;a<c;c--)e.moveNode(h,r,A[c],v,!1)}else if(q&&v==d.move.TYPE_INNER)e.addNodes(h,r,A);else if(q&&e.addNodes(h,r.getParentNode(),A),v!=d.move.TYPE_NEXT)for(a=0,c=A.length;a<c;a++)e.moveNode(h,r,A[a],v,!1);else for(a=-1,c=A.length-1;a<c;c--)e.moveNode(h,r,A[c],v,!1);e.selectNodes(h,A);p(A[0],f).focus().blur();f.treeObj.trigger(d.event.DROP,[b,h.treeId,A,r, m[a]);if(v==d.move.TYPE_INNER)e.addNodes(h,r,A);else if(e.addNodes(h,r.getParentNode(),A),v==d.move.TYPE_PREV)for(a=0,c=A.length;a<c;a++)e.moveNode(h,r,A[a],v,!1);else for(a=-1,c=A.length-1;a<c;c--)e.moveNode(h,r,A[c],v,!1)}else if(q&&v==d.move.TYPE_INNER)e.addNodes(h,r,A);else if(q&&e.addNodes(h,r.getParentNode(),A),v!=d.move.TYPE_NEXT)for(a=0,c=A.length;a<c;a++)e.moveNode(h,r,A[a],v,!1);else for(a=-1,c=A.length-1;a<c;c--)e.moveNode(h,r,A[c],v,!1);e.selectNodes(h,A);p(A[0],f).focus().blur();f.treeObj.trigger(d.event.DROP,
v,q])};v==d.move.TYPE_INNER&&g.canAsync(h,r)?e.asyncNode(h,r,!1,a):a()}}else e.selectNodes(x,m),f.treeObj.trigger(d.event.DROP,[b,f.treeId,m,null,null,null])}}function k(){return!1}var i,j,f=n.getSetting(b.data.treeId),C=n.getRoot(f),t=n.getRoots();if(b.button==2||!f.edit.enable||!f.edit.drag.isCopy&&!f.edit.drag.isMove)return!0;var q=b.target,r=n.getRoot(f).curSelectedList,m=[];if(n.isSelectedNode(f,a))for(i=0,j=r.length;i<j;i++){if(r[i].editNameFlag&&g.eqs(q.tagName,"input")&&q.getAttribute("treeNode"+ [b,h.treeId,A,r,v,q])};v==d.move.TYPE_INNER&&g.canAsync(h,r)?e.asyncNode(h,r,!1,a):a()}}else e.selectNodes(x,m),f.treeObj.trigger(d.event.DROP,[b,f.treeId,m,null,null,null])}}function k(){return!1}var i,j,f=n.getSetting(b.data.treeId),C=n.getRoot(f),t=n.getRoots();if(b.button==2||!f.edit.enable||!f.edit.drag.isCopy&&!f.edit.drag.isMove)return!0;var q=b.target,r=n.getRoot(f).curSelectedList,m=[];if(n.isSelectedNode(f,a))for(i=0,j=r.length;i<j;i++){if(r[i].editNameFlag&&g.eqs(q.tagName,"input")&&q.getAttribute("treeNode"+
d.id.INPUT)!==null)return!0;m.push(r[i]);if(m[0].parentTId!==r[i].parentTId){m=[a];break}}else m=[a];e.editNodeBlur=!0;e.cancelCurEditNode(f);var F=w(f.treeObj.get(0).ownerDocument),M=w(f.treeObj.get(0).ownerDocument.body),D,B,s,J=!1,h=f,x=f,H,R,T=null,U=null,u=null,v=d.move.TYPE_INNER,N=b.clientX,O=b.clientY,L=(new Date).getTime();g.uCanDo(f)&&F.bind("mousemove",c);F.bind("mouseup",l);F.bind("selectstart",k);b.preventDefault&&b.preventDefault();return!0}};w.extend(!0,w.fn.zTree.consts,I);w.extend(!0, d.id.INPUT)!==null)return!0;m.push(r[i]);if(m[0].parentTId!==r[i].parentTId){m=[a];break}}else m=[a];e.editNodeBlur=!0;e.cancelCurEditNode(f);var F=w(f.treeObj.get(0).ownerDocument),M=w(f.treeObj.get(0).ownerDocument.body),D,B,s,J=!1,h=f,x=f,H,R,T=null,U=null,u=null,v=d.move.TYPE_INNER,N=b.clientX,O=b.clientY,L=(new Date).getTime();g.uCanDo(f)&&F.bind("mousemove",c);F.bind("mouseup",l);F.bind("selectstart",k);b.preventDefault&&b.preventDefault();return!0}};w.extend(!0,w.fn.zTree.consts,I);w.extend(!0,
w.fn.zTree._z,{tools:{getAbs:function(b){b=b.getBoundingClientRect();return[b.left+(document.body.scrollLeft+document.documentElement.scrollLeft),b.top+(document.body.scrollTop+document.documentElement.scrollTop)]},inputFocus:function(b){b.get(0)&&(b.focus(),g.setCursorPosition(b.get(0),b.val().length))},inputSelect:function(b){b.get(0)&&(b.focus(),b.select())},setCursorPosition:function(b,a){if(b.setSelectionRange)b.focus(),b.setSelectionRange(a,a);else if(b.createTextRange){var c=b.createTextRange(); w.fn.zTree._z,{tools:{getAbs:function(b){b=b.getBoundingClientRect();return[b.left+(document.body.scrollLeft+document.documentElement.scrollLeft),b.top+(document.body.scrollTop+document.documentElement.scrollTop)]},inputFocus:function(b){b.get(0)&&(b.focus(),g.setCursorPosition(b.get(0),b.val().length))},inputSelect:function(b){b.get(0)&&(b.focus(),b.select())},setCursorPosition:function(b,a){if(b.setSelectionRange)b.focus(),b.setSelectionRange(a,a);else if(b.createTextRange){var c=b.createTextRange();
c.collapse(!0);c.moveEnd("character",a);c.moveStart("character",a);c.select()}},showIfameMask:function(b,a){for(var c=n.getRoot(b);c.dragMaskList.length>0;)c.dragMaskList[0].remove(),c.dragMaskList.shift();if(a)for(var d=p("iframe",b),e=0,i=d.length;e<i;e++){var j=d.get(e),f=g.getAbs(j),j=p("<div id='zTreeMask_"+e+"' class='zTreeMask' style='top:"+f[1]+"px; left:"+f[0]+"px; width:"+j.offsetWidth+"px; height:"+j.offsetHeight+"px;'></div>",b);j.appendTo(p("body",b));c.dragMaskList.push(j)}}},view:{addEditBtn:function(b, c.collapse(!0);c.moveEnd("character",a);c.moveStart("character",a);c.select()}},showIfameMask:function(b,a){for(var c=n.getRoot(b);c.dragMaskList.length>0;)c.dragMaskList[0].remove(),c.dragMaskList.shift();if(a)for(var d=p("iframe",b),e=0,i=d.length;e<i;e++){var j=d.get(e),f=g.getAbs(j),j=p("<div id='zTreeMask_"+e+"' class='zTreeMask' style='top:"+f[1]+"px; left:"+f[0]+"px; width:"+j.offsetWidth+"px; height:"+j.offsetHeight+"px;'></div>",b);j.appendTo(p("body",b));c.dragMaskList.push(j)}}},view:{addEditBtn:function(b,
......
/* /*
* JQuery zTree exHideNodes v3.5.16-beta.3 * JQuery zTree exHideNodes v3.5.16-beta.4
* 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-11-24 * Date: 2013-12-13
*/ */
(function($){ (function($){
//default init node of exLib //default init node of exLib
......
/* /*
* JQuery zTree exHideNodes v3.5.16-beta.3 * JQuery zTree exHideNodes v3.5.16-beta.4
* 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-11-24 * Date: 2013-12-13
*/ */
(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,8 +14,9 @@ ...@@ -14,8 +14,9 @@
</font> </font>
*2013.11.24* v3.5.16-beta.3 *2013.12.13* v3.5.16-beta.4
* 【增加】onDragMove 回调,便于控制 zTree 节点与其他 DOM 的拖拽操作。(感谢 yumi301) * 【增加】onDragMove 回调,便于控制 zTree 节点与其他 DOM 的拖拽操作。(感谢 yumi301)
* 【增加】针对 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)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册