Browse Source

BUG #3439 - step 1

Tony Kang 2 years atrás
parent
commit
d57c80ca85
2 changed files with 15 additions and 0 deletions
  1. 8 0
      app/public/jspdf/SmartSimsun-normal2.js
  2. 7 0
      app/public/report/js/rpt_main.js

File diff suppressed because it is too large
+ 8 - 0
app/public/jspdf/SmartSimsun-normal2.js


+ 7 - 0
app/public/report/js/rpt_main.js

@@ -34,6 +34,7 @@ let rptTplObj = {
             indexDbOprObj.iniDb('tmpForPDF', 2);
 
             // dynamicLoadJs('/public/jspdf/SmartSimsun-normal.js');
+            // dynamicLoadJs('/public/jspdf/SmartSimsun-normal2.js');
             // dynamicLoadJs('/public/jspdf/SmartSimsun-bold.js', me.pdfFontSimsunCallBack);
         }
     },
@@ -914,8 +915,11 @@ let rptControlObj = {
         let me = rptControlObj;
         me.isLoading = true;
         // dynamicLoadJs('/public/jspdf/SmartSimsun-normal.js', 'normal', me.getPdfFontCallbackLight);
+        // dynamicLoadJs('/public/jspdf/SmartSimsun-normal2.js', 'normal', me.getPdfFontCallbackLight);
         // dynamicLoadJs('/public/jspdf/SmartSimsun-bold.js', 'bold', me.getPdfFontCallbackLight);
+        
         dynamicLoadJs('https://d2.smartcost.com.cn/cach/SmartSimsun-normal.js', 'normal', me.getPdfFontCallbackLight);
+        // dynamicLoadJs('https://d2.smartcost.com.cn/cach/SmartSimsun-normal2.js', 'normal', me.getPdfFontCallbackLight);
         dynamicLoadJs('https://d2.smartcost.com.cn/cach/SmartSimsun-bold.js', 'bold', me.getPdfFontCallbackLight);
     },
     getPDFPre: function () {
@@ -931,8 +935,11 @@ let rptControlObj = {
             } else {
                 $.bootstrapLoading.start();
                 // dynamicLoadJs('/public/jspdf/SmartSimsun-normal.js',"normal", me.getPdfFontCallback);
+                // dynamicLoadJs('/public/jspdf/SmartSimsun-normal2.js',"normal", me.getPdfFontCallback);
                 // dynamicLoadJs('/public/jspdf/SmartSimsun-bold.js',"bold", me.getPdfFontCallback);
+                
                 dynamicLoadJs('https://d2.smartcost.com.cn/cach/SmartSimsun-normal.js', 'normal', me.getPdfFontCallback);
+                // dynamicLoadJs('https://d2.smartcost.com.cn/cach/SmartSimsun-normal2.js', 'normal', me.getPdfFontCallback);
                 dynamicLoadJs('https://d2.smartcost.com.cn/cach/SmartSimsun-bold.js', 'bold', me.getPdfFontCallback);
             }
         }