jqgrid_utils 1.28.0 → 1.29.0

package/dist/jqgrid_utils.js

@@ -507,6 +507,73 @@ col_model = await jqu.add_formatter(col_model,'select',{ formatter: "select", fo
   return col_model;
 }
 
+/**
+* Natural Sort Column
+@alias module:Jqgrid_utils
+@param {array}  - grid col_model
+@param {string} - string columns names for natural sorting
+@returns {array} - col_model
+@example
+var jqu = new Jqgrid_utils();
+col_model = await jqu.natural_sort(col_model,'colunmename');
+*/
+
+async natural_sort(col_model, column_name)
+{
+  for(let i=0;i< col_model.length;i++)
+  {
+    if(col_model[i]['name'] === column_name)
+    {
+
+        col_model[i]['sortfunc'] = function (a, b, d) {
+            
+    if(d===undefined) { d=1; }  
+    var re = /(^-?[0-9]+(\.?[0-9]*)[df]?e?[0-9]?$|^0x[0-9a-f]+$|[0-9]+)/gi,  
+        sre = /(^[ ]*|[ ]*$)/g,  
+        dre = /(^([\w ]+,?[\w ]+)?[\w ]+,?[\w ]+\d+:\d+(:\d+)?[\w ]?|^\d{1,4}[\/\-]\d{1,4}[\/\-]\d{1,4}|^\w+, \w+ \d+, \d{4})/,  
+        hre = /^0x[0-9a-f]+$/i,  
+        ore = /^0/,  
+        i = function(s) { return self.insensitive && (''+s).toLowerCase() || ''+s },  
+        // convert all to strings strip whitespace  
+        x = i(a).replace(sre, '') || '',  
+        y = i(b).replace(sre, '') || '',  
+        // chunk/tokenize  
+        xN = x.replace(re, '\0$1\0').replace(/\0$/,'').replace(/^\0/,'').split('\0'),  
+        yN = y.replace(re, '\0$1\0').replace(/\0$/,'').replace(/^\0/,'').split('\0'),  
+        // numeric, hex or date detection  
+        xD = parseInt(x.match(hre)) || (xN.length != 1 && x.match(dre) && Date.parse(x)),  
+        yD = parseInt(y.match(hre)) || xD && y.match(dre) && Date.parse(y) || null,  
+        oFxNcL, oFyNcL;  
+    // first try and sort Hex codes or Dates  
+    if (yD)  
+        if ( xD < yD ) return -d;  
+        else if ( xD > yD ) return d;  
+    // natural sorting through split numeric strings and default strings  
+    for(var cLoc=0, numS=Math.max(xN.length, yN.length); cLoc < numS; cLoc++) {  
+        // find floats not starting with '0', string or 0 if not defined (Clint Priest)  
+        oFxNcL = !(xN[cLoc] || '').match(ore) && parseFloat(xN[cLoc]) || xN[cLoc] || 0;  
+        oFyNcL = !(yN[cLoc] || '').match(ore) && parseFloat(yN[cLoc]) || yN[cLoc] || 0;  
+        // handle numeric vs string comparison - number < string - (Kyle Adams)  
+        if (isNaN(oFxNcL) !== isNaN(oFyNcL)) { return (isNaN(oFxNcL)) ? d : -d; }  
+        // rely on string comparison if different types - i.e. '02' < 2 != '02' < '2'  
+        else if (typeof oFxNcL !== typeof oFyNcL) {  
+            oFxNcL += '';  
+            oFyNcL += '';  
+        }  
+        if (oFxNcL < oFyNcL) return -d;  
+        if (oFxNcL > oFyNcL) return d;  
+    }  
+    return 0;   
+      };
+
+
+        
+    }
+  }
+  return col_model;
+}
+
+
     
 /**
 * Add HTML Formatter 

package/jqgrid_utils.js

@@ -506,6 +506,73 @@ col_model = await jqu.add_formatter(col_model,'select',{ formatter: "select", fo
   return col_model;
 }
 
+/**
+* Natural Sort Column
+@alias module:Jqgrid_utils
+@param {array}  - grid col_model
+@param {string} - string columns names for natural sorting
+@returns {array} - col_model
+@example
+var jqu = new Jqgrid_utils();
+col_model = await jqu.natural_sort(col_model,'colunmename');
+*/
+
+async natural_sort(col_model, column_name)
+{
+  for(let i=0;i< col_model.length;i++)
+  {
+    if(col_model[i]['name'] === column_name)
+    {
+
+        col_model[i]['sortfunc'] = function (a, b, d) {
+            
+    if(d===undefined) { d=1; }  
+    var re = /(^-?[0-9]+(\.?[0-9]*)[df]?e?[0-9]?$|^0x[0-9a-f]+$|[0-9]+)/gi,  
+        sre = /(^[ ]*|[ ]*$)/g,  
+        dre = /(^([\w ]+,?[\w ]+)?[\w ]+,?[\w ]+\d+:\d+(:\d+)?[\w ]?|^\d{1,4}[\/\-]\d{1,4}[\/\-]\d{1,4}|^\w+, \w+ \d+, \d{4})/,  
+        hre = /^0x[0-9a-f]+$/i,  
+        ore = /^0/,  
+        i = function(s) { return self.insensitive && (''+s).toLowerCase() || ''+s },  
+        // convert all to strings strip whitespace  
+        x = i(a).replace(sre, '') || '',  
+        y = i(b).replace(sre, '') || '',  
+        // chunk/tokenize  
+        xN = x.replace(re, '\0$1\0').replace(/\0$/,'').replace(/^\0/,'').split('\0'),  
+        yN = y.replace(re, '\0$1\0').replace(/\0$/,'').replace(/^\0/,'').split('\0'),  
+        // numeric, hex or date detection  
+        xD = parseInt(x.match(hre)) || (xN.length != 1 && x.match(dre) && Date.parse(x)),  
+        yD = parseInt(y.match(hre)) || xD && y.match(dre) && Date.parse(y) || null,  
+        oFxNcL, oFyNcL;  
+    // first try and sort Hex codes or Dates  
+    if (yD)  
+        if ( xD < yD ) return -d;  
+        else if ( xD > yD ) return d;  
+    // natural sorting through split numeric strings and default strings  
+    for(var cLoc=0, numS=Math.max(xN.length, yN.length); cLoc < numS; cLoc++) {  
+        // find floats not starting with '0', string or 0 if not defined (Clint Priest)  
+        oFxNcL = !(xN[cLoc] || '').match(ore) && parseFloat(xN[cLoc]) || xN[cLoc] || 0;  
+        oFyNcL = !(yN[cLoc] || '').match(ore) && parseFloat(yN[cLoc]) || yN[cLoc] || 0;  
+        // handle numeric vs string comparison - number < string - (Kyle Adams)  
+        if (isNaN(oFxNcL) !== isNaN(oFyNcL)) { return (isNaN(oFxNcL)) ? d : -d; }  
+        // rely on string comparison if different types - i.e. '02' < 2 != '02' < '2'  
+        else if (typeof oFxNcL !== typeof oFyNcL) {  
+            oFxNcL += '';  
+            oFyNcL += '';  
+        }  
+        if (oFxNcL < oFyNcL) return -d;  
+        if (oFxNcL > oFyNcL) return d;  
+    }  
+    return 0;   
+      };
+
+
+        
+    }
+  }
+  return col_model;
+}
+
+
     
 /**
 * Add HTML Formatter 

package/package.json

@@ -29,5 +29,5 @@
   {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
-  "version": "1.28.0"
+  "version": "1.29.0"
 }