合并

resources/js/queryForm/header.js

@@ -14,6 +14,7 @@ window.Header = function getHeader(object) {
     // form fixed
     let _headerParent = $(_this._header+"Parent");
     let _parentNodeTemp = _parentNode.clone();
+    // $(_this._header+"Roll").addClass('d-none');
     function fixed() {
         let _parentNode_top = _parentNode.offset().top;
         let height = _parentNode.height();
@@ -22,8 +23,9 @@ window.Header = function getHeader(object) {
         _parentNodeTemp.css('z-index',"1030");
         _parentNodeTemp.css('width',_headerParent.width()+"px");
         _parentNodeTemp.height(height);
-        _parentNodeTemp.attr('id',_this._header+"Temp");
-        $(_this._header+"Roll").append(_parentNodeTemp).removeClass('d-none');
+        let headerName=_this._header.substr(1);
+        _parentNodeTemp.attr('id',headerName+"Temp");
+        // $(_this._header+"Roll").append(_parentNodeTemp).removeClass('d-none');
         $(window).scroll(function(){
             let scrollTop = document.documentElement.scrollTop || document.body.scrollTop;
             if (scrollTop > _parentNode_top) {
@@ -62,7 +64,7 @@ window.Header = function getHeader(object) {
                 _parentNode.append(_td);
                 let column_dom = $('#sort_'+column.name);
                 let column_dom_temp = column_dom.clone();
-                column_dom_temp.attr('id','#sort_'+column.name+"_temp");
+                column_dom_temp.attr('id','sort_'+column.name+"_temp");
                 column_dom_temp.width(column_dom.width());
                 _parentNodeTemp.append(column_dom_temp);
                 if (!column.neglect){
@@ -143,4 +145,4 @@ window.Header = function getHeader(object) {
         append();
         fixed();
     }
-};
+};

resources/sass/text.scss

@@ -48,6 +48,3 @@
     -ms-user-select: none; /* Internet Explorer/Edge */
     user-select: none;
 }
-.fa-sort {
-    opacity: 0.3;
-}