瀏覽代碼

【综合】批量加密问题修正,批量压缩修复

niehaoyu 9 月之前
父節點
當前提交
b8363ff9d0

+ 1 - 0
PDF Office/PDF Master/Class/Batch/WindowController/VC/KMBatchOperateCompressViewController.swift

@@ -225,6 +225,7 @@ class KMBatchOperateCompressViewController: KMBatchOperateBaseViewController{
                 if file.status == .Waiting {
                     let operation = KMCompressOperation.init(file: file, compressValue: self.currentType)
                     operation.delegate = self
+                    operation.viewController = self
                     self.queue?.addOperation(operation)
                 }
             }

+ 1 - 1
PDF Office/PDF Master/Class/PDFTools/AddPassword/Model/KMBatchAddPasswordOperation.swift

@@ -83,7 +83,7 @@ class KMBatchAddPasswordOperation: KMBatchOperation{
                 attribute.updateValue(self.passwordObj?.theme ?? "", forKey: .subjectAttribute)
             }
             if self.passwordObj?.keyword.count ?? 0 > 0 {
-                attribute.updateValue([self.passwordObj?.keyword], forKey: .keywordsAttribute)
+                attribute.updateValue(self.passwordObj?.keyword ?? "", forKey: .keywordsAttribute)
             }
             self.pdfDocument?.setDocumentAttributes(attribute)
             let isSuccess = self.pdfDocument?.write(toFile: self.operateFile?.addPasswordInfo.fetchDestinationFilepath(), withOptions: options)

+ 4 - 4
PDF Office/PDF Master/Class/PDFTools/AddPassword/VC/KMBatchOperateAddPasswordViewController.swift

@@ -385,13 +385,13 @@ class KMBatchOperateAddPasswordViewController: KMBatchOperateBaseViewController,
         } else if textField.isEqual(self.ownerPasswordTextField) {
             self.passwordObject?.ownerPassword = self.ownerPasswordTextField.stringValue
         } else if textField.isEqual(self.fileTitleTextField) {
-            self.passwordObject?.ownerPassword = self.fileTitleTextField.stringValue
+            self.passwordObject?.title = self.fileTitleTextField.stringValue
         } else if textField.isEqual(self.fileAuthorTextField) {
-            self.passwordObject?.ownerPassword = self.fileAuthorTextField.stringValue
+            self.passwordObject?.author = self.fileAuthorTextField.stringValue
         } else if textField.isEqual(self.fileThemeTextField) {
-            self.passwordObject?.ownerPassword = self.fileThemeTextField.stringValue
+            self.passwordObject?.theme = self.fileThemeTextField.stringValue
         } else if textField.isEqual(self.fileKeywordTextField) {
-            self.passwordObject?.ownerPassword = self.fileKeywordTextField.stringValue
+            self.passwordObject?.keyword = self.fileKeywordTextField.stringValue
         }
         encryptButtonEnabled()
     }