build_min调整

app.js

@@ -73,7 +73,12 @@ module.exports = app => {
     });
 
     //压缩前端js
-    app.jsFiles = { common: JsFiles.commonFiles };
+    if (app.config.min) {
+        app.jsFiles = { common: JsFiles.commonFiles };
+        app.jsFiles.common.push('/public/js/web/global' + '.' + app.config.version + '.min.js');
+    } else {
+        app.jsFiles = { common: JsFiles.commonFiles.concat(JsFiles.needMin) };
+    }
     for (const c in JsFiles.controller) {
         const controller = JsFiles.controller[c];
         app.jsFiles[c] = {};

app/const/spread.js

@@ -545,7 +545,6 @@ const blank = {
     font: '12px 微软雅黑',
 };
 
-
 module.exports = {
     withCl,
     withoutCl,

build_min.js

@@ -34,3 +34,10 @@ for (const c in JsFiles.controller) {
     }
 }
 
+let needMinCode = '';
+for (const nm of JsFiles.needMin) {
+    needMinCode = needMinCode + fs.readFileSync(__dirname + '/app' + nm, 'utf8');
+}
+const needMinFileName = __dirname + '/app/public/js/web/global.' + version + '.min.js';
+fs.writeFileSync(needMinFileName, Uglyfy.minify(needMinCode, { mangle: true }).code);
+

config/web.js

@@ -37,18 +37,20 @@ const JsFiles = {
         '/public/js/jquery/jquery-3.2.1.min.js',
         '/public/js/jquery/jquery-ui.js',
         '/public/js/jquery/jquery.validate.js',
-        '/public/js/messages_zh.js',
         '/public/js/popper/popper.min.js',
         '/public/js/bootstrap/bootstrap.min.js',
         '/public/js/vue/vue.min.js',
-        '/public/js/component/input.js',
-        '/public/js/cookies.js',
         '/public/js/jquery-contextmenu/jquery.ui.position.min.js',
         '/public/js/jquery-contextmenu/jquery.contextMenu.min.js',
         '/public/js/lodash.js',
         '/public/js/lz-string/lz-string.js',
         '/public/js/toastr.min.js',
-        '/public/js/global.js',
+    ],
+    needMin: [
+        '/public/js/messages_zh.js',
+        '/public/js/component/input.js',
+        '/public/js/cookies.js',
+        '/public/js/global.js'
     ],
     controller: {
         tender: {
@@ -209,20 +211,6 @@ const JsFiles = {
                 ],
                 mergeFile: 'ledger_gather',
             },
-            revise: {
-                files: ['/public/js/spreadjs/sheets/v11/gc.spread.sheets.all.11.2.2.min.js', '/public/js/decimal.min.js'],
-                mergeFiles: [
-                    '/public/js/sub_menu.js',
-                    '/public/js/div_resizer.js',
-                    '/public/js/spreadjs_rela/spreadjs_zh.js',
-                    '/public/js/shares/cs_tools.js',
-                    '/public/js/zh_calc.js',
-                    '/public/js/path_tree.js',
-                    '/public/js/std_lib.js',
-                    '/public/js/revise.js',
-                ],
-                mergeFile: 'revise',
-            },
         },
         revise: {
             info: {