Merge branch 'dev/v1.0_fu' of dataservice/datatag into feature/v1.0

CMPlatform/web/templates/client/cuser_rule_edit.html

@@ -700,7 +700,7 @@
             } if (i >= 5 && i<= 8) {
                 btnMatchHtml2 += `<input type="button" class="btn btn-default col-md-pull-2" style="margin-left: 10px;margin-top: 10px" onclick="clickMatchBtn2(this)"
                             code="${matchTypeMap[i]["code"]}" value="${matchTypeMap[i]["name"]}">`;
-            } 
+            }
             if (dataMap.s_globaladdkeymatch.indexOf(matchTypeMap[i]["code"]) > -1) {
                 if (addMatchName == "") {
                     addMatchName = matchTypeMap[i]["name"]
@@ -1853,7 +1853,7 @@
                     } else {
                         showTip("数据生成失败", 12000);
                     }
-            
+
                 },
                 error: function (r) {
                     com.maskHide();
@@ -2151,7 +2151,7 @@
             $('#dataCount').html(str);
         }
     }
-    
+
     function produceAll(){
         $('#modal-preview').modal("hide");
         produceData("2");
@@ -2813,7 +2813,7 @@
     // 精准筛选规则-新增页面 +新增按钮
     function addExactRule(){
         ruleHtmlFunc("insert-class","","#insertexactRule")
-        if ($('.exact-rule-class').length > 3){
+        if ($('.insert-class').length > 3){
             $("#addExactRuleButton").hide()
         }
     }

CMPlatform/web/templates/com/modal.html

@@ -93,7 +93,7 @@
 
                         </div>
                     </div>
-         <div style="text-align: center" id="addExactRuleButton">
+         <div style="text-align: center;margin: -20px 0px 10px 0px;" id="addExactRuleButton">
              <a onclick="addExactRule()" style="margin: 0 auto">+新增</a>
          </div>
 
@@ -171,7 +171,7 @@
                             </div>
                         </div>
                     </div>
-         <div style="text-align: center" id="editExactRuleButton">
+         <div style="text-align: center;margin: -20px 0px 10px 0px;" id="editExactRuleButton">
              <a onclick="editExactRule()" style="margin: 0 auto">+新增</a>
          </div>
 
@@ -500,10 +500,11 @@
         "</div>" +
         "<div class=\"form-group division-line\">" +
         "<label class=\"col-sm-4 control-label\"><span style=\"color:red;\"></span></label>" +
-        "<div class=\"col-sm-8\">" +
-        "</div>" +
+        "<div class=\"col-sm-4\"></div>" +
+        "<div class=\"col-sm-4\"></div>" +
         "</div>" +
         "</div>"
+    var remarkHtml = "<div style='color: red;text-align: center; font-weight: bold; margin: 0px 0px 7px 0px;'>且（同时满足）</div>"
     //
     function validateIntegerInput(input) {
         // 获取输入的值
@@ -540,8 +541,11 @@
             }
             matchWayHtml +="<option value='"+key+"' "+selected+">"+matchWayMap[key]+"</option>"
         }
+        if ($(rule+" ."+className).length>0){
+            $(rule).append(remarkHtml);
+        }
         var ph = ruleHtml.replaceAll("#b#",parentClass).replaceAll("#a#",className).replaceAll("#0#",mark).replaceAll("#1#",phrasesHtml).replaceAll("#2#",count).replaceAll("#3#",matchWayHtml)
-        $(rule).append(ph)
+        $(rule).append(ph);
         // 初始化 selectpicker 插件
         $('.selectpicker').selectpicker('refresh');
     }

CMPlatform/web/templates/private/cuser_rule_edit.html

@@ -2859,7 +2859,7 @@
     // 精准筛选规则-新增页面 +新增按钮
     function addExactRule(){
         ruleHtmlFunc("insert-class","","#insertexactRule")
-        if ($('.exact-rule-class').length > 3){
+        if ($('.insert-class').length > 3){
             $("#addExactRuleButton").hide()
         }
     }

CMPlatform/web/templates/private/history_rule_edit.html

@@ -2562,7 +2562,7 @@
     // 精准筛选规则-新增页面 +新增按钮
     function addExactRule(){
         ruleHtmlFunc("insert-class","","#insertexactRule")
-        if ($('.exact-rule-class').length > 3){
+        if ($('.insert-class').length > 3){
             $("#addExactRuleButton").hide()
         }
     }