!47 【优化】代码生成器新增、修改页面的按钮动作loading从页面loading到按钮loading Merge pull request !47...

疯狂的狮子Li

2021-06-02 2ab7c7feaeea8be05dcfbaa3dca16e492accd166

!47 【优化】代码生成器新增、修改页面的按钮动作loading从页面loading到按钮loading
Merge pull request !47 from 狂盗一枝梅/kdyzm

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

@@ -247,7 +247,7 @@
#end

      </el-form>

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

        <el-button type="primary" @click="submitForm">确 定</el-button>

        <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>

        <el-button @click="cancel">取 消</el-button>

      </div>

    </el-dialog>

@@ -302,6 +302,8 @@
  },

  data() {

    return {

      //按钮loading

      buttonLoading: false,

      // 遮罩层

      loading: true,

      // 显示搜索条件

@@ -502,7 +504,7 @@
    submitForm() {

      this.#[[$]]#refs["form"].validate(valid => {

        if (valid) {

          this.loading = true;

          this.buttonLoading = true;

#foreach ($column in $columns)

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

          this.form.$column.javaField = this.form.${column.javaField}.join(",");

@@ -510,14 +512,14 @@
#end

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

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

              this.loading = false;

              this.buttonLoading = false;

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

              this.open = false;

              this.getList();

            });

          } else {

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

              this.loading = false;

              this.buttonLoading = false;

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

              this.open = false;

              this.getList();


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

@@ -301,7 +301,7 @@
#end
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="submitForm">确 定</el-button>
        <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
        <el-button @click="cancel">取 消</el-button>
      </div>
    </el-dialog>
@@ -353,6 +353,8 @@
  },
  data() {
    return {
      //按钮loading
      buttonLoading: false,
      // 遮罩层
      loading: true,
      // 导出遮罩层
@@ -556,7 +558,7 @@
    submitForm() {
      this.#[[$]]#refs["form"].validate(valid => {
        if (valid) {
          this.loading = true;
          this.buttonLoading = true;
#foreach ($column in $columns)
#if($column.htmlType == "checkbox")
          this.form.$column.javaField = this.form.${column.javaField}.join(",");
@@ -567,14 +569,14 @@
#end
          if (this.form.${pkColumn.javaField} != null) {
            update${BusinessName}(this.form).then(response => {
              this.loading = false;
              this.buttonLoading = false;
              this.msgSuccess("修改成功");
              this.open = false;
              this.getList();
            });
          } else {
            add${BusinessName}(this.form).then(response => {
              this.loading = false;
              this.buttonLoading = false;
              this.msgSuccess("新增成功");
              this.open = false;
              this.getList();

 ruoyi-ui/src/views/demo/demo/index.vue

@@ -152,7 +152,7 @@
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="submitForm">确 定</el-button>
        <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
        <el-button @click="cancel">取 消</el-button>
      </div>
    </el-dialog>
@@ -168,6 +168,8 @@
  },
  data() {
    return {
      //按钮loading
      buttonLoading: false,
      // 遮罩层
      loading: true,
      // 导出遮罩层
@@ -291,17 +293,17 @@
    submitForm() {
      this.$refs["form"].validate(valid => {
        if (valid) {
          this.loading = true;
          this.buttonLoading = true;
          if (this.form.id != null) {
            updateDemo(this.form).then(response => {
              this.loading = false;
              this.buttonLoading = false;
              this.msgSuccess("修改成功");
              this.open = false;
              this.getList();
            });
          } else {
            addDemo(this.form).then(response => {
              this.loading = false;
              this.buttonLoading = false;
              this.msgSuccess("新增成功");
              this.open = false;
              this.getList();

 ruoyi-ui/src/views/demo/tree/index.vue

@@ -102,7 +102,7 @@
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="submitForm">确 定</el-button>
        <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
        <el-button @click="cancel">取 消</el-button>
      </div>
    </el-dialog>
@@ -121,6 +121,8 @@
  },
  data() {
    return {
      //按钮loading
      buttonLoading: false,
      // 遮罩层
      loading: true,
      // 显示搜索条件
@@ -250,17 +252,17 @@
    submitForm() {
      this.$refs["form"].validate(valid => {
        if (valid) {
          this.loading = true;
          this.buttonLoading = true;
          if (this.form.id != null) {
            updateTree(this.form).then(response => {
              this.loading = false;
              this.buttonLoading = false;
              this.msgSuccess("修改成功");
              this.open = false;
              this.getList();
            });
          } else {
            addTree(this.form).then(response => {
              this.loading = false;
              this.buttonLoading = false;
              this.msgSuccess("新增成功");
              this.open = false;
              this.getList();