Merge remote-tracking branch 'origin/dev' into satoken

疯狂的狮子li

2021-11-29 42295ef2ac0a5e78674cf24b62d6834138f0ffdc

 ruoyi-generator/src/main/resources/vm/vue/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}"
@@ -108,7 +108,11 @@
#elseif($column.list && $column.dictType && "" != $column.dictType)
      <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)
@@ -296,8 +300,7 @@
      queryParams: {
#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
      },
@@ -315,8 +318,7 @@
#end
        $column.javaField: [
          { required: true, message: "$comment不能为空", trigger: #if($column.htmlType == "select")"change"#else"blur"#end }
        ]#if($velocityCount != $columns.size()),#end

        ]#if($foreach.count != $columns.size()),#end
#end
#end
      }
@@ -379,14 +381,12 @@
      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
        $column.javaField: #if($column.javaType == "Integer" || $column.javaType == "Long")0#else"0"#end#if($foreach.count != $columns.size()),#end

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

        $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
      };
@@ -451,7 +451,7 @@
#end
          if (this.form.${pkColumn.javaField} != null) {
            update${BusinessName}(this.form).then(response => {
              this.msgSuccess("修改成功");
              this.#[[$modal]]#.msgSuccess("修改成功");
              this.open = false;
              this.getList();
            }).finally(() => {
@@ -459,7 +459,7 @@
            });
          } else {
            add${BusinessName}(this.form).then(response => {
              this.msgSuccess("新增成功");
              this.#[[$modal]]#.msgSuccess("新增成功");
              this.open = false;
              this.getList();
            }).finally(() => {
@@ -471,19 +471,15 @@
    },
    /** 删除按钮操作 */
    handleDelete(row) {
      this.$confirm('是否确认删除${functionName}编号为"' + row.${pkColumn.javaField} + '"的数据项?', "警告", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
        }).then(() => {
        this.loading = true;
          return del${BusinessName}(row.${pkColumn.javaField});
        }).then(() => {
        this.loading = false;
          this.getList();
          this.msgSuccess("删除成功");
      this.#[[$modal]]#.confirm('是否确认删除${functionName}编号为"' + row.${pkColumn.javaField} + '"的数据项？').then(() => {
        this.loading = true;
        return del${BusinessName}(row.${pkColumn.javaField});
      }).then(() => {
        this.loading = false;
        this.getList();
        this.#[[$modal]]#.msgSuccess("删除成功");
      }).finally(() => {
              this.loading = false;
        this.loading = false;
      });
    }
  }