fix bug

silentmoooon · Oct 23, 2018 · 961f662 · 961f662
1 parent 9f46d1c
commit 961f662
Show file tree

Hide file tree

Showing 3 changed files with 105 additions and 183 deletions.
diff --git a/ClipOne/html/js/main.js b/ClipOne/html/js/main.js
@@ -179,11 +179,11 @@ function trSelect(event) {
 	if (!isShiftPressed) {
 		selectItem(index);
 	}
-	if (clipObj[index].Type == "image") {
-		previewTimeout = setTimeout(function () {
-			preview(clipObj[index].ClipValue);
-		}, 500);
-	}
+	//if (clipObj[index].Type == "image") {
+	//	previewTimeout = setTimeout(function () {
+	//		preview(clipObj[index].ClipValue);
+	//	}, 500);
+	//}
 }
 
 //反选
@@ -272,9 +272,9 @@ function displayData() {
 			}
 			if (clipObj[i].Type == "image") {
 
-				trs = " <tr style='cursor: default' index='" + i + "' id='tr" + matchCount + "' onmouseup ='mouseup(this)'  onmouseenter='trSelect(this)' onmouseleave='trUnselect()'> <td  class='td_content' > <img class='image' src='../" + clipObj[i].DisplayValue + "' /> </td><td class='td_index'  >" + num + "</td> </tr>";
+				trs = " <tr style='cursor: default' index='" + i + "' id='tr" + matchCount + "' onmouseup ='mouseup(this)'  onmouseenter='trSelect(this)' )'> <td  class='td_content' > <img class='image' src='../" + clipObj[i].DisplayValue + "' /> </td><td class='td_index'  >" + num + "</td> </tr>";
 			} else {  
-				trs = " <tr style='cursor: default' index='" + i + "' id='tr" + matchCount + "' onmouseup ='mouseup(this)'  onmouseenter='trSelect(this)' onmouseleave='trUnselect()'> <td  class='td_content' > " + clipObj[i].DisplayValue + " </td><td class='td_index'  >" + num + "</td> </tr>";
+				trs = " <tr style='cursor: default' index='" + i + "' id='tr" + matchCount + "' onmouseup ='mouseup(this)'  onmouseenter='trSelect(this)' '> <td  class='td_content' > " + clipObj[i].DisplayValue + " </td><td class='td_index'  >" + num + "</td> </tr>";
 
 			}
 		}
@@ -452,7 +452,7 @@ function pasteValueByRange(startIndex, endIndex) {
 		return;
     }
 
-	window.external.notify("PasteValueList:" + encodeURIComponent(JSON.stringify(obj)));
+	window.external.notify("PasteValueList:" + encodeURIComponent(JSON.stringify(clipList)));
 
     displayData();
 }
@@ -468,17 +468,7 @@ function changeWindowHeight(height) {
 	window.external.notify("ChangeWindowHeight:" + height);
 }
 
-//预览
-function preview(path) {
-
-	window.external.notify("Preview:" + path);
-}
-
-//隐藏预览
-function hidePreview() {
-
-	window.external.notify("HidePreview:" + "11");
-}
+
 function hideUi(){
 	//scrollTop();
 }

diff --git a/ClipOne/service/ClipService.cs b/ClipOne/service/ClipService.cs
@@ -153,13 +153,14 @@ public static void SetValueToClipboard(ClipModel result)
             {
                 try
                 {
+
                     IDataObject data = new DataObject(DataFormats.Text, result.ClipValue);
 
                     System.Windows.Forms.Clipboard.SetDataObject(data, false);
 
                 }
                 catch (Exception e){
-                     
+                    //Console.WriteLine(e.StackTrace);
                 }
             }
         }