Commit 7c8914a34f02ac25c23ee307517e0fe60af36313
Committed by
Gitee
Gitee
!253 fix:导入sql文件报错的问题、优化el-dialog
Merge pull request !253 from 颗粒/master
Showing
5 changed files
with
17 additions
and
8 deletions
sql/mysql/ruoyi-vue-pro.sql
| ... | ... | @@ -2657,8 +2657,3 @@ INSERT INTO `system_users` (`id`, `username`, `password`, `nickname`, `remark`, |
| 2657 | 2657 | COMMIT; |
| 2658 | 2658 | |
| 2659 | 2659 | SET FOREIGN_KEY_CHECKS = 1; |
| 2660 | - | |
| 2661 | - | |
| 2662 | --- 积木报表菜单 | |
| 2663 | -INSERT INTO `system_menu` VALUES (1281, '可视化报表', '', 1, 12, 0, '/visualization', 'chart', NULL, 0, b'1', b'1', '1', '2022-07-10 20:22:15', '1', '2022-07-10 20:33:30', b'0'); | |
| 2664 | -INSERT INTO `system_menu` VALUES (1282, '积木报表', '', 2, 1, 1281, 'jm-report', '#', 'visualization/jm/index', 0, b'1', b'1', '1', '2022-07-10 20:26:36', '1', '2022-07-10 20:33:26', b'0'); | |
| 2665 | 2660 | \ No newline at end of file | ... | ... |
sql/optional/mall/mall.sql
| ... | ... | @@ -253,7 +253,7 @@ create table product_sku |
| 253 | 253 | collate utf8mb4_general_ci; |
| 254 | 254 | |
| 255 | 255 | |
| 256 | ----Market-Banner管理SQL | |
| 256 | +-- Market-Banner管理SQL | |
| 257 | 257 | drop table if exists market_banner; |
| 258 | 258 | CREATE TABLE `market_banner` ( |
| 259 | 259 | `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'Banner编号', |
| ... | ... | @@ -273,7 +273,7 @@ CREATE TABLE `market_banner` ( |
| 273 | 273 | ) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 COMMENT='Banner管理'; |
| 274 | 274 | -- 菜单 SQL |
| 275 | 275 | INSERT INTO `system_menu`(`id`,`name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`) |
| 276 | -VALUES (2002, 'Banner管理', '', 2, 1, 2000, 'brand', '', 'mall/market/banner/index', 0); | |
| 276 | +VALUES (2026, 'Banner管理', '', 2, 1, 2000, 'brand', '', 'mall/market/banner/index', 0); | |
| 277 | 277 | -- 按钮父菜单ID |
| 278 | 278 | SELECT @parentId := LAST_INSERT_ID(); |
| 279 | 279 | -- 按钮 SQL | ... | ... |
yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/index.vue.vm
| ... | ... | @@ -96,7 +96,7 @@ |
| 96 | 96 | @pagination="getList"/> |
| 97 | 97 | |
| 98 | 98 | <!-- 对话框(添加 / 修改) --> |
| 99 | - <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> | |
| 99 | + <el-dialog :title="title" :visible.sync="open" width="500px" v-dialogDrag append-to-body> | |
| 100 | 100 | <el-form ref="form" :model="form" :rules="rules" label-width="80px"> |
| 101 | 101 | #foreach($column in $columns) |
| 102 | 102 | #if ($column.createOperation || $column.updateOperation) | ... | ... |
yudao-ui-admin/src/assets/styles/ruoyi.scss
| ... | ... | @@ -71,6 +71,16 @@ |
| 71 | 71 | padding: 10px 20px 0; |
| 72 | 72 | } |
| 73 | 73 | |
| 74 | +.el-dialog{ | |
| 75 | + display: flex; | |
| 76 | + flex-direction: column; | |
| 77 | + max-width: calc(100% - 30px); | |
| 78 | + max-height: calc(100% - 70px); | |
| 79 | + .el-dialog__body { | |
| 80 | + overflow: auto; | |
| 81 | + } | |
| 82 | +} | |
| 83 | + | |
| 74 | 84 | .el-table { |
| 75 | 85 | .el-table__header-wrapper, .el-table__fixed-header-wrapper { |
| 76 | 86 | th { | ... | ... |
yudao-ui-admin/src/main.js
| ... | ... | @@ -70,6 +70,10 @@ console.log(request) |
| 70 | 70 | Vue.prototype.$axios = request |
| 71 | 71 | import '@/styles/index.scss' |
| 72 | 72 | |
| 73 | +// 默认点击背景不关闭弹窗 | |
| 74 | +import ElementUI from 'element-ui' | |
| 75 | +ElementUI.Dialog.props.closeOnClickModal.default = false | |
| 76 | + | |
| 73 | 77 | /** |
| 74 | 78 | * If you don't want to use mock-server |
| 75 | 79 | * you want to use MockJs for mock api | ... | ... |