فهرست منبع

修复历史纪录bug

kangna 7 سال پیش
والد
کامیت
7b19c65001
3فایلهای تغییر یافته به همراه37 افزوده شده و 17 حذف شده
  1. 34 14
      resources/app/history.html
  2. 2 2
      resources/app/main.js
  3. 1 1
      resources/app/public/css/browser.css

+ 34 - 14
resources/app/history.html

@@ -15,7 +15,7 @@
             <p>历史记录</p>
             <div class="HistorySelect">
                 <div>
-                    <input type="text" id="SelectInp" placeholder="搜索历史记录" style="-webkit-app-region: no-drag" value="">
+                    <input type="text" id="SelectInp" placeholder="搜索历史记录" onblur="inputblur()" onclick="inputclick()" style="-webkit-app-region: no-drag" value="">
                 </div>
             </div>
         </div>
@@ -26,10 +26,9 @@
                 <li onclick="xianshi()" style="border-bottom: 2px solid #dadada">显示历史记录</li>
                 <li onclick="HistoryCancelAll()" id="qingchu">
                     清除历史记录
-                    <div class="item" onclick="HistoryCancelDone()">确定</div>
-                    <div class="item">取消</div>
+                    <div class="item" onclick="HistoryCancelDone()" style="opacity: 0">确定</div>
+                    <div class="item" style="opacity: 0">取消</div>
                 </li>
-                <li onclick="HistorySelect()">搜索</li>
             </ul>
         </div>
     </div>
@@ -46,18 +45,26 @@
 </section>
 <script src="./public/js/uform.js"></script>
 <script>
+    var isclick = false
     var ipc=require('electron').ipcRenderer;
     $(".close")[0].onclick=function(){
         ipc.send('BrowserHistory-close');
     };
     addChild = function(parent,newChild){
-        if(parent.firstChild){
-            parent.insertBefore(newChild,parent.firstChild);
-        } else {
-            parent.addChild(newChild);
-        }
+        parent.insertBefore(newChild,parent.firstChild);
+        // if(parent.firstChild){
+        //     // parent.insertBefore(newChild,parent.firstChild);
+        // } else {
+        //     // parent.addChild(newChild);
+        // }
         return parent;
     }
+    const inputblur = () => {
+        isclick = false
+    }
+    const inputclick = () => {
+        isclick = true
+    }
     const choose = () => {
         let numb = document.querySelectorAll("input[type='checkbox']:checked").length
         if (numb === 0) {
@@ -80,7 +87,6 @@
     const HistoryDelect = () => {
         let isclick = document.querySelectorAll("input[type='checkbox']:checked")
         for(let i = 0; i < isclick.length; i ++){
-            console.log(isclick[i])
             Historyshanchu(isclick[i].parentNode.parentNode.parentNode.childNodes[0].innerHTML, isclick[i].value, isclick[i].parentNode)
         }
     }
@@ -89,6 +95,7 @@
         arr.splice(~~item, 1)
         localStorage[par] = JSON.stringify(arr)
         my.style.display = 'none'
+        my.parentNode.removeChild(my)
         $('.HistoryBottom')[0].style.bottom = '-55px';
         $('.HistoryCountSpan')[0].innerText = '0'
     }
@@ -136,7 +143,7 @@
         }
     }
     const xianshi = () => {
-        // BrowserHistory.innerHTML = ''
+        BrowserHistory.innerHTML = ''
         for (date in localStorage) {
             var a = $$("div",{"className":"HistoryCard"});
             addChild(BrowserHistory,a);
@@ -146,8 +153,8 @@
             for(var i=0;i<data.length;i++){
                 var a_list=$$("li",{},a_container);
                 $$("input",{"type":"checkbox","className":"Historyinput",'value': i,'onclick':function () {
-                    choose()
-                }},a_list)
+                        choose()
+                    }},a_list)
                 var a_time=$$("span",{"innerText":data[i].time},a_list);
                 var a_content=$$("div",{},a_list);
                 $$("img",{"src":data[i].favicons,"draggable":"false"},a_content);
@@ -162,10 +169,23 @@
         }
     }
     const HistoryCancelDone = () => {
-        // localStorage = ''
+        localStorage = ''
+    }
+    const keydown = () => {
+        document.onkeydown=function(event){
+            var e = event || window.event || arguments.callee.caller.arguments[0];
+            if(e && e.keyCode==13){
+                //要做的事情
+                if(isclick == true){
+                    HistorySelect()
+                }
+            }
+            
+        };
     }
     window.onload = () => {
         xianshi()
+        keydown()
     }
 </script>
 

+ 2 - 2
resources/app/main.js

@@ -160,8 +160,8 @@ function CreateHistory() {
         return false;
     }
     BrowserHistory = new BrowserWindow({//历史记录
-        width: 800,
-        height:600,
+        width: 1450,
+        height:900,
         resizable:false,
         frame: false,
         parent:mainWindow

+ 1 - 1
resources/app/public/css/browser.css

@@ -783,7 +783,7 @@ input::-ms-input-placeholder {
     height: 866px;
     background: #eee;
     overflow: auto;
-    width: 240px;
+    width: 251px;
     float: left;
 }