分享只读的完善处理

特征及内容工具栏位置调整

web/building_saas/css/custom.css

@@ -287,4 +287,12 @@ input.text-right{
 }
 .more{
     padding-left:.25rem!important
+}
+.bottom-tznrTools {
+    height: 30px;
+    line-height: 30px;
+    background:#efefef;
+    bottom:30px;
+    left:0px;
+    z-index: 999
 }

web/building_saas/main/html/main.html

@@ -299,29 +299,29 @@
                                       <div id="tzjnrCon" class="container-fluid main-data-bottom" style="background: #F1F1F1; overflow: hidden">
                                           <div class="row" style="overflow: hidden">
                                               <div class="p-0" id="contentDiv" style="width: 90%; float: left">
-                                                  <div id="jobDiv" style="width: 25%; height: 100%; position:relative; float: left">
-                                                      <div class="main-data-bottom ovf-hidden" id="jobSpread" style="width: 99%; float: left">
+                                                  <div id="jobDiv" style="width: 25%; height: 100%;float: left">
+                                                      <div class="main-data-bottom ovf-hidden" id="jobSpread" style="width: 99%; float: left; position: relative">
+                                                          <!--工具栏-->
+                                                          <div class="bottom-tznrTools btn-group position-absolute">
+                                                              <a href="javascript:void(0);" id="jobInsert" class="btn btn-sm disabled" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="插入"><i class="fa fa-sign-in" aria-hidden="true"></i></a>
+                                                              <a href="javascript:void(0);" id="jobAdd" class="btn btn-sm " data-toggle="tooltip" data-placement="bottom" title="" data-original-title="添加"><i class="fa fa-plus" aria-hidden="true"></i></a>
+                                                              <a href="javascript:void(0);" id="jobDel" class="btn btn-sm disabled" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="删除"><i class="fa fa-remove" aria-hidden="true"></i></a>
+                                                              <a href="javascript:void(0);" id="jobDown" class="btn btn-sm disabled" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="下移"><i class="fa fa-arrow-down" aria-hidden="true"></i></a>
+                                                              <a href="javascript:void(0);" id="jobUp" class="btn btn-sm disabled" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="上移"><i class="fa fa-arrow-up" aria-hidden="true"></i></a>
+                                                          </div>
                                                       </div>
                                                       <div class="resize-x" id="TZJNRResize"></div>
-                                                      <!--工具栏-->
-                                                      <div class="bottom-tools btn-group position-absolute">
-                                                          <a href="javascript:void(0);" id="jobInsert" class="btn btn-sm disabled" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="插入"><i class="fa fa-sign-in" aria-hidden="true"></i></a>
-                                                          <a href="javascript:void(0);" id="jobAdd" class="btn btn-sm " data-toggle="tooltip" data-placement="bottom" title="" data-original-title="添加"><i class="fa fa-plus" aria-hidden="true"></i></a>
-                                                          <a href="javascript:void(0);" id="jobDel" class="btn btn-sm disabled" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="删除"><i class="fa fa-remove" aria-hidden="true"></i></a>
-                                                          <a href="javascript:void(0);" id="jobDown" class="btn btn-sm disabled" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="下移"><i class="fa fa-arrow-down" aria-hidden="true"></i></a>
-                                                          <a href="javascript:void(0);" id="jobUp" class="btn btn-sm disabled" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="上移"><i class="fa fa-arrow-up" aria-hidden="true"></i></a>
-                                                      </div>
                                                   </div>
-                                                  <div id="itemDiv" style="width: 75%; height: 100%; position:relative; float: left;">
-                                                      <div class="main-data-bottom ovf-hidden"  id="itemSpread">
-                                                      </div>
-                                                      <!--工具栏-->
-                                                      <div class="bottom-tools btn-group position-absolute">
-                                                          <a href="javascript:void(0);" id="itemInsert" class="btn btn-sm disabled" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="插入"><i class="fa fa-sign-in" aria-hidden="true"></i></a>
-                                                          <a href="javascript:void(0);" id="itemAdd" class="btn btn-sm " data-toggle="tooltip" data-placement="bottom" title="" data-original-title="添加"><i class="fa fa-plus" aria-hidden="true"></i></a>
-                                                          <a href="javascript:void(0);" id="itemDel" class="btn btn-sm disabled" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="删除"><i class="fa fa-remove" aria-hidden="true"></i></a>
-                                                          <a href="javascript:void(0);" id="itemDown" class="btn btn-sm disabled" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="下移"><i class="fa fa-arrow-down" aria-hidden="true"></i></a>
-                                                          <a href="javascript:void(0);" id="itemUp" class="btn btn-sm disabled" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="上移"><i class="fa fa-arrow-up" aria-hidden="true"></i></a>
+                                                  <div id="itemDiv" style="width: 75%; height: 100%; float: left;">
+                                                      <div class="main-data-bottom ovf-hidden" id="itemSpread" style="position: relative;">
+                                                          <!--工具栏-->
+                                                          <div class="bottom-tznrTools btn-group position-absolute">
+                                                              <a href="javascript:void(0);" id="itemInsert" class="btn btn-sm disabled" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="插入"><i class="fa fa-sign-in" aria-hidden="true"></i></a>
+                                                              <a href="javascript:void(0);" id="itemAdd" class="btn btn-sm " data-toggle="tooltip" data-placement="bottom" title="" data-original-title="添加"><i class="fa fa-plus" aria-hidden="true"></i></a>
+                                                              <a href="javascript:void(0);" id="itemDel" class="btn btn-sm disabled" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="删除"><i class="fa fa-remove" aria-hidden="true"></i></a>
+                                                              <a href="javascript:void(0);" id="itemDown" class="btn btn-sm disabled" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="下移"><i class="fa fa-arrow-down" aria-hidden="true"></i></a>
+                                                              <a href="javascript:void(0);" id="itemUp" class="btn btn-sm disabled" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="上移"><i class="fa fa-arrow-up" aria-hidden="true"></i></a>
+                                                          </div>
                                                       </div>
                                                   </div>
                                               </div>

web/building_saas/main/js/views/billsElf.js

@@ -465,26 +465,28 @@ const BillsElf = (function() {
             let $editInput = $(`<div style="height: ${height}px; background: ${cellStyle.backColor};overflow: hidden; white-space: nowrap; text-overflow: ellipsis">${node.data.options}</div>`),
                 $optDiv = $(`<div style="position: fixed; width: ${cellRect.width}px; top: ${top}px;background: ${cellStyle.backColor};border: 1px solid; overflow: auto; height: ${options.length > 6 ? height*6+5 : height*options.length+5}px; font-size: 0.9rem;"></div>`);
             for(let opt of options){
-                let $opt = $(`<div title="${opt.name ? opt.name : ''}" class="elf-options" style="height: ${height}px;overflow: hidden; white-space: nowrap; text-overflow: ellipsis"></div>`),
-                    $optInput = $(`<input rank="${opt.rank}" value="${opt.ID}" style="margin-left: 5px; vertical-align: middle" type="checkbox" 
-                    ${node.data.optionChecked && _.find(node.data.optionChecked, {ID: opt.ID}) ? 'checked' : ''}>`);
+                let $opt = $(`<div title="${opt.name ? opt.name : ''}" class="elf-options" style="cursor: pointer; height: ${height}px;overflow: hidden; white-space: nowrap; text-overflow: ellipsis"></div>`),
+                    $optInput = $(`<input rank="${opt.rank}" value="${opt.ID}" style="cursor: pointer; margin-left: 5px; vertical-align: middle" type="checkbox" 
+                    ${node.data.optionChecked && _.find(node.data.optionChecked, {ID: opt.ID}) ? 'checked' : ''} ${projectReadOnly ? 'disabled' : ''}>`);
                 $opt.text(`${opt.name ? opt.name : ''}`);
                 $opt.prepend($optInput);
                 $optDiv.append($opt);
                 //选项复选框点击监听
-                $opt.click(function () {
-                    //单选
-                    if(billsGuidanceSelMode === 0){
-                        let $allInput = $optDiv.find('input');
-                        for(let input of $allInput){
-                            $(input).prop('checked', false);
-                        }
-                        $($optInput).prop('checked', 'checked');
-                        elfItem.workBook.getSheet(0).endEdit();
-                    } else {//多选
+                if (!projectReadOnly) {
+                    $opt.click(function () {
+                        //单选
+                        if(billsGuidanceSelMode === 0){
+                            let $allInput = $optDiv.find('input');
+                            for(let input of $allInput){
+                                $(input).prop('checked', false);
+                            }
+                            $($optInput).prop('checked', 'checked');
+                            elfItem.workBook.getSheet(0).endEdit();
+                        } else {//多选
 
-                    }
-                });
+                        }
+                    });
+                }
             }
             $editor.append($editInput);
             $editor.append($optDiv);

web/building_saas/main/js/views/mbzm_view.js

@@ -483,6 +483,9 @@ $('#createLocation').change(function(){
 
 
 $('#next_mbzm').click(function () {
+    if (projectReadOnly) {
+        return;
+    }
     let mainSheet = projectObj.mainSpread.getActiveSheet();
     let selection = mainSheet.getSelections()[0];
     let node =  projectObj.project.mainTree.selected;

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

@@ -3154,6 +3154,9 @@ function disableTools(){
     //清单精灵
     $('#elfInsertRation').addClass('disabled');
     $('#elfInsertSingle').addClass('disabled');
+    //模板子目：应用、下一条
+    $('#apply_mbzm').addClass('disabled');
+    $('#next_mbzm').addClass('disabled');
     //特征及内容
     $('#add-rule').find('select').prop('disabled', 'disabled');
     $('#use-to-current').addClass('disabled');
@@ -3168,9 +3171,9 @@ function disableTools(){
     $('#compleRationLib').addClass('disabled');
     $('#compleGljLib').addClass('disabled')
     //库
-    $('#stdBillsGuidanceTab').addClass('disabled');
+    //$('#stdBillsGuidanceTab').addClass('disabled');
     $('#stdBillsTab').addClass('disabled');
-    $('#stdRationTab').addClass('disabled');
+    //$('#stdRationTab').addClass('disabled');
     $('#blockLibTab').addClass('disabled');
     //人材机汇总,选择其他、另存使用
     $('a[data-target="#change-unitFile"]').remove();

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

@@ -105,10 +105,7 @@ const billsGuidance = (function () {
                 if(!node){
                     return;
                 }
-                if(node.children.length === 0){
-                    billsLibObj.insertBills(stdBillsJobData, stdBillsFeatureData, node);
-                }
-                else {
+                if(node.children.length > 0){
                     node.setExpanded(!node.expanded);
                     //设置展开收起状态
                     sessionStorage.setItem('stdBillsGuidanceExpState', bills.tree.getExpState(bills.tree.items));
@@ -121,6 +118,8 @@ const billsGuidance = (function () {
                         args.sheet.invalidateLayout();
                     });
                     args.sheet.repaint();
+                } else if(!projectReadOnly) {
+                    billsLibObj.insertBills(stdBillsJobData, stdBillsFeatureData, node);
                 }
             }
         }
@@ -737,7 +736,7 @@ const billsGuidance = (function () {
     function bindBtn(){
         //打开清单指引库
         $('#stdBillsGuidanceTab').click(function () {
-            if(libSel.children().length === 0 && !projectReadOnly && !$(this).hasClass('disabled')){
+            if(libSel.children().length === 0 && !$(this).hasClass('disabled')){
                 initLibs(projectInfoObj.projectInfo.engineeringInfo.billsGuidance_lib);
             }
         });

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

@@ -27,8 +27,9 @@ var rationLibObj = {
         if (!this.sectionRationsSpread) {
             this.sectionRationsSpread = SheetDataHelper.createNewSpread($('#stdSectionRations')[0]);
             sheetCommonObj.spreadDefaultStyle(this.sectionRationsSpread);
-
-            this.sectionRationsSpread.bind(GC.Spread.Sheets.Events.CellDoubleClick, this.onRationSpreadCellDoubleClick);
+            if (!projectReadOnly) {
+                this.sectionRationsSpread.bind(GC.Spread.Sheets.Events.CellDoubleClick, this.onRationSpreadCellDoubleClick);
+            }
             this.refreshSettingForHint();
         }
     },
@@ -280,6 +281,9 @@ var rationLibObj = {
                 "insertStdRation": {
                     name: "插入定额",
                     icon: 'fa-sign-in',
+                    disabled: function () {
+                        return projectReadOnly;
+                    },
                     callback: function (key, opt) {
                         let select = $('#stdRationLibSelect'), rationSelect = rationSheet.getSelections();
                         let rationCode = rationSelect.length > 0 ? rationSheet.getText(rationSelect[0].row, 0) : '';
@@ -292,6 +296,9 @@ var rationLibObj = {
                 "replaceStdRation": {
                     name: "替换定额",
                     icon: 'fa-sign-in',
+                    disabled: function () {
+                        return projectReadOnly
+                    },
                     callback: function (key, opt) {
                         let select = $('#stdRationLibSelect'), rationSelect = rationSheet.getSelections();
                         let rationCode = rationSelect.length > 0 ? rationSheet.getText(rationSelect[0].row, 0) : '';
@@ -533,14 +540,12 @@ if($('#stdRationChapter').height() === 0 || $('#stdSectionRations').height() ===
 }
 
 $('#stdRationTab').bind('click', function () {
-    if(!projectReadOnly){
-        var select = $('#stdRationLibSelect');
-        rationLibObj.checkSpread();
-        if (select[0].options.length === 0) {
-            rationLibObj.loadStdRationLibs();
-            rationLibObj.loadStdRationContextMenu();
-        };
-    }
+    var select = $('#stdRationLibSelect');
+    rationLibObj.checkSpread();
+    if (select[0].options.length === 0) {
+        rationLibObj.loadStdRationLibs();
+        rationLibObj.loadStdRationContextMenu();
+    };
 });
 $('#stdRationLibSelect').change(function () {
     var select = $(this);
@@ -694,7 +699,9 @@ function seachRation(){
             rationLibObj.resultSpread = resultSpread;
             bindContextmenuOpr(resultSpread.getActiveSheet());
             SheetDataHelper.loadSheetHeader(rationLibObj.sectionRationsSetting, resultSpread.getActiveSheet());
-            resultSpread.bind(GC.Spread.Sheets.Events.CellDoubleClick, rationLibObj.onRationSpreadCellDoubleClick);
+            if (!projectReadOnly) {
+                resultSpread.bind(GC.Spread.Sheets.Events.CellDoubleClick, rationLibObj.onRationSpreadCellDoubleClick);
+            }
             resultSpread.bind(GC.Spread.Sheets.Events.TopRowChanged, rationLibObj.onRationSpreadTopRowChanged);
         }else {
             rationLibObj.resultSpread.refresh();