Merge branch 'dev3.1' into dev3.1.2

src/jy/admin/audit/rulemanager.go

@@ -141,7 +141,8 @@ func SaveClass(c *gin.Context) {
 	} else {
 		s_name, _ := c.GetPostForm("s_name")
 		s_recogfield, _ := c.GetPostForm("s_recogfield")
-		class, _ := Mgo.FindOne("rc_class", `{"s_name":"`+s_name+`","s_recogfield":"`+s_recogfield+`","delete":false}`)
+		s_fid, _ := c.GetPostForm("s_fid")
+		class, _ := Mgo.FindOne("rc_class", `{"s_name":"`+s_name+`","s_fid":"`+s_fid+`","s_recogfield":"`+s_recogfield+`","delete":false}`)
 		if len(*class) > 0 {
 			c.JSON(200, gin.H{"rep": false})
 		} else {
@@ -239,7 +240,8 @@ func SaveRule(c *gin.Context) {
 		c.JSON(200, gin.H{"rep": true})
 	} else {
 		s_name, _ := c.GetPostForm("s_name")
-		d, _ := Mgo.FindOne("rc_rule", `{"s_name":"`+s_name+`","delete":false}`)
+		s_classid, _ := c.GetPostForm("s_classid")
+		d, _ := Mgo.FindOne("rc_rule", `{"s_name":"`+s_name+`","s_classid":"`+s_classid+`","delete":false}`)
 		if len(*d) > 0 {
 			c.JSON(200, gin.H{"msg": "已存在！"})
 		} else {

src/jy/clear/clear.go

@@ -25,6 +25,7 @@ func init() {
 	BindFn("clearMaxAmount", ClearMaxAmount)     //大于1万亿的过滤掉
 	BindFn("clearProjectName", ClearProjectName) //清理项目名称
 	BindFn("getPhone", GetPhone)                 //取手机号
+	BindFn("chiToEng", ChiToEng)                 //中文符号转英文
 }
 
 //绑定清理方法

src/jy/clear/cutspace.go

@@ -148,3 +148,19 @@ func ClearAllWord(data []interface{}) []interface{} {
 	data[0] = reg.ReplaceAllString(value, "")
 	return data
 }
+
+//中文符号转英文
+func ChiToEng(data []interface{}) []interface{} {
+	value := fmt.Sprint(data[0])
+	startChars := []string{"（", "【", "｛", "“", "）", "】", "｝", "”"}
+	endChars := []string{"(", "[", "{", "\"", ")", "]", "}", "\""}
+	for i, v := range startChars {
+		sReg := regexp.MustCompile(v)
+		sIndex := sReg.FindAllStringIndex(value, -1)
+		for j := 1; j <= len(sIndex); j++ {
+			value = sReg.ReplaceAllString(value, endChars[i])
+		}
+	}
+	data[0] = value
+	return data
+}

src/web/templates/admin/audit_classlist.html

@@ -73,7 +73,7 @@ $(function () {
        	]
 	});
 	ttablerulemanager.on('init.dt', function () {
-		$(".opr").click(function(){
+		$("#rulemanagerTable").on('click','a.opr',function(){
 			var n=$(this).attr("opr");
 			var _tit="",htmlObj={},obj,tag=[];
 			var delid=$(this).attr("value");

src/web/templates/admin/audit_recogfield.html

@@ -73,7 +73,7 @@ $(function () {
        	]
 	});
 	ttablerecogfield.on('init.dt', function () {
-		$(".opr").click(function(){
+		$("#recogfieldTable").on('click','a.opr',function(){
 			var n=$(this).attr("opr");
 			var _tit="",htmlObj={},obj,tag=[];
 			//var delid=$(this).attr("value");
@@ -91,7 +91,7 @@ $(function () {
 					_tit="新增识别字段";
 				}else{
 					_tit="编辑_"+obj.s_recogfield+"字段";
-					tag[1]= {label:"识别字段",s_label:"s_recogfield",must:true,disabled:true}
+					//tag[1]= {label:"识别字段",s_label:"s_recogfield",must:true,disabled:true}
 				}
 				htmlObj={
 					mutilfield:"s_pid",

src/web/templates/admin/audit_rulelist.html

@@ -88,7 +88,7 @@ $(function () {
        	]
 	});
 	ttablerulemanager.on('init.dt', function () {
-		$(".opr").click(function(){
+		$("#rulemanagerTable").on('click','a.opr',function(){
 			var n=$(this).attr("opr");
 			var rownum=parseInt($(this).attr("num"));
 			var tobj = {{.data.rule}}[rownum];//本行数据

src/web/templates/admin/clear.html

@@ -102,7 +102,7 @@ menuActive("version")
 var field = {{.field}};
 var _id = "";
 //var clearArr = ["cutspace","cutallspace","cutSymbol","cutNotPrs","clearAllWord","clearMaxAmount","clearProjectName","toint","tofloat","totimestamp","tomoney","getcurrency","getrate","getPhone","rateToFloat"]; 
-var clearMap = {"去除首尾空格":"cutspace","去除所有空格":"cutallspace","清理符号":"cutSymbol","清理不成对符号后面的内容":"cutNotPrs","清理全部是汉字或者特殊符号的情况":"clearAllWord","过滤大于1万亿":"clearMaxAmount","清理项目名称":"clearProjectName","转int":"toint","转float":"tofloat","转时间戳":"totimestamp","转换金额":"tomoney","获取币种":"getcurrency","获取汇率":"getrate","取手机号":"getPhone","费率转小数":"rateToFloat"}
+var clearMap = {"中文符号转英文":"chiToEng","去除首尾空格":"cutspace","去除所有空格":"cutallspace","清理符号":"cutSymbol","清理不成对符号后面的内容":"cutNotPrs","清理全部是汉字或者特殊符号的情况":"clearAllWord","过滤大于1万亿":"clearMaxAmount","清理项目名称":"clearProjectName","转int":"toint","转float":"tofloat","转时间戳":"totimestamp","转换金额":"tomoney","获取币种":"getcurrency","获取汇率":"getrate","取手机号":"getPhone","费率转小数":"rateToFloat"}
 $(function () {
 	ttableclear=$('#clearTable').DataTable({
 		"lengthChange": false,

src/web/templates/admin/task_export.html

@@ -172,7 +172,7 @@ $(function () {
 	});
 	
 	ttable.on('init.dt', function () {
-		$(".edit").click(function(){
+		$("#dataTable").on('click','a.edit',function(){
 			$("#v1 option:first").attr("selected",true).siblings("option").attr("selected",false);
 			$("#v2 option:first").attr("selected",true).siblings("option").attr("selected",false);
 			var obj=ttable.row($(this).closest("tr")).data();

src/web/templates/admin/task_list.html

@@ -82,7 +82,7 @@ $(function () {
        	]
 	});
 	ttable.on('init.dt', function () {
-		$(".opr").click(function(){
+		$("#dataTable").on('click','a.opr',function(){
 			var n=$(this).attr("opr");
 			var taskid=$(this).attr("taskid");
 			var htmlObj={},obj,tag=[],bts=[];