Merge branches 'develop_PDFReaderProNew' and 'develop_PDFReaderProNew' of git.kdan.cc:Mac_PDF/PDF_Office into develop_PDFReaderProNew

PDF Office/PDF Master/Class/Batch/Data/KMBatchOperateFile.swift

@@ -14,8 +14,8 @@ import Cocoa
     var outputFilePath: String = ""
     lazy var sizeString: String = {
         let attributes = try? FileManager.default.attributesOfItem(atPath: self.filePath)
-        let fileSize = attributes?[FileAttributeKey.size] as? Float ?? 0
-        let _sizeString = self.fileSizeString(fSize: fileSize)
+        let fileSize: Int = attributes?[FileAttributeKey.size] as! Int
+        let _sizeString = self.fileSizeString(fSize: Float(fileSize))
         return _sizeString
     }()
     var fileType: KMBatchOperateFileType?

PDF Office/PDF Master/Class/PDFTools/Convert/NewController/Common/KMPDFConvert.swift

@@ -274,11 +274,11 @@ class KMPDFConvert: Operation {
             return
         }
         
-        if self.convertType == .csv && isExtractTable{
+        if self.convertType == .csv /*&& isExtractTable*/{
             self.converter = CPDFConverterCsv.init(url: URL(fileURLWithPath: filePath), password: self.password)
             self.converter.delegate = self
             let options = CPDFConvertCsvOptions()
- 
+            options.isAILayoutAnalysis = isExtractTable
             self.converter.convert(toFilePath: self.outputFilePath, pageIndexs: self.pages, options: options)
             return
         }