add

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "XYPdf",
-	"version": "2.1.0.0",
+	"version": "2.0.0.0",
 	"author": "苏州星优办公软件有限公司",
 	"description": "An electron-vue project",
 	"license": "pdf",
@@ -9,7 +9,7 @@
 		"description": "这里是软件描述文档",
 		"downloadName": "XYPdf",
 		"softMid": "q2ab1F6Bo3w8",
-		"softName": "星优PDF工厂",
+		"softName": "星优PDF工具箱",
 		"copyright": "苏州星优办公软件有限公司",
 		"popupAdvId": "28",
 		"linkId": "28",

src/renderer/assets/css/home.scss

@@ -253,7 +253,7 @@ div,p{
   justify-content: space-between;
   width: 100%;
   padding: 10px;
-  height: calc(100% - 182px);
+  height: calc(100% - 122px);
 }
 
 .img-footer-area{

src/renderer/components/home.vue

@@ -6,7 +6,7 @@
 				<el-aside width="180px" style="border-right: 1px solid #fafafa; background-color: #333744;">
 					<p class="soft-name" style="-webkit-app-region: drag; color: #fff;">
 						<img src="../assets/image/icon.png" class="soft-icon" />
-						<span style="letter-spacing: 2px;">{{productName}}</span>
+						<span style="letter-spacing: 1px;">{{productName}}</span>
 					</p>
 					<el-menu :default-active="menuIndex" class="xy-menu" active-text-color="#409EFF" background-color="#333744" text-color="#fff" style="margin-top: 10px;">
 						<el-menu-item index="1" @click="setMenuIndex(1)">
@@ -190,40 +190,7 @@
 						</template>
 
 						<template v-else>
-							<el-row type="flex" class="row-bg">
-								<el-col :span="1" style="text-align: right;">
-									<el-button style="margin-top: 8px;" type="primary" size="mini"
-										icon="el-icon-s-home" circle @click="activeName='';menuIndex='1'"></el-button>
-								</el-col>
-								<el-col :span="23" style="padding: 0 15px;">
-									<el-tabs v-model="activeName" v-if="activeName.split('-')[0] == '2'">
-										<el-tab-pane label="WORD转PDF" name="2-1"></el-tab-pane>
-										<el-tab-pane label="PPT转PDF" name="2-2"></el-tab-pane>
-										<el-tab-pane label="EXCEL转PDF" name="2-3"></el-tab-pane>
-										<el-tab-pane label="图片转PDF" name="2-4"></el-tab-pane>
-									</el-tabs>
-
-									<el-tabs v-model="activeName" v-if="activeName.split('-')[0] == '1'">
-										<el-tab-pane label="PDF转WORD" name="1-1"></el-tab-pane>
-										<el-tab-pane label="PDF转PPT" name="1-2"></el-tab-pane>
-										<el-tab-pane label="PDF转EXCEL" name="1-3"></el-tab-pane>
-										<el-tab-pane label="PDF转TXT" name="1-4"></el-tab-pane>
-										<el-tab-pane label="PDF转图片" name="1-5"></el-tab-pane>
-										<el-tab-pane label="PDF转HTML" name="1-6"></el-tab-pane>
-									</el-tabs>
-
-									<el-tabs v-model="activeName" v-if="activeName.split('-')[0] == '3'">
-										<el-tab-pane label="PDF加密" name="3-3"></el-tab-pane>
-										<el-tab-pane label="PDF解密" name="3-4"></el-tab-pane>
-										<el-tab-pane label="PDF合并" name="3-2"></el-tab-pane>
-										<el-tab-pane label="PDF分割" name="3-1"></el-tab-pane>
-										<el-tab-pane label="PDF压缩" name="3-5"></el-tab-pane>
-										<el-tab-pane label="PDF提取页面" name="3-6"></el-tab-pane>
-										<el-tab-pane label="PDF提取图片" name="3-7"></el-tab-pane>
-										<el-tab-pane label="PDF页面删除" name="3-8"></el-tab-pane>
-									</el-tabs>
-								</el-col>
-							</el-row>
+							
 
 							<div class="content-top">
 								<el-button-group>
@@ -235,6 +202,41 @@
 										@click="clearList()">清空列表</el-button>
 								</el-button-group>
 								
+								<el-row type="flex" class="row-bg" style="width: calc(100% - 350px);">
+									<el-col :span="1" style="text-align: right;">
+										<el-button style="margin-top: 8px;" type="primary" size="mini"
+											icon="el-icon-s-home" circle @click="activeName='';menuIndex='1'"></el-button>
+									</el-col>
+									<el-col :span="23" style="padding: 0 15px;">
+										<el-tabs v-model="activeName" v-if="activeName.split('-')[0] == '2'">
+											<el-tab-pane label="WORD转PDF" name="2-1"></el-tab-pane>
+											<el-tab-pane label="PPT转PDF" name="2-2"></el-tab-pane>
+											<el-tab-pane label="EXCEL转PDF" name="2-3"></el-tab-pane>
+											<el-tab-pane label="图片转PDF" name="2-4"></el-tab-pane>
+										</el-tabs>
+								
+										<el-tabs v-model="activeName" v-if="activeName.split('-')[0] == '1'">
+											<el-tab-pane label="PDF转WORD" name="1-1"></el-tab-pane>
+											<el-tab-pane label="PDF转PPT" name="1-2"></el-tab-pane>
+											<el-tab-pane label="PDF转EXCEL" name="1-3"></el-tab-pane>
+											<el-tab-pane label="PDF转TXT" name="1-4"></el-tab-pane>
+											<el-tab-pane label="PDF转图片" name="1-5"></el-tab-pane>
+											<el-tab-pane label="PDF转HTML" name="1-6"></el-tab-pane>
+										</el-tabs>
+								
+										<el-tabs v-model="activeName" v-if="activeName.split('-')[0] == '3'">
+											<el-tab-pane label="PDF加密" name="3-3"></el-tab-pane>
+											<el-tab-pane label="PDF解密" name="3-4"></el-tab-pane>
+											<el-tab-pane label="PDF合并" name="3-2"></el-tab-pane>
+											<el-tab-pane label="PDF分割" name="3-1"></el-tab-pane>
+											<el-tab-pane label="PDF压缩" name="3-5"></el-tab-pane>
+											<el-tab-pane label="PDF提取页面" name="3-6"></el-tab-pane>
+											<el-tab-pane label="PDF提取图片" name="3-7"></el-tab-pane>
+											<el-tab-pane label="PDF页面删除" name="3-8"></el-tab-pane>
+										</el-tabs>
+									</el-col>
+								</el-row>
+								
 							</div>
 
 							<div v-if="activeName && this[listStr+'List'].length == 0" class="upload-area">
@@ -245,7 +247,7 @@
 										<img src="../assets/image/pdf-excel.png" v-if="activeName == '1-3'" style="width: 220px;"/>
 										<img src="../assets/image/pdf-txt.png" v-if="activeName == '1-4'" style="width: 220px;"/>
 										<img src="../assets/image/pdf-img.png" v-if="activeName == '1-5'" style="width: 220px;"/>
-										<img src="../assets/image/pdf-img.png" v-if="activeName == '1-6'" style="width: 220px;"/>
+										<img src="../assets/image/pdf-html.png" v-if="activeName == '1-6'" style="width: 220px;"/>
 										
 										<img src="../assets/image/word-pdf.png" v-if="activeName == '2-1'" style="width: 220px;"/>
 										<img src="../assets/image/ppt-pdf.png" v-if="activeName == '2-2'" style="width: 220px;"/>
@@ -269,7 +271,7 @@
 								<div class="content-left">
 									<div class="table-scroll" @dragover.prevent @drop="handleDrop">
 										
-										<vxe-table v-show="['1-1','1-2','1-3','1-4','1-5','1-6','3-6','3-7'].indexOf(activeName) > -1"
+										<vxe-table v-show="['1-1','1-2','1-3','1-4','1-5','1-6','3-6','3-7','3-8'].indexOf(activeName) > -1"
 										 show-overflow class="img-table" max-height="100%" empty-text="没有更多数据了！" :row-config="{isHover: true}"
 										:edit-config="{trigger: 'click', mode: 'cell'}" :data="this[listStr + 'List']" :scroll-y="{enabled: true}">
 											<vxe-column field="name" title="文件名"></vxe-column>
@@ -277,7 +279,7 @@
 											<vxe-column field="totalPages" title="总页数" width="100"></vxe-column>
 											<vxe-column field="progress" title="页码" width="180">
 												<template #default="{ row, rowIndex }">
-													<el-button size="small" type="warning" @click="selectPageNum(rowIndex)" v-if="!row.selectPages || row.selectPages.length == 0">全部页码</el-button>
+													<el-button size="small" type="warning" @click="selectPageNum(rowIndex)" v-if="!row.selectPages || row.selectPages.length == 0">{{activeName == '3-8' ? '删除页码' : '全部页码'}}</el-button>
 													<el-button size="small" type="warning" @click="selectPageNum(rowIndex)" v-else>{{row.selectPages.join(',')}}</el-button>
 												</template>
 											</vxe-column>
@@ -286,14 +288,14 @@
 													<el-progress :text-inside="true" :stroke-width="20" :percentage="row.percent"></el-progress>
 												</template>
 											</vxe-column>
-											<vxe-column title="操作" width="80">
+											<vxe-column title="操作" width="100">
 												<template #default="{ row, rowIndex }">
 													<i class="el-icon-delete cur-pointer" @click="delFile(rowIndex)"></i>
 												</template>
 											</vxe-column>
 										</vxe-table>
 										
-										<vxe-table v-show="['1-1','1-2','1-3','1-4','1-5','1-6','3-6','3-7'].indexOf(activeName) == -1" show-overflow class="img-table" max-height="100%" empty-text="没有更多数据了！" :row-config="{isHover: true}"
+										<vxe-table v-show="['1-1','1-2','1-3','1-4','1-5','1-6','3-6','3-7','3-8'].indexOf(activeName) == -1" show-overflow class="img-table" max-height="100%" empty-text="没有更多数据了！" :row-config="{isHover: true}"
 										:edit-config="{trigger: 'click', mode: 'cell'}" :data="this[listStr + 'List']" :scroll-y="{enabled: true}">
 											<vxe-column field="name" title="文件名"></vxe-column>
 											<vxe-column field="size" title="大小" width="120"></vxe-column>
@@ -302,9 +304,11 @@
 													<el-progress :text-inside="true" :stroke-width="20" :percentage="row.percent"></el-progress>
 												</template>
 											</vxe-column>
-											<vxe-column title="操作" width="80">
+											<vxe-column title="操作" width="100">
 												<template #default="{ row, rowIndex }">
-													<i class="el-icon-delete cur-pointer" @click="delFile(rowIndex)"></i>
+													<el-button v-if="activeName == '3-2'" @click="fileSort('up', rowIndex);" :disabled="rowIndex == 0 ? true : false" class="sort-btn" type="primary" icon="el-icon-upload2" size="mini" title="上移"></el-button>
+													<el-button v-if="activeName == '3-2'" style="margin-left: 0;" @click="fileSort('down', rowIndex);" :disabled="rowIndex == fileList.length - 1 ? true : false" class="sort-btn" type="primary" icon="el-icon-download" size="mini" title="下移"></el-button>
+													<i class="el-icon-delete cur-pointer" @click="delFile(rowIndex)" style="font-size: 18px; vertical-align:text-bottom;"></i>
 												</template>
 											</vxe-column>
 										</vxe-table>
@@ -349,14 +353,14 @@
 										
 										<template v-if="handleData.imgContact == '2'">
 											<label class="handle-label">合并名称：</label>
-											<el-input placeholder="合并名称" size="mini" v-model="handleData.contactImgname" style="width:150px;"></el-input>.pdf
+											<el-input placeholder="合并名称" size="mini" v-model="handleData.contactImgname" style="width:150px;"></el-input> .pdf
 										</template>
 									</div>
 									
 									<!-- 3-2 pdf合并 -->
 									<div class="handle-item" v-if="activeName == '3-2'">
 										<label class="handle-label">合并名称：</label>
-										<el-input placeholder="合并名称" size="mini" v-model="handleData.contactName" style="width:150px;"></el-input>.pdf
+										<el-input placeholder="合并名称" size="mini" v-model="handleData.contactName" style="width:150px;"></el-input> .pdf
 									</div>
 									
 									<!-- 3-3 加密/解密 -->
@@ -595,8 +599,8 @@
 					cancelButtonText: '取消',
 					type: 'warning'
 				}).then(() => {
-					this[this.activeName.split('-')[0] + 'List'].splice(index, 1);
-					if (this[this.activeName.split('-')[0] + 'List'].length ==0) {
+					this[this.listStr + 'List'].splice(index, 1);
+					if (this[this.listStr + 'List'].length == 0) {
 						this.clearList();
 					}
 				}).catch(() => {
@@ -1524,11 +1528,6 @@
 			},
 			//文件排序
 			fileSort(type, index){
-				this.fileList.map((item, index) => {
-					if(item._highlight){
-						item._highlight = false;
-					}
-				})
 				if(type == "up"){
 					let temp = JSON.parse(JSON.stringify(this.fileList[index]));
 					let temp2 = JSON.parse(JSON.stringify(this.fileList[index - 1]));
@@ -1617,7 +1616,7 @@
 	}
 
 	.handle-label {
-		vertical-align: top;
+		// vertical-align: top;
 	}
 
 	.handle-desc {
@@ -1726,4 +1725,17 @@
 			color: #f73131;
 		}
 	}
+	
+	.sort-btn{
+		padding: 5px !important;
+	}
+	
+	.el-tabs__header{
+		margin: 0 !important;
+	}
+	
+	i.el-icon-arrow-right, i.el-icon-arrow-left{
+		font-size: 16px;
+		font-weight: 600;
+	}
 </style>