修改可拖拽区域

web/building_saas/css/main.css

@@ -316,9 +316,4 @@ body {
 }
 .dropdown-item.disabled, .dropdown-item:disabled{
   pointer-events:none
-}
-.resize-line{
-    cursor: s-resize;
-    height: 4px;
-    background: #f7f7f9;
 }

web/building_saas/glj/html/glj_index.html

@@ -18,7 +18,6 @@
                     <p style="text-align: center; margin-top: 30px;">正在加载数据</p>
                 </div>
             </div>
-            <div class="resize-line"></div>
             <div class="bottom-content">
                 <ul class="nav nav-tabs" role="tablist">
                     <li class="nav-item">
@@ -30,6 +29,9 @@
                     <li class="nav-item">
                         <a class="nav-link" data-toggle="tab" data-name="machine" href="#jx" role="tab">机械单价</a>
                     </li>
+                    <li class="nav-item ml-auto mr-4">
+                        <a class="nav-link text-muted position-absolute resize" data-toggle="tooltip" data-placement="bottom" title="按住，上下拖动调整高度"><i class="fa fa-arrows-v"></i></a>
+                    </li>
                 </ul>
                 <!-- Tab panes -->
                 <div class="tab-content">

web/building_saas/js/global.js

@@ -17,10 +17,7 @@ function autoFlashHeight(){
     $(".poj-list").height($(window).height()-headerHeight-toolsbarHeight);
     $(".form-view").height($(window).height()-headerHeight-ftoolsbarHeight);
     $(".form-list").height($(window).height()-headerHeight-50 );
-    // 读取本地存储的高度
-    loadSize("main", function() {
-        refreshSubSpread();
-    });
+
 };
 $(window).resize(autoFlashHeight);
 /*全局自适应高度结束*/
@@ -46,7 +43,7 @@ $(function () {
     /*侧滑*/
     /*工具提示*/
     $(function () {
-        $('[data-toggle="tooltip"]').tooltip()
+        $('[data-toggle="tooltip"]').tooltip();
     });
 
 });

web/building_saas/main/html/main.html

@@ -84,7 +84,6 @@
                           <div class="top-content">
                               <div class="main-data-top" id="billsSpread"></div>
                           </div>
-                          <div class="resize-line"></div>
                           <div class="bottom-content">
                               <ul class="nav nav-tabs" role="tablist">
                                   <li class="nav-item">
@@ -108,6 +107,9 @@
                                   <li class="nav-item">
                                       <a class="nav-link" id="linkTZJNR" data-toggle="tab" href="#subSpread" role="tab">特征及内容</a>
                                   </li>
+                                  <li class="nav-item ml-auto mr-4">
+                                      <a class="nav-link text-muted position-absolute resize" data-toggle="tooltip" data-placement="bottom" title="按住，上下拖动调整高度"><i class="fa fa-arrows-v"></i></a>
+                                  </li>
                               </ul>
                               <!-- Tab panes -->
                               <div class="tab-content" id="tabCon">
@@ -636,12 +638,6 @@
 
         <script type="text/javascript" src="/public/web/sheet/sheet_common.js"></script>
 
-
-        <!-- JS. -->
-        <script src="/lib/popper/popper.min.js"></script>
-        <script src="/lib/bootstrap/bootstrap.min.js"></script>
-        <script src="/web/building_saas/js/global.js"></script>
-
         <!--expression calculate-->
         <script src="/lib/JSExpressionEval_src/Date.js"></script>
         <script src="/lib/JSExpressionEval_src/Stack.js"></script>
@@ -658,6 +654,11 @@
         <script type="text/javascript" src="/public/web/url_util.js"></script>
         <script type="text/javascript" src="/public/web/number_util.js"></script>
         <script type="text/javascript" src="/public/web/sheet/sheet_common.js"></script>
+
+        <!-- JS. -->
+        <script src="/lib/popper/popper.min.js"></script>
+        <script src="/lib/bootstrap/bootstrap.min.js"></script>
+        <script src="/web/building_saas/js/global.js"></script>
         <!--报表 zTree -->
 
         <!-- SpreadJs -->

web/building_saas/main/js/main.js

@@ -19,6 +19,11 @@ $(function () {
         // do something
     });
 
+    // 读取本地存储的高度
+    loadSize("main", function() {
+        refreshSubSpread();
+    });
+
     slideResize($("#main"), function() {
         projectObj.mainSpread.refresh();
         refreshSubSpread();
@@ -35,7 +40,7 @@ $(function () {
 function slideResize(rootElement, callback) {
     let startY = 0;
     let drag = false;
-    const element = rootElement.find('.resize-line');
+    const element = rootElement.find('.resize');
     const topContentEle = rootElement.find(".top-content");
     const bottomContentEle = rootElement.find(".bottom-content");
     let topContentHeight = 0;
@@ -54,6 +59,7 @@ function slideResize(rootElement, callback) {
         bottomContentHeight = bottomContentEle.height();
         // nav高度部分
         navHeight = bottomContentEle.children('ul.nav').height();
+        element.tooltip('hide');
     });
 
     // 鼠标移动