diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json index 6d6aff541..4f77767e2 100644 --- a/ruoyi-ui/package.json +++ b/ruoyi-ui/package.json @@ -40,7 +40,6 @@ "quill": "2.0.2", "screenfull": "5.0.2", "sortablejs": "1.10.2", - "splitpanes": "2.4.1", "vue": "2.6.12", "vue-count-to": "1.0.13", "vue-cropper": "0.5.5", diff --git a/ruoyi-ui/src/assets/styles/ruoyi.scss b/ruoyi-ui/src/assets/styles/ruoyi.scss index b822c5533..73e7c2a94 100644 --- a/ruoyi-ui/src/assets/styles/ruoyi.scss +++ b/ruoyi-ui/src/assets/styles/ruoyi.scss @@ -324,6 +324,28 @@ display: block; } +/* tree-sidebar content */ +.tree-sidebar-manage-wrap { + display: flex; + gap: 0; + min-height: calc(100vh - 130px); + padding: 0 !important; + overflow: hidden; +} + +.tree-sidebar-content { + flex: 1; + min-width: 0; + overflow: hidden; + background: #fff; + + .content-inner { + padding: 12px 16px; + height: 100%; + overflow-y: auto; + } +} + /* error */ .error-title { color: #c0392b !important; } .error-title i { color: #c0392b !important; } @@ -408,8 +430,3 @@ position: relative; float: right; } - -/* 分割面板样式 */ -.splitpanes.default-theme .splitpanes__pane { - background-color: #fff!important; -} diff --git a/ruoyi-ui/src/components/TreePanel/index.vue b/ruoyi-ui/src/components/TreePanel/index.vue new file mode 100644 index 000000000..9feb10b0c --- /dev/null +++ b/ruoyi-ui/src/components/TreePanel/index.vue @@ -0,0 +1,709 @@ + + + + + \ No newline at end of file diff --git a/ruoyi-ui/src/views/monitor/job/index.vue b/ruoyi-ui/src/views/monitor/job/index.vue index 163053279..15b253fec 100644 --- a/ruoyi-ui/src/views/monitor/job/index.vue +++ b/ruoyi-ui/src/views/monitor/job/index.vue @@ -431,7 +431,7 @@ export default { }) }, /** 提交按钮 */ - submitForm: function() { + submitForm() { this.$refs["form"].validate(valid => { if (valid) { if (this.form.jobId != undefined) { diff --git a/ruoyi-ui/src/views/system/config/index.vue b/ruoyi-ui/src/views/system/config/index.vue index 3b1bc4d30..73fa93988 100644 --- a/ruoyi-ui/src/views/system/config/index.vue +++ b/ruoyi-ui/src/views/system/config/index.vue @@ -283,7 +283,7 @@ export default { // 多选框选中数据 handleSelectionChange(selection) { this.ids = selection.map(item => item.configId) - this.single = selection.length!=1 + this.single = selection.length != 1 this.multiple = !selection.length }, /** 修改按钮操作 */ @@ -297,7 +297,7 @@ export default { }) }, /** 提交按钮 */ - submitForm: function() { + submitForm() { this.$refs["form"].validate(valid => { if (valid) { if (this.form.configId != undefined) { diff --git a/ruoyi-ui/src/views/system/dept/index.vue b/ruoyi-ui/src/views/system/dept/index.vue index a8d63f3c4..88aab2038 100644 --- a/ruoyi-ui/src/views/system/dept/index.vue +++ b/ruoyi-ui/src/views/system/dept/index.vue @@ -325,7 +325,7 @@ export default { }) }, /** 提交按钮 */ - submitForm: function() { + submitForm() { this.$refs["form"].validate(valid => { if (valid) { if (this.form.deptId != undefined) { diff --git a/ruoyi-ui/src/views/system/dict/data.vue b/ruoyi-ui/src/views/system/dict/data.vue index c08469de5..42d8438cc 100644 --- a/ruoyi-ui/src/views/system/dict/data.vue +++ b/ruoyi-ui/src/views/system/dict/data.vue @@ -345,7 +345,7 @@ export default { // 多选框选中数据 handleSelectionChange(selection) { this.ids = selection.map(item => item.dictCode) - this.single = selection.length!=1 + this.single = selection.length != 1 this.multiple = !selection.length }, /** 修改按钮操作 */ @@ -359,7 +359,7 @@ export default { }) }, /** 提交按钮 */ - submitForm: function() { + submitForm() { this.$refs["form"].validate(valid => { if (valid) { if (this.form.dictCode != undefined) { diff --git a/ruoyi-ui/src/views/system/dict/index.vue b/ruoyi-ui/src/views/system/dict/index.vue index 124050d61..c63ceb0e4 100644 --- a/ruoyi-ui/src/views/system/dict/index.vue +++ b/ruoyi-ui/src/views/system/dict/index.vue @@ -305,7 +305,7 @@ export default { // 多选框选中数据 handleSelectionChange(selection) { this.ids = selection.map(item => item.dictId) - this.single = selection.length!=1 + this.single = selection.length != 1 this.multiple = !selection.length }, /** 字典数据抽屉显示信息 */ @@ -328,7 +328,7 @@ export default { }) }, /** 提交按钮 */ - submitForm: function() { + submitForm() { this.$refs["form"].validate(valid => { if (valid) { if (this.form.dictId != undefined) { diff --git a/ruoyi-ui/src/views/system/menu/index.vue b/ruoyi-ui/src/views/system/menu/index.vue index 4a0e47337..1ac0451f9 100644 --- a/ruoyi-ui/src/views/system/menu/index.vue +++ b/ruoyi-ui/src/views/system/menu/index.vue @@ -466,7 +466,7 @@ export default { }) }, /** 提交按钮 */ - submitForm: function() { + submitForm() { this.$refs["form"].validate(valid => { if (valid) { if (this.form.menuId != undefined) { diff --git a/ruoyi-ui/src/views/system/notice/index.vue b/ruoyi-ui/src/views/system/notice/index.vue index 3eb25a3b8..8d5f32107 100644 --- a/ruoyi-ui/src/views/system/notice/index.vue +++ b/ruoyi-ui/src/views/system/notice/index.vue @@ -258,7 +258,7 @@ export default { // 多选框选中数据 handleSelectionChange(selection) { this.ids = selection.map(item => item.noticeId) - this.single = selection.length!=1 + this.single = selection.length != 1 this.multiple = !selection.length }, /** 新增按钮操作 */ @@ -278,7 +278,7 @@ export default { }) }, /** 提交按钮 */ - submitForm: function() { + submitForm() { this.$refs["form"].validate(valid => { if (valid) { if (this.form.noticeId != undefined) { diff --git a/ruoyi-ui/src/views/system/post/index.vue b/ruoyi-ui/src/views/system/post/index.vue index abb9ae934..a9fa686e2 100644 --- a/ruoyi-ui/src/views/system/post/index.vue +++ b/ruoyi-ui/src/views/system/post/index.vue @@ -249,7 +249,7 @@ export default { // 多选框选中数据 handleSelectionChange(selection) { this.ids = selection.map(item => item.postId) - this.single = selection.length!=1 + this.single = selection.length != 1 this.multiple = !selection.length }, /** 新增按钮操作 */ @@ -269,7 +269,7 @@ export default { }) }, /** 提交按钮 */ - submitForm: function() { + submitForm() { this.$refs["form"].validate(valid => { if (valid) { if (this.form.postId != undefined) { diff --git a/ruoyi-ui/src/views/system/role/index.vue b/ruoyi-ui/src/views/system/role/index.vue index 38b8cb97d..1b50e6619 100644 --- a/ruoyi-ui/src/views/system/role/index.vue +++ b/ruoyi-ui/src/views/system/role/index.vue @@ -451,7 +451,7 @@ export default { // 多选框选中数据 handleSelectionChange(selection) { this.ids = selection.map(item => item.roleId) - this.single = selection.length!=1 + this.single = selection.length != 1 this.multiple = !selection.length }, // 更多操作触发 @@ -547,12 +547,12 @@ export default { this.title = "分配数据权限" }, /** 分配用户操作 */ - handleAuthUser: function(row) { + handleAuthUser(row) { const roleId = row.roleId this.$router.push("/system/role-auth/user/" + roleId) }, /** 提交按钮 */ - submitForm: function() { + submitForm() { this.$refs["form"].validate(valid => { if (valid) { if (this.form.roleId != undefined) { @@ -574,7 +574,7 @@ export default { }) }, /** 提交按钮(数据权限) */ - submitDataScope: function() { + submitDataScope() { if (this.form.roleId != undefined) { this.form.deptIds = this.getDeptAllCheckedKeys() dataScope(this.form).then(() => { diff --git a/ruoyi-ui/src/views/system/user/index.vue b/ruoyi-ui/src/views/system/user/index.vue index 684831f4b..2dd3120a3 100644 --- a/ruoyi-ui/src/views/system/user/index.vue +++ b/ruoyi-ui/src/views/system/user/index.vue @@ -1,98 +1,82 @@