Browse Source

【综合】转档窗口UI问题修复

tangchao 1 year ago
parent
commit
03690f5b3a

+ 2 - 1
PDF Office/PDF Master/Class/PDFTools/Convert/View/KMConvertWordSettingView.swift

@@ -50,7 +50,8 @@ class KMConvertWordSettingView: KMConvertSettingView {
         
         self.tipView?.km_add_left_constraint(constant: 8)
         self.tipView?.km_add_top_constraint(equalTo: self.pageRangeBox, attribute: .bottom, constant: -5)
-        self.tipView?.km_add_right_constraint()
+//        self.tipView?.km_add_right_constraint()
+        self.tipView?.km_add_width_constraint(constant: 300)
         self.tipView?.km_add_height_constraint(constant: 16+20+16)
     }
     

+ 17 - 4
PDF Office/PDF Master/Class/PDFWindowController/ViewController/KMMainViewController+Action.swift

@@ -2367,10 +2367,23 @@ extension KMMainViewController : KMMainToolbarControllerDelegate {
         Task { @MainActor in
             if (type == .compress) { /// 压缩
                 if await (KMLightMemberManager.manager.canPayFunction() == false) {
-                    guard let _url = KMTools.saveWatermarkDocumentToTemp(document: self.listView.document, secureOptions: self.secureOptions, removePWD: self.removeSecureFlag) else {
-                        return
-                    }
-                    self.showCompressWindow(url: _url)
+//                    self.view.window?.contentView?.superview?.beginLoading()
+                    let document = self.listView.document
+                    let secureOptions = self.secureOptions
+                    let removeSecureFlag = self.removeSecureFlag
+                    
+//                    DispatchQueue.global().async { [unowned self] in
+                        guard let _url = KMTools.saveWatermarkDocumentToTemp(document: document!, secureOptions: secureOptions, removePWD: removeSecureFlag) else {
+//                            DispatchQueue.main.async {
+//                                self.view.window?.contentView?.superview?.endLoading()
+//                            }
+                            return
+                        }
+//                        DispatchQueue.main.async {
+//                            self.view.window?.contentView?.superview?.endLoading()
+                            self.showCompressWindow(url: _url)
+//                        }
+//                    }
                     return
                 }