Merge remote-tracking branch 'origin/knowledgePlat' into test

src/components/knowledgeExtra/SubConditions.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="groups-cont">
         <el-form ref="groupData" label-width="150px" class="sub-condition-form" :model="groupData" :rules="rules">
-            <span v-if="!disabled" class="del-btn"  @click="delRule">删除</span><!--:class="isLast?'disable del-btn':'del-btn'"-->
+            <span v-if="!disabled&&!isLast" class="del-btn"  @click="delRule">删除</span><!--:class="isLast?'disable del-btn':'del-btn'"-->
             <el-form-item label="基础规则名称：" prop="subDescription">
                 <el-input v-model.trim = "groupData.subDescription" :disabled="disabled"></el-input>
             </el-form-item>

src/components/knowledgeExtra/SubRulesGroup.vue

@@ -3,7 +3,7 @@
         <SubConditions v-for="(rules,i) in data"
                        ref="group"
                        :groupData="rules"
-                       :isLast="rules.length===1"
+                       :isLast="data.length===1"
                        :ind="i"
                        :showAdd="data.length<maxNum"
                        :baseTypes="baseTypes"
@@ -14,7 +14,7 @@
                        @delRule="delRule"></SubConditions>
         <div class="group-oper">
             <el-button size="small" @click="addGroup">+新增分组</el-button>
-            <el-button :class="isLast?'disable':''" size="small" type="danger" plain @click="delGroup">-删除分组</el-button>
+            <el-button :disabled="isLast" size="small" type="danger" plain @click="delGroup">-删除分组</el-button>
         </div>
     </div>
 </template>
@@ -102,4 +102,12 @@
         border-top: 4px solid #F5F5F5;
         background: #fff;
     }
+    .el-button--danger.is-plain{
+        background: none;
+        &.is-disabled{
+            color: #f9a7a7;
+            background-color: #fef0f0;
+            border-color: #fde2e2;
+        }
+    }
 </style>