diff --git a/public/css/theme/default.css b/public/css/theme/default.css index 6643b2d..5d6bc9a 100644 --- a/public/css/theme/default.css +++ b/public/css/theme/default.css @@ -699,14 +699,16 @@ a.raw:hover { } #notebookList input, #notebookListForSearch input { - border: 1px solid #ebeff2; + border: 1px solid rgba(0, 0, 0, 0.1); width: 90%; + padding-left: 3px; box-shadow: none; + background: none; + color: #fff; } #notebookList input:focus, #notebookListForSearch input:focus { outline: none !important; - border-color: #0fb264; } #myTag .folderBody { /* @@ -1362,3 +1364,12 @@ background-position:-1px -670px .tmpzTreeMove_arrow { color: #fff; } +.ztree li a.tmpTargetNode_inner { + padding-top: 0px; + background-color: rgba(0, 0, 0, 0.3); + color: #fff; + height: 30px; + border: 1px #ccc solid; + opacity: 0.8; + filter: alpha(opacity=80); +} diff --git a/public/css/theme/default.less b/public/css/theme/default.less index 6b62c19..0784909 100644 --- a/public/css/theme/default.less +++ b/public/css/theme/default.less @@ -461,12 +461,14 @@ a.raw:hover { // 重命名, 添加notebook #notebookList input, #notebookListForSearch input { - border: 1px solid @borderColor; + border: 1px solid rgba(0,0,0,0.1); width: 90%; + padding-left:3px; box-shadow: none; + background: none; + color: #fff; &:focus { outline: none !important; - border-color: @hColor; } } @@ -1190,4 +1192,14 @@ background-position:-1px -670px } .tmpzTreeMove_arrow { color: #fff; +} + +.ztree li a.tmpTargetNode_inner { + padding-top:0px; + background-color: rgba(0, 0, 0, 0.3); + color: #fff; + height: 30px; + border:1px #ccc solid; + opacity: 0.8; + filter:alpha(opacity=80) } \ No newline at end of file diff --git a/public/css/theme/simple.css b/public/css/theme/simple.css index 9f10038..b448a45 100644 --- a/public/css/theme/simple.css +++ b/public/css/theme/simple.css @@ -664,14 +664,16 @@ a.raw:hover { } #notebookList input, #notebookListForSearch input { - border: 1px solid #ebeff2; width: 90%; + border: none; box-shadow: none; + padding-left: 3px; + background: none; } #notebookList input:focus, #notebookListForSearch input:focus { outline: none !important; - border-color: #0fb264; + border: none; } #myTag .folderBody li { position: relative; diff --git a/public/css/theme/simple.less b/public/css/theme/simple.less index c9b1023..abf6842 100644 --- a/public/css/theme/simple.less +++ b/public/css/theme/simple.less @@ -429,12 +429,14 @@ a.raw:hover { // 重命名, 添加notebook #notebookList input, #notebookListForSearch input { - border: 1px solid @borderColor; width: 90%; + border: none; box-shadow: none; + padding-left:3px; + background: none; &:focus { outline: none !important; - border-color: @hColor; + border: none; } } diff --git a/public/css/zTreeStyle/zTreeStyle.css b/public/css/zTreeStyle/zTreeStyle.css index 2fcecb3..19cdd6a 100644 --- a/public/css/zTreeStyle/zTreeStyle.css +++ b/public/css/zTreeStyle/zTreeStyle.css @@ -14,10 +14,12 @@ /* 拖动到上面 */ .ztree li a.tmpTargetNode_inner { padding-top:0px; - background-color:#316AC5; - color:white; height:30px; - border:1px #316AC5 solid; - opacity:0.8; filter:alpha(opacity=80) + background-color:#eee; + color: #000; + height: 30px; + border:1px #ccc solid; + opacity: 0.8; + filter:alpha(opacity=80) } .ztree li span {line-height:16px; margin-right:2px} .ztree li span.button {line-height:0; margin:0; width:16px; height:16px; display: inline-block; vertical-align:middle; @@ -32,14 +34,20 @@ ul.tmpTargetzTree {background-color:#FFE6B0; opacity:0.8; filter:alpha(opacity=80)} -/* 移动 */ +/* 移动 箭头*/ span.tmpzTreeMove_arrow { - z-index: 333;width:16px; height:30px; line-height: 30px; - display: inline-block; padding:0; margin:2px 0 0 15px; border:0 none; position:absolute; + z-index: 333;width:16px; + height:30px; line-height: 30px; + display: inline-block; + padding:0; + margin:0 0 0 15px; + border:0 none; position:absolute; } +/* 拖动的副本 */ ul.ztree.zTreeDragUL {z-index: 333;margin:0; padding:0; position:absolute; width:auto; height:auto;overflow:hidden; - background-color:cfcfcf; border:1px #00B83F dotted; opacity:0.8; filter:alpha(opacity=80)} + background-color: cfcfcf; + border:1px #00B83F dotted; opacity:0.8; filter:alpha(opacity=80)} .zTreeMask {z-index:1000; background-color:#cfcfcf; opacity:0.0; filter:alpha(opacity=0); position:absolute} .ztree li ul{ margin:0; padding:0} .ztree li {line-height:30px;} diff --git a/public/js/jquery.ztree.all-3.5.js b/public/js/jquery.ztree.all-3.5.js index 336c104..492a11f 100644 --- a/public/js/jquery.ztree.all-3.5.js +++ b/public/js/jquery.ztree.all-3.5.js @@ -2996,7 +2996,6 @@ } var newNodes = isCopy ? tools.clone(nodes) : nodes; - // 这里速度慢 function dropCallback() { if (isOtherTree) { if (!isCopy) { @@ -3040,7 +3039,6 @@ view.selectNodes(targetSetting, newNodes); $$(newNodes[0], setting).focus().blur(); - // 这里非常耗时!!! 原因是ajax自定义方法 setting.treeObj.trigger(consts.event.DROP, [event, targetSetting.treeId, newNodes, dragTargetNode, moveType, isCopy]); } @@ -3245,7 +3243,6 @@ root.noSelection = false; root.curEditNode = node; }, - // 这里, 速度慢 moveNode: function(setting, targetNode, node, moveType, animateFlag, isSilent) { var root = data.getRoot(setting), childKey = setting.data.key.children;