Merge branch '1.0.0_online' of http://smartcost.f3322.net:3000/SmartCost/ConstructionCost into 1.0.0_online

public/web/tree_sheet/tree_sheet_helper.js

@@ -53,8 +53,6 @@ var TREE_SHEET_HELPER = {
         this.massOperationSheet(sheet, function () {
             if(setting.rowHeaderWidth !== undefined && setting.rowHeaderWidth !== null){
                 sheet.setColumnWidth(0, setting.rowHeaderWidth, GC.Spread.Sheets.SheetArea.rowHeader);
-            }else {
-                sheet.setColumnWidth(0, 25, GC.Spread.Sheets.SheetArea.rowHeader);
             }
             if (setting.frozenCols) {
                 sheet.frozenColumnCount(setting.frozenCols);
@@ -508,9 +506,9 @@ var TREE_SHEET_HELPER = {
                 $editor.css("background", 'white');
                 $editor.css("width", cellRect.width);
                 $editor.css("height", cellRect.height);
-                $editor.attr("gcUIElement", "gcEditingInput");//padding:0
+                $editor.attr("gcUIElement", "gcEditingInput");//padding:0  //value="${context.sheet.getValue(context.row,context.col)}"
                 $editor.html(` <div class="input-group input-group-sm">
-                                <input type="text" id="esInput" class="form-control" aria-label="Text input with dropdown button" autocomplete="off" value="${context.sheet.getValue(context.row,context.col)}"  style="background-color:${cellStyle.backColor}">
+                                <input type="text" id="esInput" class="form-control" aria-label="Text input with dropdown button" autocomplete="off"   style="background-color:${cellStyle.backColor}">
                                 <div class="">                           
                                     <div class="triangle-border_dropdown tb-border_dropdown" id="esBtn" style="left: ${cellRect.width - 15+"px"}"></div>
                                 </div>
@@ -523,8 +521,9 @@ var TREE_SHEET_HELPER = {
 
             TreeNodeCellType.prototype.updateEditor = function (editorContext, cellStyle, cellRect, context) {
                 let me = this;
-                console.log("updateEditor -------");
                 $(editorContext).append(`<div><ul class="es-list" style="display: block;background-color:${cellStyle.backColor}"></ul></div>`);//<li class="" data-value="" style=""> <br></li>
+                $('#esInput').val(context.sheet.getValue(context.row,context.col));
+                $('#esInput').select();
                 projectObj.project.Ration.getNearRations(initNode.data,function(rations){
                     if(rations.length > 0){
                         let li_html = "";
@@ -545,29 +544,19 @@ var TREE_SHEET_HELPER = {
                     $("#esBtn").bind('click',function(e){
                         $(".es-list").toggle();
                     });
+                    if( $('#esInput').val()) setCursor( $("#esInput")[0], $('#esInput').val().length)
                 });
             };
             TreeNodeCellType.prototype.setEditorValue = function (editor, value, context) {
-                /*   $('#esInput').val(value);
-                 this.displayText = "hehe";*/
+
+                 $('#esInput').val(value);
             };
             TreeNodeCellType.prototype.getEditorValue = function (editor, context) {
-                console.log("get value");
-                /*if(this.isEscKey !=true&& updateCallback){
-                 updateCallback();
-                 }*/
                 this.isEscKey = false;
                 console.log($('#esInput').val());
-                return   $('#esInput').val();
-            };
-            TreeNodeCellType.prototype.isReservedKey = function (e, context) {
-                //cell type handle tab key by itself
-                this.isEscKey = e.keyCode === GC.Spread.Commands.Key.esc;
-                return false;
+                return  $('#esInput').val()!==''? $('#esInput').val():null;
             };
         }
-
-
         return new TreeNodeCellType();
 
     },

web/building_saas/main/js/views/glj_col.js

@@ -5,20 +5,21 @@ let gljCol = {
     ration_glj_setting: {
         header: [
             {headerName: "编码", headerWidth: 130, dataCode: "code", dataType: "String", formatter: "@"},
-            {headerName: "名称", headerWidth: 240, dataCode: "name", dataType: "String",cellType:'tipsCell'},
-            {headerName: "规格型号", headerWidth: 160, dataCode: "specs", dataType: "String", hAlign: "left",cellType:'tipsCell'},
+            {headerName: "名称", headerWidth: 160, dataCode: "name", dataType: "String",cellType:'tipsCell'},
+            {headerName: "规格型号", headerWidth: 190, dataCode: "specs", dataType: "String", hAlign: "left",cellType:'tipsCell'},
             {headerName: "单位", headerWidth: 45, dataCode: "unit", dataType: "String", hAlign: "center"},
-            {headerName: "市场价", headerWidth: 80, dataCode: "marketPrice", dataType: "Number", hAlign: "right"},//, decimalField: "glj.unitPrice"
-            {headerName: "调整价", headerWidth: 80, dataCode: "adjustPrice", dataType: "Number", hAlign: "right"},//, decimalField: "glj.unitPrice"1
-            {headerName: "定额价", headerWidth: 80, dataCode: "basePrice", dataType: "Number", hAlign: "right"},//, decimalField: "glj.unitPrice"
-            {headerName: "定额消耗", headerWidth: 80, dataCode: "rationItemQuantity", dataType: "Number", hAlign: "right", decimalField: "glj.quantity"},   // dataType: "Number", formatter: "0.00"
-            {headerName: "自定消耗", headerWidth: 80, dataCode: "customQuantity", dataType: "Number", hAlign: "right", decimalField: "glj.quantity"},
-            {headerName: "消耗量", headerWidth: 80, dataCode: "quantity", dataType: "Number", hAlign: "right", decimalField: "glj.quantity"},
+            {headerName: "市场价", headerWidth: 65, dataCode: "marketPrice", dataType: "Number", hAlign: "right"},//, decimalField: "glj.unitPrice"
+            {headerName: "调整价", headerWidth: 65, dataCode: "adjustPrice", dataType: "Number", hAlign: "right"},//, decimalField: "glj.unitPrice"1
+            {headerName: "定额价", headerWidth: 65, dataCode: "basePrice", dataType: "Number", hAlign: "right"},//, decimalField: "glj.unitPrice"
+            {headerName: "定额消耗", headerWidth: 65, dataCode: "rationItemQuantity", dataType: "Number", hAlign: "right", decimalField: "glj.quantity"},   // dataType: "Number", formatter: "0.00"
+            {headerName: "自定消耗", headerWidth: 65, dataCode: "customQuantity", dataType: "Number", hAlign: "right", decimalField: "glj.quantity"},
+            {headerName: "消耗量", headerWidth: 65, dataCode: "quantity", dataType: "Number", hAlign: "right", decimalField: "glj.quantity"},
             {headerName: "总消耗量", headerWidth: 80, dataCode: "totalQuantity", dataType: "Number", hAlign: "right", decimalField: "glj.quantity"},
             {headerName: "暂估", headerWidth: 45, dataCode: "isEstimate", dataType: "String", hAlign: "center", vAlign: "center", cellType: "checkBox"}
         ],
         view: {
-            lockColumns: [ 5, 7, 9, 10, 11]//这里以后改成dataCode好一点
+            lockColumns: [ 5, 7, 9, 10, 11],//这里以后改成dataCode好一点
+            rowHeaderWidth:25
         },
         getStyle:function (data) {
             if(data.type == gljType.MAIN_MATERIAL){//是主材的话字体蓝色显示

web/building_saas/main/js/views/glj_view.js

@@ -26,7 +26,8 @@ var gljOprObj = {
             {headerName: "累加", headerWidth: 120, dataCode: "isSummation", dataType: "String", cellType: "checkBox"}
         ],
         view: {
-            lockColumns: [2, 3]
+            lockColumns: [2, 3],
+            rowHeaderWidth:25
         }
     },
     gljTreeSetting: {

web/building_saas/main/js/views/std_billsGuidance_lib.js

@@ -98,6 +98,7 @@ const billsGuidance = (function () {
             {name: '项目名称', dataCode: 'name', width: 190, vAlign: 'center', hAlign: 'left', formatter: '@'},
             {name: '单位', dataCode: 'unit', width: 45, vAlign: 'center', hAlign: 'center', formatter: '@'},
         ],
+        rowHeaderWidth:25,
         events: {
             SelectionChanging: function (sender, info) {
                 billsInitSel(info.newSelections[0].row);
@@ -189,6 +190,7 @@ const billsGuidance = (function () {
             {name: '选择', dataCode: 'select', width: 35, vAlign: 'center', hAlign: 'center', formatter: '@'},
             {name: '项目指引', dataCode: 'name', width: 300, vAlign: 'center', hAlign: 'left', formatter: '@'},
         ],
+        rowHeaderWidth:25,
         events: {
             EditStarting: function (sender, args) {
                 if(!bills.tree || guideItem.headers[args.col]['dataCode'] === 'name'){
@@ -283,6 +285,7 @@ const billsGuidance = (function () {
             {name: '施工工序', dataCode: 'name', width: 250, rateWidth: 0.5, vAlign: 'center', hAlign: 'center', formatter: '@'},
             {name: '选项', dataCode: 'options', width: 250, rateWidth: 0.5,  vAlign: 'center', hAlign: 'left', formatter: '@'},
         ],
+        rowHeaderWidth:25,
         events: {
             CellClick: function (sender, args) {
                 if(elfItem.headers[args.col]['dataCode'] === 'options' && args.sheetArea === 3){
@@ -415,6 +418,7 @@ const billsGuidance = (function () {
                 sheet.getRange(-1, 0, -1, 1).locked(true);
                 sheet.getRange(-1, 1, -1, 1).locked(false);
             }
+            if(module.rowHeaderWidth)  sheet.setColumnWidth(0, module.rowHeaderWidth, GC.Spread.Sheets.SheetArea.rowHeader);
             setOptions(module.workBook, options);
             buildHeader(module.workBook.getActiveSheet(), module.headers);
             if(module === elfItem){

web/building_saas/main/js/views/zmhs_view.js

@@ -8,12 +8,13 @@ let zmhs_obj = {
     coeSheetData:[],
     coeSetting: {
         header: [
-            {headerName: "调整", headerWidth: 45, dataCode: "isAdjust", dataType: "String", cellType: "checkBox"},
-            {headerName: "条件", headerWidth: 150, dataCode: "name", dataType: "String", cellType: "button"},
-            {headerName: "内容", headerWidth: 350, dataCode: "content", dataType: "String", hAlign: "left"}
+            {headerName: "调整", headerWidth: 35, dataCode: "isAdjust", dataType: "String", cellType: "checkBox"},
+            {headerName: "条件", headerWidth: 250, dataCode: "name", dataType: "String", cellType: "button"},
+            {headerName: "内容", headerWidth: 160, dataCode: "content", dataType: "String", hAlign: "left"}
         ],
         view: {
-            lockColumns:[0,1,2]
+            lockColumns:[0,1,2],
+            rowHeaderWidth:25
         }
     },
     assSpread:null,
@@ -22,11 +23,12 @@ let zmhs_obj = {
     assSetting: {
         header: [
             {headerName: "调整名称", headerWidth: 100, dataCode: "name", dataType: "String"},
-            {headerName: "定额值", headerWidth: 120, dataCode: "stdValue", hAlign: "right", dataType: "String"},
-            {headerName: "实际值", headerWidth: 120, dataCode: "actualValue", hAlign: "right", dataType: "String"}
+            {headerName: "定额值", headerWidth: 80, dataCode: "stdValue", hAlign: "right", dataType: "String"},
+            {headerName: "实际值", headerWidth: 80, dataCode: "actualValue", hAlign: "right", dataType: "String"}
         ],
         view: {
-            lockColumns: [0, 1]
+            lockColumns: [0, 1],
+            rowHeaderWidth:25
         }
     },
     initSpread:function () {