add

src/renderer/components/home.vue

@@ -25,11 +25,26 @@
 						<div class="handle-item">
 							<b>检索类型：</b>
 							<el-select size="mini" style="width: 170px;" v-model="findType" placeholder="请选择检索类型">
-								<el-option value="1" label="按文件名检索"></el-option>
-								<el-option value="5" label="按文件夹名检索"></el-option>
-								<el-option value="2" label="按创建时间检索"></el-option>
-								<el-option value="3" label="按修改时间检索"></el-option>
-								<el-option value="4" label="按文件类型检索"></el-option>
+								<el-option value="1" label="按文件名检索">
+									<img src="../assets/image/file.png" style="width: 20px; vertical-align: middle;"/>
+									<span>按文件名检索</span>
+								</el-option>
+								<el-option value="5" label="按文件夹名检索">
+									<img src="../assets/image/folder.png" style="width: 20px; vertical-align: middle;"/>
+									<span>按文件夹名检索</span>
+								</el-option>
+								<el-option value="2" label="按创建时间检索">
+									<img src="../assets/image/btime.png" style="width: 20px; vertical-align: middle;"/>
+									<span>按创建时间检索</span>
+								</el-option>
+								<el-option value="3" label="按修改时间检索">
+									<img src="../assets/image/mtime.png" style="width: 20px; vertical-align: middle;"/>
+									<span>按修改时间检索</span>
+								</el-option>
+								<el-option value="4" label="按文件类型检索">
+									<img src="../assets/image/filetype.png" style="width: 20px; vertical-align: middle;"/>
+									<span>按文件类型检索</span>
+								</el-option>
 							</el-select>
 						</div>
 						
@@ -51,7 +66,8 @@
 							<el-input class="find-textarea" type="textarea" placeholder="查找文件名清单,多个请换行显示:
 							名称1
 							名称2
-							名称3" v-model="handleData.findText"></el-input>
+							名称3
+							(名称大小写敏感)" v-model="handleData.findText"></el-input>
 						</template>
 						<template v-else-if="findType == '2' || findType == '3'">
 							<div class="handle-item">
@@ -97,7 +113,7 @@
 						</template>
 						
 						<div style="position: relative; margin: 10px 0;" >
-							<el-button type="danger" size="mini" style="position: absolute; right: 0; top: 0;" :loading="searchLoading" @click="search()">搜索</el-button>
+							<el-button type="danger" size="small" style="position: absolute; right: 0; top: 0;" :loading="searchLoading" @click="search()">搜索</el-button>
 						</div>
 					</div>
 					
@@ -766,6 +782,9 @@ export default {
 				}
 				
 				this.tabLoading = true;
+				setTimeout(() => {
+					this.tabLoading = false;
+				}, 2000)
 				
 				setTimeout(() => {
 					for(let i = 0; i < this.fileList.length; i++){
@@ -814,7 +833,6 @@ export default {
 										item.status = '3'
 									}catch(e){
 										let str = e.toString();
-										
 										if(str.indexOf('busy or locked') > -1){
 											this.$notify.error({
 												title: '提示',
@@ -824,19 +842,21 @@ export default {
 										
 										if(str.indexOf('already exists') > -1){
 											newFilePath = newPath + middlePath + item.title + '重复文件' + uuidv4().substr(0, 18) + i.toString() + item.suffix;
-											try{
-												fse.move(item.path, newFilePath).then(() => {
-													item.status = '3';
-												}).catch(err => {
-													item.status = '6';
-												})
-											}catch(e){
-												console.log(e.toString());
-											}
+											fse.move(item.path, newFilePath).then(() => {
+												item.status = '3';
+											}).catch(err => {
+												item.status = '6';
+												let str = err.toString();
+												if(str.indexOf('busy or locked') > -1){
+													this.$notify.error({
+														title: '提示',
+														message: '文件被系统或其他进程占用，无法剪切'+item.path
+													});
+												}
+											})
 											
 										}
 										
-										
 									}
 								}
 								
@@ -879,10 +899,6 @@ export default {
 						}
 					}
 					
-					setTimeout(() => {
-						this.tabLoading = false;
-					}, 500)
-					
 				}, 100);
 				
 			}