分享与取消分享同一页面，取消取消分享

web/building_saas/main/html/main.html

@@ -177,7 +177,7 @@
                   <div class="row">
                       <!--col-lg-12 p-0-->
                       <div class="main-content" style="width: 100%; display: inline-block" id="main">
-                          <div class="top-content" id="top_div">
+                          <div class="top-content" id="top_div" style="overflow:hidden;">
                               <div class="main-data-top" id="billsSpread"></div>
                           </div>
                           <div class="resize"></div>

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

@@ -31,6 +31,12 @@
         #summary-engineering,#summary-project{
             display: none;
         }
+        #shareToInfo {
+            display:block;
+            height:200px;
+            overflow-y:auto;
+            -webkit-overflow-scrolling: touch;
+        }
     </style>
 </head>
 
@@ -650,7 +656,7 @@
                     </div>
                 </div>
                 <table class="table table-sm" id="shareFindDiv">
-                    <tbody>
+                    <tbody style="display: block">
                     <tr><th style="width: 112px;">姓名</th><th style="width: 165px;">公司</th><th style="width: 136px;">手机</th><th style="width: 160px;">邮箱</th><th style="width: 90px;">允许拷贝</th><th style="width: 90px;">添加分享</th></tr>
                     <tr><td id="user_name">张三</td><td id="user_company">XX公司</td><td id="user_mobile">12345678900</td><td id="user_email"></td><td><input id="allowCopy" type="checkbox"></td><td><a id="share-confirm" href="javascript:void(0)" class="btn btn-sm btn-primary">添加分享</a></td></tr>
                     </tbody>

web/building_saas/pm/js/pm_newMain.js

@@ -1901,7 +1901,7 @@ function AddTenderItems(selected, projName, engName, tenderName, property, callb
             let updateProjs = GetUpdateData(pre, parent, next, projName, null, projID, {updateType: 'new', projectType: projectType.project});
             let updateEng = {updateType: 'new', updateData: {ID: engID, ParentID: projID, NextSiblingID: -1, name: engName, projType: projectType.engineering}};
             property.rootProjectID = projID;
-            let updateTender = {updateType: 'new', updateData: {ID: tenderID, ParentID: engID, NextSiblingID: -1, name: tenderName, projType: projectType.tender, property: property}};
+            let updateTender = {updateType: 'new', updateData: {ID: tenderID, ParentID: engID, NextSiblingID: -1, shareInfo: [], name: tenderName, projType: projectType.tender, property: property}};
             updateDatas = updateDatas.concat(updateProjs);
             updateDatas.push(updateEng);
             updateDatas.push(updateTender);
@@ -1936,7 +1936,7 @@ function AddTenderItems(selected, projName, engName, tenderName, property, callb
             let next = null;
             let updateEng = {updateType: 'new', updateData: {ID: engID, ParentID: tempProj.data.ID, NextSiblingID: -1, name: engName, projType: projectType.engineering}};
             property.rootProjectID = tempProj.data.ID;
-            let updateTender = {updateType: 'new', updateData: {ID: tenderID, ParentID: engID, NextSiblingID: -1, name: tenderName, projType: projectType.tender, property: property}};
+            let updateTender = {updateType: 'new', updateData: {ID: tenderID, ParentID: engID, NextSiblingID: -1,  shareInfo: [], name: tenderName, projType: projectType.tender, property: property}};
             if(selected && selected.data.projType === projectType.engineering && selected.parent === tempProj){
                 pre = selected;
                 next = selected.nextSibling;
@@ -1972,7 +1972,7 @@ function AddTenderItems(selected, projName, engName, tenderName, property, callb
             let tenderID = IDs.lowID;
             let pre = tempEng.lastChild();
             property.rootProjectID = tempProj.data.ID;
-            let updateTender = {updateType: 'new', updateData: {ID: tenderID, ParentID: tempEng.id(), NextSiblingID: -1, name: tenderName, projType: projectType.tender, property: property}};
+            let updateTender = {updateType: 'new', updateData: {ID: tenderID, ParentID: tempEng.id(), NextSiblingID: -1,  shareInfo: [], name: tenderName, projType: projectType.tender, property: property}};
             updateDatas.push(updateTender);
             if(pre){
                 updateDatas.push({updateType: 'update', updateData: {ID: pre.id(), NextSiblingID: tenderID}});
@@ -3385,6 +3385,7 @@ $('#sharePhone').on('keyup',function () {
 $('#share-confirm').click(function(){
     const hintInfo = $('#share-info');
     $.bootstrapLoading.start();
+    const perHeight = 30;
     let allowCopy = $('#allowCopy').prop('checked'),
         userName = $('#user_name').text() || '',
         userCompany = $('#user_company').text() || '',
@@ -3402,6 +3403,8 @@ $('#share-confirm').click(function(){
                         <td style="width: 90px;"><input value="allowCopy" ${allowCopy ? 'checked' : ''} type="checkbox"></td>
                         <td style="width: 90px;"><input value="cancelShare" type="checkbox"></td>
                      </tr>`);
+        let tbodyTotalHeight = $('#shareToInfo').height() + perHeight > 200 ? 200 : $('#shareToInfo').height() + perHeight;
+        $('#shareToInfo').height(tbodyTotalHeight);
         $('#shareToInfo').append($tr);
         //更新缓存
        // if (shareSeleted.data.shareInfo.length === 0) {
@@ -3443,6 +3446,7 @@ $('#shareToConfirm').click(function () {
 //设置分享给界面数据
 //@param {Object}selected @return {void}
 function setShareToModal(selected){
+    const perHeight = 30; //每条分享给数据的高度
     $('#shareToInfo').empty();
     if(!selected){
         return;
@@ -3484,6 +3488,8 @@ function setShareToModal(selected){
                                </tr>`;
             infoArr.push(infoHtml);
         }
+        let tbodyTotalHeight = infoArr.length * perHeight + 5 > 200 ? 200 : infoArr.length * perHeight + 5;
+        $('#shareToInfo').height(tbodyTotalHeight);
         let infoHtml = infoArr.join('');
         $('#shareToInfo').html(infoHtml);
     });