Merge remote-tracking branch 'origin/1.0.0_online' into 1.0.0_online

web/building_saas/report/html/rpt_main.html

@@ -32,7 +32,7 @@
                                 <!--
                                 <button type="button" class="btn btn-outline-primary btn-sm" onclick="rptControlObj.getPDF()"><i class="fa fa-file-pdf-o"></i> PDF <span class="badge badge-secondary">0</span></button>
                                 -->
-                                <button type="button" class="btn btn-outline-primary btn-sm" onclick="rptControlObj.getPDFEx()"><i class="fa fa-file-pdf-o"></i> PDF <span class="badge badge-secondary">0</span></button>
+                                <button type="button" class="btn btn-outline-primary btn-sm" onclick="rptControlObj.getPDFPre()"><i class="fa fa-file-pdf-o"></i> PDF <span class="badge badge-secondary">0</span></button>
                             </div>
                         </div>
                         <div class="panel-foot text-muted">

web/building_saas/report/js/rpt_main.js

@@ -25,8 +25,8 @@ let rptTplObj = {
             if (JpcJsPDFHelper.doc === null) {
                 JpcJsPDFHelper.initialize('p', 'pt', 'a4');
             }
-            dynamicLoadJs('/lib/jspdf/SmartSimsun-normal.js');
-            dynamicLoadJs('/lib/jspdf/SmartSimsun-bold.js', me.pdfFontSimsunCallBack);
+            // dynamicLoadJs('/lib/jspdf/SmartSimsun-normal.js');
+            // dynamicLoadJs('/lib/jspdf/SmartSimsun-bold.js', me.pdfFontSimsunCallBack);
         }
     },
     pdfFontSimsunCallBack: function() {
@@ -510,6 +510,22 @@ let rptControlObj = {
             );
         }
     },
+    getPdfFontCallback: function(fontProperty) {
+        let me = rptControlObj;
+        rptTplObj.pdfFont['SmartSimsun'].push(fontProperty);
+        if (rptTplObj.pdfFont['SmartSimsun'].length === 2) {
+            me.getPDFEx();
+        }
+    },
+    getPDFPre: function () {
+        let me = rptControlObj;
+        if (rptTplObj.pdfFont['SmartSimsun'].length === 2) {
+            me.getPDFEx();
+        } else {
+            dynamicLoadJs('http://d2.smartcost.com.cn/cach/SmartSimsun-normal.js', me.getPdfFontCallback('normal'));
+            dynamicLoadJs('http://d2.smartcost.com.cn/cach/SmartSimsun-bold.js', me.getPdfFontCallback('bold'));
+        }
+    },
     getPDFEx: function () {
         if (zTreeOprObj.checkedRptTplNodes && zTreeOprObj.checkedRptTplNodes.length > 0) {
             let rptIds = [], rpt_names = [];