qiushang 7 mēneši atpakaļ
vecāks
revīzija
379bd11049
1 mainītis faili ar 36 papildinājumiem un 68 dzēšanām
  1. 36 68
      src/renderer/components/home.vue

+ 36 - 68
src/renderer/components/home.vue

@@ -373,7 +373,7 @@
 							<div v-show="menuIndex == '8'">
 								<div class="handle-item" >
 									<label class="handle-label">操作类型:</label>
-									<el-select v-model="mergeData.type" style="width:150px;" size="small" @change="refreshList('change')">
+									<el-select v-model="mergeData.type" style="width:150px;" size="small">
 										<el-option value="merge" label="合并目录"></el-option>
 										<el-option value="extract" label="提取文件"></el-option>
 									</el-select>
@@ -381,80 +381,44 @@
 								
 								<div class="handle-item">
 									<label class="handle-label">保存位置:</label>
-									<el-input :title="mergeData.newPath" ref="upload-merge" size="mini" @focus="pickPath('mergeData', 'upload-merge')" placeholder="请选择保存位置" v-model="mergeData.newPath" readonly style="width:150px;" prefix-icon="el-icon-folder"></el-input>
+									<el-input :title="mergeData.newPath" ref="upload-merge" size="small" @focus="pickPath('mergeData', 'upload-merge')" placeholder="请选择保存位置" v-model="mergeData.newPath" readonly style="width:150px;" prefix-icon="el-icon-folder"></el-input>
 								</div>
 								
-								
-								<el-divider content-position="left">
-									<i class="el-icon-s-tools" style="margin-right: 3px;"></i>参数设置
-								</el-divider>
-								<el-popover placement="left" popper-class="popper-open" trigger="manual" v-model="visible5" content='文件名不能包含下列任何字符: \ / : * ? " < > |'>
-									<i slot="reference"></i>
-								</el-popover>
-								
-								<div class="handle-item" style="text-align: center;">
-									<el-radio-group v-model="foundData.foundMethod" @change="refreshList()">
-										<el-radio label="2">导入创建</el-radio>
-										<el-radio label="1">自定义创建</el-radio>
-									</el-radio-group>
-								</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>
-									</div>
-									
-									<el-popover placement="bottom" popper-class="popper-open" trigger="hover">
-										<img src="../assets/image/f-tips.jpg" style="width: 220px;"/>
-										<div slot="reference" class="i-tips" style="margin-bottom: 10px;">查看文件名填写示例</div>
-									</el-popover>
-								</template>
-								
-								<template v-else>
-									<div class="handle-item" >
-										<label class="handle-label">创建数量:</label>
-										<el-input-number size="small" :min="1" v-model="foundData.foundNumber" @change="refreshList()" style="width: 130px;" controls-position="right"></el-input-number> 个
-									</div>
+								<template v-if="mergeData.type == 'extract'">
 									<div class="handle-item">
-										<label class="handle-label">创建名称:</label>
-										<el-input placeholder="请输入创建名称" @input="inputChange('foundData', 'foundName', 'visible5')" size="small" v-model="foundData.foundName" style="width:150px;"></el-input>
-									</div>
-									<el-divider content-position="left">
-										<i class="el-icon-s-tools" style="margin-right: 3px;"></i>编号设置
-									</el-divider>
-									<div class="handle-item">
-										<label class="handle-label">编号位置:</label>
-										<el-select v-model="foundData.insertPosition" style="width:80px;" size="small" @change="refreshList()">
-											<el-option value="1" label="自定义"></el-option>
-											<el-option value="2" label="文件头"></el-option>
-											<el-option value="3" label="文件尾"></el-option>
+										<label class="handle-label">提取设置:</label>
+										<el-select v-model="mergeData.extractType" style="width:150px;" size="small" >
+											<el-option value="1" 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-select>
-										<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" 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" 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" 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 v-if="mergeData.extractType == '2'">
+										<div class="handle-item">
+											<label class="handle-label">文件类型:</label>
+											<el-select v-model="mergeData.fileType" style="width:150px;" size="small" >
+												<el-option value="1" label="图片"></el-option>
+												<el-option value="2" label="视频"></el-option>
+												<el-option value="3" label="文本"></el-option>
+											</el-select>
+										</div>
+									</template>
+									<template v-if="mergeData.extractType == '3'">
+										<el-divider content-position="left">提取包含以下名称的文件</el-divider>
+										<div class="handle-item">
+											<el-input placeholder="请输入文件名称(模糊搜索)" size="small" v-model="mergeData.fileName" style="width:225px; margin-left: 20px;"></el-input>
+										</div>
+									</template>
+									<template v-if="mergeData.extractType == '4'">
+										<el-divider content-position="left">提取是以下后缀名的文件</el-divider>
+										<div class="handle-item">
+											<el-input placeholder="请输入后缀名(后缀名一致)" size="small" v-model="mergeData.suffixName" style="width:225px; margin-left: 20px;"></el-input>
+										</div>
+									</template>
 								</template>
 								
-								<div class="handle-item" >
-									<label class="handle-label">创建位置:</label>
-									<el-input :title="foundData.newPath" ref="upload-create" @focus="pickPath('foundData', 'upload-create')" 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>
 							</div>
 							
 							<!--创建文件设置 -->
@@ -941,6 +905,10 @@ export default {
 			mergeData: { // 合并设置参数
 				type: 'merge', // 1合并 2提取
 				newPath: '',
+				extractType: '1',
+				fileType: '1',
+				fileName: '',
+				suffixName: '',
 			},
 			
 	        dowloadModel: false,