Procházet zdrojové kódy

优化表格拖拽移动时tooltip定位

Karson před 1 rokem
rodič
revize
c170985264

+ 3 - 0
public/assets/css/backend.css

@@ -970,6 +970,9 @@ form.form-horizontal .control-label {
 .fixed-table-container .bs-checkbox {
   min-width: 36px;
 }
+.fixed-table-container tr[data-origpos] > td > .tooltip.in {
+  display: none!important;
+}
 /*修复nice-validator新版下的一处BUG*/
 .nice-validator input,
 .nice-validator select,

+ 14 - 0
public/assets/css/frontend.css

@@ -652,6 +652,20 @@ form.form-horizontal .control-label {
     padding: 15px;
     min-height: 300px;
   }
+  .n-bootstrap .n-right {
+    margin-top: 0;
+    top: -20px;
+    position: absolute;
+    left: 0;
+    text-align: right;
+    width: 100%;
+  }
+  .n-bootstrap .n-right .msg-wrap {
+    position: relative;
+  }
+  .n-bootstrap .col-xs-12 > .n-right .msg-wrap {
+    margin-right: 15px;
+  }
 }
 .nav-pills > li {
   margin-right: 5px;

+ 1 - 1
public/assets/js/backend.js

@@ -242,7 +242,7 @@ define(['fast', 'template', 'moment'], function (Fast, Template, Moment) {
             }
             //tooltip和popover
             if (!('ontouchstart' in document.documentElement)) {
-                $('body').tooltip({selector: '[data-toggle="tooltip"]'});
+                $('body').tooltip({selector: '[data-toggle="tooltip"]', trigger: 'hover'});
             }
             $('body').popover({selector: '[data-toggle="popover"]'});
         }

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 16 - 15559
public/assets/js/require-backend.min.js


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 15 - 15158
public/assets/js/require-frontend.min.js


+ 7 - 4
public/assets/js/require-table.js

@@ -89,14 +89,14 @@ define(['jquery', 'bootstrap', 'moment', 'moment/locale/zh-cn', 'bootstrap-table
                 name: 'edit',
                 icon: 'fa fa-pencil',
                 title: __('Edit'),
-                extend: 'data-toggle="tooltip"',
+                extend: 'data-toggle="tooltip" data-container="body"',
                 classname: 'btn btn-xs btn-success btn-editone'
             },
             del: {
                 name: 'del',
                 icon: 'fa fa-trash',
                 title: __('Del'),
-                extend: 'data-toggle="tooltip"',
+                extend: 'data-toggle="tooltip" data-container="body"',
                 classname: 'btn btn-xs btn-danger btn-delone'
             },
             dragsort: {
@@ -248,12 +248,12 @@ define(['jquery', 'bootstrap', 'moment', 'moment/locale/zh-cn', 'bootstrap-table
                                     if (overlapped) {
                                         if (!$(this).hasClass("overlaped")) {
                                             $(this).addClass("overlaped");
-                                            checkbox.prop("checked", !checkbox.prop("checked"));
+                                            checkbox.trigger("click");
                                         }
                                     } else {
                                         if ($(this).hasClass("overlaped")) {
                                             $(this).removeClass("overlaped");
-                                            checkbox.prop("checked", !checkbox.prop("checked"));
+                                            checkbox.trigger("click");
                                         }
                                     }
                                 });
@@ -463,6 +463,9 @@ define(['jquery', 'bootstrap', 'moment', 'moment/locale/zh-cn', 'bootstrap-table
                     $("tbody", table).dragsort({
                         itemSelector: 'tr:visible',
                         dragSelector: "a.btn-dragsort",
+                        dragBegin: function (a, b) {
+                            $("[data-toggle='tooltip']", this).tooltip("destroy");
+                        },
                         dragEnd: function (a, b) {
                             var element = $("a.btn-dragsort", this);
                             var data = table.bootstrapTable('getData');

+ 5 - 0
public/assets/less/backend.less

@@ -888,6 +888,11 @@ form.form-horizontal .control-label {
     .bs-checkbox {
         min-width: 36px;
     }
+
+    //拖拽时隐藏tooltip,避免出现错位
+    tr[data-origpos] > td > .tooltip.in {
+        display:none!important;
+    }
 }
 
 /*修复nice-validator新版下的一处BUG*/