debug

web/building_saas/main/html/main.html

@@ -638,7 +638,7 @@
                                                     </div>
                                                 </div>
                                             </div>
-                                            <h5 class="mt-3">工料机</h5>
+                                            <h5 class="mt-3">人材机</h5>
                                             <div class="row m-0">
                                                 <div class="col-sm-3">
                                                     <div class="input-group input-group-sm mb-2">

web/building_saas/main/js/views/calc_base_view.js

@@ -131,13 +131,13 @@ let calcBaseView = {
     isDef: function (v) {
         return v !== undefined && v !== null;
     },
-    ifEdit: function (type) {
+    //processMouseDown触发时间比SelectionChanged早，所以直接取selected是上一个节点的,需要传row取当前选中节点
+    ifEdit: function (type, row) {
         if (type == 'ration'){
             return true;
         }
         else{
-
-            var selected = projectObj.project.mainTree.selected;
+            let selected = projectObj.project.mainTree.items[row];
             return selected && MainTreeCol.readOnly.forCalcBase(selected)?false:true;
         }
     },
@@ -345,7 +345,7 @@ let calcBaseView = {
             // ctx.fillText(value,x+w-3,y+h-3);
             GC.Spread.Sheets.CellTypes.Text.prototype.paint.apply(this, arguments);
             // }
-            if(calcBaseView.editingCell && !projectReadOnly && calcBaseView.ifEdit(type)){
+            if(calcBaseView.editingCell && !projectReadOnly && calcBaseView.ifEdit(type, options.row)){
                 if(calcBaseView.editingCell.row==options.row&&calcBaseView.editingCell.col==options.col){
                     var image = document.getElementById('f_btn'),imageMagin = 3;
                     var imageHeight = h-2*imageMagin;
@@ -381,7 +381,7 @@ let calcBaseView = {
             if(me.editingCell==null){
                 var showSelectBtn = true;
                 if(hitinfo.sheet.name()!='calc_detail'){
-                    showSelectBtn=me.ifEdit(type);
+                    showSelectBtn=me.ifEdit(type, hitinfo.row);
                 }
                 if(showSelectBtn){
                     me.editingCell={
@@ -397,7 +397,7 @@ let calcBaseView = {
                 var imageHeight = hitinfo.cellRect.height-2*imageMagin;
                 var imageWidth = hitinfo.cellRect.width*2/7;
                 if(hitinfo.x<offset&&hitinfo.x>offset-imageWidth){
-                    if(!projectReadOnly && me.ifEdit(type)){
+                    if(!projectReadOnly && me.ifEdit(type, hitinfo.row)){
                         calcBaseView.initCalctor(type);
                     }
                 }

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

@@ -228,6 +228,7 @@ var feeRateObject={
 
         sheet.setSelection(rowIdx, -1, 1, -1);
         sheet.showRow(rowIdx, GC.Spread.Sheets.VerticalPosition.center);
+        feeRateObject.onCellClick({type: 'CellClick'}, {row:rowIdx});
     },
     getTreeNodeCellType:function () {
         var ns = GC.Spread.Sheets;
@@ -342,7 +343,7 @@ var feeRateObject={
             if(me.editingCell==null){
                 var showSelectBtn = true;
                 if(hitinfo.sheet.name()!='calc_detail'){
-                    showSelectBtn=me.ifFeeRateEdit();
+                    showSelectBtn=me.ifFeeRateEdit(hitinfo.row);
                 }
                 if(showSelectBtn){
                     me.editingCell={
@@ -358,7 +359,7 @@ var feeRateObject={
                 var imageHeight = hitinfo.cellRect.height-2*imageMagin;
                 var imageWidth = hitinfo.cellRect.width*2/7;
                 if(hitinfo.x<offset&&hitinfo.x>offset-imageWidth){
-                    if(!projectReadOnly){
+                    if(!projectReadOnly && me.ifFeeRateEdit(hitinfo.row)){
                         me.showSelectModal(hitinfo);
                     }
                 }
@@ -405,8 +406,8 @@ var feeRateObject={
         }
         return children.length+sum;
     },
-    ifFeeRateEdit:function () {
-        var selected = projectObj.project.mainTree.selected;
+    ifFeeRateEdit:function (row) {
+        var selected = projectObj.project.mainTree.items[row];
         return selected&&MainTreeCol.readOnly.forFeeRate(selected)?false:true;
     },
     createSpreadView:function () {

web/building_saas/main/js/views/main_tree_col.js

@@ -394,7 +394,7 @@ let colSettingObj = {
         sheet.getRange(-1, 0, -1, 1).cellType(this.checkBox).hAlign(GC.Spread.Sheets.HorizontalAlign.center);
         sheet.getCell(0, 0, GC.Spread.Sheets.SheetArea.colHeader).value('显示');
         sheet.setColumnWidth(0, 100);
-        sheet.setColumnWidth(0, 150, GC.Spread.Sheets.SheetArea.rowHeader);
+        sheet.setColumnWidth(0, 240, GC.Spread.Sheets.SheetArea.rowHeader);
 
         setting.cols.forEach(function (col, index) {
             let i, iCol = 0, cell;

web/building_saas/main/js/views/project_property_basicInfo.js

@@ -8,7 +8,7 @@ let basicInfoView = {
     setting:{
         header: [
             {name: '属性', dataCode: 'dispName', width: 200, vAlign: 'center', hAlign: 'left'},
-            {name: '值', dataCode: 'value', width: 120, vAlign: 'center', hAlign: 'center'}
+            {name: '值', dataCode: 'value', width: 300, vAlign: 'center', hAlign: 'left'}
         ],
         options: {
             allowContextMenu: false,

web/building_saas/main/js/views/project_property_projFeature.js

@@ -9,7 +9,7 @@ let projFeatureView = {
     setting:{
         header: [
             {name: '属性', dataCode: 'dispName', width: 200, vAlign: 'center', hAlign: 'left'},
-            {name: '值', dataCode: 'value', width: 120, vAlign: 'center', hAlign: 'center'}
+            {name: '值', dataCode: 'value', width: 300, vAlign: 'center', hAlign: 'left'}
         ],
         options: {
             allowContextMenu: false,

web/building_saas/main/js/views/project_view.js

@@ -765,8 +765,6 @@ var projectObj = {
                 if(projectReadOnly){
                     disableSpread(that.mainSpread);
                 }
-                let themeName = that.mainSpread.getSheet(0).currentTheme().name();
-                console.log(GC.Spread.Sheets.Themes[themeName]);
                 $.bootstrapLoading.end();
             }
             else {
@@ -1268,6 +1266,7 @@ var projectObj = {
         const sheet = this.mainSpread.getActiveSheet();
         sheet.setSelection(row, col, 1, 1);
         this.mainController.setTreeSelected(this.mainController.tree.items[row]);//触发树节点选中事件
+        sheet.showRow(row, GC.Spread.Sheets.VerticalPosition.center);
     },
     // 选中区域合计数字
     amountAreaNumber: function(e, info) {

web/building_saas/pm/js/pm_newMain.js

@@ -1626,6 +1626,7 @@ function init() {
             projTreeObj.tree = pmTree.createNew(projTreeObj.setting, datas);
             projTreeObj.tree.selected = projTreeObj.tree.items[0];
             projTreeObj.workBook = projTreeObj.buildSheet(projTreeObj.workBook,'projSpread',projTreeObj.setting);
+            projTreeObj.workBook.getSheet(0).frozenColumnCount(2);
             sheetCommonObj.spreadDefaultStyle(projTreeObj.workBook);
             projTreeObj.sumEngineeringCost();
             projTreeObj.showTreeData(projTreeObj.tree.items, projTreeObj.setting.header, projTreeObj.workBook.getActiveSheet());