add

nsis/test.nsi

@@ -1,16 +1,16 @@
 # ====================== 自定义宏 产品信息==============================
 !define PRODUCT_MID        		    "JyW8sIXfYSbu"
-!define PRODUCT_VERSION        		"2.0.5.1"
+!define PRODUCT_VERSION        		"2.1.0.0"
 !define PRODUCT_NAME           		"星优文件检索大师"
 !define INSTALL_OUTPUT_NAME    		"XYFile_XY.exe" 
 !define EXE_NAME               		"XYFile.exe"
 !define PRODUCT_PATHNAME           	"XYFile"     #安装卸载项用到的KEY，注册表
 !define INSTALL_APPEND_PATH         "XYFile"     #安装路径追加的名称 
-!define APP_DOWNLOAD_URL    		"https://xy.xingyousoft.com/soft/XYFile/lastest2.0.5.1.7z"
+!define APP_DOWNLOAD_URL    		"https://xy.xingyousoft.com/soft/XYFile/lastest2.1.0.0.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/XYFile/uninstallWeb/?v=2.0.5.1"   # 接卸优惠网址
+!define UNINSTALL_url               "https://xy.xingyousoft.com/soft/XYFile/uninstallWeb/?v=2.1.0.0"   # 接卸优惠网址
 
 # ====================== 自定义宏 安装信息==============================
 !define INSTALL_7Z_NAME 	   		"app.7z"

package.json

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

src/renderer/components/home.vue

@@ -49,17 +49,12 @@
 						</div>
 						
 						<template v-if="findType == '1' || findType == '5'">
-							<b>检索方式：</b>
-							<el-select size="mini" style="width: 170px;" v-model="handleData.rule" placeholder="请选择检索方式">
+							<!-- <b>检索方式：</b> -->
+							<!-- <el-select size="mini" style="width: 170px;" v-model="handleData.rule" placeholder="请选择检索方式">
 								<el-option value="1" label="精确(名称相同)"></el-option>
 								<el-option value="2" label="模糊(包含名称)"></el-option>
 								<el-option value="3" label="精确到格式(名称和后缀都相同)"></el-option>
-							</el-select>
-							<!-- <el-radio-group class="line-radio" v-model="handleData.rule" size="mini">
-								<el-radio label="1">精确(文件名相同)</el-radio>
-								<el-radio label="2">模糊(包含文件名)</el-radio>
-								<el-radio label="3">精确到格式(文件名和后缀都相同)</el-radio>
-							</el-radio-group> -->
+							</el-select> -->
 							<div class="handle-item" style="margin-bottom: 5px;">
 								<p><b>文件名检索清单：</b><span style="color: #F56C6C; font-size: 12px;">(一行填一个,首尾空格清除)</span></p>
 							</div>
@@ -112,8 +107,16 @@
 							</el-popover>
 						</template>
 						
-						<div style="position: relative; margin: 10px 0;" >
+						<div style="position: relative; margin-top: 10px;" >
 							<el-button type="danger" size="small" style="position: absolute; right: 0; top: 0;" :loading="searchLoading" @click="search()">搜索</el-button>
+							<template v-if="findType == '1' || findType == '5'">
+								<b>检索方式：</b>
+								<el-radio-group class="line-radio" v-model="handleData.rule" size="mini">
+									<el-radio label="1">精确(文件名相同)</el-radio>
+									<el-radio label="2">模糊(包含文件名)</el-radio>
+									<el-radio label="3">精确到格式(文件名和后缀都相同)</el-radio>
+								</el-radio-group>
+							</template>
 						</div>
 					</div>
 					
@@ -135,7 +138,7 @@
 								<vxe-column field="match" title="匹配词" v-if="findType == '1' || findType == '5'" width="150" min-width="120" align="center"></vxe-column>
 								<vxe-column field="rangeTime" title="时间" v-else-if="findType == '2' || findType == '3'" width="150" min-width="120" align="center"></vxe-column>
 								<vxe-column field="match" title="类型" v-else-if="findType == '4'" width="150" min-width="120" align="center"></vxe-column>
-								<vxe-column field="path" title="文件位置/名称">
+								<vxe-column field="path" title="位置/名称">
 									<template #default="{ row }">
 										<img v-if="row.isDirectory" src="../assets/image/folder.png" style="width: 20px; vertical-align: middle;"/>
 										<img v-else src="../assets/image/file.png" style="width: 20px; vertical-align: middle;"/>
@@ -529,9 +532,13 @@ export default {
 						}
 						let res = '';
 						if(this.findType == '1'){
-							res = regExp.exec(filename);
-							if(!res){
-								res = regExp2.exec(filename);
+							if(this.handleData.rule == '3'){
+								res = filename;
+							}else{
+								res = regExp.exec(filename);
+								if(!res || res == ''){
+									res = regExp2.exec(filename);
+								}
 							}
 						}
 						
@@ -711,7 +718,7 @@ export default {
 		exportXlsx(){
 			this.xlsxLoading = true;
 			let filename = '文件检索结果' + new Date().getTime() +'.xlsx';
-			let sheet1 = [['编号','匹配词','文件位置/名称','类型']];
+			let sheet1 = [['编号','匹配词','位置/名称','类型']];
 			let sheet2 = [];
 			
 			let findText = this.handleData.findText.split('\n');
@@ -1173,7 +1180,7 @@ export default {
 	}
 	
 	.find-textarea{
-		height: calc(100% - 160px);
+		height: calc(100% - 195px);
 		
 		textarea{
 			height: 100%;