Sfoglia il codice sorgente

fix: 一轮QA测试修复

wzl 1 anno fa
parent
commit
024afe9d8b

+ 1 - 0
packages/webview/src/components/Dialogs/DeletePageDialog.vue

@@ -56,6 +56,7 @@ const handleDelete = async () => {
 
       svg {
         margin-right: 8px;
+        min-width: 20px;
         width: 20px;
         height: 20px;
       }

+ 1 - 1
packages/webview/src/components/Dialogs/ExtractPageSettingDialog.vue

@@ -2,7 +2,7 @@
   <div class="extract-page-setting-popup" v-if="show">
     <Dialog :show="show" :dialogName="dialogName" :close="false">
       <template #header>
-        <p>Extract</p>
+        <p>{{ $t('documentEditor.extract') }}</p>
       </template>
 
       <p class="title">{{ $t('documentEditor.dialog.pageRange') }}</p>

+ 6 - 2
packages/webview/src/components/DocumentEditorContainer/DocumentEditorContainer.vue

@@ -34,7 +34,10 @@
         <MovePage />
         <span>{{ $t('documentEditor.move') }}</span>
       </Button>
-      <Button class="select-all" @click="selectAll"><SelectAll /></Button>
+      <Button class="select-all" @click="selectAll">
+        <UnselectAll v-if="selectedPageList.length === pageList.length" />
+        <SelectAll v-else />
+      </Button>
     </div>
 
     <!-- 页面展示 -->
@@ -170,13 +173,14 @@ const handleInsertPage = async (data) => {
     operation.file = data.file
     operation.range = data.range
     
+    const { width, height } = imgBoxEl.value[0].getBoundingClientRect()
+
     const totalPages = await core.saveDocumentEdit(operation)
     const oldLenth = pageList.length
     for (let i = 0; i < totalPages - oldLenth; i++) {
       pageList.splice(data.place + i, 0, { type: 'page' })
     }
 
-    const { width, height } = imgBoxEl.value[0].getBoundingClientRect()
     const pageSize = {
       width,
       height

+ 7 - 1
packages/webview/src/components/DocumentEditorHeader/DocumentEditorHeader.vue

@@ -20,6 +20,13 @@ const useViewer = useViewerStore()
 const useDocument = useDocumentStore()
 
 const docEditorOperationList = computed(() => useDocument.getDocEditorOperationList)
+const toolMode = computed(() => useViewer.getToolMode)
+
+watch(toolMode, (newToolMode, oldToolMode) => {
+  if (oldToolMode === 'document') {
+    useDocument.setDocEditorOperationList('reset')
+  }
+})
 
 const cancel = () => {
   useDocument.setToolState('')
@@ -38,7 +45,6 @@ const save = async () => {
   const { newUrl } = await core.saveDocumentEdit()
   
   useDocument.setCurrentPdfData(newUrl)
-  useDocument.setDocEditorOperationList('reset')
   const totalPages = core.getPagesCount()
   useDocument.setTotalPages(totalPages)
   useDocument.setOutline(core.getOutlines())

+ 7 - 0
packages/webview/src/components/Icon/UnselectAll.vue

@@ -0,0 +1,7 @@
+<template>
+  <svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <g id="toolbar / pageedit / unselect">
+      <path id="Union" fill-rule="evenodd" clip-rule="evenodd" d="M17.5 2.5H6.5V13.5H17.5V2.5ZM6.5 1H5V2.5V2.9342H2H1.25V3.6842V18V18.75H2H16.3158H17.0658V18V15H17.5H19V13.5V2.5V1H17.5H6.5ZM2.75 4.4342H5V13.5V15H6.5H15.5658V17.25H2.75V4.4342ZM8 8.75H16V7.25H8V8.75Z" fill="currentColor"/>
+    </g>
+  </svg>
+</template>

+ 1 - 0
packages/webview/src/stores/modules/document.js

@@ -271,6 +271,7 @@ export const useDocumentStore = defineStore({
       this.outlines = []
       this.activeOutlineId = null
       this.searchResults = []
+      this.docEditorOperationList = []
     },
     setTotalPages (totalPages) {
       this.totalPages = totalPages