Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue

疯狂的狮子li

2021-01-06 b36874538051c56d9c76485d4485f7b3c164aad3

 ruoyi-generator/src/main/resources/vm/vue/index.vue.vm

@@ -64,7 +64,7 @@
#end
#end
      <el-form-item>
        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
      </el-form-item>
    </el-form>
@@ -73,6 +73,7 @@
      <el-col :span="1.5">
        <el-button
          type="primary"
        plain
          icon="el-icon-plus"
          size="mini"
          @click="handleAdd"
@@ -82,6 +83,7 @@
      <el-col :span="1.5">
        <el-button
          type="success"
        plain
          icon="el-icon-edit"
          size="mini"
          :disabled="single"
@@ -92,6 +94,7 @@
      <el-col :span="1.5">
        <el-button
          type="danger"
        plain
          icon="el-icon-delete"
          size="mini"
          :disabled="multiple"
@@ -102,6 +105,7 @@
      <el-col :span="1.5">
        <el-button
          type="warning"
        plain
          icon="el-icon-download"
          size="mini"
          @click="handleExport"
@@ -181,9 +185,13 @@
        <el-form-item label="${comment}" prop="${field}">
          <el-input v-model="form.${field}" placeholder="请输入${comment}" />
        </el-form-item>
#elseif($column.htmlType == "uploadImage")
#elseif($column.htmlType == "imageUpload")
        <el-form-item label="${comment}">
          <uploadImage v-model="form.${field}"/>
          <imageUpload v-model="form.${field}"/>
        </el-form-item>
#elseif($column.htmlType == "fileUpload")
        <el-form-item label="${comment}">
          <fileUpload v-model="form.${field}"/>
        </el-form-item>
#elseif($column.htmlType == "editor")
        <el-form-item label="${comment}">
@@ -270,8 +278,14 @@
<script>
import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName}, export${BusinessName} } from "@/api/${moduleName}/${businessName}";
#foreach($column in $columns)
#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "uploadImage")
import UploadImage from '@/components/UploadImage';
#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "imageUpload")
import ImageUpload from '@/components/ImageUpload';
#break
#end
#end
#foreach($column in $columns)
#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "fileUpload")
import FileUpload from '@/components/FileUpload';
#break
#end
#end
@@ -286,8 +300,14 @@
  name: "${BusinessName}",
  components: {
#foreach($column in $columns)
#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "uploadImage")
    UploadImage,
#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "imageUpload")
    ImageUpload,
#break
#end
#end
#foreach($column in $columns)
#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "fileUpload")
    FileUpload,
#break
#end
#end