remove all semicolons

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

@@ -54,7 +54,7 @@ export default {
           { required: true, message: "请输入作者", trigger: "blur" }
         ]
       }
-    };
+    }
   }
-};
+}
 </script>

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

@@ -127,11 +127,11 @@
 </template>
 
 <script>
-import { getGenTable, updateGenTable } from "@/api/tool/gen";
-import { optionselect as getDictOptionselect } from "@/api/system/dict/type";
-import { listMenu as getMenuTreeselect } from "@/api/system/menu";
-import basicInfoForm from "./basicInfoForm";
-import genInfoForm from "./genInfoForm";
+import { getGenTable, updateGenTable } from "@/api/tool/gen"
+import { optionselect as getDictOptionselect } from "@/api/system/dict/type"
+import { listMenu as getMenuTreeselect } from "@/api/system/menu"
+import basicInfoForm from "./basicInfoForm"
+import genInfoForm from "./genInfoForm"
 import Sortable from 'sortablejs'
 
 export default {
@@ -156,79 +156,79 @@ export default {
       menus: [],
       // 表详细信息
       info: {}
-    };
+    }
   },
   created() {
-    const tableId = this.$route.params && this.$route.params.tableId;
+    const tableId = this.$route.params && this.$route.params.tableId
     if (tableId) {
       // 获取表详细信息
       getGenTable(tableId).then(res => {
-        this.columns = res.data.rows;
-        this.info = res.data.info;
-        this.tables = res.data.tables;
-      });
+        this.columns = res.data.rows
+        this.info = res.data.info
+        this.tables = res.data.tables
+      })
       /** 查询字典下拉列表 */
       getDictOptionselect().then(response => {
-        this.dictOptions = response.data;
-      });
+        this.dictOptions = response.data
+      })
       /** 查询菜单下拉列表 */
       getMenuTreeselect().then(response => {
-        this.menus = this.handleTree(response.data, "menuId");
-      });
+        this.menus = this.handleTree(response.data, "menuId")
+      })
     }
   },
   methods: {
     /** 提交按钮 */
     submitForm() {
-      const basicForm = this.$refs.basicInfo.$refs.basicInfoForm;
-      const genForm = this.$refs.genInfo.$refs.genInfoForm;
+      const basicForm = this.$refs.basicInfo.$refs.basicInfoForm
+      const genForm = this.$refs.genInfo.$refs.genInfoForm
       Promise.all([basicForm, genForm].map(this.getFormPromise)).then(res => {
-        const validateResult = res.every(item => !!item);
+        const validateResult = res.every(item => !!item)
         if (validateResult) {
-          const genTable = Object.assign({}, basicForm.model, genForm.model);
-          genTable.columns = this.columns;
+          const genTable = Object.assign({}, basicForm.model, genForm.model)
+          genTable.columns = this.columns
           genTable.params = {
             treeCode: genTable.treeCode,
             treeName: genTable.treeName,
             treeParentCode: genTable.treeParentCode,
             parentMenuId: genTable.parentMenuId
-          };
+          }
           updateGenTable(genTable).then(res => {
-            this.$modal.msgSuccess(res.msg);
+            this.$modal.msgSuccess(res.msg)
             if (res.code === 200) {
-              this.close();
+              this.close()
             }
-          });
+          })
         } else {
-          this.$modal.msgError("表单校验未通过，请重新检查提交内容");
+          this.$modal.msgError("表单校验未通过，请重新检查提交内容")
         }
-      });
+      })
     },
     getFormPromise(form) {
       return new Promise(resolve => {
         form.validate(res => {
-          resolve(res);
-        });
-      });
+          resolve(res)
+        })
+      })
     },
     /** 关闭按钮 */
     close() {
-      const obj = { path: "/tool/gen", query: { t: Date.now(), pageNum: this.$route.query.pageNum } };
-      this.$tab.closeOpenPage(obj);
+      const obj = { path: "/tool/gen", query: { t: Date.now(), pageNum: this.$route.query.pageNum } }
+      this.$tab.closeOpenPage(obj)
     }
   },
   mounted() {
-    const el = this.$refs.dragTable.$el.querySelectorAll(".el-table__body-wrapper > table > tbody")[0];
+    const el = this.$refs.dragTable.$el.querySelectorAll(".el-table__body-wrapper > table > tbody")[0]
     const sortable = Sortable.create(el, {
       handle: ".allowDrag",
       onEnd: evt => {
-        const targetRow = this.columns.splice(evt.oldIndex, 1)[0];
-        this.columns.splice(evt.newIndex, 0, targetRow);
+        const targetRow = this.columns.splice(evt.oldIndex, 1)[0]
+        this.columns.splice(evt.newIndex, 0, targetRow)
         for (let index in this.columns) {
-          this.columns[index].sort = parseInt(index) + 1;
+          this.columns[index].sort = parseInt(index) + 1
         }
       }
-    });
+    })
   }
-};
+}
 </script>

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

@@ -223,8 +223,8 @@
 </template>
 
 <script>
-import Treeselect from "@riophae/vue-treeselect";
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import Treeselect from "@riophae/vue-treeselect"
+import "@riophae/vue-treeselect/dist/vue-treeselect.css"
 
 export default {
   components: { Treeselect },
@@ -240,7 +240,7 @@ export default {
     menus: {
       type: Array,
       default: []
-    },
+    }
   },
   data() {
     return {
@@ -260,17 +260,17 @@ export default {
         ],
         functionName: [
           { required: true, message: "请输入生成功能名", trigger: "blur" }
-        ],
+        ]
       }
-    };
+    }
   },
   watch: {
     'info.subTableName': function(val) {
-      this.setSubTableColumns(val);
+      this.setSubTableColumns(val)
     },
     'info.tplWebType': function(val) {
       if (val === '') {
-        this.info.tplWebType = "element-ui";
+        this.info.tplWebType = "element-ui"
       }
     }
   },
@@ -278,35 +278,35 @@ export default {
     /** 转换菜单数据结构 */
     normalizer(node) {
       if (node.children && !node.children.length) {
-        delete node.children;
+        delete node.children
       }
       return {
         id: node.menuId,
         label: node.menuName,
         children: node.children
-      };
+      }
     },
     /** 选择子表名触发 */
     subSelectChange(value) {
-      this.info.subTableFkName = '';
+      this.info.subTableFkName = ''
     },
     /** 选择生成模板触发 */
     tplSelectChange(value) {
       if(value !== 'sub') {
-        this.info.subTableName = '';
-        this.info.subTableFkName = '';
+        this.info.subTableName = ''
+        this.info.subTableFkName = ''
       }
     },
     /** 设置关联外键 */
     setSubTableColumns(value) {
       for (var item in this.tables) {
-        const name = this.tables[item].tableName;
+        const name = this.tables[item].tableName
         if (value === name) {
-          this.subColumns = this.tables[item].columns;
-          break;
+          this.subColumns = this.tables[item].columns
+          break
         }
       }
     }
   }
-};
+}
 </script>

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

@@ -47,7 +47,7 @@
 </template>
 
 <script>
-import { listDbTable, importTable } from "@/api/tool/gen";
+import { listDbTable, importTable } from "@/api/tool/gen"
 export default {
   data() {
     return {
@@ -66,55 +66,55 @@ export default {
         tableName: undefined,
         tableComment: undefined
       }
-    };
+    }
   },
   methods: {
     // 显示弹框
     show() {
-      this.getList();
-      this.visible = true;
+      this.getList()
+      this.visible = true
     },
     clickRow(row) {
-      this.$refs.table.toggleRowSelection(row);
+      this.$refs.table.toggleRowSelection(row)
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.tables = selection.map(item => item.tableName);
+      this.tables = selection.map(item => item.tableName)
     },
     // 查询表数据
     getList() {
       listDbTable(this.queryParams).then(res => {
         if (res.code === 200) {
-          this.dbTableList = res.rows;
-          this.total = res.total;
+          this.dbTableList = res.rows
+          this.total = res.total
         }
-      });
+      })
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
+      this.queryParams.pageNum = 1
+      this.getList()
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
+      this.resetForm("queryForm")
+      this.handleQuery()
     },
     /** 导入按钮操作 */
     handleImportTable() {
-      const tableNames = this.tables.join(",");
+      const tableNames = this.tables.join(",")
       if (tableNames == "") {
-        this.$modal.msgError("请选择要导入的表");
-        return;
+        this.$modal.msgError("请选择要导入的表")
+        return
       }
       importTable({ tables: tableNames }).then(res => {
-        this.$modal.msgSuccess(res.msg);
+        this.$modal.msgSuccess(res.msg)
         if (res.code === 200) {
-          this.visible = false;
-          this.$emit("ok");
+          this.visible = false
+          this.$emit("ok")
         }
-      });
+      })
     }
   }
-};
+}
 </script>

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

@@ -158,16 +158,16 @@
 </template>
 
 <script>
-import { listTable, previewTable, delTable, genCode, synchDb } from "@/api/tool/gen";
-import importTable from "./importTable";
-import hljs from "highlight.js/lib/highlight";
-import "highlight.js/styles/github-gist.css";
-hljs.registerLanguage("java", require("highlight.js/lib/languages/java"));
-hljs.registerLanguage("xml", require("highlight.js/lib/languages/xml"));
-hljs.registerLanguage("html", require("highlight.js/lib/languages/xml"));
-hljs.registerLanguage("vue", require("highlight.js/lib/languages/xml"));
-hljs.registerLanguage("javascript", require("highlight.js/lib/languages/javascript"));
-hljs.registerLanguage("sql", require("highlight.js/lib/languages/sql"));
+import { listTable, previewTable, delTable, genCode, synchDb } from "@/api/tool/gen"
+import importTable from "./importTable"
+import hljs from "highlight.js/lib/highlight"
+import "highlight.js/styles/github-gist.css"
+hljs.registerLanguage("java", require("highlight.js/lib/languages/java"))
+hljs.registerLanguage("xml", require("highlight.js/lib/languages/xml"))
+hljs.registerLanguage("html", require("highlight.js/lib/languages/xml"))
+hljs.registerLanguage("vue", require("highlight.js/lib/languages/xml"))
+hljs.registerLanguage("javascript", require("highlight.js/lib/languages/javascript"))
+hljs.registerLanguage("sql", require("highlight.js/lib/languages/sql"))
 
 export default {
   name: "Gen",
@@ -210,121 +210,121 @@ export default {
         data: {},
         activeName: "domain.java"
       }
-    };
+    }
   },
   created() {
-    this.queryParams.orderByColumn = this.defaultSort.prop;
-    this.queryParams.isAsc = this.defaultSort.order;
-    this.getList();
+    this.queryParams.orderByColumn = this.defaultSort.prop
+    this.queryParams.isAsc = this.defaultSort.order
+    this.getList()
   },
   activated() {
-    const time = this.$route.query.t;
+    const time = this.$route.query.t
     if (time != null && time != this.uniqueId) {
-      this.uniqueId = time;
-      this.queryParams.pageNum = Number(this.$route.query.pageNum);
-      this.getList();
+      this.uniqueId = time
+      this.queryParams.pageNum = Number(this.$route.query.pageNum)
+      this.getList()
     }
   },
   methods: {
     /** 查询表集合 */
     getList() {
-      this.loading = true;
+      this.loading = true
       listTable(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
-          this.tableList = response.rows;
-          this.total = response.total;
-          this.loading = false;
+          this.tableList = response.rows
+          this.total = response.total
+          this.loading = false
         }
-      );
+      )
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
+      this.queryParams.pageNum = 1
+      this.getList()
     },
     /** 生成代码操作 */
     handleGenTable(row) {
-      const tableNames = row.tableName || this.tableNames;
+      const tableNames = row.tableName || this.tableNames
       if (tableNames == "") {
-        this.$modal.msgError("请选择要生成的数据");
-        return;
+        this.$modal.msgError("请选择要生成的数据")
+        return
       }
       if(row.genType === "1") {
         genCode(row.tableName).then(response => {
-          this.$modal.msgSuccess("成功生成到自定义路径：" + row.genPath);
-        });
+          this.$modal.msgSuccess("成功生成到自定义路径：" + row.genPath)
+        })
       } else {
-        this.$download.zip("/code/gen/batchGenCode?tables=" + tableNames, "ruoyi.zip");
+        this.$download.zip("/code/gen/batchGenCode?tables=" + tableNames, "ruoyi.zip")
       }
     },
     /** 同步数据库操作 */
     handleSynchDb(row) {
-      const tableName = row.tableName;
+      const tableName = row.tableName
       this.$modal.confirm('确认要强制同步"' + tableName + '"表结构吗？').then(function() {
-        return synchDb(tableName);
+        return synchDb(tableName)
       }).then(() => {
-        this.$modal.msgSuccess("同步成功");
-      }).catch(() => {});
+        this.$modal.msgSuccess("同步成功")
+      }).catch(() => {})
     },
     /** 打开导入表弹窗 */
     openImportTable() {
-      this.$refs.import.show();
+      this.$refs.import.show()
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.dateRange = [];
-      this.resetForm("queryForm");
-      this.queryParams.pageNum = 1;
+      this.dateRange = []
+      this.resetForm("queryForm")
+      this.queryParams.pageNum = 1
       this.$refs.tables.sort(this.defaultSort.prop, this.defaultSort.order)
     },
     /** 预览按钮 */
     handlePreview(row) {
       previewTable(row.tableId).then(response => {
-        this.preview.data = response.data;
-        this.preview.open = true;
-        this.preview.activeName = "domain.java";
-      });
+        this.preview.data = response.data
+        this.preview.open = true
+        this.preview.activeName = "domain.java"
+      })
     },
     /** 高亮显示 */
     highlightedCode(code, key) {
-      const vmName = key.substring(key.lastIndexOf("/") + 1, key.indexOf(".vm"));
-      var language = vmName.substring(vmName.indexOf(".") + 1, vmName.length);
-      const result = hljs.highlight(language, code || "", true);
-      return result.value || '&nbsp;';
+      const vmName = key.substring(key.lastIndexOf("/") + 1, key.indexOf(".vm"))
+      var language = vmName.substring(vmName.indexOf(".") + 1, vmName.length)
+      const result = hljs.highlight(language, code || "", true)
+      return result.value || '&nbsp;'
     },
     /** 复制代码成功 */
     clipboardSuccess() {
-      this.$modal.msgSuccess("复制成功");
+      this.$modal.msgSuccess("复制成功")
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.tableId);
-      this.tableNames = selection.map(item => item.tableName);
-      this.single = selection.length != 1;
-      this.multiple = !selection.length;
+      this.ids = selection.map(item => item.tableId)
+      this.tableNames = selection.map(item => item.tableName)
+      this.single = selection.length != 1
+      this.multiple = !selection.length
     },
     /** 排序触发事件 */
     handleSortChange(column, prop, order) {
-      this.queryParams.orderByColumn = column.prop;
-      this.queryParams.isAsc = column.order;
-      this.getList();
+      this.queryParams.orderByColumn = column.prop
+      this.queryParams.isAsc = column.order
+      this.getList()
     },
     /** 修改按钮操作 */
     handleEditTable(row) {
-      const tableId = row.tableId || this.ids[0];
-      const tableName = row.tableName || this.tableNames[0];
-      const params = { pageNum: this.queryParams.pageNum };
-      this.$tab.openPage("修改[" + tableName + "]生成配置", '/tool/gen-edit/index/' + tableId, params);
+      const tableId = row.tableId || this.ids[0]
+      const tableName = row.tableName || this.tableNames[0]
+      const params = { pageNum: this.queryParams.pageNum }
+      this.$tab.openPage("修改[" + tableName + "]生成配置", '/tool/gen-edit/index/' + tableId, params)
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const tableIds = row.tableId || this.ids;
+      const tableIds = row.tableId || this.ids
       this.$modal.confirm('是否确认删除表编号为"' + tableIds + '"的数据项？').then(function() {
-        return delTable(tableIds);
+        return delTable(tableIds)
       }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+        this.getList()
+        this.$modal.msgSuccess("删除成功")
+      }).catch(() => {})
     }
   }
-};
+}
 </script>