Merge branch 'master' into olym

public/calc_util.js

@@ -304,7 +304,8 @@ class Calculation {
                 };
 
                 if (item.feeRateID) {
-                    item.feeRate = me.compiledFeeRates["feeRate_" + item.feeRateID].rate;
+                    var cmf = me.compiledFeeRates["feeRate_" + item.feeRateID];
+                    item.feeRate = cmf?cmf.rate:100;
                 };
 
                 // 字段名映射

web/building_saas/main/js/models/fee_rate.js

@@ -143,6 +143,7 @@ var FeeRate = {
             var node = project.mainTree.selected;
             if(node){
                 if (node.sourceType==='ration' && calcProgramObj.sheet) {
+                    project.calcProgram.compileAllTemps();
                     calcProgramObj.showData(node);
                 }
             }

web/building_saas/main/js/views/fee_rate_view.js

@@ -94,10 +94,11 @@ var feeRateObject={
                var selected = feeRateObject.mainViews.getSelections()[0];
                 params.sourceIndex = selected.sourceRow;
             }
+            params.success();
             if(!$('#cascadeSet').prop('checked')||params.hasOwnProperty('viewIndex')){
                 projectObj.project.FeeRate.updateFeeRateByEdit(params,feeRateObject.activateFeeRate);
             }
-            params.success();
+
         }
     },
     createSpreadView:function () {