qiushang 1 rok pred
rodič
commit
b095863106

+ 4 - 4
package.json

@@ -1,15 +1,15 @@
 {
 	"name": "XYPdf",
-	"version": "2.0.0.0",
+	"version": "2.1.0.0",
 	"author": "苏州星优办公软件有限公司",
 	"description": "An electron-vue project",
-	"license": "pdf",
+	"license": "watermark",
 	"main": "./dist/electron/main.js",
 	"softInfo": {
 		"description": "这里是软件描述文档",
-		"downloadName": "XYPdf",
+		"downloadName": "XYWatermark",
 		"softMid": "q2ab1F6Bo3w8",
-		"softName": "星优PDF工具箱",
+		"softName": "星优水印处理器",
 		"copyright": "苏州星优办公软件有限公司",
 		"popupAdvId": "28",
 		"linkId": "28",

+ 2 - 2
src/renderer/components/header.vue

@@ -3,8 +3,8 @@
 		<div style="-webkit-app-region: drag;height:45px;line-height: 45px;">
 			<div class="soft-head">
 				<p class="soft-name">
-					<!-- <img src="../assets/image/icon.png" class="soft-icon" />
-					<span style="letter-spacing: 2px;">{{productName}}</span> -->
+					<img src="../assets/image/icon.png" class="soft-icon" />
+					<span style="letter-spacing: 2px;">{{productName}}</span>
 				</p>
 				<div style="-webkit-app-region:no-drag">
 					<div>

+ 7 - 8
src/renderer/components/home.vue

@@ -5,8 +5,8 @@
 				<soft-header ref="headerRef" @update-soft="updateSoft()" @export-file="exportFile"></soft-header>
 			</el-header>
 			<el-main ref="el-main" style="background-color: #fafafa;">
-				<div v-if="!menuIndex" style="padding: 30px 40px 0;">
-					<div class="cmenu-item">
+				<div v-if="!menuIndex" style="padding: 30px 80px 0;">
+					<div class="cmenu-item" style="padding-top: 20vh;">
 						<el-row :gutter="40">
 							<el-col :span="8">
 								<div class="citem-nav" @click="menuIndex = '1'">
@@ -42,17 +42,16 @@
 								@click="clearList()">清空列表</el-button>
 						</el-button-group>
 						<el-row type="flex" class="row-bg">
-							<el-col :span="1" style="text-align: right;">
-								<el-button style="margin-top: 8px;" type="danger" size="mini"
-									icon="el-icon-arrow-left" circle @click="menuIndex=''"></el-button>
-							</el-col>
-							<el-col :span="23" style="padding: 0 15px;">
+							<div>
+								<el-button style="margin-top: 8px;" type="danger" size="mini" icon="el-icon-s-home" circle @click="menuIndex=''"></el-button>
+							</div>
+							<div style="padding: 0 20px;">
 								<el-tabs v-model="menuIndex">
 									<el-tab-pane label="图片水印" name="1"></el-tab-pane>
 									<el-tab-pane label="PDF水印" name="2"></el-tab-pane>
 									<el-tab-pane label="视频水印" name="3"></el-tab-pane>
 								</el-tabs>
-							</el-col>
+							</div>
 						</el-row>
 						
 					</div>

+ 26 - 26
yarn.lock

@@ -244,9 +244,9 @@
   integrity sha512-nG96G3Wp6acyAgJqGasjODb+acrI7KltPiRxzHPXnP3NgI28bpQDRv53olbqGXbfcgF5aiiHmO3xpwEpS5Ld9g==
 
 "@types/node@*":
-  version "20.14.8"
-  resolved "https://registry.npmmirror.com/@types/node/-/node-20.14.8.tgz#45c26a2a5de26c3534a9504530ddb3b27ce031ac"
-  integrity sha512-DO+2/jZinXfROG7j7WKFn/3C6nFwxy2lLpgLjEXJz+0XKphZlTLJ14mo8Vfg8X5BWN6XjyESXq+LcYdT7tR3bA==
+  version "20.14.10"
+  resolved "https://registry.npmmirror.com/@types/node/-/node-20.14.10.tgz#a1a218290f1b6428682e3af044785e5874db469a"
+  integrity sha512-MdiXf+nDuMvY0gJKxyfZ7/6UFsETO7mGKF54MVD/ekJS6HdFtpZFBgrh6Pseu64XTb2MLyFPlbW6hj8HYRQNOQ==
   dependencies:
     undici-types "~5.26.4"
 
@@ -2341,14 +2341,14 @@ caniuse-api@^1.5.2:
     lodash.uniq "^4.5.0"
 
 caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639:
-  version "1.0.30001636"
-  resolved "https://registry.npmmirror.com/caniuse-db/-/caniuse-db-1.0.30001636.tgz#bfd2d63edb974a9379558f8f8f666fc8bd77d9ba"
-  integrity sha512-7FWgXF1302ING0IRtWeWAEmHIwEFhUZTrKJ2gN1NeqalM5SmAe86718jXR6jih+5Tbp5NIzPhJovE6MXLeQ4Sw==
+  version "1.0.30001640"
+  resolved "https://registry.npmmirror.com/caniuse-db/-/caniuse-db-1.0.30001640.tgz#015fca756dd25eb256c68b009af2d75780b09d2c"
+  integrity sha512-K8/5iWoH/NULlqJz/iaopQJraQCHGcFGvs8dmTpAH7GyvoQu2Xq8ht3jq2c+wNck4bgQu/PHu2GN2mJfUj9qtw==
 
 caniuse-lite@^1.0.30000844:
-  version "1.0.30001636"
-  resolved "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001636.tgz#b15f52d2bdb95fad32c2f53c0b68032b85188a78"
-  integrity sha512-bMg2vmr8XBsbL6Lr0UHXy/21m84FTxDLWn2FSqMd5PrlbMxwJlQnC2YWYxVgp66PZE+BBNF2jYQUBKCo1FDeZg==
+  version "1.0.30001640"
+  resolved "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001640.tgz#32c467d4bf1f1a0faa63fc793c2ba81169e7652f"
+  integrity sha512-lA4VMpW0PSUrFnkmVuEKBUovSWKhj7puyCg8StBChgu298N1AtuF1sKWEvfDuimSEDbhlb/KqPKC3fs1HbuQUA==
 
 caseless@~0.12.0:
   version "0.12.0"
@@ -3700,9 +3700,9 @@ electron-store@^2.0.0:
     conf "^2.0.0"
 
 electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.47:
-  version "1.4.811"
-  resolved "https://registry.npmmirror.com/electron-to-chromium/-/electron-to-chromium-1.4.811.tgz#031c8b101e7d0a7cde1dfdb0623dbdb5e19655cd"
-  integrity sha512-CDyzcJ5XW78SHzsIOdn27z8J4ist8eaFLhdto2hSMSJQgsiwvbv2fbizcKUICryw1Wii1TI/FEkvzvJsR3awrA==
+  version "1.4.818"
+  resolved "https://registry.npmmirror.com/electron-to-chromium/-/electron-to-chromium-1.4.818.tgz#7762c8bfd15a07c3833b7f5deed990e9e5a4c24f"
+  integrity sha512-eGvIk2V0dGImV9gWLq8fDfTTsCAeMDwZqEPMr+jMInxZdnp9Us8UpovYpRCf9NQ7VOFgrN2doNSgvISbsbNpxA==
 
 electron@6.0.0:
   version "6.0.0"
@@ -7147,7 +7147,7 @@ picocolors@^0.2.1:
   resolved "https://registry.npmmirror.com/picocolors/-/picocolors-0.2.1.tgz#570670f793646851d1ba135996962abad587859f"
   integrity sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==
 
-picocolors@^1.0.0:
+picocolors@^1.0.0, picocolors@^1.0.1:
   version "1.0.1"
   resolved "https://registry.npmmirror.com/picocolors/-/picocolors-1.0.1.tgz#a8ad579b571952f0e5d25892de5445bcfe25aaa1"
   integrity sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==
@@ -7529,12 +7529,12 @@ postcss@^7.0.36:
     source-map "^0.6.1"
 
 postcss@^8.4.14:
-  version "8.4.38"
-  resolved "https://registry.npmmirror.com/postcss/-/postcss-8.4.38.tgz#b387d533baf2054288e337066d81c6bee9db9e0e"
-  integrity sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==
+  version "8.4.39"
+  resolved "https://registry.npmmirror.com/postcss/-/postcss-8.4.39.tgz#aa3c94998b61d3a9c259efa51db4b392e1bde0e3"
+  integrity sha512-0vzE+lAiG7hZl1/9I8yzKLx3aR9Xbof3fBHKunvMfOCYAtMhrsnccJY2iTURb9EZd5+pLuiNV9/c/GZJOHsgIw==
   dependencies:
     nanoid "^3.3.7"
-    picocolors "^1.0.0"
+    picocolors "^1.0.1"
     source-map-js "^1.2.0"
 
 prepend-http@^1.0.0:
@@ -7688,9 +7688,9 @@ qs@6.11.0:
     side-channel "^1.0.4"
 
 qs@^6.11.2:
-  version "6.12.1"
-  resolved "https://registry.npmmirror.com/qs/-/qs-6.12.1.tgz#39422111ca7cbdb70425541cba20c7d7b216599a"
-  integrity sha512-zWmv4RSuB9r2mYQw3zxQuHWeU+42aKi1wWig/j4ele4ygELZ7PEO6MM7rim9oAQH2A5MWfsAVf/jPvTPgCbvUQ==
+  version "6.12.2"
+  resolved "https://registry.npmmirror.com/qs/-/qs-6.12.2.tgz#5443b587f3bf73ac68968de491e5b25bafe04478"
+  integrity sha512-x+NLUpx9SYrcwXtX7ob1gnkSems4i/mGZX5SlYxwIau6RrUSODO89TR/XDGGpn5RPWSYIB+aSfuSlV5+CmbTBg==
   dependencies:
     side-channel "^1.0.6"
 
@@ -9660,9 +9660,9 @@ vuex@^3.0.1:
   integrity sha512-ETW44IqCgBpVomy520DT5jf8n0zoCac+sxWnn+hMe/CzaSejb/eVw2YToiXYX+Ex/AuHHia28vWTq4goAexFbw==
 
 vxe-table@^3.7.9:
-  version "3.8.8"
-  resolved "https://registry.npmmirror.com/vxe-table/-/vxe-table-3.8.8.tgz#e04c673603d05cec9983f912834723cab4cba104"
-  integrity sha512-uwf/BBkUasMem1iUphaeZy5eKwDyAWLLQbaGH7H51u3MXTQsmHMQd9x03qlLdiLpdVDkez9B36eyjNJu05V77Q==
+  version "3.8.10"
+  resolved "https://registry.npmmirror.com/vxe-table/-/vxe-table-3.8.10.tgz#765f96697c5936b3db7a2696e31f7a80ef319d62"
+  integrity sha512-S5Mi51rFDoFIUMELmIlpyZDdYHaqO+Hn3pHtcO1s9dnLk6JVdNuKJGt1DZaoNlncBuqGvVSo+W2T/BdJ2MN9PA==
   dependencies:
     dom-zindex "^1.0.4"
     xe-utils "^3.5.26"
@@ -9974,9 +9974,9 @@ xdg-basedir@^4.0.0:
   integrity sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==
 
 xe-utils@^3.5.19, xe-utils@^3.5.26:
-  version "3.5.27"
-  resolved "https://registry.npmmirror.com/xe-utils/-/xe-utils-3.5.27.tgz#81a4b7fbdd601b9f8daf4bd140c303f79ce515e6"
-  integrity sha512-qn303MEL90Fn+1BGAfwmz+ot/3klNc9OgX3HBO5TPKHLLl+/zhfH+zrCOi7QIhvzaRiv63SSUhQE4Z1lTwmAuw==
+  version "3.5.28"
+  resolved "https://registry.npmmirror.com/xe-utils/-/xe-utils-3.5.28.tgz#f6fa54f43ca2ec8f13c35f4b5691e5b32f365bb9"
+  integrity sha512-oeLLJ0b54QdOSSgYQ9TiKW/xAGrc9r0weCA/5UfyGdm3n3js4cNOuuf9Tml7UwgBQpl4uWMbMwUZKLh2yqPF3A==
 
 xml-char-classes@^1.0.0:
   version "1.0.0"