From 54a79aacc7749647ab49a89b40755b2c63477b53 Mon Sep 17 00:00:00 2001
From: Jason <5340635+wen-jason@user.noreply.gitee.com>
Date: Wed, 17 Aug 2022 10:37:42 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BB=A3=E7=A0=81=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E5=99=A8=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/vue/edit.vue.vm              |  4 ++--
 .../src/main/resources/vue/index-tree.vue.vm        |  3 ++-
 .../src/main/resources/vue/index.vue.vm             | 13 ++++---------
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/server/like-generator/src/main/resources/vue/edit.vue.vm b/server/like-generator/src/main/resources/vue/edit.vue.vm
index 3da86feb..7d8b655e 100644
--- a/server/like-generator/src/main/resources/vue/edit.vue.vm
+++ b/server/like-generator/src/main/resources/vue/edit.vue.vm
@@ -107,9 +107,9 @@
                     <el-date-picker
                         class="flex-1 !flex"
                         v-model="formData.${column.javaField}"
-                        type="date"
+                        type="datetime"
                         clearable
-                        value-format="YYYY-MM-DD"
+                        value-format="YYYY-MM-DD hh:mm:ss"
                         placeholder="请选择${column.columnComment}"
                     />
                 </el-form-item>
diff --git a/server/like-generator/src/main/resources/vue/index-tree.vue.vm b/server/like-generator/src/main/resources/vue/index-tree.vue.vm
index 87120008..57269eff 100644
--- a/server/like-generator/src/main/resources/vue/index-tree.vue.vm
+++ b/server/like-generator/src/main/resources/vue/index-tree.vue.vm
@@ -199,7 +199,8 @@ const handleEdit = async (data: any) => {
 
 const handleDelete = async (${primaryKey}: number) => {
     await feedback.confirm('确定要删除？')
-    await ${moduleName}Delete({ id: ${primaryKey} })
+    await ${moduleName}Delete({ ${primaryKey} })
+    feedback.msgSuccess('删除成功')
     getLists()
 }
 
diff --git a/server/like-generator/src/main/resources/vue/index.vue.vm b/server/like-generator/src/main/resources/vue/index.vue.vm
index 19ef151b..77b027eb 100644
--- a/server/like-generator/src/main/resources/vue/index.vue.vm
+++ b/server/like-generator/src/main/resources/vue/index.vue.vm
@@ -69,9 +69,7 @@
                 size="large"
                 v-loading="pager.loading"
                 :data="pager.lists"
-                @selection-change="handleSelectionChange"
             >
-                <el-table-column type="selection" width="50" align="center" />
             #foreach ($column in $columns)
             #if($column.isList)
                 #if($column.dictType!="" && ($column.htmlType=="select" || $column.htmlType=="radio" || $column.htmlType=="checkbox"))
@@ -112,7 +110,7 @@
                             v-perms="['${moduleName}:del']"
                             type="danger"
                             link
-                            @click="handleDelete([row.${primaryKey}])"
+                            @click="handleDelete(row.${primaryKey})"
                         >
                             删除
                         </el-button>
@@ -171,10 +169,6 @@ const { dictData } = useDictData<{
 }>([#foreach ($dict in $dictFields)'${dict}'#if($dictFields[$dictSize] != ${dict}),#end#end])
 #end
 
-const selectData = ref<any[]>([])
-const handleSelectionChange = (selection: any[]) => {
-    selectData.value = selection.map((item) => item.${primaryKey})
-}
 
 const handleAdd = async () => {
     showEdit.value = true
@@ -189,8 +183,9 @@ const handleEdit = async (data: any) => {
     editRef.value?.setFormData(data)
 }
 
-const handleDelete = async (${primaryKey}: number[]) => {
-    await ${moduleName}Delete({ ids: ${primaryKey} })
+const handleDelete = async (${primaryKey}: number) => {
+    await feedback.confirm('确定要删除？')
+    await ${moduleName}Delete({ ${primaryKey} })
     feedback.msgSuccess('删除成功')
     getLists()
 }