qiushang 2 meses atrás
pai
commit
9947d4cf4f
4 arquivos alterados com 26 adições e 9 exclusões
  1. 3 3
      nsis/test.nsi
  2. 1 1
      package.json
  3. 9 0
      src/main/index.js
  4. 13 5
      src/renderer/components/home.vue

+ 3 - 3
nsis/test.nsi

@@ -1,16 +1,16 @@
 # ====================== 自定义宏 产品信息==============================
 !define PRODUCT_MID        		    "EkoFCqqaUJXy"
-!define PRODUCT_VERSION        		"2.0.5.0"
+!define PRODUCT_VERSION        		"2.0.5.1"
 !define PRODUCT_NAME           		"星优视频解析下载器"
 !define INSTALL_OUTPUT_NAME    		"XYCaptureVideo_XY.exe" 
 !define EXE_NAME               		"XYCaptureVideo.exe"
 !define PRODUCT_PATHNAME           	"XYCaptureVideo"     #安装卸载项用到的KEY,注册表
 !define INSTALL_APPEND_PATH         "XYCaptureVideo"     #安装路径追加的名称 
-!define APP_DOWNLOAD_URL    		"https://xy.xingyousoft.com/soft/XYCaptureVideo/lastest2.0.5.0.7z"
+!define APP_DOWNLOAD_URL    		"https://xy.xingyousoft.com/soft/XYCaptureVideo/lastest2.0.5.1.7z"
 !define PRODUCT_PUBLISHER      	    "苏州星优办公软件有限公司"
 !define PRODUCT_LEGAL          	    "苏州星优办公软件有限公司"
 !define STATISTICS_url              "https://www.xingyousoft.com/api/index/user_log"   # 统计网址
-!define UNINSTALL_url               "https://xy.xingyousoft.com/soft/XYCaptureVideo/uninstallWeb/?v=2.0.5.0"   # 接卸优惠网址
+!define UNINSTALL_url               "https://xy.xingyousoft.com/soft/XYCaptureVideo/uninstallWeb/?v=2.0.5.1"   # 接卸优惠网址
 
 # ====================== 自定义宏 安装信息==============================
 !define INSTALL_7Z_NAME 	   		"app.7z"

+ 1 - 1
package.json

@@ -1,6 +1,6 @@
 {
 	"name": "XYCaptureVideo",
-	"version": "2.0.5.0",
+	"version": "2.0.5.1",
 	"author": "苏州星优办公软件有限公司",
 	"description": "An electron-vue project",
 	"license": "captureVideo",

+ 9 - 0
src/main/index.js

@@ -201,6 +201,15 @@ ipcMain.on('boot', (e, res) => {
 		})
 	}
 })
+ipcMain.on('show-context-menu', (event, elementType) => {
+  const template = [
+    { role: 'cut', label: '剪切' },
+    { role: 'copy', label: '复制' },
+    { role: 'paste', label: '粘贴' }
+  ];
+  const menu = Menu.buildFromTemplate(template);
+  menu.popup(BrowserWindow.fromWebContents(event.sender));
+});
 
 // 接口调用
 for (let k in electronApis) {

+ 13 - 5
src/renderer/components/home.vue

@@ -21,7 +21,7 @@
 									<img src="../assets/image/cctv.png" class="soft-icon" title="cctv" />
 									<img src="../assets/image/56.png" class="soft-icon" title="56视频" />
 									<img src="../assets/image/acfun.png" class="soft-icon" title="acfun" />
-									等多个平台,<span style="color: #F56C6C;">(请使用win7以上系统)</span>
+									等多个平台,<span style="color: #F56C6C;">(不支持win7及win7以下系统)</span>
 									
 									<el-popover placement="bottom" popper-class="popper-open" trigger="hover" content="会员/付费/版权视频不支持下载">
 										<i class="el-icon-info" slot="reference" style="margin-right: 10px; color: #F56C6C;"></i>
@@ -30,7 +30,7 @@
 							</div>
 						
 						<div style="margin-top: 20px;">
-							<el-input type="textarea" :rows="5" placeholder="请输入需要解析的视频地址" v-model="formatUrl"></el-input>
+							<el-input id="aaa" type="textarea" :rows="5" placeholder="请输入需要解析的视频地址" v-model="formatUrl"></el-input>
 							
 							<div class="content-top" style="padding: 10px 0; text-align: center; display: inherit;">
 								<el-button type="danger" @click="startParsing()" :loading="parseLoading">开始解析</el-button>
@@ -186,7 +186,7 @@
 					</div>
 					
 					<el-divider content-position="left">
-						普通下载
+						软件下载
 						<el-popover placement="bottom" popper-class="popper-open" trigger="hover" content="使用软件下载可能会失败,建议使用浏览器/迅雷下载">
 							<i class="el-icon-info" slot="reference" style="margin-left: 10px; color: #F56C6C;"></i>
 						</el-popover>
@@ -220,8 +220,7 @@
 	import puppeteer from 'puppeteer-extra'
 	const axios = require('axios');
 	const StealthPlugin = require('puppeteer-extra-plugin-stealth');
-	const listNameArr = ['douyin','kuaishou','weibo','','','','','', '' ,'common'];
-	import { VxeTooltip } from 'vxe-table';
+	const { ipcRenderer } = require('electron');
 	
 	let separator = '';
 	if (os.platform == 'linux') {
@@ -312,6 +311,12 @@
 			this.$utils.setStorage('headless', 1);
 			this.$utils.setStorage('waitUntil', 'networkidle2');
 			
+			document.getElementById('aaa').addEventListener('contextmenu', e => {
+				e.preventDefault();
+				// 发送事件到主进程,附带元素类型信息
+				ipcRenderer.send('show-context-menu', 'input');
+			});
+			
 		},
 		methods: {
 			// 实时获取开发者设置
@@ -488,6 +493,9 @@
 			async startParsing(){
 				if(this.formatUrl.trim()){
 					let formatUrl = this.formatUrl.trim();
+					if(formatUrl.indexOf('http://') > -1){
+						formatUrl = formatUrl.replace('http://', 'https://');
+					}
 					
 					if(formatUrl.indexOf('https://') == -1){
 						this.$message.error('错了哦,请输入正确的视频地址(https://开头)');