From f82a82387e14b9d33dc701bc0537abcc7bd3127b 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: Sun, 8 May 2022 14:09:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E6=96=87=E5=AD=97=E5=A2=9E=E5=8A=A0=E5=9B=BD=E9=99=85?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wwwroot/CodeGenTemplate/TplVue.txt        |  6 ++--
 .../wwwroot/CodeGenTemplate/TplVueSelect.txt  |  6 ++--
 .../wwwroot/CodeGenTemplate/v3/TreeVue.txt    | 26 ++++++++++------
 .../wwwroot/CodeGenTemplate/v3/Vue.txt        | 31 ++++++++++++-------
 4 files changed, 41 insertions(+), 28 deletions(-)

diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt
index 28199bf..f744b87 100644
--- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt
+++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt
@@ -1,10 +1,10 @@
 <!--
- * @Descripttion: (${genTable.functionName}/${genTable.remark})
+ * @Descripttion: (${genTable.functionName}/${genTable.tableName})
  * @version: (1.0)
  * @Author: (${replaceDto.Author})
  * @Date: (${replaceDto.AddTime})
- * @LastEditors: (最后更新作者)
- * @LastEditTime: (最后更新时间)
+ * @LastEditors: (${replaceDto.Author})
+ * @LastEditTime: (${replaceDto.AddTime})
 -->
 <template>
   <div class="app-container">
diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVueSelect.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVueSelect.txt
index e2d5439..8849f45 100644
--- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVueSelect.txt
+++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVueSelect.txt
@@ -1,10 +1,10 @@
 <!--
- * @Descripttion: (${genTable.functionName}/${genTable.remark})
+ * @Descripttion: (${genTable.functionName}/${genTable.tableName})
  * @version: (1.0)
  * @Author: (${replaceDto.Author})
  * @Date: (${replaceDto.AddTime})
- * @LastEditors: (最后更新作者)
- * @LastEditTime: (最后更新时间)
+ * @LastEditors: (${replaceDto.Author})
+ * @LastEditTime: (${replaceDto.AddTime})
 -->
 <template>
   <div class="app-container">
diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/TreeVue.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/TreeVue.txt
index f4f65da..a973c4f 100644
--- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/TreeVue.txt
+++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/TreeVue.txt
@@ -1,10 +1,10 @@
 <!--
- * @Descripttion: (${genTable.functionName}/${genTable.remark})
+ * @Descripttion: (${genTable.functionName}/${genTable.tableName})
  * @version: (1.0)
  * @Author: (${replaceDto.Author})
  * @Date: (${replaceDto.AddTime})
- * @LastEditors: (最后更新作者)
- * @LastEditTime: (最后更新时间)
+ * @LastEditors: (${replaceDto.Author})
+ * @LastEditTime: (${replaceDto.AddTime})
 -->
 <template>
   <div class="app-container">
@@ -45,15 +45,17 @@ $end
 $end
 $end
       <el-form-item>
-        <el-button icon="search" type="primary" @click="handleQuery">搜索</el-button>
-        <el-button icon="refresh" @click="resetQuery">重置</el-button>
+        <el-button icon="search" type="primary" @click="handleQuery">{{ ${t}t('btn.search') }}</el-button>
+        <el-button icon="refresh" @click="resetQuery">{{ ${t}t('btn.reset') }}</el-button>
       </el-form-item>
     </el-form>
     <!-- 工具区域 -->
     <el-row :gutter="10" class="mb8">
 $if(replaceDto.ShowBtnAdd)
       <el-col :span="1.5">
-        <el-button type="primary" v-hasPermi="['${replaceDto.PermissionPrefix}:add']" plain icon="plus" @click="handleAdd">新增</el-button>
+        <el-button type="primary" v-hasPermi="['${replaceDto.PermissionPrefix}:add']" plain icon="plus" @click="handleAdd">
+          {{ ${t}t('btn.add') }}
+        </el-button>
       </el-col>
 $end
        <el-col :span="1.5">
@@ -61,12 +63,16 @@ $end
       </el-col>
 $if(replaceDto.ShowBtnDelete)
       <el-col :span="1.5">
-        <el-button type="danger" :disabled="multiple" v-hasPermi="['${replaceDto.PermissionPrefix}:delete']" plain icon="delete" @click="handleDelete">删除</el-button>
+        <el-button type="danger" :disabled="multiple" v-hasPermi="['${replaceDto.PermissionPrefix}:delete']" plain icon="delete" @click="handleDelete">
+          {{ ${t}t('btn.delete') }}
+        </el-button>
       </el-col>
 $end
 $if(replaceDto.ShowBtnExport)
       <el-col :span="1.5">
-        <el-button type="warning" plain icon="download" @click="handleExport" v-hasPermi="['${replaceDto.PermissionPrefix}:export']">导出</el-button>
+        <el-button type="warning" plain icon="download" @click="handleExport" v-hasPermi="['${replaceDto.PermissionPrefix}:export']">
+          {{ ${t}t('btn.export') }}
+        </el-button>
       </el-col>
 $end
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
@@ -272,8 +278,8 @@ $end
       </el-form>
       <template #footer>
         <div class="dialog-footer">
-          <el-button type="text" @click="cancel">取 消</el-button>
-          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button type="text" @click="cancel">{{ ${t}t('btn.cancel') }}</el-button>
+          <el-button type="primary" @click="submitForm">{{ ${t}t('btn.submit') }}</el-button>
         </div>
       </template>
     </el-dialog>
diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt
index b2a1300..19af23e 100644
--- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt
+++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt
@@ -1,10 +1,10 @@
 <!--
- * @Descripttion: (${genTable.functionName}/${genTable.remark})
+ * @Descripttion: (${genTable.functionName}/${genTable.tableName})
  * @version: (1.0)
  * @Author: (${replaceDto.Author})
  * @Date: (${replaceDto.AddTime})
- * @LastEditors: (最后更新作者)
- * @LastEditTime: (最后更新时间)
+ * @LastEditors: (${replaceDto.Author})
+ * @LastEditTime: (${replaceDto.AddTime})
 -->
 <template>
   <div class="app-container">
@@ -52,32 +52,39 @@ $else
 $end
 $end
 $end
-
       <el-form-item>
-        <el-button icon="search" type="primary" @click="handleQuery">搜索</el-button>
-        <el-button icon="refresh" @click="resetQuery">重置</el-button>
+        <el-button icon="search" type="primary" @click="handleQuery">{{ ${t}t('btn.search') }}</el-button>
+        <el-button icon="refresh" @click="resetQuery">{{ ${t}t('btn.reset') }}</el-button>
       </el-form-item>
     </el-form>
     <!-- 工具区域 -->
     <el-row :gutter="10" class="mb8">
 $if(replaceDto.ShowBtnAdd)
       <el-col :span="1.5">
-        <el-button type="primary" v-hasPermi="['${replaceDto.PermissionPrefix}:add']" plain icon="plus" @click="handleAdd">新增</el-button>
+        <el-button type="primary" v-hasPermi="['${replaceDto.PermissionPrefix}:add']" plain icon="plus" @click="handleAdd">
+          {{ ${t}t('btn.add') }}
+        </el-button>
       </el-col>
 $end
 $if(replaceDto.ShowBtnEdit)
       <el-col :span="1.5">
-        <el-button type="success" :disabled="single" v-hasPermi="['${replaceDto.PermissionPrefix}:edit']" plain icon="edit" @click="handleUpdate">修改</el-button>
+        <el-button type="success" :disabled="single" v-hasPermi="['${replaceDto.PermissionPrefix}:edit']" plain icon="edit" @click="handleUpdate">
+          {{ ${t}t('btn.edit') }}
+        </el-button>
       </el-col>
 $end
 $if(replaceDto.ShowBtnDelete)
       <el-col :span="1.5">
-        <el-button type="danger" :disabled="multiple" v-hasPermi="['${replaceDto.PermissionPrefix}:delete']" plain icon="delete" @click="handleDelete">删除</el-button>
+        <el-button type="danger" :disabled="multiple" v-hasPermi="['${replaceDto.PermissionPrefix}:delete']" plain icon="delete" @click="handleDelete">
+          {{ ${t}t('btn.delete') }}
+        </el-button>
       </el-col>
 $end
 $if(replaceDto.ShowBtnExport)
       <el-col :span="1.5">
-        <el-button type="warning" plain icon="download" @click="handleExport" v-hasPermi="['${replaceDto.PermissionPrefix}:export']">导出</el-button>
+        <el-button type="warning" plain icon="download" @click="handleExport" v-hasPermi="['${replaceDto.PermissionPrefix}:export']">
+          {{ ${t}t('btn.export') }}
+        </el-button>
       </el-col>
 $end
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
@@ -256,8 +263,8 @@ $end
       </el-form>
       <template #footer>
         <div class="dialog-footer">
-          <el-button type="text" @click="cancel">取 消</el-button>
-          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button type="text" @click="cancel">{{ ${t}t('btn.cancel') }}</el-button>
+          <el-button type="primary" @click="submitForm">{{ ${t}t('btn.submit') }}</el-button>
         </div>
       </template>
     </el-dialog>