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

RuoYi

2022-12-08 f9debbb7dae706025da39523db712be3bc2b696e

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

@@ -43,7 +43,7 @@
          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")

@@ -148,18 +148,8 @@
#end

      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">

        <template #default="scope">

          <el-button

            type="text"

            icon="Edit"

            @click="handleUpdate(scope.row)"

            v-hasPermi="['${moduleName}:${businessName}:edit']"

          >修改</el-button>

          <el-button

            type="text"

            icon="Delete"

            @click="handleDelete(scope.row)"

            v-hasPermi="['${moduleName}:${businessName}:remove']"

          >删除</el-button>

          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['${moduleName}:${businessName}:edit']">修改</el-button>

          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['${moduleName}:${businessName}:remove']">删除</el-button>

        </template>

      </el-table-column>

    </el-table>

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

        </el-form-item>

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

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

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

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

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

        </el-form-item>

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

@@ -209,8 +199,11 @@
              v-for="dict in ${dictType}"

              :key="dict.value"

              :label="dict.label"

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



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

              :value="parseInt(dict.value)"

#else

              :value="dict.value"

#end

            ></el-option>

          </el-select>

        </el-form-item>

@@ -221,7 +214,7 @@
          </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 ${dictType}"

@@ -232,24 +225,27 @@
          </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 ${dictType}"

              :key="dict.value"

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



#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>

@@ -260,7 +256,7 @@
            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")

@@ -293,10 +289,42 @@
#set($comment=$column.columnComment)

#end

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

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

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

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

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

            <template #default="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 #default="scope">

              <el-date-picker clearable

                v-model="scope.row.$javaField"

                type="date"

                value-format="YYYY-MM-DD"

                placeholder="请选择$comment">

              </el-date-picker>

            </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 #default="scope">

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

                <el-option

                  v-for="dict in $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 #default="scope">

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

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

              </el-select>

            </template>

          </el-table-column>

#end

@@ -366,7 +394,7 @@
#set($comment=$column.columnComment)

#end

    $column.javaField: [

      { required: true, message: "$comment不能为空", trigger: #if($column.htmlType == "select")"change"#else"blur"#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

@@ -410,9 +438,7 @@
function reset() {

  form.value = {

#foreach ($column in $columns)

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

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

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

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

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

#else

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

@@ -460,8 +486,8 @@
/** 修改按钮操作 */

function handleUpdate(row) {

  reset();

  const ${pkColumn.javaField} = row.${pkColumn.javaField} || ids.value

  get${BusinessName}(${pkColumn.javaField}).then(response => {

  const _${pkColumn.javaField} = row.${pkColumn.javaField} || ids.value

  get${BusinessName}(_${pkColumn.javaField}).then(response => {

    form.value = response.data;

#foreach ($column in $columns)

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

@@ -507,9 +533,9 @@


/** 删除按钮操作 */

function handleDelete(row) {

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

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

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

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

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

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

  }).then(() => {

    getList();

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