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

疯狂的狮子li

2021-06-10 2103731f104c4b98ef596be50ff1dd972b4f6000

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


 Conflicts:

	pom.xml

	ruoyi-admin/pom.xml

	ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java

	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java

	ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java

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

	ruoyi-ui/src/layout/components/Navbar.vue

	ruoyi-ui/src/views/monitor/job/index.vue

	ruoyi-ui/src/views/monitor/logininfor/index.vue

	ruoyi-ui/src/views/monitor/online/index.vue

	ruoyi-ui/src/views/monitor/operlog/index.vue

	ruoyi-ui/src/views/system/config/index.vue

	ruoyi-ui/src/views/system/dept/index.vue

	ruoyi-ui/src/views/system/dict/data.vue

	ruoyi-ui/src/views/system/dict/index.vue

	ruoyi-ui/src/views/system/menu/index.vue

	ruoyi-ui/src/views/system/notice/index.vue

	ruoyi-ui/src/views/system/post/index.vue

	ruoyi-ui/src/views/system/role/index.vue

	ruoyi-ui/src/views/system/user/index.vue

	ruoyi-ui/src/views/tool/gen/index.vue

	ruoyi-ui/src/views/tool/swagger/index.vue

 pom.xml

 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java

@@ -51,8 +51,8 @@
    @NotBlank(message = "显示顺序不能为空")
    private String roleSort;

    /** 数据范围（1：所有数据权限；2：自定义数据权限；3：本部门数据权限；4：本部门及以下数据权限） */
    @Excel(name = "数据范围", readConverterExp = "1=所有数据权限,2=自定义数据权限,3=本部门数据权限,4=本部门及以下数据权限")
    /** 数据范围（1：所有数据权限；2：自定义数据权限；3：本部门数据权限；4：本部门及以下数据权限；5：仅本人数据权限） */
    @Excel(name = "数据范围", readConverterExp = "1=所有数据权限,2=自定义数据权限,3=本部门数据权限,4=本部门及以下数据权限,5=仅本人数据权限")
    private String dataScope;

    /** 菜单树选择项是否关联显示（ 0：父子不互相关联显示 1：父子互相关联显示） */

 ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java

@@ -31,8 +31,7 @@
        registry.addResourceHandler(Constants.RESOURCE_PREFIX + "/**").addResourceLocations("file:" + RuoYiConfig.getProfile() + "/");

        /** swagger配置 */
        registry.addResourceHandler("swagger-ui.html").addResourceLocations("classpath:/META-INF/resources/");
        registry.addResourceHandler("/webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/");
        registry.addResourceHandler("/swagger-ui/**").addResourceLocations("classpath:/META-INF/resources/webjars/springfox-swagger-ui/");
    }

    /**

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

@@ -541,7 +541,7 @@
          this.loading = false;

          this.getList();

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

        })

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

    }

  }

};


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

@@ -599,7 +599,7 @@
          this.loading = false;
          this.getList();
          this.msgSuccess("删除成功");
        })
        }).catch(() => {});
    },
#if($table.sub)
    /** ${subTable.functionName}序号 */
@@ -648,7 +648,7 @@
        }).then(response => {
          this.download(response.msg);
          this.exportLoading = false;
        })
        }).catch(() => {});
    }
  }
};

 ruoyi-ui/src/components/Editor/index.vue

@@ -75,7 +75,7 @@
            [{ color: [] }, { background: [] }],             // 字体颜色、字体背景颜色
            [{ align: [] }],                                 // 对齐方式
            ["clean"],                                       // 清除文本格式
            ["link", "image"]                                // 链接、图片
            ["link", "image", "video"]                       // 链接、图片、视频
          ],
        },
        placeholder: "请输入内容",

 ruoyi-ui/src/layout/components/Navbar.vue

@@ -104,7 +104,7 @@
        this.$store.dispatch('LogOut').then(() => {
          location.href = '/index';
        })
      })
      }).catch(() => {});
    }
  }
}

 ruoyi-ui/src/utils/request.js

@@ -63,7 +63,7 @@
        store.dispatch('LogOut').then(() => {
          location.href = '/index';
        })
      })
      }).catch(() => {});
    } else if (code === 500) {
      Message({
        message: msg,

 ruoyi-ui/src/views/monitor/job/index.vue

@@ -410,7 +410,7 @@
          return runJob(row.jobId, row.jobGroup);
        }).then(() => {
          this.msgSuccess("执行成功");
        })
        }).catch(() => {});
    },
    /** 任务详细信息 */
    handleView(row) {
@@ -471,7 +471,7 @@
        }).then(() => {
          this.getList();
          this.msgSuccess("删除成功");
        })
        }).catch(() => {});
    },
    /** 导出按钮操作 */
    handleExport() {
@@ -486,7 +486,7 @@
        }).then(response => {
          this.download(response.msg);
          this.exportLoading = false;
        })
        }).catch(() => {});
    }
  }
};

 ruoyi-ui/src/views/monitor/job/log.vue

@@ -269,7 +269,7 @@
        }).then(() => {
          this.getList();
          this.msgSuccess("删除成功");
        })
        }).catch(() => {});
    },
    /** 清空按钮操作 */
    handleClean() {
@@ -282,7 +282,7 @@
        }).then(() => {
          this.getList();
          this.msgSuccess("清空成功");
        })
        }).catch(() => {});
    },
    /** 导出按钮操作 */
    handleExport() {
@@ -297,7 +297,7 @@
        }).then(response => {
          this.download(response.msg);
          this.exportLoading = false;
        })
        }).catch(() => {});
    }
  }
};

 ruoyi-ui/src/views/monitor/logininfor/index.vue

@@ -202,7 +202,7 @@
        }).then(() => {
          this.getList();
          this.msgSuccess("删除成功");
        })
        }).catch(() => {});
    },
    /** 清空按钮操作 */
    handleClean() {
@@ -215,7 +215,7 @@
        }).then(() => {
          this.getList();
          this.msgSuccess("清空成功");
        })
        }).catch(() => {});
    },
    /** 导出按钮操作 */
    handleExport() {
@@ -230,7 +230,7 @@
        }).then(response => {
          this.download(response.msg);
          this.exportLoading = false;
        })
        }).catch(() => {});
    }
  }
};

 ruoyi-ui/src/views/monitor/online/index.vue

@@ -120,7 +120,7 @@
        }).then(() => {
          this.getList();
          this.msgSuccess("强退成功");
        })
        }).catch(() => {});
    }
  }
};

 ruoyi-ui/src/views/monitor/operlog/index.vue

@@ -290,7 +290,7 @@
        }).then(() => {
          this.getList();
          this.msgSuccess("删除成功");
        })
        }).catch(() => {});
    },
    /** 清空按钮操作 */
    handleClean() {
@@ -303,7 +303,7 @@
        }).then(() => {
          this.getList();
          this.msgSuccess("清空成功");
        })
        }).catch(() => {});
    },
    /** 导出按钮操作 */
    handleExport() {
@@ -318,7 +318,7 @@
        }).then(response => {
          this.download(response.msg);
          this.exportLoading = false;
        })
        }).catch(() => {});
    }
  }
};

 ruoyi-ui/src/views/system/config/index.vue

@@ -338,7 +338,7 @@
        }).then(() => {
          this.getList();
          this.msgSuccess("删除成功");
        })
        }).catch(() => {});
    },
    /** 导出按钮操作 */
    handleExport() {
@@ -353,7 +353,7 @@
        }).then(response => {
          this.download(response.msg);
          this.exportLoading = false;
        })
        }).catch(() => {});
    },
    /** 刷新缓存按钮操作 */
    handleRefreshCache() {

 ruoyi-ui/src/views/system/dept/index.vue

@@ -310,7 +310,7 @@
        }).then(() => {
          this.getList();
          this.msgSuccess("删除成功");
        })
        }).catch(() => {});
    }
  }
};

 ruoyi-ui/src/views/system/dict/data.vue

@@ -337,7 +337,7 @@
        }).then(() => {
          this.getList();
          this.msgSuccess("删除成功");
        })
        }).catch(() => {});
    },
    /** 导出按钮操作 */
    handleExport() {
@@ -352,7 +352,7 @@
        }).then(response => {
          this.download(response.msg);
          this.exportLoading = false;
        })
        }).catch(() => {});
    }
  }
};

 ruoyi-ui/src/views/system/dict/index.vue

@@ -342,7 +342,7 @@
        }).then(() => {
          this.getList();
          this.msgSuccess("删除成功");
        })
        }).catch(() => {});
    },
    /** 导出按钮操作 */
    handleExport() {
@@ -357,7 +357,7 @@
        }).then(response => {
          this.download(response.msg);
          this.exportLoading = false;
        })
        }).catch(() => {});
    },
    /** 刷新缓存按钮操作 */
    handleRefreshCache() {

 ruoyi-ui/src/views/system/menu/index.vue

@@ -163,7 +163,7 @@
          </el-col>
          <el-col :span="12">
            <el-form-item v-if="form.menuType != 'M'" label="权限标识">
              <el-input v-model="form.perms" placeholder="请权限标识" maxlength="100" />
              <el-input v-model="form.perms" placeholder="请输入权限标识" maxlength="100" />
            </el-form-item>
          </el-col>
          <el-col :span="12">
@@ -393,7 +393,7 @@
        }).then(() => {
          this.getList();
          this.msgSuccess("删除成功");
        })
        }).catch(() => {});
    }
  }
};

 ruoyi-ui/src/views/system/notice/index.vue

@@ -336,7 +336,7 @@
        }).then(() => {
          this.getList();
          this.msgSuccess("删除成功");
        })
        }).catch(() => {});
    }
  }
};

 ruoyi-ui/src/views/system/post/index.vue

@@ -309,7 +309,7 @@
        }).then(() => {
          this.getList();
          this.msgSuccess("删除成功");
        })
        }).catch(() => {});
    },
    /** 导出按钮操作 */
    handleExport() {
@@ -324,7 +324,7 @@
        }).then(response => {
          this.download(response.msg);
          this.exportLoading = false;
        })
        }).catch(() => {});
    }
  }
};

 ruoyi-ui/src/views/system/role/index.vue

@@ -593,7 +593,7 @@
        }).then(() => {
          this.getList();
          this.msgSuccess("删除成功");
        })
        }).catch(() => {});
    },
    /** 导出按钮操作 */
    handleExport() {
@@ -608,7 +608,7 @@
        }).then(response => {
          this.download(response.msg);
          this.exportLoading = false;
        })
        }).catch(() => {});
    }
  }
};

 ruoyi-ui/src/views/system/user/index.vue

@@ -631,7 +631,7 @@
        }).then(() => {
          this.getList();
          this.msgSuccess("删除成功");
        })
        }).catch(() => {});
    },
    /** 导出按钮操作 */
    handleExport() {
@@ -646,7 +646,7 @@
        }).then(response => {
          this.download(response.msg);
          this.exportLoading = false;
        })
        }).catch(() => {});
    },
    /** 导入按钮操作 */
    handleImport() {

 ruoyi-ui/src/views/tool/gen/index.vue

@@ -283,7 +283,7 @@
          return synchDb(tableName);
      }).then(() => {
          this.msgSuccess("同步成功");
      })
      }).catch(() => {});
    },
    /** 打开导入表弹窗 */
    openImportTable() {
@@ -333,7 +333,7 @@
      }).then(() => {
          this.getList();
          this.msgSuccess("删除成功");
      })
      }).catch(() => {});
    }
  }
};