Browse Source

bs jQueryui tooltip冲突

zhongzewei 6 years ago
parent
commit
0639d32c2a

+ 2 - 2
web/building_saas/main/html/main.html

@@ -63,7 +63,7 @@
                     <!--<a href="javascript:void(0)" class="btn btn-sm" title="复制" ><i class="fa fa-files-o" aria-hidden="true"></i></a>
                     <a href="javascript:void(0)" class="btn btn-sm" title="剪切"><i class="fa fa-scissors" aria-hidden="true"></i></a>
                     <a href="javascript:void(0)" class="btn btn-sm" title="粘贴"><i class="fa fa-clipboard" aria-hidden="true"></i></a>-->
-                    <a class="btn btn-sm" href="javascript:void(0);" aria-expanded="false" data-toggle="modal" data-target="#poj-set"><i class="fa fa-cog" data-toggle="tooltip" title="项目属性" data-placement="bottom"></i></a>
+                    <a class="btn btn-sm" href="javascript:void(0);" aria-expanded="false" data-toggle="modal" data-target="#poj-set"><i class="fa fa-cog" data-original-title="项目属性" data-toggle="tooltip" data-placement="bottom"></i></a>
                     <span class="btn btn-sm">
                         <a class="dropdown-toggle" href="#" data-toggle="dropdown"><i class="fa  fa-cloud-upload" data-toggle="tooltip" data-placement="bottom" title="导入"></i></a>
                         <div class="dropdown-menu">
@@ -96,7 +96,7 @@
                       <% } else { %>
                       <a href="javascript:void(0)" data-toggle="tooltip" class="btn btn-sm" name="lockBills" data-original-title="锁定清单"> <i class="fa fa-lock" aria-hidden="true"></i></a>
                       <% } %>
-                      <a id="switchTznr" data-toggle="tooltip" href="javascript:void(0);" class="btn btn-sm"  data-placement="bottom" data-original-title="显示特征"><i class="fa fa-eye" aria-hidden="true"></i></a>
+                      <a id="switchTznr" href="javascript:void(0);" class="btn btn-sm"  data-placement="bottom" title="显示特征"><i class="fa fa-eye" aria-hidden="true"></i></a>
                   </div>
                   <div class="side-tabs">
                       <ul class="nav nav-tabs" role="tablist">

+ 1 - 1
web/building_saas/main/js/views/main_tree_col.js

@@ -530,7 +530,7 @@ function switchTznrHtml(show) {
 $('#switchTznr').click(function () {
     let me = colSettingObj;
     let cur = $(this).attr('data-original-title');
-    $("[data-toggle='tooltip']").tooltip('hide');
+    //$("[data-toggle='tooltip']").tooltip('hide');
     if(cur.includes('显示特征')){
         switchTznrHtml(false);
         me.setVisible('itemCharacterText', true);

+ 1 - 1
web/building_saas/main/js/views/project_view.js

@@ -1725,7 +1725,7 @@ $("a[name='lockBills']").click(function () {//点击锁定/解锁清单
         if(!projectReadOnly){
             pageCCOprObj.refreshRuleTools(lockBills);
         }
-        $("[data-toggle='tooltip']").tooltip('hide');
+        //$("[data-toggle='tooltip']").tooltip('hide'); bs 与 jqueryUI冲突
     });
 });
 $('#ZLFB_btn').click(function () {