From f20d1bff2095adb1965d1a03790ffd4350c33eb6 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, 26 May 2022 20:19:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E6=96=B0=E5=A2=9E=E6=9F=A5=E7=9C=8B=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wwwroot/CodeGenTemplate/v3/Vue.txt        | 47 ++++++++++++++-----
 ZR.CodeGenerator/CodeGeneratorTool.cs         |  1 +
 ZR.CodeGenerator/Model/ReplaceDto.cs          |  1 +
 3 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt
index 8380270..8221726 100644
--- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt
+++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt
@@ -38,7 +38,7 @@ $if(column.HtmlType == "datetime")
           :shortcuts="dateOptions">
         </el-date-picker>
       </el-form-item>
-$elseif(column.HtmlType == "select")
+$elseif(column.HtmlType == "select" || column.HtmlType == "radio")
       <el-form-item label="${labelName}" prop="${columnName}">
         <el-select v-model="queryParams.${columnName}" placeholder="请选择${labelName}">
           <el-option v-for="item in $if(column.DictType != "") ${column.DictType} $else ${column.CsharpFieldFl}Options$end" :key="item.dictValue" :label="item.dictLabel" :value="item.dictValue"></el-option>
@@ -117,7 +117,11 @@ $if(column.HtmlType == "customInput" && column.IsPk == false)
       <el-table-column prop="${columnName}" label="${labelName}" width="90" sortable align="center">
         <template #default="scope">
           <span v-show="editIndex != scope.$${index}index" @click="editCurrRow(scope.$${index}index)">{{scope.row.${columnName}}}</span>
-          <el-input :id="scope.$${index}index" v-show="(editIndex == scope.$${index}index)" v-model="scope.row.${columnName}" @blur="handleChangeSort(scope.row)"></el-input>
+          <el-input
+            :ref="setColumnsRef"
+            v-show="(editIndex == scope.$${index}index)" 
+            v-model="scope.row.${columnName}" 
+            @blur="handleChangeSort(scope.row)"></el-input>
         </template>
       </el-table-column>
 $elseif(column.HtmlType == "imageUpload")
@@ -143,15 +147,16 @@ $else
 $end
 $end
 $end
-      <el-table-column label="操作" align="center" width="140">
+      <el-table-column label="操作" align="center" width="160">
         <template #default="scope">
+$if(replaceDto.ShowBtnView)
+          <el-button type="primary" icon="view" @click="handlePreview(scope.row)"></el-button>
+$end
 $if(replaceDto.ShowBtnEdit)
-          <el-button v-hasPermi="['${replaceDto.PermissionPrefix}:edit']" type="success" icon="edit" title="编辑" 
-            @click="handleUpdate(scope.row)"></el-button>      
+          <el-button v-hasPermi="['${replaceDto.PermissionPrefix}:edit']" type="success" icon="edit" title="编辑" @click="handleUpdate(scope.row)"></el-button>
 $end
 $if(replaceDto.ShowBtnDelete)
-          <el-button v-hasPermi="['${replaceDto.PermissionPrefix}:delete']" type="danger" icon="delete" title="删除" 
-            @click="handleDelete(scope.row)"></el-button>
+          <el-button v-hasPermi="['${replaceDto.PermissionPrefix}:delete']" type="danger" icon="delete" title="删除" @click="handleDelete(scope.row)"></el-button>
 $end
         </template>
       </el-table-column>
@@ -257,7 +262,7 @@ $end
 $end
         </el-row>
       </el-form>
-      <template #footer>
+      <template #footer v-if="opertype != 3">
         <el-button text @click="cancel">{{ ${t}t('btn.cancel') }}</el-button>
         <el-button type="primary" @click="submitForm">{{ ${t}t('btn.submit') }}</el-button>
       </template>
@@ -330,12 +335,19 @@ const dateRange${item.CsharpField} = ref([])
 $elseif(item.HtmlType == "customInput")
 // ******************自定义编辑 start **********************
 const editIndex = ref(-1)
+// 动态ref设置值
+const columnRefs = ref([])
+const setColumnsRef = (el) => {
+  if (el) {
+    columnRefs.value.push(el)
+  }
+}
 // 显示编辑排序
-function editCurrRow(rowId) {
-  editIndex.value = rowId
+function editCurrRow(index) {
+  editIndex.value = index
 
   setTimeout(() => {
-    document.getElementById(rowId).focus()
+    columnRefs.value[index].focus()
   }, 100)
 }
 // 保存排序
@@ -516,7 +528,18 @@ function handleExport() {
     })
 }
 $end
-
+$if(replaceDto.ShowBtnView)
+/**
+ * 预览
+ * @param {*} row
+ */
+function handlePreview(row) {
+  open.value = true
+  title.value = '预览'
+  opertype.value = 3
+  form.value = row
+}
+$end
 // 多选框选中数据
 function handleSelectionChange(selection) {
   ids.value = selection.map((item) => item.${replaceDto.FistLowerPk});
diff --git a/ZR.CodeGenerator/CodeGeneratorTool.cs b/ZR.CodeGenerator/CodeGeneratorTool.cs
index f65de04..0f0d985 100644
--- a/ZR.CodeGenerator/CodeGeneratorTool.cs
+++ b/ZR.CodeGenerator/CodeGeneratorTool.cs
@@ -56,6 +56,7 @@ namespace ZR.CodeGenerator
             replaceDto.ShowBtnEdit = dto.GenTable.Options.CheckedBtn.Any(f => f == 2);
             replaceDto.ShowBtnDelete = dto.GenTable.Options.CheckedBtn.Any(f => f == 3);
             replaceDto.ShowBtnExport = dto.GenTable.Options.CheckedBtn.Any(f => f == 4);
+            replaceDto.ShowBtnView = dto.GenTable.Options.CheckedBtn.Any(f => f == 5);
 
 
             //循环表字段信息
diff --git a/ZR.CodeGenerator/Model/ReplaceDto.cs b/ZR.CodeGenerator/Model/ReplaceDto.cs
index 2251b83..e61cfd1 100644
--- a/ZR.CodeGenerator/Model/ReplaceDto.cs
+++ b/ZR.CodeGenerator/Model/ReplaceDto.cs
@@ -47,6 +47,7 @@ namespace ZR.CodeGenerator.Model
         public bool ShowBtnAdd { get; set; }
         public bool ShowBtnEdit { get; set; }
         public bool ShowBtnDelete { get; set; }
+        public bool ShowBtnView { get; set; }
         /// <summary>
         /// 上传URL data
         /// </summary>