二次修复

resources/js/queryForm/header.js

@@ -13,6 +13,7 @@ window.Header = function getHeader(object) {
     this._restorationColumn = object.restorationColumn;
     this._fixedTop = object.fixedTop || 0;
     this._offset = object.offset || 0;
+    this._is_restorationColumn_desc = object.is_restorationColumn_desc || 0;
 
     let _this = this;
     let _parentNode = $(_this._header);
@@ -23,14 +24,6 @@ window.Header = function getHeader(object) {
     let _parentNodeTemp = _parentNode.clone();
     function fixed() {
         let _parentNode_top = _parentNode.offset().top;
-        let height = _parentNode.height();
-        _parentNodeTemp.css('position',"fixed");
-        _parentNodeTemp.css('top',_this._fixedTop+"px");
-        _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);
         $(window).scroll(function(){
             let scrollTop = document.documentElement.scrollTop || document.body.scrollTop;
             if (scrollTop > _parentNode_top-_this._fixedTop) {
@@ -56,70 +49,79 @@ window.Header = function getHeader(object) {
      *          neglect : null || bool          --是否忽略排序
      *         }
      * */
-    let rule=function (column,column_sort,column_sort_temp) {
-        if (!sortType[column.name]){
-            sortType[column.name] = 'asc';
-            columnArr.push(column.name);
-            column_sort.removeClass('fa-sort').addClass('fa-sort-asc');
-            column_sort_temp.removeClass('fa-sort').addClass('fa-sort-asc');
-            let columnArrTemp = [];
-            columnArrTemp.push.apply(columnArrTemp,columnArr);
-            window.sort.sort(_this._data,columnArrTemp,sortType);
-            return ;
-        }
-        if (sortType[column.name] === 'asc'){
-            sortType[column.name] = 'desc';
-            column_sort.removeClass('fa-sort-asc').addClass('fa-sort-desc');
-            column_sort_temp.removeClass('fa-sort-asc').addClass('fa-sort-desc');
-            let columnArrTemp = [];
-            columnArrTemp.push.apply(columnArrTemp,columnArr);
-            window.sort.sort(_this._data,columnArrTemp,sortType);
-            return ;
-        }
-        if (sortType[column.name] === 'desc'){
-            delete sortType[column.name];
-            columnArr.some(function (name, index) {
-                if (name === column.name){
-                    columnArr.splice(index,1);
-                    return true;
-                }
-            });
-            column_sort.removeClass('fa-sort-desc').addClass('fa-sort');
-            column_sort_temp.removeClass('fa-sort-desc').addClass('fa-sort');
-            if (columnArr.length === 0){
-                //希尔排序
-                let arr = [];
-                arr.push.apply(arr,_this._data);
-                let len = arr.length;
-                for(let gap = Math.floor(len / 2); gap > 0; gap = Math.floor(gap / 2)) {
-                    for(let i = gap; i < len; i++) {
-                        let j = i;
-                        let current = arr[i];
-                        while(j - gap >= 0 && current[_this._restorationColumn] < arr[j - gap][_this._restorationColumn]) {
-                            arr[j] = arr[j - gap];
-                            j = j - gap;
+    function rule(column,column_sort,column_sort_temp) {
+        return function () {
+            if (!sortType[column.name]){
+                sortType[column.name] = 'asc';
+                columnArr.push(column.name);
+                column_sort.removeClass('fa-sort').addClass('fa-sort-asc');
+                column_sort_temp.removeClass('fa-sort').addClass('fa-sort-asc');
+                let columnArrTemp = [];
+                columnArrTemp.push.apply(columnArrTemp,columnArr);
+                window.sort.sort(_this._data,columnArrTemp,sortType);
+                return ;
+            }
+            if (sortType[column.name] === 'asc'){
+                sortType[column.name] = 'desc';
+                column_sort.removeClass('fa-sort-asc').addClass('fa-sort-desc');
+                column_sort_temp.removeClass('fa-sort-asc').addClass('fa-sort-desc');
+                let columnArrTemp = [];
+                columnArrTemp.push.apply(columnArrTemp,columnArr);
+                window.sort.sort(_this._data,columnArrTemp,sortType);
+                return ;
+            }
+            if (sortType[column.name] === 'desc'){
+                delete sortType[column.name];
+                columnArr.some(function (name, index) {
+                    if (name === column.name){
+                        columnArr.splice(index,1);
+                        return true;
+                    }
+                });
+                column_sort.removeClass('fa-sort-desc').addClass('fa-sort');
+                column_sort_temp.removeClass('fa-sort-desc').addClass('fa-sort');
+                if (columnArr.length === 0){
+                    //希尔排序
+                    let arr = [];
+                    arr.push.apply(arr,_this._data);
+                    let len = arr.length;
+                    for(let gap = Math.floor(len / 2); gap > 0; gap = Math.floor(gap / 2)) {
+                        for(let i = gap; i < len; i++) {
+                            let j = i;
+                            let current = arr[i];
+                            if (_this._is_restorationColumn_desc){
+                                while(j - gap >= 0 && current[_this._restorationColumn] < arr[j - gap][_this._restorationColumn]) {
+                                    arr[j] = arr[j - gap];
+                                    j = j - gap;
+                                }
+                            }else{
+                                while(j - gap >= 0 && current[_this._restorationColumn] > arr[j - gap][_this._restorationColumn]) {
+                                    arr[j] = arr[j - gap];
+                                    j = j - gap;
+                                }
+                            }
+                            arr[j] = current;
                         }
-                        arr[j] = current;
                     }
+                    //插入排序
+                    /*let preIndex, current;
+                    for(let i = 1; i < len; i++) {
+                        preIndex = i - 1;
+                        current = arr[i];
+                        while(preIndex >= 0 && arr[preIndex][_this._restorationColumn] > current[_this._restorationColumn]) {
+                            arr[preIndex + 1] = arr[preIndex];
+                            preIndex--;
+                        }
+                        arr[preIndex + 1] = current;
+                    }*/
+                    _this._data.length = 0;
+                    _this._data.push.apply(_this._data,arr);
+                    return;
                 }
-                //插入排序
-                /*let preIndex, current;
-                for(let i = 1; i < len; i++) {
-                    preIndex = i - 1;
-                    current = arr[i];
-                    while(preIndex >= 0 && arr[preIndex][_this._restorationColumn] > current[_this._restorationColumn]) {
-                        arr[preIndex + 1] = arr[preIndex];
-                        preIndex--;
-                    }
-                    arr[preIndex + 1] = current;
-                }*/
-                _this._data.length = 0;
-                _this._data.push.apply(_this._data,arr);
-                return;
+                let columnArrTemp = [];
+                columnArrTemp.push.apply(columnArrTemp,columnArr);
+                window.sort.sort(_this._data,columnArrTemp,sortType);
             }
-            let columnArrTemp = [];
-            columnArrTemp.push.apply(columnArrTemp,columnArr);
-            window.sort.sort(_this._data,columnArrTemp,sortType);
         }
     };
     function append() {
@@ -151,6 +153,14 @@ window.Header = function getHeader(object) {
     }
     function cloneDom(){
         _this._column.forEach(function (column) {
+            let height = _parentNode.height();
+            _parentNodeTemp.css('position',"fixed");
+            _parentNodeTemp.css('top',_this._fixedTop+"px");
+            _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);
             let column_dom = $('#dom_'+column.name);
             let column_dom_temp = column_dom.clone();
             let columnNameDom = column_dom_temp.children()[0];

resources/views/process/index.blade.php

@@ -461,7 +461,7 @@
 @section('lastScript')
     <script type="text/javascript" src="{{asset('js/queryForm/export200804.js')}}"></script>
     <script type="text/javascript" src="{{asset('js/queryForm/queryForm200806.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/header200813a.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/header200813b.js')}}"></script>
     <script>
         new Vue({
             el:"#process",
@@ -572,6 +572,7 @@
                     data: this.processes,
                     restorationColumn: 'serial_number',
                     fixedTop:($('#form_div').height())+2,
+                    is_restorationColumn_desc :true,
                 });
                 header.init();
             },
@@ -612,7 +613,7 @@
                     indexs.forEach(function (index) {
                         let processTemp = Object.assign({}, _this.processes[index]);
                         processTemp.id = '';
-                        processTemp.is_multi_row = false;
+                        processTemp.is_multi_row = false;count++;
                         processTemp.serial_number = _this.processes[index].serial_number + 1;
                         _this.processes.splice(index + 1, 0, processTemp);
                     });

resources/views/rejected/search/general.blade.php

@@ -180,7 +180,7 @@
     </script>
     <script src="{{asset('js/queryForm/export200804.js')}}"></script>
     <script src="{{asset('js/queryForm/queryForm200806.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/header200813a.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/header200813b.js')}}"></script>
     <script>
         new Vue({
             el:"#list",

webpack.mix.js

@@ -21,5 +21,5 @@ mix.js('resources/js/trix.js','public/js/trix.js');
 mix.copy('resources/sass/trix.css','public/css/trix.css');
 mix.copy('resources/js/queryForm/queryForm.js','public/js/queryForm/queryForm200806.js');
 mix.copy('resources/js/queryForm/export.js','public/js/queryForm/export200804.js');
-mix.js('resources/js/queryForm/header.js','public/js/queryForm/header200813a.js');
+mix.js('resources/js/queryForm/header.js','public/js/queryForm/header200813b.js');