Merge branch 'feature/Process.log_add_noSort' into 'wrdp'

Merge of feature/Process.log_add_noSort 流程记录分类内排序增加无分类  to wrdp

See merge request o2oa/o2oa!2800

o2web/source/x_component_process_FormDesigner/Module/Log/log.html

@@ -169,6 +169,9 @@
 						<input class="editTableRadio" name="sortTypeInCategory" text{( $.sortTypeInCategory && $.sortTypeInCategory=='completedTimeDesc')?'checked':''} type="radio" value="completedTimeDesc" onclick="if (this.checked){
 							//$('text{$.pid}sortInCategoryScript').setStyle('display', 'none');
 						}"/>按时间倒序
+						<input class="editTableRadio" name="sortTypeInCategory" text{( $.sortTypeInCategory && $.sortTypeInCategory=='none')?'checked':''} type="radio" value="none" onclick="if (this.checked){
+							//$('text{$.pid}sortInCategoryScript').setStyle('display', 'none');
+						}"/>不排序
 						<!--<input class="editTableRadio" name="sortTypeInCategory" text{( $.sortTypeInCategory=='script')?'checked':''} type="radio" value="script" onclick="if (this.checked){-->
 						<!--$('text{$.pid}sortInCategoryScript').setStyle('display', 'block');-->
 						<!--}"/>脚本-->

o2web/source/x_component_process_Xform/Log.js

@@ -187,7 +187,11 @@ MWF.xApplication.process.Xform.Log = MWF.APPLog =  new Class(
                                 return parseFloat(value1) - parseFloat(value2);
                             }
                         } else if (!this.isNumber(value1) && !this.isNumber(value2)) {
-                            return Date.parse(a.fromTime) - Date.parse(b.fromTime);
+                            if( this.json.sortTypeInCategory === "none" ){
+                                return -1;
+                            }else{
+                                return Date.parse(a.fromTime) - Date.parse(b.fromTime);
+                            }
                         } else {
                             return this.isNumber(value1) ? -1 : 1;
                         }
@@ -196,7 +200,11 @@ MWF.xApplication.process.Xform.Log = MWF.APPLog =  new Class(
                 }else if( a.properties.fromOpinionGroup || b.properties.fromOpinionGroup ){
                     return a.properties.fromOpinionGroup ? -1 : 1;
                 }else{
-                    return Date.parse(a.fromTime) - Date.parse(b.fromTime);
+                    if( this.json.sortTypeInCategory === "none" ){
+                        return -1;
+                    }else{
+                        return Date.parse(a.fromTime) - Date.parse(b.fromTime);
+                    }
                 }
             }.bind(this))
         }
@@ -794,7 +802,11 @@ MWF.xApplication.process.Xform.Log = MWF.APPLog =  new Class(
                               return parseFloat(value1) - parseFloat(value2);
                           }
                       } else if (!this.isNumber(value1) && !this.isNumber(value2)) {
-                          return Date.parse(a.fromTime) - Date.parse(b.fromTime);
+                          if( this.json.sortTypeInCategory === "none" ){
+                              return -1;
+                          }else{
+                              return Date.parse(a.fromTime) - Date.parse(b.fromTime);
+                          }
                       } else {
                           return this.isNumber(value1) ? -1 : 1;
                       }
@@ -803,7 +815,11 @@ MWF.xApplication.process.Xform.Log = MWF.APPLog =  new Class(
               }else if( a.fromOpinionGroup || b.fromOpinionGroup ){
                   return a.fromOpinionGroup ? -1 : 1;
               }else{
-                  return Date.parse(a.fromTime) - Date.parse(b.fromTime);
+                  if( this.json.sortTypeInCategory === "none" ){
+                      return -1;
+                  }else{
+                      return Date.parse(a.fromTime) - Date.parse(b.fromTime);
+                  }
               }
             }.bind(this))
         }