修复关键词导入问题

src/web/templates/client/cuser_rule_create.html

@@ -936,12 +936,37 @@
     //页面添加附加词、排除词
     function addkeyWord(rdata) {
         o_rules = rdata["o_rules"];
-        $('#g_addkey').attr("value", rdata["s_globaladdkey"]);
-        $('#g_notkey').attr("value", rdata["s_globalnotkey"]);
-        $('#s_globalclearkey').attr("value", rdata["s_globalclearkey"]);
-        dataMap["s_globalclearkey"] = rdata["s_globalclearkey"];
-        dataMap["s_globaladdkey"] = rdata["s_globaladdkey"];
-        dataMap["s_globalnotkey"] = rdata["s_globalnotkey"];
+        // 如果所上传文件中全局附加词为空  附加词置空 匹配方式置空
+        if (rdata["s_globaladdkey"]===undefined) {
+            $('#g_addkey').attr("value", "");
+            dataMap["s_globaladdkey"] = "";
+            $('#s_addkeymatch').attr("value", "");
+            dataMap["s_globaladdkeymatch"] = "";
+        }else {
+            $('#g_addkey').attr("value", rdata["s_globaladdkey"]);
+            dataMap["s_globaladdkey"] = rdata["s_globaladdkey"];
+        }
+        //如果上传文件中全局排除词为空 排除词置空 匹配方式置空
+        if (rdata["s_globalnotkey"]===undefined){
+            $('#g_notkey').attr("value", "");
+            dataMap["s_globalnotkey"] = "";
+            $('#s_notkeymatch').attr("value", "");
+            dataMap["s_globalnotkeymatch"] = "";
+        }else {
+            $('#g_notkey').attr("value", rdata["s_globalnotkey"]);
+            dataMap["s_globalnotkey"] = rdata["s_globalnotkey"];
+        }
+
+        //如果上传文件中全局清理词为空 则清理词置空 匹配方式置空
+        if(rdata["s_globalclearkey"]===undefined){
+            $('#s_globalclearkey').attr("value", "");
+            dataMap["s_globalclearkey"] = "";
+            $('#s_globalclearkeymatch').attr("value", "");
+            dataMap["s_globalclearkeymatch"] = "";
+        }else {
+            $('#s_globalclearkey').attr("value", rdata["s_globalclearkey"]);
+            dataMap["s_globalclearkey"] = rdata["s_globalclearkey"];
+        }
 
         $('#keywords').dataTable().fnClearTable();
         $('#keywords').dataTable().fnAddData(rdata["o_rules"]);

src/web/templates/client/cuser_rule_edit.html

@@ -1313,12 +1313,39 @@
     //页面添加附加词、排除词
     function addkeyWord(rdata) {
         o_rules = rdata["o_rules"];
-        $('#g_addkey').attr("value", rdata["s_globaladdkey"]);
-        $('#g_notkey').attr("value", rdata["s_globalnotkey"]);
-        $('#s_globalclearkey').attr("value", rdata["s_globalclearkey"]);
-        dataMap["s_globaladdkey"] = rdata["s_globaladdkey"];
-        dataMap["s_globalnotkey"] = rdata["s_globalnotkey"];
-        dataMap["s_globalclearkey"] = rdata["s_globalclearkey"];
+        debugger
+        // 如果所上传文件中全局附加词为空  附加词置空 匹配方式置空
+        if (rdata["s_globaladdkey"]===undefined) {
+            $('#g_addkey').attr("value", "");
+            dataMap["s_globaladdkey"] = "";
+            $('#s_addkeymatch').attr("value", "");
+            dataMap["s_globaladdkeymatch"] = "";
+        }else {
+            $('#g_addkey').attr("value", rdata["s_globaladdkey"]);
+            dataMap["s_globaladdkey"] = rdata["s_globaladdkey"];
+        }
+        //如果上传文件中全局排除词为空 排除词置空 匹配方式置空
+        if (rdata["s_globalnotkey"]===undefined){
+            $('#g_notkey').attr("value", "");
+            dataMap["s_globalnotkey"] = "";
+            $('#s_notkeymatch').attr("value", "");
+            dataMap["s_globalnotkeymatch"] = "";
+        }else {
+            $('#g_notkey').attr("value", rdata["s_globalnotkey"]);
+            dataMap["s_globalnotkey"] = rdata["s_globalnotkey"];
+        }
+
+        //如果上传文件中全局清理词为空 则清理词置空 匹配方式置空
+        if(rdata["s_globalclearkey"]===undefined){
+            $('#s_globalclearkey').attr("value", "");
+            dataMap["s_globalclearkey"] = "";
+            $('#s_globalclearkeymatch').attr("value", "");
+            dataMap["s_globalclearkeymatch"] = "";
+        }else {
+            $('#s_globalclearkey').attr("value", rdata["s_globalclearkey"]);
+            dataMap["s_globalclearkey"] = rdata["s_globalclearkey"];
+        }
+
 
         $('#keywords').dataTable().fnClearTable();
         $('#keywords').dataTable().fnAddData(rdata["o_rules"]);

src/web/templates/private/cuser_rule_create.html

@@ -1166,12 +1166,38 @@
     //页面添加附加词、排除词
     function addkeyWord(rdata) {
         o_rules = rdata["o_rules"];
-        $('#g_addkey').attr("value", rdata["s_globaladdkey"]);
-        $('#g_notkey').attr("value", rdata["s_globalnotkey"]);
-        $('#s_globalclearkey').attr("value", rdata["s_globalclearkey"]);
-        dataMap["s_globalclearkey"] = rdata["s_globalclearkey"];
-        dataMap["s_globaladdkey"] = rdata["s_globaladdkey"];
-        dataMap["s_globalnotkey"] = rdata["s_globalnotkey"];
+        // 如果所上传文件中全局附加词为空  附加词置空 匹配方式置空
+        if (rdata["s_globaladdkey"]===undefined) {
+            $('#g_addkey').attr("value", "");
+            dataMap["s_globaladdkey"] = "";
+            $('#s_addkeymatch').attr("value", "");
+            dataMap["s_globaladdkeymatch"] = "";
+        }else {
+            $('#g_addkey').attr("value", rdata["s_globaladdkey"]);
+            dataMap["s_globaladdkey"] = rdata["s_globaladdkey"];
+        }
+        //如果上传文件中全局排除词为空 排除词置空 匹配方式置空
+        if (rdata["s_globalnotkey"]===undefined){
+            $('#g_notkey').attr("value", "");
+            dataMap["s_globalnotkey"] = "";
+            $('#s_notkeymatch').attr("value", "");
+            dataMap["s_globalnotkeymatch"] = "";
+        }else {
+            $('#g_notkey').attr("value", rdata["s_globalnotkey"]);
+            dataMap["s_globalnotkey"] = rdata["s_globalnotkey"];
+        }
+
+        //如果上传文件中全局清理词为空 则清理词置空 匹配方式置空
+        if(rdata["s_globalclearkey"]===undefined){
+            $('#s_globalclearkey').attr("value", "");
+            dataMap["s_globalclearkey"] = "";
+            $('#s_globalclearkeymatch').attr("value", "");
+            dataMap["s_globalclearkeymatch"] = "";
+        }else {
+            $('#s_globalclearkey').attr("value", rdata["s_globalclearkey"]);
+            dataMap["s_globalclearkey"] = rdata["s_globalclearkey"];
+        }
+
 
         $('#keywords').dataTable().fnClearTable();
         $('#keywords').dataTable().fnAddData(rdata["o_rules"]);

src/web/templates/private/cuser_rule_edit.html

@@ -1255,13 +1255,38 @@
     //页面添加附加词、排除词
     function addkeyWord(rdata) {
         o_rules = rdata["o_rules"];
-        $('#g_addkey').attr("value", rdata["s_globaladdkey"]);
-        $('#g_notkey').attr("value", rdata["s_globalnotkey"]);
-        $('#s_globalclearkey').attr("value", rdata["s_globalclearkey"]);
+        // 如果所上传文件中全局附加词为空  附加词置空 匹配方式置空
+        if (rdata["s_globaladdkey"]===undefined) {
+            $('#g_addkey').attr("value", "");
+            dataMap["s_globaladdkey"] = "";
+            $('#s_addkeymatch').attr("value", "");
+            dataMap["s_globaladdkeymatch"] = "";
+        }else {
+            $('#g_addkey').attr("value", rdata["s_globaladdkey"]);
+            dataMap["s_globaladdkey"] = rdata["s_globaladdkey"];
+        }
+        //如果上传文件中全局排除词为空 排除词置空 匹配方式置空
+        if (rdata["s_globalnotkey"]===undefined){
+            $('#g_notkey').attr("value", "");
+            dataMap["s_globalnotkey"] = "";
+            $('#s_notkeymatch').attr("value", "");
+            dataMap["s_globalnotkeymatch"] = "";
+        }else {
+            $('#g_notkey').attr("value", rdata["s_globalnotkey"]);
+            dataMap["s_globalnotkey"] = rdata["s_globalnotkey"];
+        }
+
+        //如果上传文件中全局清理词为空 则清理词置空 匹配方式置空
+        if(rdata["s_globalclearkey"]===undefined){
+            $('#s_globalclearkey').attr("value", "");
+            dataMap["s_globalclearkey"] = "";
+            $('#s_globalclearkeymatch').attr("value", "");
+            dataMap["s_globalclearkeymatch"] = "";
+        }else {
+            $('#s_globalclearkey').attr("value", rdata["s_globalclearkey"]);
+            dataMap["s_globalclearkey"] = rdata["s_globalclearkey"];
+        }
 
-        dataMap["s_globaladdkey"] = rdata["s_globaladdkey"];
-        dataMap["s_globalnotkey"] = rdata["s_globalnotkey"];
-        dataMap["s_globalclearkey"] = rdata["s_globalclearkey"];
 
 
         $('#keywords').dataTable().fnClearTable();