wip:匹配方式

CMPlatform/web/templates/com/modal.html

@@ -475,7 +475,7 @@
 
 <script>
     var exactRuleBool = false
-    var ruleHtml = "<div class=\"insertexactRule-form  exact-rule-1 exact-rule-class #a#  #0#\" >" +
+    var ruleHtml = "<div class=\"#b#-form  exact-rule-1 exact-rule-class #a#  #0#\" >" +
         "<div class=\"form-group\" >" +
         "<label class=\"col-sm-4 control-label\"><span style=\"color:red;\">* </span>关键词分组:</label>" +
         "<div class=\"col-sm-8\">" +
@@ -509,17 +509,22 @@
         if (ruleGroupList.length===0){
             showGroupListData()
         }
-        var count = 0;
+        var count = 1;
         var phrasesHtml = '';
         var matchWayHtml = '';
+        var parentClass = rule.replaceAll("#","");
         for (var i=0;i< ruleGroupList.length;i++){
             phrasesHtml += "<option value='"+ruleGroupList[i]["name"]+"'>"+ruleGroupList[i]["name"]+"</option>"
         }
         for (let key in matchWayMap) {
             console.log(`${key}: ${matchWayMap[key]}`);
-            matchWayHtml +="<option value='"+key+"'>"+matchWayMap[key]+"</option>"
+            var selected = ''
+            if (key=="title"){
+                selected = 'selected = true'
+            }
+            matchWayHtml +="<option value='"+key+"' "+selected+">"+matchWayMap[key]+"</option>"
         }
-        var ph = ruleHtml.replaceAll("#a#",className).replaceAll("#0#",mark).replaceAll("#1#",phrasesHtml).replaceAll("#2#",count).replaceAll("#3#",matchWayHtml)
+        var ph = ruleHtml.replaceAll("#b#",parentClass).replaceAll("#a#",className).replaceAll("#0#",mark).replaceAll("#1#",phrasesHtml).replaceAll("#2#",count).replaceAll("#3#",matchWayHtml)
         $(rule).append(ph)
         // 初始化 selectpicker 插件
         $('.selectpicker').selectpicker('refresh');

CMPlatform/web/templates/private/cuser_rule_edit.html

@@ -17,25 +17,17 @@
         font-weight: bold;
     }
 
-    .insertexactRule-form{
-        display: block;
-        padding: 10px;
-        border-bottom: 1px solid #ffffff;
-        min-height: 0;
-        max-height: none;
-    }
-    .insertexactRule-form .division-line{
+    .insertexactRule-form .division-line ,.editexactRule-form .division-line{
         display: inline-block !important;
     }
-    .insertexactRule-form .form-group{
+    .insertexactRule-form .form-group,.editexactRule-form .form-group{
         display: block;
-        /*overflow: auto;*/
         margin-bottom: 1px !important;
     }
-    .insertexactRule-form .form-group label{
+    .insertexactRule-form .form-group label,.editexactRule-form .form-group label{
         padding-top: 8px;
     }
-    .insertexactRule-form .form-group .col-sm-8{
+    .insertexactRule-form .form-group .col-sm-8,.editexactRule-form .form-group .col-sm-8 {
         margin-bottom: 5px;
     }
     .modal-header {
@@ -45,7 +37,7 @@
     #addExactRuleButton a {
         cursor:pointer;
     }
-    .insertexactRule-form {
+    .insertexactRule-form , .editexactRule-form{
         padding: 10px 10px 0px 10px;
     }
     #editExactRuleButton a {
@@ -2972,7 +2964,7 @@
         }
         return exactRuleTableArrTmp;
     }
-
+    var editexactRuleId = 0;
     const matchWayMap = {
         "title":"标题匹配",
         "content":"全文匹配"
@@ -3035,7 +3027,8 @@
         $("#editExactRuleButton").show();
         // showGroupListData("#modal-edit-exactRule") // 铺分组下拉列表数据
         // matchWayShow("#editexactRule")
-        $("#editexactRuleId").text(index) // 隐藏选中的数组行号
+        // $("#editexactRuleId").text(index) // 隐藏选中的数组行号
+        editexactRuleId = index;
         // 铺数据
         let contentArr = exactRuleTableArr[index]
         // keyArr 定义数组 维持最后有序
@@ -3086,33 +3079,50 @@
     }
     // 编辑保存
     function edit_exactRule_save(){
-       let index =  $("#editexactRuleId").text()
+       // let index =  $("#editexactRuleId").text()
         // 获取数
         let ruleArr = []
         let formList =  $("#editexactRule .editexactRule-form")
-        for (let i = 0; i < formList.length; i++) {
-            let groupName = formList[i].querySelector('[name=groupSelect]').value
-            let count = formList[i].querySelector('[name=count]').value
-            // 这是因为现在新增的表单是写死的两个
-            let tmp = '#editexactRule .exact-rule-'+(i+1)+' select[name=matchWay]'
-            let matchWay = $(tmp).val();
-            if (groupName==""||matchWay.length==0||count==""){
+        formList.each(function() {
+            var groupName = $(this).find('select[name="groupSelect"]').val();
+            var count = $(this).find('input[name="count"]').val();
+            var matchWayValue = $(this).find('select[name="matchWay"]').val();
+            if (groupName===""||matchWayValue.length===0||count===""){
                 // todo
-                showMsg("必填项缺失")
-                return
+                return true;
             }
-            for (let j = 0; j < matchWay.length; j++) {
+            for (let j = 0; j < matchWayValue.length; j++) {
                 let rule =      {
-                    "group":groupName,"match_way":matchWay[j],"count":count
+                    "group":groupName,"match_way":matchWayValue[j],"count":count
                 }
                 ruleArr.push(rule)
             }
-        }
+            console.log(matchWayValue);
+        });
+        // for (let i = 0; i < formList.length; i++) {
+        //     let groupName = formList[i].querySelector('[name=groupSelect]').value
+        //     let count = formList[i].querySelector('[name=count]').value
+        //     let mw = formList[i].querySelector('[name=matchWay]').value
+        //     // 这是因为现在新增的表单是写死的两个
+        //     let tmp = '#editexactRule .exact-rule-'+(i+1)+' select[name=matchWay]'
+        //     let matchWay = $(tmp).val();
+        //     if (groupName==""||matchWay.length==0||count==""){
+        //         // todo
+        //         showMsg("必填项缺失")
+        //         return
+        //     }
+        //     for (let j = 0; j < matchWay.length; j++) {
+        //         let rule =      {
+        //             "group":groupName,"match_way":matchWay[j],"count":count
+        //         }
+        //         ruleArr.push(rule)
+        //     }
+        // }
         // 保存到exactRuleTableArr 临时数组
-        exactRuleTableArr[index] = ruleArr
+        exactRuleTableArr[editexactRuleId] = ruleArr
         $('#exactRuleTable').dataTable().fnClearTable();
         $('#exactRuleTable').dataTable().fnAddData(exactRuleTableArr);
-        if (exactRuleTableArr.length == 0) {
+        if (exactRuleTableArr.length === 0) {
             $('#exactRuleTable').dataTable().fnClearTable();
         }
         $("#modal-edit-exactRule").modal("hide");