Merge branch 'dev-moreTab-20210425' into 'release'

自定义tab可以增删

自定义tab可以增删

See merge request !262

src/views/yqrange/range-setting.vue

@@ -56,16 +56,16 @@
                 :value="item2.id">
               </el-option>
             </el-select>
-<!--              <img v-if="scope.row.appTag == 10"-->
-<!--                @click="add(scope.$index)"-->
-<!--                class="edit-img"-->
-<!--                src="../../assets/image/plus.png"-->
-<!--              />-->
-<!--              <img v-if="scope.row.appTag == 10 && count > 0"-->
-<!--                @click="del(scope.$index, scope.row)"-->
-<!--                class="edit-img"-->
-<!--                src="../../assets/image/trash.png"-->
-<!--              />-->
+            <img v-if="scope.row.appTag == 10"
+              @click="add(scope.$index)"
+              class="edit-tplbtn"
+              src="../../assets/image/plus.png"
+            />
+            <img v-if="scope.row.appTag == 10 && count > 0"
+              @click="del(scope.$index, scope.row)"
+              class="edit-tplbtn"
+              src="../../assets/image/trash.png"
+            />
           </template>
         </el-table-column>
 
@@ -310,15 +310,17 @@ export default {
         circleId: this.circleId,
         id: row.id
       }
-
-      vm.$confirm(`确定删除“${row.appName}”吗？`, "", {
-        confirmButtonText: "删除",
-        cancelButtonText: "取消",
-        type: "warning"
-        // customClass: 'range-make-box',
-      })
+       vm.$confirm(
+        `确定删除自定义tab“${row.appName}”吗？<br>（<span style='color:red;font-size:12px;'>删除后该tab将不再显示</span>）`,
+        "提示",
+        {
+          confirmButtonText: "删除",
+          cancelButtonText: "取消",
+          dangerouslyUseHTMLString: true,
+          customClass: "cc-class-box",
+          type: "warning",
+        })
         .then(() => {
-
           if (params.id == "") {
             vm.$message({
               type: "success",
@@ -346,7 +348,6 @@ export default {
           }
         })
         .catch(() => {});
-
     },
     activityColor({row, column, rowIndex, columnIndex}){
       return "activity-color";
@@ -388,6 +389,11 @@ export default {
         }
       }
     }
+    .edit-tplbtn {
+      // display: inline-block;
+      vertical-align: middle;
+    }
+
   }
   /*.range-make-box{*/
     /*.el-message-box__btns{*/