From c636e6909b8ed1dc1dba18bceca2554d5adde7f9 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 21 一月 2022 18:29:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'ruoyi-vue/master' into dev

---
 ruoyi-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm |   38 ++++++++++++++++++++++++--------------
 1 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/ruoyi-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm b/ruoyi-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm
index d57bbdf..629b931 100644
--- a/ruoyi-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm
+++ b/ruoyi-generator/src/main/resources/vm/vue/v3/index-tree.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}"
@@ -103,11 +103,11 @@
       </el-table-column>
 #elseif($column.list && $column.htmlType == "imageUpload")
       <el-table-column label="${comment}" align="center" prop="${javaField}" width="100">
-        <template #default="scope">
-          <image-preview :src="scope.row.${javaField}" :width="50" :height="50"/>
-        </template>
+          <template #default="scope">
+              <image-preview :src="scope.row.${javaField}" :width="50" :height="50"/>
+          </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")
@@ -155,7 +155,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))
@@ -244,8 +243,8 @@
         <el-form-item label="${comment}" prop="${field}">
           <el-date-picker clearable
             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>
@@ -253,7 +252,6 @@
         <el-form-item label="${comment}" prop="${field}">
           <el-input v-model="form.${field}" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
         </el-form-item>
-#end
 #end
 #end
 #end
@@ -280,6 +278,7 @@
 const ${businessName}List = ref([]);
 const ${businessName}Options = ref([]);
 const open = ref(false);
+const buttonLoading = ref(false);
 const loading = ref(true);
 const showSearch = ref(true);
 const title = ref("");
@@ -293,14 +292,14 @@
 const data = reactive({
   form: {},
   queryParams: {
-    #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)
@@ -351,7 +350,7 @@
     ${businessName}Options.value.push(data);
   });
 }
-	
+
 // 鍙栨秷鎸夐挳
 function cancel() {
   open.value = false;
@@ -407,12 +406,14 @@
 
 /** 淇敼鎸夐挳鎿嶄綔 */
 async function handleUpdate(row) {
+  loading.value = true;
   reset();
   await getTreeselect();
   if (row != null) {
     form.value.${treeParentCode} = row.${treeCode};
   }
   get${BusinessName}(row.${pkColumn.javaField}).then(response => {
+    loading.value = false;
     form.value = response.data;
 #foreach ($column in $columns)
 #if($column.htmlType == "checkbox")
@@ -428,6 +429,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(",");
@@ -438,12 +440,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;
         });
       }
     }
@@ -453,11 +459,15 @@
 /** 鍒犻櫎鎸夐挳鎿嶄綔 */
 function handleDelete(row) {
   proxy.#[[$modal]]#.confirm('鏄惁纭鍒犻櫎${functionName}缂栧彿涓�"' + row.${pkColumn.javaField} + '"鐨勬暟鎹」锛�').then(function() {
+    loading.value = true;
     return del${BusinessName}(row.${pkColumn.javaField});
   }).then(() => {
+    loading.value = false;
     getList();
     proxy.#[[$modal]]#.msgSuccess("鍒犻櫎鎴愬姛");
-  }).catch(() => {});
+  }).finally(() => {
+    loading.value = false;
+  });
 }
 
 getList();

--
Gitblit v1.9.3