From d600cdd8a0a590d43c141c36f5ba7077fc81c420 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 16 十二月 2021 15:09:35 +0800
Subject: [PATCH] add 代码生成增加 vue3 页面模板

---
 ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm |   36 +++++++++++++++++++++++-------------
 1 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm b/ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm
index 6e7b41f..6487f0f 100644
--- a/ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm
+++ b/ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm
@@ -11,7 +11,7 @@
 #else
 #set($comment=$column.columnComment)
 #end
-#if($column.htmlType == "input")
+#if($column.htmlType == "input" || $column.htmlType == "textarea")
       <el-form-item label="${comment}" prop="${column.javaField}">
         <el-input
           v-model="queryParams.${column.javaField}"
@@ -126,14 +126,14 @@
 #set($comment=$column.columnComment)
 #end
 #if($column.pk)
-      <el-table-column label="${comment}" align="center" prop="${javaField}" />
+      <el-table-column label="${comment}" align="center" prop="${javaField}" v-if="${column.list}"/>
 #elseif($column.list && $column.htmlType == "datetime")
       <el-table-column label="${comment}" align="center" prop="${javaField}" width="180">
         <template #default="scope">
           <span>{{ parseTime(scope.row.${javaField}, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-#elseif($column.list && "" != $column.dictType)
+#elseif($column.list && $column.dictType && "" != $column.dictType)
       <el-table-column label="${comment}" align="center" prop="${javaField}">
         <template #default="scope">
 #if($column.htmlType == "checkbox")
@@ -166,7 +166,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -181,7 +181,6 @@
 #foreach($column in $columns)
 #set($field=$column.javaField)
 #if($column.insert && !$column.pk)
-#if(($column.usableColumn) || (!$column.superColumn))
 #set($parentheseIndex=$column.columnComment.indexOf("锛�"))
 #if($parentheseIndex != -1)
 #set($comment=$column.columnComment.substring(0, $parentheseIndex))
@@ -261,8 +260,8 @@
         <el-form-item label="${comment}" prop="${field}">
           <el-date-picker clearable size="small"
             v-model="form.${field}"
-            type="date"
-            value-format="YYYY-MM-DD"
+            type="datetime"
+            value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="閫夋嫨${comment}">
           </el-date-picker>
         </el-form-item>
@@ -270,7 +269,6 @@
         <el-form-item label="${comment}" prop="${field}">
           <el-input v-model="form.${field}" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
         </el-form-item>
-#end
 #end
 #end
 #end
@@ -309,7 +307,7 @@
       </el-form>
       <template #footer>
         <div class="dialog-footer">
-          <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">纭� 瀹�</el-button>
           <el-button @click="cancel">鍙� 娑�</el-button>
         </div>
       </template>
@@ -331,6 +329,7 @@
 const ${subclassName}List = ref([]);
 #end
 const open = ref(false);
+const buttonLoading = ref(false);
 const loading = ref(true);
 const showSearch = ref(true);
 const ids = ref([]);
@@ -353,14 +352,14 @@
   queryParams: {
     pageNum: 1,
     pageSize: 10,
-    #foreach ($column in $columns)
+#foreach ($column in $columns)
 #if($column.query)
-    $column.javaField: null#if($foreach.count != $columns.size()),#end
+    $column.javaField: undefined#if($foreach.count != $columns.size()),#end
 #end
 #end
   },
   rules: {
-    #foreach ($column in $columns)
+#foreach ($column in $columns)
 #if($column.required)
 #set($parentheseIndex=$column.columnComment.indexOf("锛�"))
 #if($parentheseIndex != -1)
@@ -462,9 +461,11 @@
 
 /** 淇敼鎸夐挳鎿嶄綔 */
 function handleUpdate(row) {
+  loading.value = true
   reset();
   const ${pkColumn.javaField} = row.${pkColumn.javaField} || ids.value
   get${BusinessName}(${pkColumn.javaField}).then(response => {
+    loading.value = false;
     form.value = response.data;
 #foreach ($column in $columns)
 #if($column.htmlType == "checkbox")
@@ -483,6 +484,7 @@
 function submitForm() {
   proxy.#[[$]]#refs["${businessName}Ref"].validate(valid => {
     if (valid) {
+      buttonLoading.value = true;
 #foreach ($column in $columns)
 #if($column.htmlType == "checkbox")
       form.value.$column.javaField = form.value.${column.javaField}.join(",");
@@ -496,12 +498,16 @@
           proxy.#[[$modal]]#.msgSuccess("淇敼鎴愬姛");
           open.value = false;
           getList();
+        }).finally(() => {
+          buttonLoading.value = false;
         });
       } else {
         add${BusinessName}(form.value).then(response => {
           proxy.#[[$modal]]#.msgSuccess("鏂板鎴愬姛");
           open.value = false;
           getList();
+        }).finally(() => {
+          buttonLoading.value = false;
         });
       }
     }
@@ -512,11 +518,15 @@
 function handleDelete(row) {
   const ${pkColumn.javaField}s = row.${pkColumn.javaField} || ids.value;
   proxy.#[[$modal]]#.confirm('鏄惁纭鍒犻櫎${functionName}缂栧彿涓�"' + ${pkColumn.javaField}s + '"鐨勬暟鎹」锛�').then(function() {
+    loading.value = true;
     return del${BusinessName}(${pkColumn.javaField}s);
   }).then(() => {
+    loading.value = true;
     getList();
     proxy.#[[$modal]]#.msgSuccess("鍒犻櫎鎴愬姛");
-  }).catch(() => {});
+  }).finally(() => {
+    loading.value = false;
+  });
 }
 
 #if($table.sub)

--
Gitblit v1.9.3