Browse Source

fix: 三轮测试修复

wzl 6 months ago
parent
commit
02e1160cbf

+ 3 - 1
packages/core/src/index.js

@@ -3933,8 +3933,10 @@ class ComPDFKitViewer {
       })
       const newUrl = URL.createObjectURL(blobData)
       const filename = this._docName
+      const pageNumber = this.page
       await this.loadDocument(newUrl, { filename, notUpdatePwd: true })
-      this.eventBus.dispatch('onPagesUpdated')
+      this.page = pageNumber
+      this.eventBus.dispatch('onPagesUpdated', { pageNumber })
       URL.revokeObjectURL(blobData)
     } else {
       await this.messageHandler.sendWithPromise('UpdateSignatureAP', {

File diff suppressed because it is too large
+ 4 - 9
packages/core/src/worker/compdfkit_worker.js


+ 1 - 1
packages/webview/locales/en.json

@@ -306,7 +306,7 @@
       "title": "Add a Digital ID",
       "desc": "Browse a digital ID file. Digital IDs are password-protected. If you do not know the password, you cannot obtain a digital ID.",
       "certificateFile": "Certificate File",
-      "uploadFile": "Upload your certificate file",
+      "uploadFile": "Upload certificate file",
       "upload": "Upload",
       "password": "Password",
       "enterPassword": "Enter the password of the certificate file",

+ 1 - 1
packages/webview/locales/zh-CN.json

@@ -306,7 +306,7 @@
       "title": "添加数字身份证",
       "desc": "浏览数字身份证文件。数字身份证受密码保护。如果你不知道密码,你就无法获取数字身份证。",
       "certificateFile": "证书文件",
-      "uploadFile": "上传你的证书文件",
+      "uploadFile": "上传证书文件",
       "upload": "浏览",
       "password": "证书密码",
       "enterPassword": "请输入证书密码",

+ 2 - 3
packages/webview/src/components/AnnotationContainer/AnnotationContent.vue

@@ -308,6 +308,8 @@ const addReply = () => {
 // 编辑回复
 const editReply = () => {
   showReplyInput.value = false
+  showReplyPopover.value = false
+
   if (editing.value && editingReplyText.value !== selectedReply.value.contents) {
     const data = {
       type: 'edit',
@@ -330,8 +332,6 @@ const editReply = () => {
       inputElement.setSelectionRange(inputElement.value.length, inputElement.value.length)
     })
   }
-  
-  showReplyPopover.value = false
 }
 
 // 删除回复
@@ -574,7 +574,6 @@ const findNewObject = (oldData, newData) => {
           margin-right: 8px;
           font-size: 12px;
           line-height: 16px;
-          color: #999;
           cursor: pointer;
         }
 

+ 3 - 0
packages/webview/src/components/Dialogs/AddDigitalFileDialog.vue

@@ -137,6 +137,9 @@ const uploadFile = () => {
 
 const handleFile = (e) => {
   const file = e.target.files[0]
+  const extension = file?.name.split('.').pop().toLowerCase()
+  if (extension !== 'pfx' && extension !== 'p12') return
+
   inputFile.value = file
   uploadFileEl.value.value = ''
 }

+ 6 - 3
packages/webview/src/components/DocumentContainer/DocumentContainer.vue

@@ -126,7 +126,8 @@ function onDoubleClick() {
   core.scaleChanged(newScale / 100)
 }
 
-function onSingleClick() {
+function onSingleClick(e) {
+  if (e.target.nodeName === 'A') return
   const currentTime = new Date().getTime()
   if (currentTime - lastClickTime < 300) {
     onDoubleClick() // 如果在 300ms 内点击两次,视为双击
@@ -253,12 +254,13 @@ window.instance.initOptions = async (options) => {
     useViewer.setUpload(false)
   }
 
-  core.addEvent('onPagesUpdated', () => {
+  core.addEvent('onPagesUpdated', (data) => {
+    const { pageNumber } = data
     useDocument.setOutline(core.getOutlines())
     const totalPages = core.getPagesCount()
     const scale = core.getScale()
     useDocument.setTotalPages(totalPages)
-    useViewer.setCurrentPage(1)
+    useViewer.setCurrentPage(pageNumber || 1)
     useViewer.setCurrentScale(scale)
 
     const scrollMode = useViewer.getScrollMode
@@ -746,6 +748,7 @@ window.instances.UI.loadDocument = async (file, {
     border: none;
     background-color: var(--c-findbar-input-bg);
     color: var(--c-findbar-text);
+    font-size: 16px;
   }
 
   .toolbarLabel {

+ 1 - 0
packages/webview/src/components/FindbarContainer/FindbarHeader.vue

@@ -146,6 +146,7 @@ function download(blobUrl, filename) {
       border: none;
       background-color: var(--c-findbar-input-bg);
       color: var(--c-findbar-text);
+      font-size: 16px;
     }
     .empty-input {
       position: absolute;

+ 8 - 8
packages/webview/src/components/StampPanel/StampPanel.vue

@@ -31,22 +31,22 @@
       <!-- Standard -->
       <div class="standard-container" :class="{ hidden: activePanelTab !== 'STANDARD' }">
         <div class="block"><img @click="addStamp" src="/images/stamp/Approved.png" alt="Approved"></div>
-        <div class="block"><img @click="addStamp" src="/images/stamp/NotApproved.png" alt="NotApproved"></div>
+        <div class="block"><img @click="addStamp" src="/images/stamp/NotApproved.png" alt="Not Approved"></div>
         <div class="block"><img @click="addStamp" src="/images/stamp/Completed.png" alt="Completed"></div>
         <div class="block"><img @click="addStamp" src="/images/stamp/Final.png" alt="Final"></div>
         <div class="block"><img @click="addStamp" src="/images/stamp/Draft.png" alt="Draft"></div>
         <div class="block"><img @click="addStamp" src="/images/stamp/Confidential.png" alt="Confidential"></div>
-        <div class="block"><img @click="addStamp" src="/images/stamp/ForPublicRelease.png" alt="ForPublicRelease"></div>
-        <div class="block"><img @click="addStamp" src="/images/stamp/NotForPublicRelease.png" alt="NotForPublicRelease"></div>
-        <div class="block"><img @click="addStamp" src="/images/stamp/ForComment.png" alt="ForComment"></div>
+        <div class="block"><img @click="addStamp" src="/images/stamp/ForPublicRelease.png" alt="For Public Release"></div>
+        <div class="block"><img @click="addStamp" src="/images/stamp/NotForPublicRelease.png" alt="Not For Public Release"></div>
+        <div class="block"><img @click="addStamp" src="/images/stamp/ForComment.png" alt="For Comment"></div>
         <div class="block"><img @click="addStamp" src="/images/stamp/Void.png" alt="Void"></div>
-        <div class="block"><img @click="addStamp" src="/images/stamp/PreliminaryResults.png" alt="PreliminaryResults"></div>
-        <div class="block"><img @click="addStamp" src="/images/stamp/InformationOnly.png" alt="InformationOnly"></div>
+        <div class="block"><img @click="addStamp" src="/images/stamp/PreliminaryResults.png" alt="Preliminary Results"></div>
+        <div class="block"><img @click="addStamp" src="/images/stamp/InformationOnly.png" alt="Information Only"></div>
         <!-- <div class="block"><img @click="addStamp" src="/images/stamp/Accepted.png" alt="Accepted"></div> -->
         <!-- <div class="block"><img @click="addStamp" src="/images/stamp/Rejected.png" alt="Rejected"></div> -->
         <div class="block"><img @click="addStamp" src="/images/stamp/Witness.png" alt="Witness"></div>
-        <div class="block"><img @click="addStamp" src="/images/stamp/InitialHere.png" alt="InitialHere"></div>
-        <div class="block"><img @click="addStamp" src="/images/stamp/SignHere.png" alt="SignHere"></div>
+        <div class="block"><img @click="addStamp" src="/images/stamp/InitialHere.png" alt="Initial Here"></div>
+        <div class="block"><img @click="addStamp" src="/images/stamp/SignHere.png" alt="Sign Here"></div>
         <div class="block"><img @click="addStamp" src="/images/stamp/revised.png" alt="revised"></div>
         <!-- <div class="block"><img @click="addStamp" src="/images/stamp/PrivateMark1.png" alt="PrivateMark#1"></div> -->
         <!-- <div class="block"><img @click="addStamp" src="/images/stamp/PrivateMark2.png" alt="PrivateMark#2"></div> -->

+ 1 - 1
packages/webview/src/components/Toolbar/Toolbar.vue

@@ -219,7 +219,7 @@ const clickUpload = () => {
   }
 }
 
-@media screen and (max-width: 530px) {
+@media screen and (max-width: 672px) {
   .toolbar {
     &.security,
     &.editor {