From c53034a2dc16bdfa60ba0deeb7d129406a26e3b4 Mon Sep 17 00:00:00 2001 From: ycak47 Date: Tue, 16 Aug 2022 16:03:28 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=A6=96=E6=AC=A1=E5=AF=BC=E5=85=A5sql?= =?UTF-8?q?=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82=201.?= =?UTF-8?q?=E7=A7=AF=E6=9C=A8=E6=8A=A5=E8=A1=A8=E8=8F=9C=E5=8D=95=E9=87=8D?= =?UTF-8?q?=E5=A4=8D=202.Banner=E7=AE=A1=E7=90=86SQL=E6=B3=A8=E9=87=8A?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E5=8F=8A=E4=B8=BB=E9=94=AE=E9=87=8D=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sql/mysql/ruoyi-vue-pro.sql | 5 ----- sql/optional/mall/mall.sql | 4 ++-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/sql/mysql/ruoyi-vue-pro.sql b/sql/mysql/ruoyi-vue-pro.sql index 683206e6f..6a25c70d4 100644 --- a/sql/mysql/ruoyi-vue-pro.sql +++ b/sql/mysql/ruoyi-vue-pro.sql @@ -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 diff --git a/sql/optional/mall/mall.sql b/sql/optional/mall/mall.sql index 9493c3bcf..9a090c9e4 100644 --- a/sql/optional/mall/mall.sql +++ b/sql/optional/mall/mall.sql @@ -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 From 74f12e0b9f8f17ec45b65a13292953bb06afb682 Mon Sep 17 00:00:00 2001 From: ycak47 Date: Tue, 16 Aug 2022 17:07:07 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96el-dialog=201.=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E9=BB=98=E8=AE=A4=E7=82=B9=E5=87=BB=E8=83=8C=E6=99=AF?= =?UTF-8?q?=E4=B8=8D=E5=85=B3=E9=97=ADdialog=EF=BC=88=E8=BF=99=E4=B8=AA?= =?UTF-8?q?=E5=BE=88=E5=AE=B9=E6=98=93=E8=AF=AF=E6=93=8D=E4=BD=9C=EF=BC=8C?= =?UTF-8?q?=E4=BD=93=E9=AA=8C=E8=BE=83=E5=B7=AE=EF=BC=89=202.el-dialog?= =?UTF-8?q?=E5=86=85=E5=AE=B9=E8=BE=83=E5=A4=9A=E6=97=B6=EF=BC=8C=E6=BB=9A?= =?UTF-8?q?=E5=8A=A8=E6=9D=A1=E9=99=90=E5=AE=9A=E5=9C=A8=E5=86=85=E9=83=A8?= =?UTF-8?q?=E8=80=8C=E4=B8=8D=E6=92=91=E5=BC=80=E7=88=B6=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E7=9A=84=E6=BB=9A=E5=8A=A8=E6=9D=A1=203.=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E7=94=9F=E6=88=90=E7=9A=84el-dialog=E9=BB=98=E8=AE=A4=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=20v-dialogDrag=E5=B1=9E=E6=80=A7=EF=BC=88=E5=8F=AF?= =?UTF-8?q?=E6=8B=96=E6=8B=BD=E7=A7=BB=E5=8A=A8=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/codegen/vue/views/index.vue.vm | 2 +- yudao-ui-admin/src/assets/styles/ruoyi.scss | 10 ++++++++++ yudao-ui-admin/src/main.js | 4 ++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/index.vue.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/index.vue.vm index 95f7d66a2..c84a510ac 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/index.vue.vm +++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/index.vue.vm @@ -96,7 +96,7 @@ @pagination="getList"/> - + #foreach($column in $columns) #if ($column.createOperation || $column.updateOperation) diff --git a/yudao-ui-admin/src/assets/styles/ruoyi.scss b/yudao-ui-admin/src/assets/styles/ruoyi.scss index 4c2bde64d..0eae565df 100644 --- a/yudao-ui-admin/src/assets/styles/ruoyi.scss +++ b/yudao-ui-admin/src/assets/styles/ruoyi.scss @@ -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 { diff --git a/yudao-ui-admin/src/main.js b/yudao-ui-admin/src/main.js index 680b14585..01504a75e 100644 --- a/yudao-ui-admin/src/main.js +++ b/yudao-ui-admin/src/main.js @@ -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