修复代码生成图片/文件/单选时选择必填无法校验问题(I64IO2)

RuoYi

2022-12-08 f9debbb7dae706025da39523db712be3bc2b696e

 src/main/resources/vm/vue/index.vue.vm

@@ -1,6 +1,6 @@
<template>

  <div class="app-container">

    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">

    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">

#foreach($column in $columns)

#if($column.query)

#set($dictType=$column.dictType)

@@ -17,41 +17,39 @@
          v-model="queryParams.${column.javaField}"

          placeholder="请输入${comment}"

          clearable

          size="small"

          @keyup.enter.native="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 size="small">

        <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable>

          <el-option

            v-for="dict in ${column.javaField}Options"

            :key="dict.dictValue"

            :label="dict.dictLabel"

            :value="dict.dictValue"

            v-for="dict in dict.type.${dictType}"

            :key="dict.value"

            :label="dict.label"

            :value="dict.value"

          />

        </el-select>

      </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 size="small">

        <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable>

          <el-option label="请选择字典生成" value="" />

        </el-select>

      </el-form-item>

#elseif($column.htmlType == "datetime" && $column.queryType != "BETWEEN")

      <el-form-item label="${comment}" prop="${column.javaField}">

        <el-date-picker clearable size="small"

        <el-date-picker clearable

          v-model="queryParams.${column.javaField}"

          type="date"

          value-format="yyyy-MM-dd"

          placeholder="选择${comment}">

          placeholder="请选择${comment}">

        </el-date-picker>

      </el-form-item>

#elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")

      <el-form-item label="${comment}">

        <el-date-picker

          v-model="daterange${AttrName}"

          size="small"

          style="width: 240px"

          value-format="yyyy-MM-dd"

          type="daterange"

@@ -73,7 +71,7 @@
      <el-col :span="1.5">

        <el-button

          type="primary"

        plain

          plain

          icon="el-icon-plus"

          size="mini"

          @click="handleAdd"

@@ -83,7 +81,7 @@
      <el-col :span="1.5">

        <el-button

          type="success"

        plain

          plain

          icon="el-icon-edit"

          size="mini"

          :disabled="single"

@@ -94,7 +92,7 @@
      <el-col :span="1.5">

        <el-button

          type="danger"

        plain

          plain

          icon="el-icon-delete"

          size="mini"

          :disabled="multiple"

@@ -105,7 +103,7 @@
      <el-col :span="1.5">

        <el-button

          type="warning"

        plain

          plain

          icon="el-icon-download"

          size="mini"

          @click="handleExport"

@@ -133,8 +131,22 @@
          <span>{{ parseTime(scope.row.${javaField}, '{y}-{m}-{d}') }}</span>

        </template>

      </el-table-column>

#elseif($column.list && $column.htmlType == "imageUpload")

      <el-table-column label="${comment}" align="center" prop="${javaField}" width="100">

        <template slot-scope="scope">

          <image-preview :src="scope.row.${javaField}" :width="50" :height="50"/>

        </template>

      </el-table-column>

#elseif($column.list && "" != $column.dictType)

      <el-table-column label="${comment}" align="center" prop="${javaField}" :formatter="${javaField}Format" />

      <el-table-column label="${comment}" align="center" prop="${javaField}">

        <template slot-scope="scope">

#if($column.htmlType == "checkbox")

          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.${javaField} ? scope.row.${javaField}.split(',') : []"/>

#else

          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.${javaField}"/>

#end

        </template>

      </el-table-column>

#elseif($column.list && "" != $javaField)

      <el-table-column label="${comment}" align="center" prop="${javaField}" />

#end

@@ -186,12 +198,12 @@
          <el-input v-model="form.${field}" placeholder="请输入${comment}" />

        </el-form-item>

#elseif($column.htmlType == "imageUpload")

        <el-form-item label="${comment}">

          <imageUpload v-model="form.${field}"/>

        <el-form-item label="${comment}" prop="${field}">

          <image-upload v-model="form.${field}"/>

        </el-form-item>

#elseif($column.htmlType == "fileUpload")

        <el-form-item label="${comment}">

          <fileUpload v-model="form.${field}"/>

        <el-form-item label="${comment}" prop="${field}">

          <file-upload v-model="form.${field}"/>

        </el-form-item>

#elseif($column.htmlType == "editor")

        <el-form-item label="${comment}">

@@ -201,11 +213,14 @@
        <el-form-item label="${comment}" prop="${field}">

          <el-select v-model="form.${field}" placeholder="请选择${comment}">

            <el-option

              v-for="dict in ${field}Options"

              :key="dict.dictValue"

              :label="dict.dictLabel"

              #if($column.javaType == "Integer" || $column.javaType == "Long"):value="parseInt(dict.dictValue)"#else:value="dict.dictValue"#end



              v-for="dict in dict.type.${dictType}"

              :key="dict.value"

              :label="dict.label"

#if($column.javaType == "Integer" || $column.javaType == "Long")

              :value="parseInt(dict.value)"

#else

              :value="dict.value"

#end

            ></el-option>

          </el-select>

        </el-form-item>

@@ -216,46 +231,49 @@
          </el-select>

        </el-form-item>

#elseif($column.htmlType == "checkbox" && "" != $dictType)

        <el-form-item label="${comment}">

        <el-form-item label="${comment}" prop="${field}">

          <el-checkbox-group v-model="form.${field}">

            <el-checkbox

              v-for="dict in ${field}Options"

              :key="dict.dictValue"

              :label="dict.dictValue">

              {{dict.dictLabel}}

              v-for="dict in dict.type.${dictType}"

              :key="dict.value"

              :label="dict.value">

              {{dict.label}}

            </el-checkbox>

          </el-checkbox-group>

        </el-form-item>

#elseif($column.htmlType == "checkbox" && $dictType)

        <el-form-item label="${comment}">

        <el-form-item label="${comment}" prop="${field}">

          <el-checkbox-group v-model="form.${field}">

            <el-checkbox>请选择字典生成</el-checkbox>

          </el-checkbox-group>

        </el-form-item>

#elseif($column.htmlType == "radio" && "" != $dictType)

        <el-form-item label="${comment}">

        <el-form-item label="${comment}" prop="${field}">

          <el-radio-group v-model="form.${field}">

            <el-radio

              v-for="dict in ${field}Options"

              :key="dict.dictValue"

              #if($column.javaType == "Integer" || $column.javaType == "Long"):label="parseInt(dict.dictValue)"#else:label="dict.dictValue"#end



            >{{dict.dictLabel}}</el-radio>

              v-for="dict in dict.type.${dictType}"

              :key="dict.value"

#if($column.javaType == "Integer" || $column.javaType == "Long")

              :label="parseInt(dict.value)"

#else

              :label="dict.value"

#end

            >{{dict.label}}</el-radio>

          </el-radio-group>

        </el-form-item>

#elseif($column.htmlType == "radio" && $dictType)

        <el-form-item label="${comment}">

        <el-form-item label="${comment}" prop="${field}">

          <el-radio-group v-model="form.${field}">

            <el-radio label="1">请选择字典生成</el-radio>

          </el-radio-group>

        </el-form-item>

#elseif($column.htmlType == "datetime")

        <el-form-item label="${comment}" prop="${field}">

          <el-date-picker clearable size="small"

          <el-date-picker clearable

            v-model="form.${field}"

            type="date"

            value-format="yyyy-MM-dd"

            placeholder="选择${comment}">

            placeholder="请选择${comment}">

          </el-date-picker>

        </el-form-item>

#elseif($column.htmlType == "textarea")

@@ -265,6 +283,65 @@
#end

#end

#end

#end

#if($table.sub)

        <el-divider content-position="center">${subTable.functionName}信息</el-divider>

        <el-row :gutter="10" class="mb8">

          <el-col :span="1.5">

            <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd${subClassName}">添加</el-button>

          </el-col>

          <el-col :span="1.5">

            <el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDelete${subClassName}">删除</el-button>

          </el-col>

        </el-row>

        <el-table :data="${subclassName}List" :row-class-name="row${subClassName}Index" @selection-change="handle${subClassName}SelectionChange" ref="${subclassName}">

          <el-table-column type="selection" width="50" align="center" />

          <el-table-column label="序号" align="center" prop="index" width="50"/>

#foreach($column in $subTable.columns)

#set($javaField=$column.javaField)

#set($parentheseIndex=$column.columnComment.indexOf("（"))

#if($parentheseIndex != -1)

#set($comment=$column.columnComment.substring(0, $parentheseIndex))

#else

#set($comment=$column.columnComment)

#end

#if($column.pk || $javaField == ${subTableFkclassName})

#elseif($column.list && $column.htmlType == "input")

          <el-table-column label="$comment" prop="${javaField}" width="150">

            <template slot-scope="scope">

              <el-input v-model="scope.row.$javaField" placeholder="请输入$comment" />

            </template>

          </el-table-column>

#elseif($column.list && $column.htmlType == "datetime")

          <el-table-column label="$comment" prop="${javaField}" width="240">

            <template slot-scope="scope">

              <el-date-picker clearable v-model="scope.row.$javaField" type="date" value-format="yyyy-MM-dd" placeholder="请选择$comment" />

            </template>

          </el-table-column>

#elseif($column.list && ($column.htmlType == "select" || $column.htmlType == "radio") && "" != $column.dictType)

          <el-table-column label="$comment" prop="${javaField}" width="150">

            <template slot-scope="scope">

              <el-select v-model="scope.row.$javaField" placeholder="请选择$comment">

                <el-option

                  v-for="dict in dict.type.$column.dictType"

                  :key="dict.value"

                  :label="dict.label"

                  :value="dict.value"

                ></el-option>

              </el-select>

            </template>

          </el-table-column>

#elseif($column.list && ($column.htmlType == "select" || $column.htmlType == "radio") && "" == $column.dictType)

          <el-table-column label="$comment" prop="${javaField}" width="150">

            <template slot-scope="scope">

              <el-select v-model="scope.row.$javaField" placeholder="请选择$comment">

                <el-option label="请选择字典生成" value="" />

              </el-select>

            </template>

          </el-table-column>

#end

#end

        </el-table>

#end

      </el-form>

      <div slot="footer" class="dialog-footer">

@@ -276,54 +353,23 @@
</template>



<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 == "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

#foreach($column in $columns)

#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "editor")

import Editor from '@/components/Editor';

#break

#end

#end

import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName} } from "@/api/${moduleName}/${businessName}";



export default {

  name: "${BusinessName}",

  components: {

#foreach($column in $columns)

#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "imageUpload")

    ImageUpload,

#break

#if(${dicts} != '')

  dicts: [${dicts}],

#end

#end

#foreach($column in $columns)

#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "fileUpload")

    FileUpload,

#break

#end

#end

#foreach($column in $columns)

#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "editor")

    Editor,

#break

#end

#end

  },

  data() {

    return {

      // 遮罩层

      loading: true,

      // 选中数组

      ids: [],

#if($table.sub)

      // 子表选中数据

      checked${subClassName}: [],

#end

      // 非单个禁用

      single: true,

      // 非多个禁用

@@ -334,21 +380,16 @@
      total: 0,

      // ${functionName}表格数据

      ${businessName}List: [],

#if($table.sub)

      // ${subTable.functionName}表格数据

      ${subclassName}List: [],

#end

      // 弹出层标题

      title: "",

      // 是否显示弹出层

      open: false,

#foreach ($column in $columns)

#set($parentheseIndex=$column.columnComment.indexOf("（"))

#if($parentheseIndex != -1)

#set($comment=$column.columnComment.substring(0, $parentheseIndex))

#else

#set($comment=$column.columnComment)

#end

#if(${column.dictType} != '')

      // $comment字典

      ${column.javaField}Options: [],

#elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")

#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")

#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})

      // $comment时间范围

      daterange${AttrName}: [],

@@ -360,8 +401,7 @@
        pageSize: 10,

#foreach ($column in $columns)

#if($column.query)

        $column.javaField: null#if($velocityCount != $columns.size()),#end



        $column.javaField: null#if($foreach.count != $columns.size()),#end

#end

#end

      },

@@ -378,9 +418,8 @@
#set($comment=$column.columnComment)

#end

        $column.javaField: [

          { required: true, message: "$comment不能为空", trigger: #if($column.htmlType == "select")"change"#else"blur"#end }

        ]#if($velocityCount != $columns.size()),#end



          { required: true, message: "$comment不能为空", trigger: #if($column.htmlType == "select" || $column.htmlType == "radio")"change"#else"blur"#end }

        ]#if($foreach.count != $columns.size()),#end

#end

#end

      }

@@ -388,13 +427,6 @@
  },

  created() {

    this.getList();

#foreach ($column in $columns)

#if(${column.dictType} != '')

    this.getDicts("${column.dictType}").then(response => {

      this.${column.javaField}Options = response.data;

    });

#end

#end

  },

  methods: {

    /** 查询${functionName}列表 */

@@ -421,20 +453,6 @@
        this.loading = false;

      });

    },

#foreach ($column in $columns)

#if(${column.dictType} != '')

#set($parentheseIndex=$column.columnComment.indexOf("（"))

#if($parentheseIndex != -1)

#set($comment=$column.columnComment.substring(0, $parentheseIndex))

#else

#set($comment=$column.columnComment)

#end

    // $comment字典翻译

    ${column.javaField}Format(row, column) {

      return this.selectDictLabel#if($column.htmlType == "checkbox")s#end(this.${column.javaField}Options, row.${column.javaField});

    },

#end

#end

    // 取消按钮

    cancel() {

      this.open = false;

@@ -444,18 +462,16 @@
    reset() {

      this.form = {

#foreach ($column in $columns)

#if($column.htmlType == "radio")

        $column.javaField: #if($column.javaType == "Integer" || $column.javaType == "Long")0#else"0"#end#if($velocityCount != $columns.size()),#end



#elseif($column.htmlType == "checkbox")

        $column.javaField: []#if($velocityCount != $columns.size()),#end



#if($column.htmlType == "checkbox")

        $column.javaField: []#if($foreach.count != $columns.size()),#end

#else

        $column.javaField: null#if($velocityCount != $columns.size()),#end



        $column.javaField: null#if($foreach.count != $columns.size()),#end

#end

#end

      };

#if($table.sub)

      this.${subclassName}List = [];

#end

      this.resetForm("form");

    },

    /** 搜索按钮操作 */

@@ -497,6 +513,9 @@
        this.form.$column.javaField = this.form.${column.javaField}.split(",");

#end

#end

#if($table.sub)

        this.${subclassName}List = response.data.${subclassName}List;

#end

        this.open = true;

        this.title = "修改${functionName}";

      });

@@ -510,15 +529,18 @@
          this.form.$column.javaField = this.form.${column.javaField}.join(",");

#end

#end

#if($table.sub)

          this.form.${subclassName}List = this.${subclassName}List;

#end

          if (this.form.${pkColumn.javaField} != null) {

            update${BusinessName}(this.form).then(response => {

              this.msgSuccess("修改成功");

              this.#[[$modal]]#.msgSuccess("修改成功");

              this.open = false;

              this.getList();

            });

          } else {

            add${BusinessName}(this.form).then(response => {

              this.msgSuccess("新增成功");

              this.#[[$modal]]#.msgSuccess("新增成功");

              this.open = false;

              this.getList();

            });

@@ -529,29 +551,51 @@
    /** 删除按钮操作 */

    handleDelete(row) {

      const ${pkColumn.javaField}s = row.${pkColumn.javaField} || this.ids;

      this.$confirm('是否确认删除${functionName}编号为"' + ${pkColumn.javaField}s + '"的数据项?', "警告", {

          confirmButtonText: "确定",

          cancelButtonText: "取消",

          type: "warning"

        }).then(function() {

          return del${BusinessName}(${pkColumn.javaField}s);

        }).then(() => {

          this.getList();

          this.msgSuccess("删除成功");

        })

      this.#[[$modal]]#.confirm('是否确认删除${functionName}编号为"' + ${pkColumn.javaField}s + '"的数据项？').then(function() {

        return del${BusinessName}(${pkColumn.javaField}s);

      }).then(() => {

        this.getList();

        this.#[[$modal]]#.msgSuccess("删除成功");

      }).catch(() => {});

    },

#if($table.sub)

   /** ${subTable.functionName}序号 */

    row${subClassName}Index({ row, rowIndex }) {

      row.index = rowIndex + 1;

    },

    /** ${subTable.functionName}添加按钮操作 */

    handleAdd${subClassName}() {

      let obj = {};

#foreach($column in $subTable.columns)

#if($column.pk || $column.javaField == ${subTableFkclassName})

#elseif($column.list && "" != $javaField)

      obj.$column.javaField = "";

#end

#end

      this.${subclassName}List.push(obj);

    },

    /** ${subTable.functionName}删除按钮操作 */

    handleDelete${subClassName}() {

      if (this.checked${subClassName}.length == 0) {

        this.#[[$modal]]#.msgError("请先选择要删除的${subTable.functionName}数据");

      } else {

        const ${subclassName}List = this.${subclassName}List;

        const checked${subClassName} = this.checked${subClassName};

        this.${subclassName}List = ${subclassName}List.filter(function(item) {

          return checked${subClassName}.indexOf(item.index) == -1

        });

      }

    },

    /** 复选框选中数据 */

    handle${subClassName}SelectionChange(selection) {

      this.checked${subClassName} = selection.map(item => item.index)

    },

#end

    /** 导出按钮操作 */

    handleExport() {

      const queryParams = this.queryParams;

      this.$confirm('是否确认导出所有${functionName}数据项?', "警告", {

          confirmButtonText: "确定",

          cancelButtonText: "取消",

          type: "warning"

        }).then(function() {

          return export${BusinessName}(queryParams);

        }).then(response => {

          this.download(response.msg);

        })

      this.download('${moduleName}/${businessName}/export', {

        ...this.queryParams

      }, `${businessName}_#[[${new Date().getTime()}]]#.xlsx`)

    }

  }

};