encoding_util.js

config/gulpConfig.js

@@ -81,6 +81,7 @@ module.exports = {
         'web/building_saas/main/js/models/main_consts.js',
         'web/over_write/config/compilation_config.js',
         'public/web/common_util.js',
+        'public/web/encoding_util.js',
         'web/building_saas/glj/js/project_glj.js',
         'web/building_saas/glj/js/composition.js',
         'web/building_saas/glj/js/common_spread.js',

public/common_util.js

@@ -84,20 +84,6 @@ function deleteEmptyObject(arr) {
             return sorted;
         }
     }
-    /**
-     * 根据编码方式获取编码数据
-     * @param {Set} source - 字符串集合数据源
-     * @param {String} encoding - 编码方式
-     */
-    // async 函数打包后会在前端注入var _regenerator = require("babel-runtime/regenerator"),导致报错
-    // 因此用Promise包装
-    function getEncodedData(source, encoding, toBase64 = false) {
-        return new Promise((resolve, reject) => {
-            ajaxPost('/project/getEncodedData', { source, encoding, toBase64 })
-                .then(resolve)
-                .catch(reject);
-        });
-    }
 
     return {
         isDef,
@@ -106,6 +92,5 @@ function deleteEmptyObject(arr) {
         similarEqual,
         getRequired,
         getSortedTreeData,
-        getEncodedData,
     };
 });

public/web/encoding_util.js

@@ -0,0 +1,13 @@
+const encodingUtil = (() => {
+
+    /**
+     * 根据编码方式获取编码数据
+     * @param {Set} source - 字符串集合数据源
+     * @param {String} encoding - 编码方式
+     */
+    async function getEncodedData(source, encoding, toBase64 = false) {
+        return await ajaxPost('/project/getEncodedData', { source, encoding, toBase64 });
+    }
+
+    return { getEncodedData }
+})();

web/building_saas/main/html/main.html

@@ -2462,6 +2462,7 @@
     <script type="text/javascript" src="/web/building_saas/main/js/models/main_consts.js"></script>
     <script type="text/javascript" src="/web/over_write/config/compilation_config.js"></script>
     <script type="text/javascript" src="/public/web/common_util.js"></script>
+    <script type="text/javascript" src="/public/web/encoding_util.js"></script>
     <script type="text/javascript" src="/web/building_saas/glj/js/project_glj.js"></script>
     <script type="text/javascript" src="/web/building_saas/glj/js/composition.js"></script>
     <script type="text/javascript" src="/web/building_saas/glj/js/common_spread.js"></script>

web/over_write/js/guangdong_2018_export.js

@@ -2167,7 +2167,7 @@ const XMLStandard = (function () {
             // 系统信息
             // 软件相关信息进行base64编码(gbk to base64)
             const hardwareID = _util.generateHardwareId();
-            const encodedData = await commonUtil.getEncodedData([projectData.softInfo, hardwareID], 'gbk', true);
+            const encodedData = await encodingUtil.getEncodedData([projectData.softInfo, hardwareID], 'gbk', true);
             const ID1 = encodedData[projectData.softInfo];
             const ID2 = encodedData[hardwareID];
             const systemInfo = new SystemInfo({
@@ -2908,7 +2908,7 @@ const XMLStandard = (function () {
                     return string;
                 }
             });
-            const encodedData = await commonUtil.getEncodedData([...source], 'gbk');
+            const encodedData = await encodingUtil.getEncodedData([...source], 'gbk');
             const zipFile = await zip.generateAsync({
                 type: 'uint8array',
                 encodeFileName: (string) => {