From 3f79da761f3d4549e4185a091a0da6804dee1171 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Thu, 19 May 2022 19:34:25 +0800
Subject: [PATCH] =?UTF-8?q?vue3=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E8=AF=AD=E6=B3=95=E9=80=82=E9=85=8Delement2.2.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                             | 1 +
 ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/TreeVue.txt | 2 +-
 ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt     | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 53a1570..91c5d32 100644
--- a/.gitignore
+++ b/.gitignore
@@ -270,3 +270,4 @@ __pycache__/
 /ZR.Admin.WebApi/ZRAdmin.xml
 /ZR.Admin.WebApi/DataProtection
 /Quartz.NET.WindowsService
+/ZRAdmin-vue
diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/TreeVue.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/TreeVue.txt
index a973c4f..766c81e 100644
--- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/TreeVue.txt
+++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/TreeVue.txt
@@ -278,7 +278,7 @@ $end
       </el-form>
       <template #footer>
         <div class="dialog-footer">
-          <el-button type="text" @click="cancel">{{ ${t}t('btn.cancel') }}</el-button>
+          <el-button text @click="cancel">{{ ${t}t('btn.cancel') }}</el-button>
           <el-button type="primary" @click="submitForm">{{ ${t}t('btn.submit') }}</el-button>
         </div>
       </template>
diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt
index 19af23e..ed23f8e 100644
--- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt
+++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt
@@ -263,7 +263,7 @@ $end
       </el-form>
       <template #footer>
         <div class="dialog-footer">
-          <el-button type="text" @click="cancel">{{ ${t}t('btn.cancel') }}</el-button>
+          <el-button text @click="cancel">{{ ${t}t('btn.cancel') }}</el-button>
           <el-button type="primary" @click="submitForm">{{ ${t}t('btn.submit') }}</el-button>
         </div>
       </template>