Merge branch 'dev1.3' of http://192.168.3.207:10080/qmx/datatag into dev1.3

src/history/historytask.go

@@ -3,6 +3,7 @@ package history
 import (
 	"encoding/json"
 	"fmt"
+	"regexp"
 
 	"log"
 	mongoutil "qfw/mongodb"
@@ -380,25 +381,41 @@ func (this *HistoryData) DataTest(id string) {
 	customer, _ := Mgo.Find("cuserdepartrule", map[string]interface{}{"_id": mongoutil.StringTOBsonId(id)}, nil, nil, false, -1, -1)
 	if len(*customer) == 1 {
 		c := (*customer)[0]
-		//tmps := Es.GetByIdField(Index, Itype, dataId, "")
-		//
-		//tmp := map[string]interface{}{}
-		//if tmps != nil {
-		//	tmp = *tmps
-		//}
-		//if len(tmp) == 0 {
-		//	this.ServeJson(map[string]interface{}{
-		//		"result": false,
-		//		"info":   "没有查到此数据",
-		//	})
-		//	return
-		//}
+
 		s_globaladdkey := qu.ObjToString(c["s_globaladdkey"])
 		s_globaladdkeymatch := qu.ObjToString(c["s_globaladdkeymatch"])
 		s_globalnotkey := qu.ObjToString(c["s_globalnotkey"])
 		s_globalnotkeymatch := qu.ObjToString(c["s_globalnotkeymatch"])
-		// s_globalclearkey := qu.ObjToString(c["s_globalclearkey"])
-		// s_globalclearkeymatch := qu.ObjToString(c["s_globalclearkeymatch"])
+		s_globalclearkey := qu.ObjToString(c["s_globalclearkey"])
+		s_globalclearkeymatch := qu.ObjToString(c["s_globalclearkeymatch"])
+
+		//清理词匹配方式
+		cwmArr := []string{}
+		for _, mv := range strings.Split(s_globalclearkeymatch, ",") {
+			if field := qu.ObjToString(MatchType[mv]); field != "" {
+				cwmArr = append(cwmArr, field)
+			}
+		}
+		//清理词正则
+		cwkArr := []*regexp.Regexp{}
+		for _, kv := range strings.Split(s_globalclearkey, ",") {
+			if LetterCase.MatchString(kv) { //字母转大写
+				kv = strings.ToUpper(kv)
+			}
+			reg := regexp.MustCompile(kv)
+			cwkArr = append(cwkArr, reg)
+		}
+		//清理清理词
+		for _, cwm := range cwmArr {
+			if text := qu.ObjToString(article[cwm]); text != "" {
+				for _, gcw_reg := range cwkArr{
+					text = gcw_reg.ReplaceAllString(text, "")
+				}
+				article[cwm] = text
+			}
+		}
+
+
 		o_rule, ok := c["o_rules"].([]interface{})
 		if !ok {
 			o_rule = []interface{}{}
@@ -465,16 +482,6 @@ func (this *HistoryData) DataTest(id string) {
 					tempData["data"] = nKey
 					resultList = append(resultList,tempData)
 					continue
-					//this.ServeJson(map[string]interface{}{
-					//	"status":true,
-					//	"data":map[string]interface{}{
-					//		"result":     false,
-					//		"data": nKey,
-					//		"info":"被排除词排除",
-					//	},
-					//	"message":"测试成功",
-					//})
-					//return
 				}
 			}
 			if key != "" {

src/web/templates/com/modal.html

@@ -255,7 +255,7 @@
 </div>
 
 <div class="modal fade" id="modal-dataTest" tabindex="-1" role="dialog" aria-hidden="true" style="height:100%">
-    <div class="modal-dialog" style="width: 60%; ">
+    <div class="modal-dialog" style="width: 75%; ">
         <div class="modal-content">
             <div class="modal-header">
                 <div class="modal-header">

src/web/templates/private/cuser_rule_create.html

@@ -28,7 +28,7 @@
                 </button>
                 <button class="btn btn-danger btn-sm" onclick="archive()"><i class="fa fa-fw fa-save fa-lg"></i>存档
                 </button>
-                <button class="btn tn-info btn-sm" onclick="dataTest()"><i class="fa fa-fw fa-save fa-lg"></i>测试数据
+                <button class="btn tn-info btn-sm" onclick="dataTest()"  style="background-color:#AA77AF;color: white "><i class="fa fa-fw fa-save fa-lg"></i>测试数据
                 </button>
             </small>
         </h1>
@@ -1894,7 +1894,8 @@
         "data": [],
         "columns": [
             {"data": null, width: "5%"},
-            {"data": function (row) {
+            {
+                "data": function (row) {
                     var str = row.keymatch;
                     if (str && str != "") {
                         var s = "";
@@ -1907,13 +1908,30 @@
                                 }
                             }
                         }
-                        return row.key+"("+s+")"
+                        return row.key + "(" + s + ")"
                     }
                     return ""
-                }, width: "10%"},
+                },
+
+                render: function (data) {
+                    if (data) {
+                        if (data.length > 60) {
+                            return '<span title="' + data + '">' + data.substr(0, 60) + '...</span>';
+
+
+                        } else {
+                            return '<span title="' + data + '">' + data + '</span>';
+                        }
+                    }
+                    return ""
+                },
+
+                width: "25%"
+            },
 
             // {"data": "addkey", width: "10%"},
-            {"data": function (row) {
+            {
+                "data": function (row) {
                     var str = row.addkeymatch;
                     if (str && str != "") {
                         var s = "";
@@ -1926,12 +1944,27 @@
                                 }
                             }
                         }
-                        return row.addkey+"("+s+")"
+                        return row.addkey + "(" + s + ")"
                     }
                     return ""
-                }, width: "10%"},
+                },
+                render: function (data) {
+                    if (data) {
+                        if (data.length > 40) {
+                            return '<span title="' + data + '">' + data.substr(0, 40) + '...</span>';
+
+
+                        } else {
+                            return '<span title="' + data + '">' + data + '</span>';
+                        }
+                    }
+                    return ""
+                },
+                width: "18%"
+            },
             // {"data": "notkey", width: "10%"},
-            {"data": function (row) {
+            {
+                "data": function (row) {
                     var str = row.notkeymatch;
                     if (str && str != "") {
                         var s = "";
@@ -1944,13 +1977,42 @@
                                 }
                             }
                         }
-                        return row.notkey+"("+s+")"
+                        return row.notkey + "(" + s + ")"
+                    }
+                    return ""
+                },
+                render: function (data) {
+                    if (data) {
+                        if (data.length > 40) {
+                            return '<span title="' + data + '">' + data.substr(0, 40) + '...</span>';
+
+
+                        } else {
+                            return '<span title="' + data + '">' + data + '</span>';
+                        }
                     }
                     return ""
-                }, width: "10%"},
-            {"data": "status", width: "10%"},
-            {"data": "info", width: "10%"},
-            {"data": "data", width: "10%"},
+                },
+                width: "18%"
+            },
+            {"data": "status", width: "7%"},
+            {"data": "info", width: "12%"},
+            {
+                "data": "data", render: function (data) {
+                    if (data) {
+                        if (data.length > 40) {
+                            return '<span title="' + data + '">' + data.substr(0, 40) + '...</span>';
+
+
+                        } else {
+                            return '<span title="' + data + '">' + data + '</span>';
+                        }
+                    }
+                    return ""
+                },
+                width: "10%"
+
+            }
 
         ]
     });