update 优化代码生成模板

10 months ago · 981e9aad31
parent 7f29a4662f
commit 981e9aad31
2 changed files with 107 additions and 131 deletions
--- a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index-tree.vue.vm
+++ b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index-tree.vue.vm
@ -1,8 +1,9 @@
 <template>
  <div class="p-2">
    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
-      <div class="search" v-show="showSearch">
-        <el-form :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
+      <div v-show="showSearch" class="mb-[10px]">
+        <el-card shadow="hover">
+          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
 #foreach($column in $columns)
 #if($column.query)
 #set($dictType=$column.dictType)
@ -15,17 +16,12 @@
 #end
 #if($column.htmlType == "input" || $column.htmlType == "textarea")
            <el-form-item label="${comment}" prop="${column.javaField}">
-            <el-input v-model="queryParams.${column.javaField}" placeholder="请输入${comment}" clearable style="width: 240px" @keyup.enter="handleQuery" />
+              <el-input v-model="queryParams.${column.javaField}" placeholder="请输入${comment}" clearable @keyup.enter="handleQuery" />
            </el-form-item>
 #elseif(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType)
            <el-form-item label="${comment}" prop="${column.javaField}">
              <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable>
-              <el-option
-                  v-for="dict in ${dictType}"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-              />
+                <el-option v-for="dict in ${dictType}" :key="dict.value" :label="dict.label" :value="dict.value"/>
              </el-select>
            </el-form-item>
 #elseif(($column.htmlType == "select" || $column.htmlType == "radio") && $dictType)
@ -63,6 +59,7 @@
              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
            </el-form-item>
          </el-form>
+        </el-card>
      </div>
    </transition>

@ -79,12 +76,12 @@
        </el-row>
      </template>
      <el-table
+        ref="${businessName}TableRef"
        v-loading="loading"
        :data="${businessName}List"
        row-key="${treeCode}"
        :default-expand-all="isExpandAll"
        :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
-        ref="${businessName}TableRef"
      >
 #foreach($column in $columns)
 #set($javaField=$column.javaField)
@ -421,17 +418,15 @@ const resetQuery = () => {

 /** 新增按钮操作 */
 const handleAdd = (row?: ${BusinessName}VO) => {
-  dialog.visible = true;
-  dialog.title = "添加${functionName}";
-  nextTick(() => {
  reset();
  getTreeselect();
  if (row != null && row.${treeCode}) {
-      form.value.${treeParentCode} = row.${treeParentCode};
+    form.value.${treeParentCode} = row.${treeCode};
  } else {
    form.value.${treeParentCode} = 0;
  }
-  });
+  dialog.visible = true;
+  dialog.title = "添加${functionName}";
 }

 /** 展开/折叠操作 */
@ -449,25 +444,21 @@ const toggleExpandAll = (data: ${BusinessName}VO[], status: boolean) => {
 }

 /** 修改按钮操作 */
-const handleUpdate = (row: ${BusinessName}VO) => {
-  loading.value = true;
-  dialog.visible = true;
-  dialog.title = "修改${functionName}";
-  nextTick(async () => {
+const handleUpdate = async (row: ${BusinessName}VO) => {
  reset();
  await getTreeselect();
  if (row != null) {
-      form.value.${treeParentCode} = row.${treeCode};
+    form.value.${treeParentCode} = row.${treeParentCode};
  }
  const res = await get${BusinessName}(row.${pkColumn.javaField});
-    loading.value = false;
  Object.assign(form.value, res.data);
 #foreach ($column in $columns)
  #if($column.htmlType == "checkbox")
  form.value.$column.javaField = form.value.${column.javaField}.split(",");
  #end
 #end
-  });
+  dialog.visible = true;
+  dialog.title = "修改${functionName}";
 }

 /** 提交按钮 */
--- a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index.vue.vm
+++ b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index.vue.vm
@ -1,8 +1,9 @@
 <template>
  <div class="p-2">
    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
-      <div class="search" v-show="showSearch">
-        <el-form :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
+      <div v-show="showSearch" class="mb-[10px]">
+        <el-card shadow="hover">
+          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
 #foreach($column in $columns)
 #if($column.query)
 #set($dictType=$column.dictType)
@ -15,17 +16,12 @@
 #end
 #if($column.htmlType == "input" || $column.htmlType == "textarea")
            <el-form-item label="${comment}" prop="${column.javaField}">
-            <el-input v-model="queryParams.${column.javaField}" placeholder="请输入${comment}" clearable style="width: 240px" @keyup.enter="handleQuery" />
+              <el-input v-model="queryParams.${column.javaField}" placeholder="请输入${comment}" clearable @keyup.enter="handleQuery" />
            </el-form-item>
 #elseif(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType)
            <el-form-item label="${comment}" prop="${column.javaField}">
              <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable >
-              <el-option
-                v-for="dict in ${dictType}"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              />
+                <el-option v-for="dict in ${dictType}" :key="dict.value" :label="dict.label" :value="dict.value"/>
              </el-select>
            </el-form-item>
 #elseif(($column.htmlType == "select" || $column.htmlType == "radio") && $dictType)
@ -63,6 +59,7 @@
              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
            </el-form-item>
          </el-form>
+        </el-card>
      </div>
    </transition>

@ -135,13 +132,7 @@
        </el-table-column>
      </el-table>

-      <pagination
-          v-show="total>0"
-          :total="total"
-          v-model:page="queryParams.pageNum"
-          v-model:limit="queryParams.pageSize"
-          @pagination="getList"
-      />
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
    </el-card>
    <!-- 添加或修改${functionName}对话框 -->
    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
@ -404,30 +395,24 @@ const handleSelectionChange = (selection: ${BusinessName}VO[]) => {

 /** 新增按钮操作 */
 const handleAdd = () => {
+  reset();
  dialog.visible = true;
  dialog.title = "添加${functionName}";
-  nextTick(() => {
-    reset();
-  });
 }

 /** 修改按钮操作 */
-const handleUpdate = (row?: ${BusinessName}VO) => {
-  loading.value = true
-  dialog.visible = true;
-  dialog.title = "修改${functionName}";
-  nextTick(async () => {
+const handleUpdate = async (row?: ${BusinessName}VO) => {
  reset();
  const _${pkColumn.javaField} = row?.${pkColumn.javaField} || ids.value[0]
  const res = await get${BusinessName}(_${pkColumn.javaField});
-    loading.value = false;
  Object.assign(form.value, res.data);
 #foreach ($column in $columns)
  #if($column.htmlType == "checkbox")
  form.value.$column.javaField = form.value.${column.javaField}.split(",");
  #end
 #end
-  });
+  dialog.visible = true;
+  dialog.title = "修改${functionName}";
 }

 /** 提交按钮 */