前台字体统一设置

config/gulpConfig.js

@@ -36,6 +36,7 @@ module.exports = {
         'public/web/id_tree.js',
         'public/web/tree_sheet/tree_sheet_helper.js',
         'public/web/sheet/sheet_data_helper.js',
+        'public/web/sheet/sheet_common.js',
         'public/web/common_ajax.js',
         'lib/JSExpressionEval_src/Date.js',
         'web/building_saas/pm/js/**/*.js',

modules/complementary_ration_lib/models/compleRationModel.js

@@ -176,12 +176,12 @@ class CompleRatoinDao {
                     }
                 }
                 hintsArr.push(`基价 元 ${ration.basePrice}`);
-                hintsArr.push(`工作内容:`);
-                if(ration.jobContent){
+                if(ration.jobContent && ration.jobContent.toString().trim() !== ''){
+                    hintsArr.push(`工作内容:`);
                     hintsArr = hintsArr.concat(ration.jobContent.split('\n'));
                 }
-                hintsArr.push(`附注:`);
-                if(ration.annotation){
+                if(ration.annotation && ration.annotation.toString().trim() !== ''){
+                    hintsArr.push(`附注:`);
                     hintsArr = hintsArr.concat(ration.annotation.split('\n'));
                 }
                 ration._doc.hint = hintsArr.join('<br>');

modules/options/models/optionTypes.js

@@ -15,11 +15,11 @@ const optionSetting = {
         DEFAULT: {
             backColor: 'White',
             foreColor: 'Black',
-            stringFont: '15px Arial',
-            numFont: '13px Arial'
+            stringFont: '0.9rem Arial',
+            numFont: '0.9rem Arial'
         },
         SELECTED: {
-            backColor: '#dddddd',
+            backColor: '#FFFACD',
             foreColor: 'default',
             stringFont: 'default',
             numFont: 'default'
@@ -27,8 +27,8 @@ const optionSetting = {
         DXFY: {
             backColor: 'default',
             foreColor: 'default',
-            stringFont: 'bold 15px Arial',
-            numFont: 'bold 13px Arial'
+            stringFont: 'bold 0.9rem Arial',
+            numFont: 'bold 0.9rem Arial'
         },
         FB: {
             backColor: '#C4CAFB',

public/web/sheet/sheet_common.js

@@ -638,6 +638,18 @@ var sheetCommonObj = {
         });
         workBook.commandManager().setShortcutKey(null, GC.Spread.Commands.Key.esc, false, false, false, false);
         workBook.commandManager().setShortcutKey('myEsc', GC.Spread.Commands.Key.esc, false, false, false, false);
-    }
+    },
+    //设置默认样式
+    spreadDefaultStyle: function (workBook) {
+        let defaultStyle = new GC.Spread.Sheets.Style();
+        defaultStyle.font = '0.9rem Arial';
+        let sheetCount = workBook.getSheetCount();
+        for(let i = 0; i < sheetCount; i++){
+            let sheet = workBook.getSheet(i);
+            sheet.setDefaultStyle(defaultStyle, GC.Spread.Sheets.SheetArea.viewport);
+            sheet.setDefaultStyle(defaultStyle, GC.Spread.Sheets.SheetArea.colHeader);
+            sheet.setDefaultStyle(defaultStyle, GC.Spread.Sheets.SheetArea.rowHeader);
+        }
+    },
 
 }

public/web/sheet/sheet_data_helper.js

@@ -87,7 +87,8 @@ var SheetDataHelper = {
                     for (i = 0; i < col.head.spanCols.length; i++) {
                         if (col.head.spanCols[i] !== 0) {
                             cell = sheet.getCell(iRow, index, GC.Spread.Sheets.SheetArea.colHeader);
-                            cell.value(col.head.titleNames[i]).font(col.head.font).hAlign(col.head.hAlign[i]).vAlign(col.head.vAlign[i]).wordWrap(true);
+                            cell.value(col.head.titleNames[i]).hAlign(col.head.hAlign[i]).vAlign(col.head.vAlign[i]).wordWrap(true);
+                            //cell.value(col.head.titleNames[i]).font(col.head.font).hAlign(col.head.hAlign[i]).vAlign(col.head.vAlign[i]).wordWrap(true);
                         }
                         if (col.head.spanCols[i] > 1 || col.head.spanRows[i] > 1) {
                             sheet.addSpan(iRow, index, col.head.spanRows[i], col.head.spanCols[i], GC.Spread.Sheets.SheetArea.colHeader);
@@ -115,7 +116,7 @@ var SheetDataHelper = {
         var style = new GC.Spread.Sheets.Style();
         style.locked = setting.readOnly;
         style.name = setting.id;
-        style.font = setting.data.font;
+        //style.font = setting.data.font;
         style.hAlign = setting.data.hAlign;
         style.vAlign = setting.data.vAlign;
         style.wordWrap = setting.data.wordWrap;
@@ -159,7 +160,7 @@ var SheetDataHelper = {
                         $(div).css("position", "absolute")
                             .css("border", "1px #C0C0C0 solid")
                             .css("box-shadow", "1px 2px 5px rgba(0,0,0,0.4)")
-                            .css("font", "9pt Arial")
+                           // .css("font", "9pt Arial")
                             .css("background", "white")
                             .css("padding", 5)
                             .attr("id", 'autoTip');

public/web/tree_sheet/tree_sheet_helper.js

@@ -40,7 +40,7 @@ var TREE_SHEET_HELPER = {
         var style = new GC.Spread.Sheets.Style();
         //style.locked = setting.readOnly ? true : false;
         style.name = setting.id;
-        style.font = setting.data.font;
+        //style.font = setting.data.font;
         style.hAlign = setting.data.hAlign;
         style.vAlign = setting.data.vAlign;
         style.wordWrap = setting.data.wordWrap;
@@ -64,7 +64,8 @@ var TREE_SHEET_HELPER = {
                 for (i = 0; i < col.head.spanCols.length; i++) {
                     if (col.head.spanCols[i] !== 0) {
                         cell = sheet.getCell(iRow, index, GC.Spread.Sheets.SheetArea.colHeader);
-                        cell.value(col.head.titleNames[i]).font(col.head.font).hAlign(col.head.hAlign[i]).vAlign(col.head.vAlign[i]).wordWrap(true);
+                        //cell.value(col.head.titleNames[i]).font(col.head.font).hAlign(col.head.hAlign[i]).vAlign(col.head.vAlign[i]).wordWrap(true);
+                        cell.value(col.head.titleNames[i]).hAlign(col.head.hAlign[i]).vAlign(col.head.vAlign[i]).wordWrap(true);
                     }
                     if (col.head.spanCols[i] > 1 || col.head.spanRows[i] > 1) {
                         sheet.addSpan(iRow, index, col.head.spanRows[i], col.head.spanCols[i], GC.Spread.Sheets.SheetArea.colHeader);
@@ -119,10 +120,10 @@ var TREE_SHEET_HELPER = {
             }
             setting.cols.forEach(function (colSetting, iCol) {
                 var cell = sheet.getCell(iRow, iCol, GC.Spread.Sheets.SheetArea.viewport);
-                if(typeof projectObj !== 'undefined'){
+               /* if(typeof projectObj !== 'undefined'){
                     let boldFontStyle = projectObj.getBoldFontStyle(node, colSetting);
                     sheet.setStyle(iRow, iCol, boldFontStyle);
-                }
+                }*/
 
                 // var getFieldText = function () {
                 //     var fields = colSetting.data.field.split('.');

web/building_saas/complementary_glj_lib/js/components.js

@@ -25,6 +25,7 @@ let componentOprObj = {
     buildSheet: function (container) {
         let me = componentOprObj;
         me.workBook = sheetOpr.buildSheet(container, me.setting, 30);
+        sheetCommonObj.spreadDefaultStyle(me.workBook);
         me.workBook.getSheet(0).setColumnWidth(0, 20, GC.Spread.Sheets.SheetArea.rowHeader);
         me.workBook.getSheet(0).setFormatter(-1, 1, "@", GC.Spread.Sheets.SheetArea.viewport);
         me.workBook.getSheet(0).bind(GC.Spread.Sheets.Events.EditStarting, me.onCellEditStart);

web/building_saas/complementary_glj_lib/js/glj.js

@@ -204,6 +204,7 @@ let repositoryGljObj = {
     buildSheet: function(container) {
         let me = repositoryGljObj;
         me.workBook = sheetOpr.buildSheet(container, me.setting, 30);
+        sheetCommonObj.spreadDefaultStyle(me.workBook);
         me.repositoryGljDelOpr();
         me.bindEnterKey();
         me.setUnitCombo(me.workBook.getActiveSheet(), me.setting.header);

web/building_saas/complementary_glj_lib/js/gljClassTree.js

@@ -76,6 +76,7 @@ let gljClassTreeObj = {
     buildSheet: function () {
         if(!this.isDef(this.workBook)){
             this.workBook = new GC.Spread.Sheets.Workbook($('#gljClassSpread')[0], {sheetCount: 1});
+            sheetCommonObj.spreadDefaultStyle(this.workBook);
             this.sheet = this.workBook.getActiveSheet();
             this.setOptions(this.workBook, this.setting.options);
             this.sheet.options.clipBoardOptions = GC.Spread.Sheets.ClipboardPasteOptions.values;

web/building_saas/complementary_glj_lib/js/gljComponent.js

@@ -21,6 +21,7 @@ let gljComponentOprObj = {
     buildSheet: function(container) {
         let me = gljComponentOprObj;
         me.workBook = sheetOpr.buildSheet(container, me.setting, 30);
+        sheetCommonObj.spreadDefaultStyle(me.workBook);
         me.workBook.getSheet(0).setColumnWidth(0, 20, GC.Spread.Sheets.SheetArea.rowHeader);
         me.workBook.getSheet(0).setFormatter(-1, 0, "@", GC.Spread.Sheets.SheetArea.viewport);
         sheetOpr.cleanData(me.workBook.getSheet(0), me.setting, -1);

web/building_saas/complementary_ration_lib/html/dinge.html

@@ -547,6 +547,7 @@
 
         // tabPanel 下有多个Spread时，相互之间不能正确显示。改成一个Spread下多个Sheet。
         var rdSpread = sheetCommonObj.createSpread($("#rdSpread")[0], 4);
+        sheetCommonObj.spreadDefaultStyle(rdSpread);
         rationGLJOprObj.buildSheet(rdSpread.getSheet(0));
 
         rationAssistOprObj.buildSheet(rdSpread.getSheet(1));

web/building_saas/complementary_ration_lib/js/coe.js

@@ -77,6 +77,7 @@ let coeOprObj = {
     buildSheet: function (container) {
         let me = coeOprObj;
         me.workBook = sheetCommonObj.buildSheet(container, me.setting, 30);
+        sheetCommonObj.spreadDefaultStyle(me.workBook);
         me.workSheet = me.workBook.getSheet(0);
         me.workSheet.options.isProtected = true;
         me.workSheet.bind(GC.Spread.Sheets.Events.SelectionChanged, me.onSelectionChanged);
@@ -155,6 +156,7 @@ let gljAdjOprObj = {
     buildSheet: function (container) {
         let me = gljAdjOprObj;
         me.workBook = sheetCommonObj.buildSheet(container, me.setting, 3);
+        sheetCommonObj.spreadDefaultStyle(me.workBook);
         me.workSheet = me.workBook.getSheet(0);
         me.workSheet.options.isProtected = true;
         me.workSheet.clearSelection();

web/building_saas/complementary_ration_lib/js/gljSelect.js

@@ -78,6 +78,7 @@ let gljSelOprObj = {
     buildSheet: function (container) {
         let me = gljSelOprObj;
         me.workBook = sheetCommonObj.buildSheet(container, me.setting, 30);
+        sheetCommonObj.spreadDefaultStyle(me.workBook);
         me.workBook.getSheet(0).setColumnWidth(0, 20, GC.Spread.Sheets.SheetArea.rowHeader);
         me.workBook.getSheet(0).setFormatter(-1, 1, "@", GC.Spread.Sheets.SheetArea.viewport);
         me.workBook.getSheet(0).bind(GC.Spread.Sheets.Events.EditStarting, me.onCellEditStart);

web/building_saas/complementary_ration_lib/js/installation.js

@@ -40,6 +40,7 @@ let feeItemObj = {
         let me = this, se = sectionObj, fr = feeRuleObj;
         if(!this.isDef(this.workBook)){
             this.workBook = sheetCommonObj.buildSheet($('#feeItemSpread')[0], this.setting, 10);
+            sheetCommonObj.spreadDefaultStyle(this.workBook);
             this.sheet = this.workBook.getActiveSheet();
             this.setOptions(this.workBook, this.setting.options);
             this.bindEvents(this.sheet);
@@ -155,6 +156,7 @@ let sectionObj = {
     buildSheet: function () {
         if(!this.isDef(this.workBook)){
             this.workBook = sheetCommonObj.buildSheet($('#instSectionSpread')[0], this.setting, 10);
+            sheetCommonObj.spreadDefaultStyle(this.workBook);
             this.sheet = this.workBook.getActiveSheet();
             this.setOptions(this.workBook, this.setting.options);
             this.sheet.options.clipBoardOptions = GC.Spread.Sheets.ClipboardPasteOptions.values;
@@ -265,6 +267,7 @@ let feeRuleObj = {
     buildSheet: function () {
         if(!this.isDef(this.workBook)){
             this.workBook = sheetCommonObj.buildSheet($('#instFeeRuleSpread')[0], this.setting, 10);
+            sheetCommonObj.spreadDefaultStyle(this.workBook);
             this.sheet = this.workBook.getActiveSheet();
             this.buildHeader();
             this.setOptions(this.workBook, this.setting.options);

web/building_saas/complementary_ration_lib/js/ration.js

@@ -41,6 +41,7 @@ let rationOprObj = {
         let rationRepId = getQueryString("repository");
         let me = rationOprObj;
         me.workBook = sheetCommonObj.buildSheet(container, me.setting, 30);
+        sheetCommonObj.spreadDefaultStyle(me.workBook);
         sheetCommonObj.bindEscKey(me.workBook, [{sheet: me.workBook.getSheet(0), editStarting: me.onCellEditStart, editEnded: me.onCellEditEnd}]);
         me.getRationsCodes(rationRepId);
         me.onContextmenuOpr();

web/building_saas/complementary_ration_lib/js/repository_glj.js

@@ -148,6 +148,7 @@ repositoryGljObj = {
     buildSheet: function(container) {
         var me = repositoryGljObj;
         me.workBook = sheetCommonObj.buildSheet(container, me.setting, 30, me);
+        sheetCommonObj.spreadDefaultStyle(me.workBook);
         me.workBook.getSheet(0).options.isProtected = true;
         /* me.repositoryGljDelOpr();
          me.workBook.bind(GC.Spread.Sheets.Events.ClipboardPasting, me.onClipboardPasting);

web/building_saas/complementary_ration_lib/js/section_tree.js

@@ -143,6 +143,7 @@ let sectionTreeObj = {
     buildSheet: function () {
         if(!this.isDef(this.workBook)){
             this.workBook = new GC.Spread.Sheets.Workbook($('#sectionSpread')[0], {sheetCount: 1});
+            sheetCommonObj.spreadDefaultStyle(this.workBook);
             sheetCommonObj.bindEscKey(this.workBook, [{sheet: this.workBook.getSheet(0), editStarting: this.onEditStarting, editEnded: this.onEditEnded}]);
             this.sheet = this.workBook.getSheet(0);
             this.bindEvents(this.sheet);

web/building_saas/css/main.css

@@ -104,7 +104,7 @@ body {
     left:0
 }
 .pm-content{
-    padding-left:58px
+    padding-left:48px
 }
 .content {
     border-left: 1px solid #ccc;

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

@@ -67,6 +67,7 @@ let calcBaseView = {
     buildSheet: function () {
         if(!this.workBook){
             this.workBook = new GC.Spread.Sheets.Workbook($('#billsBaseSpread')[0], {sheetCount: 1});
+            sheetCommonObj.spreadDefaultStyle(this.workBook);
             this.setOptions(this.workBook, this.setting.options);
             //bills
             if(this.curType === this.type.bills){

web/building_saas/main/js/views/calc_program_manage.js

@@ -49,7 +49,9 @@ let calcProgramManage = {
             me.detailSpread = null;
         };
         me.mainSpread = sheetCommonObj.buildSheet($('#mainSpread')[0], me.mainSetting, me.datas.length);
+        sheetCommonObj.spreadDefaultStyle(me.mainSpread);
         me.detailSpread = sheetCommonObj.buildSheet($('#detailSpread')[0], me.detailSetting, me.datas[0].calcItems.length);
+        sheetCommonObj.spreadDefaultStyle(me.detailSpread);
         let arr = projectObj.project.calcProgram.compiledFeeTypeNames.slice();
         // arr.splice(arr.findIndex(function (e){return e == '暂估费'}), 1);
         let fieldName = new GC.Spread.Sheets.CellTypes.ComboBox();

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

@@ -130,6 +130,7 @@ var feeRateObject={
     createSheet:function(){
         var feeRateFile = projectObj.project.FeeRate.getActivateFeeRate();
         feeRateObject.feeRateSpreads=sheetCommonObj.buildSheet($('#fee_rate_sheet')[0], feeRateObject.sheetSetting,feeRateFile.rates.length);
+        sheetCommonObj.spreadDefaultStyle(feeRateObject.feeRateSpreads);
         feeRateObject.feeRateSheet = feeRateObject.feeRateSpreads.getSheet(0);
         feeRateObject.feeRateSheet.selectionUnit(1)//0 cell,1 row,2 col;
         feeRateObject.feeRateSheet.options.isProtected = true;
@@ -430,6 +431,7 @@ var feeRateObject={
     initFeeRateSpread:function (rowCount) {
         //初始化费用项表格
         this.mainFeeRateSpread = sheetCommonObj.buildSheet($('#divFee')[0], this.mainFeeRateSetting,rowCount);
+        sheetCommonObj.spreadDefaultStyle(this.mainFeeRateSpread);
         this.mainFeeRateSpread.options.scrollbarMaxAlign = true;
         this.mainFeeRateSheet = this.mainFeeRateSpread.getSheet(0);
         if(!projectReadOnly){

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

@@ -1316,6 +1316,7 @@ $(function () {
     $('#glj_tree_div').on('shown.bs.modal', function (e) {
         if (gljOprObj.gljLibSpresd == undefined) {
             gljOprObj.gljLibSpresd = sheetCommonObj.buildSheet($('#gljLibSheet')[0], gljOprObj.gljLibSheetSetting, gljOprObj.stdGLJ.length + gljOprObj.complementaryGLJs.length);
+            sheetCommonObj.spreadDefaultStyle(gljOprObj.gljLibSpresd);
             gljOprObj.gljLibSpresd.bind(GC.Spread.Sheets.Events.ButtonClicked, gljOprObj.onButtonClick);
             gljOprObj.gljLibSheet = gljOprObj.gljLibSpresd.getSheet(0);
             gljOprObj.gljLibSheet.setColumnWidth(0, 20, GC.Spread.Sheets.SheetArea.rowHeader);

web/building_saas/main/js/views/installation_fee_view.js

@@ -234,6 +234,7 @@ let installationFeeObj={
     initInstallationFeeSpread:function(){
         //初始化费用项表格
       this.feeItemSpread = SheetDataHelper.createNewSpread($("#feeItemSheet")[0]);
+      sheetCommonObj.spreadDefaultStyle(this.feeItemSpread);
       this.feeItemSheet = this.feeItemSpread.getSheet(0);
       this.initSheet(this.feeItemSheet,this.feeItemSetting);
       this.feeItemSheet.name('feeItemSheet');
@@ -244,6 +245,7 @@ let installationFeeObj={
 
       //初始化章节项表格
        this.feeDetailSpread = SheetDataHelper.createNewSpread($("#feeDetailSheet")[0]);
+       sheetCommonObj.spreadDefaultStyle(this.feeDetailSpread);
        this.feeDetailSheet = this.feeDetailSpread.getSheet(0);
        this.initSheet(this.feeDetailSheet,this.feeDetailSetting);
        this.feeDetailSheet.bind(GC.Spread.Sheets.Events.SelectionChanged,this.onFeeDetailSelectionChange);
@@ -567,6 +569,7 @@ let installationFeeObj={
     },
     initPositionSpread:function () {
         this.positionSpread = SheetDataHelper.createNewSpread($('#positionSpread')[0]);
+        sheetCommonObj.spreadDefaultStyle(this.positionSpread);
         this.selectionTree = idTree.createNew({id: 'ID', pid: 'ParentID', nid: 'NextSiblingID', rootId: -1, autoUpdate: false});
         this.selectionTreeController = TREE_SHEET_CONTROLLER.createNew(this.selectionTree, this.positionSpread.getActiveSheet(), this.positionSetting);
         this.positionSheet = this.positionSpread.getActiveSheet();
@@ -574,6 +577,7 @@ let installationFeeObj={
     },
     initMoreFeeRuleSpread:function () {
         this.moreFeeRuleSpread = SheetDataHelper.createNewSpread($("#moreFeeRuleSpread")[0]);
+        sheetCommonObj.spreadDefaultStyle(this.moreFeeRuleSpread);
         this.moreFeeRuleSheet = this.moreFeeRuleSpread.getSheet(0);
         this.initSheet(this.moreFeeRuleSheet,this.moreFeeRuleSetting);
         this.moreFeeRuleSheet.bind(GC.Spread.Sheets.Events.CellDoubleClick, this.onFeeRuleDoubleClick);
@@ -583,6 +587,7 @@ let installationFeeObj={
     initModifyFeeRuleSpread:function () {
         let me = this;
         me.modifyFeeRuleSpread = SheetDataHelper.createNewSpread($("#modifyFeeRuleSpread")[0]);
+        sheetCommonObj.spreadDefaultStyle(me.modifyFeeRuleSpread);
         me.modifyFeeRuleSheet = me.modifyFeeRuleSpread.getSheet(0);
         me.initSheet(me.modifyFeeRuleSheet, me.modifyFeeRuleSetting);
         this.modifyFeeRuleSpread.bind(GC.Spread.Sheets.Events.ButtonClicked, this.onPositionButtonClick);

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

@@ -401,7 +401,8 @@ let colSettingObj = {
             for (i = 0; i < col.head.spanCols.length; i++) {
                 if (col.head.spanCols[i] !== 0) {
                     cell = sheet.getCell(index, iCol, GC.Spread.Sheets.SheetArea.rowHeader);
-                    cell.value(col.head.titleNames[i]).font(col.head.font).hAlign(col.head.hAlign[i]).vAlign(col.head.vAlign[i]);
+                    cell.value(col.head.titleNames[i]).hAlign(col.head.hAlign[i]).vAlign(col.head.vAlign[i]);
+                    //cell.value(col.head.titleNames[i]).font(col.head.font).hAlign(col.head.hAlign[i]).vAlign(col.head.vAlign[i]);
                 }
                 if (col.head.spanCols[i] > 1 || col.head.spanRows[i] > 1) {
                     sheet.addSpan(index, iCol, col.head.spanRows[i], col.head.spanCols[i], GC.Spread.Sheets.SheetArea.rowHeader);
@@ -419,6 +420,7 @@ let colSettingObj = {
     },
     initSettingSpread: function () {
         this.settingSpread = SheetDataHelper.createNewSpread($('#col_setting_spread')[0], {sheetCount: 1});
+        sheetCommonObj.spreadDefaultStyle(this.settingSpread);
         this.settingSpread.options.showScrollTip = GC.Spread.Sheets.ShowScrollTip.vertical;
         this.settingSpread.bind(GC.Spread.Sheets.Events.ButtonClicked, function (sender, args) {
             if(args.sheet.isEditing()){

web/building_saas/main/js/views/project_glj_view.js

@@ -46,6 +46,7 @@ projectGljObject={
     initProjectGljSpread:function () {
         if(!this.projectGljSpread){
             this.projectGljSpread = SheetDataHelper.createNewSpread($("#project_glj_sheet")[0],2);
+            sheetCommonObj.spreadDefaultStyle(this.projectGljSpread);
         }
         this.projectGljSpread.bind(GC.Spread.Sheets.Events.RangeChanged, this.onProjectGljRangeChange);
         this.initProjectGljSheet();
@@ -80,6 +81,7 @@ projectGljObject={
     },
     initMixRatioSpread:function () {
         this.mixRatioSpread = SheetDataHelper.createNewSpread($("#mix_ratio_sheet")[0]);
+        sheetCommonObj.spreadDefaultStyle(this.mixRatioSpread);
         this.mixRatioSheet = this.mixRatioSpread .getSheet(0);
         this.initSheet(this.mixRatioSheet,this.mixRatioSetting);
         this.mixRatioSheet.name('mixRatioSheet');

web/building_saas/main/js/views/project_info.js

@@ -22,7 +22,7 @@ var projectInfoObj = {
             }
              */
             let newHtml = `<span><i class="fa fa-sticky-note-o"></i></span>
-                <span class="" data-placement="bottom" title="t1"> <span class="text-truncate float-right">&nbsp;t1</span></span>`
+                <span class="" data-placement="bottom" title="${proj.name}"> <span class="text-truncate float-right">&nbsp;${proj.name}</span></span>`
             fullPath.push(newHtml);
 
         }

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

@@ -78,6 +78,7 @@ let basicInfoView = {
     buildSheet: function () {
         if(!this.workBook){
             this.workBook = new GC.Spread.Sheets.Workbook($('#basicInfoSpread')[0], {sheetCount: 1});
+            sheetCommonObj.spreadDefaultStyle(this.workBook);
             sheetCommonObj.bindEscKey(this.workBook, [{sheet: this.workBook.getSheet(0), editStarting: this.onEditStarting, editEnded: this.onEditEnded}]);
             this.setOptions(this.workBook, this.setting.options);
             this.buildHeader(this.workBook.getActiveSheet(), this.setting.header);

web/building_saas/main/js/views/project_property_bills_quantity_decimal.js

@@ -85,6 +85,7 @@ let billsDecimalView = {
     buildSheet: function () {
         if(!this.workBook){
             this.workBook = new GC.Spread.Sheets.Workbook($('#billsQuanDecimal')[0], {sheetCount: 1});
+            sheetCommonObj.spreadDefaultStyle(this.workBook);
             this.setOptions(this.workBook, this.setting.options);
             this.buildHeader(this.workBook.getActiveSheet(), this.setting.header);
             this.bindEvent(this.workBook);

web/building_saas/main/js/views/project_property_indicativeInfo.js

@@ -53,6 +53,7 @@ let indicativeInfoObj = {
     buildSheet: function () {
         if(!this.workBook){
             this.workBook = new GC.Spread.Sheets.Workbook($('#indicativeInfoSpread')[0], {sheetCount: 1});
+            sheetCommonObj.spreadDefaultStyle(this.workBook);
             this.setOptions(this.workBook, this.setting.options);
             this.workBook.getSheet(0).options.isProtected = true;
             this.buildHeader(this.workBook.getActiveSheet(), this.setting.header);

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

@@ -81,6 +81,7 @@ let projFeatureView = {
     buildSheet: function () {
         if(!this.workBook){
             this.workBook = new GC.Spread.Sheets.Workbook($('#projFeatureSpread')[0], {sheetCount: 1});
+            sheetCommonObj.spreadDefaultStyle(this.workBook);
             sheetCommonObj.bindEscKey(this.workBook, [{sheet: this.workBook.getSheet(0), editStarting: this.onEditStarting, editEnded: this.onEditEnded}]);
             this.setOptions(this.workBook, this.setting.options);
             this.buildHeader(this.workBook.getActiveSheet(), this.setting.header);

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

@@ -617,6 +617,7 @@ var projectObj = {
     checkMainSpread: function () {
         if (!this.mainSpread) {
             this.mainSpread = SheetDataHelper.createNewSpread($('#billsSpread')[0]);
+            sheetCommonObj.spreadDefaultStyle(this.mainSpread);
             this.mainSpread.getActiveSheet().selectionPolicy(GC.Spread.Sheets.SelectionPolicy.muliRange);
             this.mainSpread.getActiveSheet().name('mainSheet');
             this.mainSpread.getActiveSheet().options.isProtected = true;
@@ -728,7 +729,6 @@ var projectObj = {
                 that.mainSpread.bind(GC.Spread.Sheets.Events.ButtonClicked, that.onButtonClick);
                 that.mainSpread.bind(GC.Spread.Sheets.Events.CellDoubleClick, that.onCellDoubleClick);
                 that.mainSpread.bind(GC.Spread.Sheets.Events.ColumnWidthChanged, that.onColumnWidthChanged);
-
                 //let loadOtherStartTime = +new Date();
                 if(!projectReadOnly){
                     that.loadMainSpreadContextMenu();
@@ -1448,7 +1448,6 @@ var projectObj = {
         node.changed = true;
         projectObj.project.calcProgram.calcAndSave(node);
     },
-
     //根据节点获取行style(颜色、字体加粗)
     getNodeColorStyle: function (sheet, node, tree) {
         let colorSetting = optionsOprObj.getOption(optionsOprObj.optionsTypes.COLOROPTS);
@@ -1541,6 +1540,10 @@ var projectObj = {
         if(node === tree.selected){
              style.backColor = colorSetting[mapping.SELECTED]['backColor'];
         }
+        //大项费用加粗（数字与中文字符大小不一问题由字体造成，暂时不考虑分别设置大小）
+        if(node.sourceType === this.project.Bills.getSourceType() && node.data.type === billType.DXFY){
+            style.font = 'bold 0.9rem Arial';
+        }
         style.borderLeft = new GC.Spread.Sheets.LineBorder("#D4D4D4", GC.Spread.Sheets.LineStyle.thin);
         style.borderTop = new GC.Spread.Sheets.LineBorder("#D4D4D4", GC.Spread.Sheets.LineStyle.thin);
         style.borderRight = new GC.Spread.Sheets.LineBorder("#D4D4D4", GC.Spread.Sheets.LineStyle.thin);
@@ -1567,13 +1570,13 @@ var projectObj = {
             'programID',
             'ruleText'
         ];
-
-        if(stringFields.indexOf(colSetting.data.field) > 0){
-            style.font = 'bold 15px Arial';
+        style.font = 'bold 0.9rem Arial';
+        /*if(stringFields.indexOf(colSetting.data.field) > 0){
+            style.font = 'bold 0.9rem Arial';
         }
         else {
             style.font = 'bold 13px Arial';
-        }
+        }*/
         return style;
     },
    //设置节点style

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

@@ -331,6 +331,7 @@ const billsGuidance = (function () {
     function buildSheet(module) {
         if(!module.workBook){
             module.workBook = new GC.Spread.Sheets.Workbook(module.dom[0], {sheetCount: 1});
+            sheetCommonObj.spreadDefaultStyle(module.workBook);
             let sheet = module.workBook.getActiveSheet();
             if(module === bills){
                 //默认初始可控制焦点在清单表中

web/building_saas/main/js/views/std_bills_lib.js

@@ -14,6 +14,7 @@ var billsLibObj = {
     checkBillsSpread: function () {
         if (!this.stdBillsSpread) {
             this.stdBillsSpread = SheetDataHelper.createNewSpread($('#stdBillsSpread')[0]);
+            sheetCommonObj.spreadDefaultStyle(this.stdBillsSpread);
             this.stdBillsSpread.getSheet(0).name('stdBillsLib_bills');
             // 刷新setting中记录的spread的位置
             this.refreshSettingForHint();
@@ -27,9 +28,11 @@ var billsLibObj = {
     checkBillsRelaSpread: function () {
         if (!this.stdBillsJobSpread) {
             this.stdBillsJobSpread = SheetDataHelper.createNewSpread($('#stdBillsJobs')[0]);
+            sheetCommonObj.spreadDefaultStyle(this.stdBillsJobSpread);
         }
         if (!this.stdBillsFeatureSpread) {
             this.stdBillsFeatureSpread = SheetDataHelper.createNewSpread($('#stdBillsFeatures')[0]);
+            sheetCommonObj.spreadDefaultStyle(this.stdBillsFeatureSpread);
         }
     },
     refreshBillsRelaSpread: function () {

web/building_saas/main/js/views/std_ration_lib.js

@@ -14,11 +14,13 @@ var rationLibObj = {
     checkSpread: function () {
         if (!this.rationChapterSpread) {
             this.rationChapterSpread = SheetDataHelper.createNewSpread($('#stdRationChapter')[0]);
+            sheetCommonObj.spreadDefaultStyle(this.rationChapterSpread);
             this.rationChapterSpread.getSheet(0).name('stdRationLib_chapter');
             this.rationChapterSpread.bind(GC.Spread.Sheets.Events.CellDoubleClick, this.onChapterSpreadCellDoubleClick);
         }
         if (!this.sectionRationsSpread) {
             this.sectionRationsSpread = SheetDataHelper.createNewSpread($('#stdSectionRations')[0]);
+            sheetCommonObj.spreadDefaultStyle(this.sectionRationsSpread);
 
             this.sectionRationsSpread.bind(GC.Spread.Sheets.Events.CellDoubleClick, this.onRationSpreadCellDoubleClick);
             this.refreshSettingForHint();

web/building_saas/main/js/views/sub_fee_rate_views.js

@@ -84,6 +84,7 @@ var subRateObject={
     initSubRateSpread:function (item) {
         if(this.subRateSpread == null){
             this.subRateSpread = SheetDataHelper.createNewSpread($("#subRate")[0]);
+            sheetCommonObj.spreadDefaultStyle(this.subRateSpread);
             this.subRateSheet = this.subRateSpread.getSheet(0);
             sheetCommonObj.initSheet(this.subRateSheet, this.subRateSetting, 30);
             this.subRateSheet.bind(GC.Spread.Sheets.Events.SelectionChanged, this.onSubRateSelectChanged);

web/building_saas/main/js/views/sub_view.js

@@ -12,11 +12,14 @@ let subObj = {
     initSubSpread:function () {
         contentOprObj.buildSheet($("#jobSpread")[0]);
         sheetCommonObj.bindEscKey(contentOprObj.workBook, [{sheet: contentOprObj.workBook.getSheet(0), editStarting: contentOprObj.onEditStart, editEnded: contentOprObj.onEditEnded}]);
+        sheetCommonObj.spreadDefaultStyle(contentOprObj.workBook);
         characterOprObj.buildSheet($("#itemSpread")[0]);
         sheetCommonObj.bindEscKey(characterOprObj.workBook, [{sheet: characterOprObj.workBook.getSheet(0), editStarting: characterOprObj.onEditStart, editEnded: characterOprObj.onEditEnded}]);
+        sheetCommonObj.spreadDefaultStyle(characterOprObj.workBook);
         $("#tzjnrCon").hide();
         $("#subSpread").show();
         subSpread = sheetCommonObj.createSpread($("#subSpread")[0], 4);
+        sheetCommonObj.spreadDefaultStyle(subSpread);
         subSpread.options.allowUserDragDrop = false;
         subSpread.options.allowUserDragFill = false;
         subSpread.getSheet(2).name('JSCX');

web/building_saas/main/js/views/tender_price_view.js

@@ -42,6 +42,7 @@ let tender_obj={
     initTenderSpread:function () {
         if(!this.tenderSpread){
             this.tenderSpread = SheetDataHelper.createNewSpread($("#tenderSpread")[0]);
+            sheetCommonObj.spreadDefaultStyle(this.tenderSpread);
         }
         this.tenderSheet = this.tenderSpread.getSheet(0);
         this.tenderTree = cacheTree.createNew(this);

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

@@ -31,7 +31,10 @@ let zmhs_obj = {
     },
     initSpread:function () {
         this.coeSpread = SheetDataHelper.createNewSpread($("#coeSpread")[0]);
+        sheetCommonObj.spreadDefaultStyle(this.coeSpread);
         this.assSpread = SheetDataHelper.createNewSpread($("#assSpread")[0]);
+        sheetCommonObj.spreadDefaultStyle(this.assSpread);
+
         this.coeSheet = this.coeSpread.getSheet(0);
         sheetCommonObj.initSheet(this.coeSheet, this.coeSetting, 30);
         this.coeSheet.name('ration_coe');

web/building_saas/pm/html/project-management.html

@@ -540,6 +540,7 @@
 <script src="/public/web/id_tree.js"></script>
 <script src="/public/web/tree_sheet/tree_sheet_helper.js"></script>
 <script src="/public/web/sheet/sheet_data_helper.js"></script>
+<script src="/public/web/sheet/sheet_common.js"></script>
 <script type="text/javascript" src="/public/web/common_ajax.js"></script>
 <script src="/lib/JSExpressionEval_src/Date.js"></script>
 <script src="/web/building_saas/pm/js/pm_ajax.js"></script>

web/building_saas/pm/js/pm_gc.js

@@ -88,6 +88,7 @@ const gcTreeObj = {
     buildSheet: function () {
         if(!this.workBook){
             this.workBook = new GC.Spread.Sheets.Workbook($('#gcSpread')[0], {sheetCount: 1});
+            sheetCommonObj.spreadDefaultStyle(this.workBook);
             this.setOptions(this.workBook, this.setting.options);
             this.buildHeader(this.workBook.getActiveSheet(), this.setting.header);
             this.bindEvent(this.workBook);

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);
+            sheetCommonObj.spreadDefaultStyle(projTreeObj.workBook);
             projTreeObj.sumEngineeringCost();
             projTreeObj.showTreeData(projTreeObj.tree.items, projTreeObj.setting.header, projTreeObj.workBook.getActiveSheet());
             //初始选择

web/building_saas/pm/js/pm_share.js

@@ -132,6 +132,7 @@ const pmShare = (function () {
     //
     function buildSheet(){
         spreadObj.workBook = new GC.Spread.Sheets.Workbook(spreadDom[0], {sheetCount: 1});
+        sheetCommonObj.spreadDefaultStyle(spreadObj.workBook);
         spreadObj.sheet = spreadObj.workBook.getActiveSheet();
         setSpreadOptions(spreadObj.workBook, spreadOpts);
         bindEvent(spreadObj.workBook, spreadEvents);