!312 修复代码生成页面数据编辑保存之后总是跳转第一页的问题

Merge pull request !312 from 稚屿/master

ruoyi-ui/src/router/index.js

@@ -144,7 +144,7 @@ export const constantRoutes = [
     hidden: true,
     children: [
       {
-        path: 'index/:tableId(\\d+)',
+        path: 'index',
         component: (resolve) => require(['@/views/tool/gen/editTable'], resolve),
         name: 'GenEdit',
         meta: { title: '修改生成配置', activeMenu: '/tool/gen'}

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

@@ -157,7 +157,7 @@ export default {
     };
   },
   created() {
-    const tableId = this.$route.params && this.$route.params.tableId;
+    const tableId = this.$route.query && this.$route.query.tableId;
     if (tableId) {
       // 获取表详细信息
       getGenTable(tableId).then(res => {
@@ -212,7 +212,7 @@ export default {
     /** 关闭按钮 */
     close() {
       this.$store.dispatch("tagsView/delView", this.$route);
-      this.$router.push({ path: "/tool/gen", query: { t: Date.now()}})
+      this.$router.push({ path: "/tool/gen", query: { t: Date.now(), pageNum: this.$route.query.pageNum } })
     }
   },
   mounted() {

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

@@ -238,7 +238,10 @@ export default {
     const time = this.$route.query.t;
     if (time != null && time != this.uniqueId) {
       this.uniqueId = time;
-      this.resetQuery();
+      this.queryParams.pageNum = Number(this.$route.query.pageNum);
+      this.dateRange = [];
+      this.resetForm("queryForm");
+      this.getList();
     }
   },
   methods: {
@@ -319,7 +322,7 @@ export default {
     /** 修改按钮操作 */
     handleEditTable(row) {
       const tableId = row.tableId || this.ids[0];
-      this.$router.push("/tool/gen-edit/index/" + tableId);
+      this.$router.push({ path: '/tool/gen-edit/index', query: { tableId: tableId, pageNum: this.queryParams.pageNum } });
     },
     /** 删除按钮操作 */
     handleDelete(row) {