Merge branch 'dev' of http://192.168.1.41:3000/maixinrong/Calculation into dev

app/public/js/global.js

@@ -21,7 +21,7 @@ function autoFlashHeight(){
     $(".sjs-height-0").height($(window).height()-cHeader-90+53);
     $(".sjs-height-1").height($(window).height()-cHeader-bcontent-90+53);
     $(".sjs-height-2").height($(window).height()-cHeader-sBarz-120);
-    $(".sjs-height-3").height($(window).height()-cHeader-sBar-492+25);/*492*/
+    $(".sjs-height-3").height($(window).height()-cHeader-sBar-492+25+150);/*492*/
     $(".sjs-height-4").height($(window).height()-cHeader-pBarz-110+75);
     $(".sjs-height-5").height($(window).height()-cHeader-sBar-492+55);/*492*/
     $(".sjs-height-6").height($(window).height()-cHeader-34-sBar1);

app/public/js/stage.js

@@ -3064,8 +3064,6 @@ $(document).ready(() => {
                     $('.zhongjian-msg').height($('#zhongjian .sjs-bottom').height());
                 } else {
                     detail.spread.refresh();
-                    $('#zhongjian .sjs-bottom').height('400px');
-                    $('.zhongjian-msg').height($('#zhongjian .sjs-bottom').height());
                 }
             }
             if (tab.attr('content') === '#checked-change') {

sql/update.sql

@@ -0,0 +1,2 @@
+ALTER TABLE `zh_s2b_proj`
+ADD COLUMN `common_option`  text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '通用配置' AFTER `dagl_option`;