qiushang 1 year ago
parent
commit
0f5655d6ed
2 changed files with 50 additions and 60 deletions
  1. 1 1
      src/renderer/assets/css/home.scss
  2. 49 59
      src/renderer/components/home.vue

+ 1 - 1
src/renderer/assets/css/home.scss

@@ -216,7 +216,7 @@ div,p{
 	border: 1px dashed #ccc;
 	
 	&:hover{
-		outline: 1px dashed #2d8cf0;
+		border: 1px dashed #2d8cf0;
 	}
 	
 	.file-area-pos{

+ 49 - 59
src/renderer/components/home.vue

@@ -94,11 +94,11 @@
 							</el-popover>
 						</el-button-group>
 						
-						<div>
-							<el-popover v-if="['1','2'].indexOf(menuIndex) > -1" placement="bottom" popper-class="popper-open" trigger="hover" content="命名撤回一次">
-								<i slot="reference" class="el-icon-refresh-left icon-back icon-back-grey" v-if="backFileList.length == 0" ></i>
-								<i slot="reference" class="el-icon-refresh-left icon-back" v-else  @click="back()"></i>
+						<div style="width: 366px; display: flex; justify-content: space-between;align-items: flex-end;">
+							<el-popover v-if="(menuIndex == '1' && fileList.length > 0) || (menuIndex == '2' && dirList.length > 0)" placement="bottom" popper-class="popper-open" trigger="hover" content="命名撤回一次">
+								<el-button slot="reference" type="info" size="mini" @click="back()" :disabled="backFileList.length == 0">撤回</el-button>
 							</el-popover>
+							<div v-else></div>
 							<el-button type="danger" style="margin-left: 20px;" @click="exportFile()" >开始处理</el-button>
 						</div>
 					</div>
@@ -319,7 +319,7 @@
 								<!-- 7、文件批量创建-->
 								<vxe-table
 									v-show="menuIndex == '7'"
-									show-overflow class="img-table" max-height="100%" empty-text="没有更多数据了!" :loading="tabLoading"
+									show-overflow class="img-table" max-height="100%" empty-text="没有数据" :loading="tabLoading"
 									:loading-config="{icon: 'vxe-icon-indicator roll', text: '文件加载中...'}" :row-config="{isHover: true}"
 									:edit-config="{trigger: 'click', mode: 'cell'}" :data="foundList2" :scroll-y="{enabled: true}">
 									<vxe-column field="name" :title="'文件名'+'(' + foundList2.length + ')'"></vxe-column>
@@ -378,7 +378,7 @@
 								<template v-if="foundData.foundType != 'folder'">
 									<div class="handle-item">
 										<label class="handle-label">上传模板:</label>
-										<el-input :title="foundData.sourceFileName" ref="upload-file" @focus="importExample" placeholder="导入文件名(excel)" size="small" v-model="foundData.sourceFileName" readonly style="width:150px;" prefix-icon="el-icon-folder"></el-input>
+										<el-input :title="foundData.sourceFileName" ref="upload-file" @focus="importExample" placeholder="选择文件" size="small" v-model="foundData.sourceFileName" readonly style="width:150px;" prefix-icon="el-icon-folder"></el-input>
 									</div>
 									
 									<div class="eq-tips">不上传模板,默认创建文件内容为空</div>
@@ -399,8 +399,8 @@
 								</div>
 								<template v-if="foundData.foundMethod == '2'" style="margin: 10px auto; text-align: center;">
 									<div class="handle-item">
-										<label class="handle-label">导入文件:</label>
-										<el-input :title="newnamePath" ref="upload-xlsx" @focus="importFoundXlsx" placeholder="导入文件名(excel)" size="small" v-model="newnamePath" readonly style="width:150px;" prefix-icon="el-icon-folder"></el-input>
+										<label class="handle-label">导入名称:</label>
+										<el-input :title="newnamePath" ref="upload-xlsx" @focus="importFoundXlsx" placeholder="excel格式" size="small" v-model="newnamePath" readonly style="width:150px;" prefix-icon="el-icon-folder"></el-input>
 									</div>
 									
 									<el-popover placement="bottom" popper-class="popper-open" trigger="hover">
@@ -431,32 +431,26 @@
 										<el-input-number v-if="foundData.insertPosition == '1'"  size="small" :min="1" v-model="foundData.insertNo" @change="refreshList()" style="width: 80px;" controls-position="right"></el-input-number>
 									</div>
 									<div class="handle-item" >
-										<label class="handle-label">起始:</label>
-										<el-input-number size="small" :min="0" v-model="foundData.startNumber" @change="refreshList()" style="width: 100px;" controls-position="right"></el-input-number>
-										<el-popover placement="bottom" popper-class="popper-open" trigger="hover" content="第一位编号的值">
-											<i slot="reference" class="el-icon-question"></i>
-										</el-popover>
+										<label class="handle-label" style="width: 50px;">起始:</label>
+										<el-input-number size="small" :min="0" v-model="foundData.startNumber" @change="refreshList()" style="width: 90px;" controls-position="right"></el-input-number>
+										<span class="i-desc">(第一位编号的值)</span>
 									</div>
 									<div class="handle-item" >
-										<label class="handle-label">增量:</label>
-										<el-input-number size="small" v-model="foundData.increment" @change="refreshList()" style="width: 100px;" controls-position="right"></el-input-number>
-										<el-popover placement="bottom" popper-class="popper-open" trigger="hover" content="后一位编号增加的值">
-											<i slot="reference" class="el-icon-question"></i>
-										</el-popover>
+										<label class="handle-label" style="width: 50px;">增量:</label>
+										<el-input-number size="small" v-model="foundData.increment" @change="refreshList()" style="width: 90px;" controls-position="right"></el-input-number>
+										<span class="i-desc">(后一位编号增加的值)</span>
 									</div>
 									<div class="handle-item" >
-										<label class="handle-label">位数:</label>
-										<el-input-number size="small" :min="1" v-model="foundData.digit" @change="refreshList()" style="width: 100px;" controls-position="right"></el-input-number>
-										<el-popover placement="bottom" popper-class="popper-open" trigger="hover" content="例:0068的编号位数为4">
-											<i slot="reference" class="el-icon-question"></i>
-										</el-popover>
+										<label class="handle-label" style="width: 50px;">位数:</label>
+										<el-input-number size="small" :min="1" v-model="foundData.digit" @change="refreshList()" style="width: 90px;" controls-position="right"></el-input-number>
+										<span class="i-desc">(0068的编号位数为4)</span>
 									</div>
 								</template>
 								
 								<div class="handle-item" >
-									<label class="handle-label">导出目录:</label>
-									<el-input :title="foundData.newPath" ref="upload-input" @focus="pickPath('foundData')" placeholder="请选择输出目录" size="small" v-model="foundData.newPath" readonly style="width:150px; font-size: 12px;" prefix-icon="el-icon-folder"></el-input>
-									<el-popover placement="bottom" popper-class="popper-open" trigger="hover" content="打开保存目录">
+									<label class="handle-label">创建位置:</label>
+									<el-input :title="foundData.newPath" ref="upload-input" @focus="pickPath('foundData')" placeholder="请选择创建位置" size="small" v-model="foundData.newPath" readonly style="width:150px; font-size: 12px;" prefix-icon="el-icon-folder"></el-input>
+									<el-popover placement="bottom" popper-class="popper-open" trigger="hover" content="打开创建目录">
 									    <i class="el-icon-folder-opened" slot="reference" style="width: 18px;cursor: pointer; font-size: 22px; vertical-align: middle;" @click="openFolder('foundData')"></i>
 									</el-popover>
 								</div>
@@ -475,13 +469,13 @@
 									<el-checkbox v-model="extractData.includeSuffix">包含扩展名</el-checkbox>
 								</div>
 								<div class="handle-item">
-									<el-checkbox v-model="extractData.includePath">提取文件路径</el-checkbox>
+									<el-checkbox v-model="extractData.includePath">提取文件{{menuIndex == '6' ? '夹' : ''}}路径</el-checkbox>
 								</div>
 								<div class="handle-item">
-									<el-checkbox v-model="extractData.includeBtime">提取文件创建时间</el-checkbox>
+									<el-checkbox v-model="extractData.includeBtime">提取文件{{menuIndex == '6' ? '夹' : ''}}创建时间</el-checkbox>
 								</div>
 								<div class="handle-item">
-									<el-checkbox v-model="extractData.includeMtime">提取文件修改时间</el-checkbox>
+									<el-checkbox v-model="extractData.includeMtime">提取文件{{menuIndex == '6' ? '夹' : ''}}修改时间</el-checkbox>
 								</div>
 								
 								<el-divider content-position="left"><i class="el-icon-s-tools" style="margin-right: 3px;"></i>导出设置</el-divider>
@@ -497,9 +491,9 @@
 								<div class="handle-item" >
 									<label class="handle-label">导出格式:</label>
 									<el-select v-model="extractData.exportSuffix" style="width:150px;" size="small">
-										<el-option value="xlsx" label="xlsx"></el-option>
-										<el-option value="docx" label="docx"></el-option>
-										<el-option value="txt" label="txt"></el-option>
+										<el-option value="xlsx" label="excel表格"></el-option>
+										<el-option value="docx" label="word文档"></el-option>
+										<el-option value="txt" label="txt文本"></el-option>
 									</el-select>
 								</div>
 								<div class="handle-item" >
@@ -538,7 +532,7 @@
 										<el-option value="3" label="插入"></el-option>
 										<el-option value="4" label="删除"></el-option>
 										<!-- <el-option value="5" label="时间属性"></el-option> -->
-										<el-option value="6" label="导入表格"></el-option>
+										<el-option value="6" label="导入命名"></el-option>
 										<el-option value="7" label="一键删除"></el-option>
 										<el-option value="8" label="时间命名"></el-option>
 									</el-select>
@@ -621,9 +615,9 @@
 								<!-- 6、导入表格 -->
 								<template v-if="handleData.fileMethod == '6'">
 									<div class="handle-item">
-										<label class="handle-label">上传文件:</label>
-										<el-input v-if="menuIndex == '1'" :title="filexlsxPath" ref="upload-input" @focus="importXlsx" placeholder="导入文件名(excel)" size="small" v-model="filexlsxPath" readonly style="width:150px;" prefix-icon="el-icon-folder"></el-input>
-										<el-input v-if="menuIndex == '2'" :title="dirxlsxPath" ref="upload-input" @focus="importXlsx" placeholder="导入文件名(excel)" size="small" v-model="dirxlsxPath" readonly style="width:150px;" prefix-icon="el-icon-folder"></el-input>
+										<label class="handle-label">导入名称:</label>
+										<el-input v-if="menuIndex == '1'" :title="filexlsxPath" ref="upload-input" @focus="importXlsx" placeholder="excel格式" size="small" v-model="filexlsxPath" readonly style="width:150px;" prefix-icon="el-icon-folder"></el-input>
+										<el-input v-if="menuIndex == '2'" :title="dirxlsxPath" ref="upload-input" @focus="importXlsx" placeholder="excel格式" size="small" v-model="dirxlsxPath" readonly style="width:150px;" prefix-icon="el-icon-folder"></el-input>
 										
 										<el-popover placement="bottom" popper-class="popper-open" trigger="hover">
 											<img src="../assets/image/a-tips.jpg" style="width: 260px;"/>
@@ -680,25 +674,19 @@
 								<template v-if="handleData.fileMethod == '1' || (handleData.fileMethod == '3' && handleData.fileInsertType == '2')">
 									<el-divider content-position="left"><i class="el-icon-medal-1" style="margin-right: 3px;"></i>编号设置</el-divider>
 									<div class="handle-item" >
-										<label class="handle-label">起始:</label>
-										<el-input-number size="small" :min="0" v-model="handleData.startNumber" @change="setChange" style="width: 100px;" controls-position="right"></el-input-number>
-										<el-popover placement="bottom" popper-class="popper-open" trigger="hover" content="第一位编号的值">
-											<i slot="reference" class="el-icon-question"></i>
-										</el-popover>
+										<label class="handle-label" style="width: 50px;">起始:</label>
+										<el-input-number size="small" :min="0" v-model="handleData.startNumber" @change="setChange" style="width: 80px;" controls-position="right"></el-input-number>
+										<span class="i-desc">(第一位编号的值)</span>
 									</div>
 									<div class="handle-item" >
-										<label class="handle-label">增量:</label>
-										<el-input-number size="small" v-model="handleData.increment" @change="setChange" style="width: 100px;" controls-position="right"></el-input-number>
-										<el-popover placement="bottom" popper-class="popper-open" trigger="hover" content="后一位编号增加的值">
-											<i slot="reference" class="el-icon-question"></i>
-										</el-popover>
+										<label class="handle-label" style="width: 50px;">增量:</label>
+										<el-input-number size="small" v-model="handleData.increment" @change="setChange" style="width: 80px;" controls-position="right"></el-input-number>
+										<span class="i-desc">(后一位编号增加的值)</span>
 									</div>
 									<div class="handle-item" >
-										<label class="handle-label">位数:</label>
-										<el-input-number size="small" :min="1" v-model="handleData.digit" @change="setChange" style="width: 100px;" controls-position="right"></el-input-number>
-										<el-popover placement="bottom" popper-class="popper-open" trigger="hover" content="例:0068的编号位数为4">
-											<i slot="reference" class="el-icon-question"></i>
-										</el-popover>
+										<label class="handle-label" style="width: 50px;">位数:</label>
+										<el-input-number size="small" :min="1" v-model="handleData.digit" @change="setChange" style="width: 80px;" controls-position="right"></el-input-number>
+										<span class="i-desc">(0068的编号位数为4)</span>
 									</div>
 								</template>
 								
@@ -841,9 +829,9 @@ export default {
 			
 			extractData: { // 导出格式设置
 				includeSuffix: true,
-				includeMtime: true,
-				includeBtime: true,
-				includePath: true,
+				includeMtime: false,
+				includeBtime: false,
+				includePath: false,
 				timeStyle: 'yyyy/mm/dd hh:mm:ss',
 				newPath: '',
 				fileName: '文件名提取',
@@ -935,11 +923,13 @@ export default {
 		// 打开自定义目录
 		openFolder(str){
 			let path = str == 'foundData' ? this.downloadFoundDir : this.downloadDir;
-			if(fs.existsSync(path + separator + pjson.softInfo.softName)){
-				path = path + separator + pjson.softInfo.softName;
-			} else {
-				fs.mkdirSync(path + separator + pjson.softInfo.softName);
-				path = path + separator + pjson.softInfo.softName;
+			if(str == 'extractData'){
+				if(fs.existsSync(path + separator + pjson.softInfo.softName)){
+					path = path + separator + pjson.softInfo.softName;
+				} else {
+					fs.mkdirSync(path + separator + pjson.softInfo.softName);
+					path = path + separator + pjson.softInfo.softName;
+				}
 			}
 			electronApi.call('showItemInfolder',[path+'\\tty.tty'])
 		},