主界面面包屑导航更新

public/web/tree_sheet/tree_sheet_helper.js

@@ -336,7 +336,7 @@ var TREE_SHEET_HELPER = {
                 $(this._toolTipElement).show("fast");
             }
         };
-        TipCellType.prototype.processMouseLeave = function (hininfo) {
+        TipCellType.prototype.processMouseLeave = function (hitinfo) {
             if (this._toolTipElement) {
                 document.body.removeChild(this._toolTipElement);
                 this._toolTipElement = null;

web/building_saas/css/main.css

@@ -305,6 +305,7 @@ body {
   background:#fff;
   border-bottom:1px solid #ddd
 }
-.gc-column-header-cell{
-    text-align: center!important;
+.navbar-crumb span{
+  max-width: 200px;
+  display: inline-block;
 }

web/building_saas/js/global.js

@@ -21,11 +21,11 @@ function autoFlashHeight(){
 $(window).resize(autoFlashHeight);
 /*全局自适应高度结束*/
 $(function(){
-    /*侧滑*/
-    $(".open-sidebar").click(function(){
-        $(".slide-sidebar").animate({width:"800"}).addClass("open");
-    });
-    $("body").click(function(event){
+/*侧滑*/
+$(".open-sidebar").click(function(){
+    $(".slide-sidebar").animate({width:"800"}).addClass("open");
+});
+$("body").click(function(event){
         var e = event || window.event; //浏览器兼容性
         if(!$(event.target).is('a')) {
             var elem = event.target || e.srcElement;
@@ -39,13 +39,9 @@ $(function(){
         }
 
     });
-    /*侧滑*/
-    /*工具提示*/
-    $(function () {
-        $('[data-toggle="tooltip"]').tooltip()
-    });
-    /*工具提示*/
-    $(function () {
-        $('[data-toggle="popover"]').popover()
-    });
+/*侧滑*/
+/*工具提示*/
+$(function () {
+  $('[data-toggle="tooltip"]').tooltip()
+});
 });

web/building_saas/main/html/main.html

@@ -16,8 +16,6 @@
     <link rel="stylesheet" href="/lib/spreadjs/views/gc.spread.views.dataview.10.0.0.css">
     <!-- jquery.contextmenu -->
     <link rel="stylesheet" href="/lib/jquery-contextmenu/jquery.contextMenu.css" type="text/css">
-    <script src="/lib/jquery/jquery.min.js"></script>
-    <script src="/web/building_saas/js/global.js"></script>
     <script>
         // 这里的变量供页面调用
         var userAccount = '<%- userAccount %>';
@@ -512,19 +510,19 @@
         </div>
     </div>
     <!-- JS. -->
+    <script src="/lib/jquery/jquery.min.js"></script>
+    <script src="/lib/tether/tether.min.js"></script>
+    <script src="/lib/bootstrap/bootstrap.min.js"></script>
+    <script src="/web/building_saas/js/global.js"></script>
     <script type="text/javascript">
         autoFlashHeight();
     </script>
-
-    <script src="/lib/tether/tether.min.js"></script>
-    <script src="/lib/bootstrap/bootstrap.min.js"></script>
     <!--expression calculate-->
     <script src="/lib/JSExpressionEval_src/Date.js"></script>
     <script src="/lib/JSExpressionEval_src/Stack.js"></script>
     <script src="/lib/JSExpressionEval_src/Tokanizer.js"></script>
     <script src="/lib/JSExpressionEval_src/Evaluator.js"></script>
     <!--end expression calculate-->
-    <!--<script type="text/javascript" src="/lib/bootstrap/bootstrap-select.min.js"></script>-->
     <script type="text/javascript" src="/lib/jquery-contextmenu/jquery.contextMenu.js"></script>
     <script type="text/javascript" src="/lib/jquery-contextmenu/jquery.ui.position.js"></script>
     <script type="text/javascript" src="/lib/lodash/lodash.js"></script>
@@ -569,11 +567,6 @@
     <script type="text/javascript" src="/public/web/tree_sheet/tree_sheet_helper.js"></script>
     <script type="text/javascript" src="/public/web/sheet/sheet_data_helper.js"></script>
 
-    <!-- Test Data -->
-    <script type="text/javascript" src="/test/tmp_data/bills_grid_setting.js"></script>
-    <!--<script type="text/javascript" src="/test/tmp_data/test_bills_calc/bills_grid_setting_test_calc.js"></script>
-    <script type="text/javascript" src="/test/tmp_data/test_bills_calc/bills_data_15690.js"></script>
-    <script type="text/javascript" src="/test/tmp_data/test_bills_calc/drawing_data_10268.js"></script>-->
     <!-- view -->
     <script type="text/javascript" src="/web/building_saas/main/js/views/main_tree_col.js"></script>
     <script type="text/javascript" src="/web/building_saas/main/js/views/project_info.js"></script>

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

@@ -40,10 +40,10 @@ let MainTreeCol = {
         },
         forCalcBase: function (node) {
             // to do according to billsParentType
-            return MainTreeCol.readOnly.billsParent(node) && MainTreeCol.readOnly.non_bills(node);
+            return MainTreeCol.readOnly.billsParent(node) || MainTreeCol.readOnly.non_bills(node);
         },
         forUnitFee: function (node) {
-            return MainTreeCol.readOnly.ration(node) && MainTreeCol.readOnly.billsParent(node);
+            return MainTreeCol.readOnly.ration(node) || MainTreeCol.readOnly.billsParent(node);
         }
     },
     cellType: {

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

@@ -5,13 +5,19 @@
 var projectInfoObj = {
     projectInfo: null,
     getFullPathHtml: function (proj) {
-        var fullPath = [], i, pm = '<a href="/pm">项目管理</a>', angleRight = '<i class="fa fa-angle-right fa-fw"></i>';
+        let fullPath = [], i, pm = '<span class="text-truncate"><a href="/pm">项目管理</a></span>', angleRight = '<span class="text-truncate"><i class="fa fa-angle-right fa-fw"></i></span>';
         fullPath.push(pm);
         if (proj && proj.fullFolder) {
             for (i = 0; i < proj.fullFolder.length; i++) {
-                fullPath.push(angleRight, proj.fullFolder[i]);
+                if (i <= proj.fullFolder.length - 3) {
+                    fullPath.push(angleRight, '<span class="text-truncate" data-toggle="tooltip" data-placement="bottom" title="', proj.fullFolder[i], '"><i class="fa fa-folder-open-o"></i></span>');
+                } else if (i === proj.fullFolder.length - 2) {
+                    fullPath.push(angleRight, '<span class="text-truncate" data-toggle="tooltip" data-placement="bottom" title="' + proj.fullFolder[i] + '"><i class="fa fa-cubes"></i>' + proj.fullFolder[i] + '</span>');
+                } else if (i === proj.fullFolder.length - 1) {
+                    fullPath.push(angleRight, '<span class="text-truncate" data-toggle="tooltip" data-placement="bottom" title="' + proj.fullFolder[i] + '"><i class="fa fa-cube"></i>' + proj.fullFolder[i] + '</span>');
+                }
             }
-            fullPath.push(angleRight, proj.name);
+            fullPath.push(angleRight, '<span class="text-truncate" data-toggle="tooltip" data-placement="bottom" title="' + proj.name + '"><i class="fa fa-sticky-note-o"></i>' + proj.name + '</span>');
         }
         return fullPath.join('');
     },

web/common/html/header.html

@@ -1,8 +1,8 @@
 <nav class="navbar navbar-toggleable-lg navbar-light bg-faded p-0 justify-content-between">
     <span class="header-logo px-2">Smartcost</span>
-    <div class="navbar-text" id="fullpath">
+    <div class="navbar-text navbar-crumb p-0" id="fullpath">
         <% if (action !== 'index' || controller !== 'pm') {%>
-        <a href="/pm">项目管理</a>
+        <span class="text-truncate"><a href="/pm">项目管理</a></span>
         <% } %>
     </div>
     <div class="float-lg-right navbar-text pt-0">