!253 fix:导入sql文件报错的问题、优化el-dialog

Merge pull request !253 from 颗粒/master

!253 fix:导入sql文件报错的问题、优化el-dialog
Merge pull request !253 from 颗粒/master
芋道源码 · Gitee
2 parents ffa2850a 74f12e0b
Showing 5 changed files with 17 additions and 8 deletions
sql/mysql/ruoyi-vue-pro.sql
sql/optional/mall/mall.sql
yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/index.vue.vm
yudao-ui-admin/src/assets/styles/ruoyi.scss
yudao-ui-admin/src/main.js
@@ -2657,8 +2657,3 @@ INSERT INTO `system_users` (`id`, `username`, `password`, `nickname`, `remark`, 
 COMMIT;
 SET FOREIGN_KEY_CHECKS = 1;
-
-
--- 积木报表菜单
-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');
-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');
 \ No newline at end of file
@@ -253,7 +253,7 @@ create table product_sku
                   collate utf8mb4_general_ci;
----Market-Banner管理SQL
+-- Market-Banner管理SQL
 drop table if exists market_banner;
 CREATE TABLE `market_banner` (
   `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'Banner编号',
@@ -273,7 +273,7 @@ CREATE TABLE `market_banner` (
 ) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 COMMENT='Banner管理';
 -- 菜单 SQL
 INSERT INTO `system_menu`(`id`,`name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`)
-VALUES (2002, 'Banner管理', '', 2, 1, 2000, 'brand', '', 'mall/market/banner/index', 0);
+VALUES (2026, 'Banner管理', '', 2, 1, 2000, 'brand', '', 'mall/market/banner/index', 0);
 -- 按钮父菜单ID
 SELECT @parentId := LAST_INSERT_ID();
 -- 按钮 SQL
@@ -96,7 +96,7 @@
                 @pagination="getList"/>
     <!-- 对话框(添加 / 修改) -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="500px" v-dialogDrag append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
 #foreach($column in $columns)
 #if ($column.createOperation || $column.updateOperation)
@@ -71,6 +71,16 @@
   padding: 10px 20px 0;
 }
+.el-dialog{
+  display: flex;
+  flex-direction: column;
+  max-width: calc(100% - 30px);
+  max-height: calc(100% - 70px);
+  .el-dialog__body {
+    overflow: auto;
+  }
+}
+
 .el-table {
   .el-table__header-wrapper, .el-table__fixed-header-wrapper {
     th {
@@ -70,6 +70,10 @@ console.log(request)
 Vue.prototype.$axios = request
 import '@/styles/index.scss'
+// 默认点击背景不关闭弹窗
+import ElementUI from 'element-ui'
+ElementUI.Dialog.props.closeOnClickModal.default = false
+
 /**
  * If you don't want to use mock-server
  * you want to use MockJs for mock api