jiangyc/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://github.com/dromara/RuoYi-Vue-Plus.git synced 2025-09-24 07:19:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
 Conflicts:
	ruoyi-ui/package.json
	ruoyi-ui/src/api/login.js
	ruoyi-ui/src/assets/styles/ruoyi.scss
	ruoyi-ui/src/layout/components/Navbar.vue
	ruoyi-ui/src/utils/ruoyi.js
	ruoyi-ui/src/views/tool/build/index.vue
	ruoyi-ui/src/views/tool/gen/editTable.vue
	ruoyi-ui/src/views/tool/gen/index.vue
	ruoyi/src/main/java/com/ruoyi/project/monitor/domain/SysLogininfor.java
	ruoyi/src/main/java/com/ruoyi/project/monitor/domain/SysOperLog.java
	ruoyi/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java
	ruoyi/src/main/java/com/ruoyi/project/tool/gen/controller/GenController.java
	ruoyi/src/main/resources/mybatis/tool/GenTableMapper.xml
This commit is contained in:
疯狂的狮子li
2020-04-03 10:16:28 +08:00
parent 39d8723159 ec65b1f7ec
commit 31a2713012
14 changed files with 118 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ruoyi-ui/src/views/tool/build/index.vue
View File

@ -135,7 +135,6 @@
</div>
</template>
<script>
import draggable from 'vuedraggable'
import { saveAs } from 'file-saver'
@ -429,7 +428,7 @@ input, textarea{
padding: 12px 18px 15px 15px;
}
}
.el-scrollbar__wrap {
.left-scrollbar .el-scrollbar__wrap {
box-sizing: border-box;
overflow-x: hidden !important;
margin-bottom: 0 !important;
@ -503,7 +502,7 @@ input, textarea{
}
}
.el-scrollbar__view{
.left-scrollbar .el-scrollbar__view{
overflow-x: hidden;
}

18
ruoyi-ui/src/views/tool/gen/editTable.vue
View File

@ -5,8 +5,8 @@
<basic-info-form ref="basicInfo" :info="info" />
</el-tab-pane>
<el-tab-pane label="字段信息" name="cloum">
<el-table :data="cloumns" :max-height="tableHeight">
<el-table-column label="序号" type="index" min-width="5%" />
<el-table ref="dragTable" :data="cloumns" row-key="columnId" :max-height="tableHeight">
<el-table-column label="序号" type="index" min-width="5%" class-name="allowDrag" />
<el-table-column
label="字段列名"
prop="columnName"
@ -126,6 +126,7 @@ import { getGenTable, updateGenTable } from "@/api/tool/gen";
import { optionselect as getDictOptionselect } from "@/api/system/dict/type";
import basicInfoForm from "./basicInfoForm";
import genInfoForm from "./genInfoForm";
import Sortable from 'sortablejs'
export default {
name: "GenEdit",
components: {
@ -198,6 +199,19 @@ export default {
this.$store.dispatch("tagsView/delView", this.$route);
this.$router.push({ path: "/tool/gen", query: { t: Date.now()}})
}
},
mounted() {
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.cloumns.splice(evt.oldIndex, 1)[0];
this.cloumns.splice(evt.newIndex, 0, targetRow);
for (let index in this.cloumns) {
this.cloumns[index].sort = parseInt(index) + 1;
}
}
});
}
};
</script>

4
ruoyi-ui/src/views/tool/gen/index.vue
View File

@ -80,7 +80,7 @@
<el-table v-loading="loading" :data="tableList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column label="序号" align="center" prop="tableId" width="50px" />
<el-table-column label="序号" align="center" prop="tableId" width="60px" />
<el-table-column
label="表名称"
align="center"
@ -284,4 +284,4 @@ export default {
}
}
};
</script>
</script>