Merge pull request 'feat' (#27) from dev into main

Reviewed-on: https://gitea.fleyx.com/fanxb/open-renamer/pulls/27
FleyX · Nov 29, 2022 · ffb2140 · ffb2140
2 parents bb49dd0 + 5b01d40
commit ffb2140
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/openRenamerFront/src/views/home/components/ApplicationRuleList.vue b/openRenamerFront/src/views/home/components/ApplicationRuleList.vue
@@ -41,6 +41,7 @@ import HttpUtil from "../../../utils/HttpUtil";
 import dayjs from "dayjs";
 export default {
   name: "ApplicationRuleList",
+  props: ["curId"],
   emits: ["templateUpdate"],
   data() {
     return {
@@ -79,6 +80,10 @@ export default {
         this.templateForm.comment = rowData.comment;
         this.showEditAddModal = true;
       } else {
+        if (this.curId == rowData.id) {
+          this.$message({ message: "当前模板使用中，无法删除", type: "warning" });
+          return;
+        }
         await HttpUtil.delete("/applicationRule/" + rowData.id);
         await this.init();
       }

diff --git a/openRenamerFront/src/views/home/components/RuleBlock.vue b/openRenamerFront/src/views/home/components/RuleBlock.vue
@@ -36,7 +36,7 @@
       <rule :editRule="editRule" @ruleAdd="ruleAdd" v-if="addRuleDialogShow" />
     </el-dialog>
     <el-dialog title="模板管理" v-model="ruleTemplateShow" width="70%">
-      <application-rule-list v-if="ruleTemplateShow" @templateUpdate="templateUpdate" />
+      <application-rule-list v-if="ruleTemplateShow" :curId="chosedTemplate.id" @templateUpdate="templateUpdate" />
     </el-dialog>
   </div>
 </template>