浏览代码

feat: 首次打开页面时,不重复刷新表格

zhangweicheng 4 年之前
父节点
当前提交
eb48d5a04d

+ 4 - 4
web/building_saas/main/js/views/glj_col.js

@@ -261,7 +261,7 @@ let gljCol = {
             setting.view.lockColumns = newArray;
         }
     },
-    initGljCol: function (showAdjustPrice, showTenderFields) {
+    initGljCol: function (showAdjustPrice, showTenderFields,init=false) {
       let me = gljCol;
       if (showAdjustPrice !== true) {
         me.removeCol('adjustPrice', me.ration_glj_setting);
@@ -274,7 +274,7 @@ let gljCol = {
         me.removeCol('priceFrom', me.project_glj_setting);
       } 
       
-      me.showTenderFields(showTenderFields, false);
+      me.showTenderFields(showTenderFields, false,init);
 
       gljOprObj.setting = me.ration_glj_setting;
       projectGljObject.projectGljSetting = me.project_glj_setting;
@@ -282,7 +282,7 @@ let gljCol = {
       me.setScopeFormater();
       gljOprObj.scopeSetting = me.scopeSetting;
     },
-    showTenderFields: function (showFields = false, needRefresh = false){
+    showTenderFields: function (showFields = false, needRefresh = false,init=false){
         let me = gljCol;
 
         let PGLJHeader = me.project_glj_setting.header;
@@ -308,7 +308,7 @@ let gljCol = {
 
         colSettingObj.setVisible('feesIndex.common.tenderUnitFee', showFields);
         colSettingObj.setVisible('feesIndex.common.tenderTotalFee', showFields);
-        colSettingObj.updateColSetting(true);
+        colSettingObj.updateColSetting(true,init);
 
         if (needRefresh){
             if(projectGljObject.projectGljSpread) {

+ 2 - 2
web/building_saas/main/js/views/main_tree_col.js

@@ -696,7 +696,7 @@ let colSettingObj = {
         }
         return false;
     },
-    updateColSetting: function (skipSetValue = false) {
+    updateColSetting: function (skipSetValue = false,init=false) {
         let mainSheet = projectObj.mainSpread.getActiveSheet();
         if(!skipSetValue){
             let sheet = this.settingSpread.getActiveSheet();
@@ -711,7 +711,7 @@ let colSettingObj = {
             mainSheet.showColumn(projectObj.project.projSetting.mainGridSetting.frozenCols, GC.Spread.Sheets.HorizontalPosition.left);
         });
         //refresh nodes to autoFitRow
-        projectObj.mainController.refreshTreeNode(projectObj.project.mainTree.roots, true);
+       if(init===false) projectObj.mainController.refreshTreeNode(projectObj.project.mainTree.roots, true);
         if(!skipSetValue){
             //列设置将项目特征和工作内容都取消打钩后,更新快速列设置
             if(!this.getVisible('itemCharacterText')){

+ 3 - 2
web/building_saas/main/js/views/project_view.js

@@ -965,14 +965,15 @@ var projectObj = {
                 });
                 let startShowTime = +new Date();
                 that.mainController = TREE_SHEET_CONTROLLER.createNew(that.project.mainTree, that.mainSpread.getActiveSheet(), that.project.projSetting.mainGridSetting);
-                that.mainController.showTreeData();
+               
                 let endShowTime = +new Date();
                 console.log(`show data时间——${endShowTime - startShowTime}`);
                 that.mainController.bind('refreshBaseActn', that.refreshBaseActn);
                 that.mainController.bind(TREE_SHEET_CONTROLLER.eventName.beforeTreeSelectedChange, that.beforeMainTreeSelectedChange);
                 that.mainController.bind(TREE_SHEET_CONTROLLER.eventName.treeSelectedChanged, that.treeSelectedChanged);
                 gljCol.initGljCol(that.project.projSetting.glj_col?that.project.projSetting.glj_col.showAdjustPrice:false,
-                  that.project.property.tenderSetting.showTenderFields?that.project.property.tenderSetting.showTenderFields:false);
+                  that.project.property.tenderSetting.showTenderFields?that.project.property.tenderSetting.showTenderFields:false,true);
+                  that.mainController.showTreeData();
                 subObj.initSubSpread();//初始化主界面下方的表格
                 if(!projectReadOnly){
                     that.mainSpreadEscKey(that.mainSpread, that.mainSpreadEditStarting, that.mainSpreadEditEnded);