From 75cfcd49415c96441857fce90e05a8315f8d7c66 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Wed, 8 Nov 2023 16:59:00 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feat:=20=E6=A8=A1=E7=89=88=E8=8F=9C?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + .../src/main/java/io/dataease/menu/manage/MenuManage.java | 1 + .../core-backend/src/main/resources/i18n/core_zh_CN.properties | 3 ++- core/core-frontend/src/assets/svg/icon_template.svg | 3 +++ core/core-frontend/src/views/system/template-setting/index.vue | 3 +++ core/core-frontend/src/views/template-market/index.vue | 3 +++ de-xpack | 2 +- 7 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 core/core-frontend/src/assets/svg/icon_template.svg create mode 100644 core/core-frontend/src/views/system/template-setting/index.vue create mode 100644 core/core-frontend/src/views/template-market/index.vue diff --git a/.gitignore b/.gitignore index 0c403a5842..4cf03103c2 100644 --- a/.gitignore +++ b/.gitignore @@ -50,3 +50,4 @@ core/core-frontend/src/assets/fsSvg.html /sdk/dataease-plugin-view/ /extensions/ .vite/ +/core/backend/ diff --git a/core/core-backend/src/main/java/io/dataease/menu/manage/MenuManage.java b/core/core-backend/src/main/java/io/dataease/menu/manage/MenuManage.java index 3f1b7e1df1..a28896d782 100644 --- a/core/core-backend/src/main/java/io/dataease/menu/manage/MenuManage.java +++ b/core/core-backend/src/main/java/io/dataease/menu/manage/MenuManage.java @@ -42,6 +42,7 @@ public class MenuManage { @Cacheable(cacheNames = CORE_MENU_CACHE, key = "'-dataease-'") public List coreMenus() { QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.orderByAsc("menu_sort"); return coreMenuMapper.selectList(wrapper); } diff --git a/core/core-backend/src/main/resources/i18n/core_zh_CN.properties b/core/core-backend/src/main/resources/i18n/core_zh_CN.properties index 36a4670dde..0aa7d104fe 100644 --- a/core/core-backend/src/main/resources/i18n/core_zh_CN.properties +++ b/core/core-backend/src/main/resources/i18n/core_zh_CN.properties @@ -7,7 +7,8 @@ i18n_menu.visualized=\u53EF\u89C6\u5316 i18n_menu.template=\u6A21\u7248 i18n_menu.application=\u5E94\u7528 i18n_menu.system=\u7CFB\u7EDF\u7BA1\u7406 - +i18n_menu.template-market=\u6A21\u7248\u5E02\u573A +i18n_menu.template-setting=\u6A21\u7248\u7BA1\u7406 i18n_menu.view=\u6570\u636E\u5C55\u793A i18n_menu.data=\u6570\u636E\u51C6\u5907 i18n_menu.panel=\u4EEA\u8868\u677F diff --git a/core/core-frontend/src/assets/svg/icon_template.svg b/core/core-frontend/src/assets/svg/icon_template.svg new file mode 100644 index 0000000000..639de0ac3b --- /dev/null +++ b/core/core-frontend/src/assets/svg/icon_template.svg @@ -0,0 +1,3 @@ + + + diff --git a/core/core-frontend/src/views/system/template-setting/index.vue b/core/core-frontend/src/views/system/template-setting/index.vue new file mode 100644 index 0000000000..6258e890f8 --- /dev/null +++ b/core/core-frontend/src/views/system/template-setting/index.vue @@ -0,0 +1,3 @@ + diff --git a/core/core-frontend/src/views/template-market/index.vue b/core/core-frontend/src/views/template-market/index.vue new file mode 100644 index 0000000000..4ec75a4e20 --- /dev/null +++ b/core/core-frontend/src/views/template-market/index.vue @@ -0,0 +1,3 @@ + diff --git a/de-xpack b/de-xpack index e3143e3176..1023f4cab4 160000 --- a/de-xpack +++ b/de-xpack @@ -1 +1 @@ -Subproject commit e3143e3176ca189c35729fa7bb195264c061a824 +Subproject commit 1023f4cab4d7960b2a4793161773c8803bb507f3 From cb671dcb76585236befad8c34696534b659a458b Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Wed, 8 Nov 2023 16:59:54 +0800 Subject: [PATCH 2/4] =?UTF-8?q?perf:=20=E4=BB=A3=E7=A0=81=E4=B8=AD?= =?UTF-8?q?=E6=9A=B4=E6=BC=8F=E6=9C=AC=E5=9C=B0=E4=B9=8B=E5=A4=96=E7=9A=84?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/core-backend/src/main/resources/application-standalone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/core-backend/src/main/resources/application-standalone.yml b/core/core-backend/src/main/resources/application-standalone.yml index 19ab8a6e2e..1fc31e9388 100644 --- a/core/core-backend/src/main/resources/application-standalone.yml +++ b/core/core-backend/src/main/resources/application-standalone.yml @@ -1,6 +1,6 @@ spring: datasource: - url: jdbc:mysql://39.98.78.97:3306/dataease?autoReconnect=false&useUnicode=true&characterEncoding=UTF-8&characterSetResults=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false + url: jdbc:mysql://127.0.0.1:3306/de_standalone?autoReconnect=false&useUnicode=true&characterEncoding=UTF-8&characterSetResults=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false username: root password: Password123@mysql messages: From 90f0d83546a322be687575b123698e9b26ab0df2 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Wed, 8 Nov 2023 17:43:45 +0800 Subject: [PATCH 3/4] =?UTF-8?q?feat:=20=E6=A8=A1=E7=89=88=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E8=8F=9C=E5=8D=95sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/db/migration/V2.1__ddl.sql | 41 +++++++++++-------- de-xpack | 2 +- 2 files changed, 26 insertions(+), 17 deletions(-) diff --git a/core/core-backend/src/main/resources/db/migration/V2.1__ddl.sql b/core/core-backend/src/main/resources/db/migration/V2.1__ddl.sql index 4bff33b67d..2df7f2aa01 100644 --- a/core/core-backend/src/main/resources/db/migration/V2.1__ddl.sql +++ b/core/core-backend/src/main/resources/db/migration/V2.1__ddl.sql @@ -1,17 +1,26 @@ DROP TABLE IF EXISTS `visualization_template`; -CREATE TABLE `visualization_template` ( - `id` varchar(50) NOT NULL COMMENT '主键', - `name` varchar(255) DEFAULT NULL COMMENT '名称', - `pid` varchar(255) DEFAULT NULL COMMENT '父级id', - `level` int(10) DEFAULT NULL COMMENT '层级', - `dv_type` varchar(255) DEFAULT NULL COMMENT '模版种类 dataV or dashboard 目录或者文件夹', - `node_type` varchar(255) DEFAULT NULL COMMENT '节点类型 folder or panel 目录或者文件夹', - `create_by` varchar(255) DEFAULT NULL COMMENT '创建人', - `create_time` bigint(13) DEFAULT NULL COMMENT '创建时间', - `snapshot` longtext COMMENT '缩略图', - `template_type` varchar(255) DEFAULT NULL COMMENT '模版类型 system 系统内置 self 用户自建 ', - `template_style` longtext COMMENT 'template 样式', - `template_data` longtext COMMENT 'template 数据', - `dynamic_data` longtext COMMENT '预存数据', - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='模板表'; \ No newline at end of file +CREATE TABLE `visualization_template` +( + `id` varchar(50) NOT NULL COMMENT '主键', + `name` varchar(255) DEFAULT NULL COMMENT '名称', + `pid` varchar(255) DEFAULT NULL COMMENT '父级id', + `level` int(10) DEFAULT NULL COMMENT '层级', + `dv_type` varchar(255) DEFAULT NULL COMMENT '模版种类 dataV or dashboard 目录或者文件夹', + `node_type` varchar(255) DEFAULT NULL COMMENT '节点类型 folder or panel 目录或者文件夹', + `create_by` varchar(255) DEFAULT NULL COMMENT '创建人', + `create_time` bigint(13) DEFAULT NULL COMMENT '创建时间', + `snapshot` longtext COMMENT '缩略图', + `template_type` varchar(255) DEFAULT NULL COMMENT '模版类型 system 系统内置 self 用户自建 ', + `template_style` longtext COMMENT 'template 样式', + `template_data` longtext COMMENT 'template 数据', + `dynamic_data` longtext COMMENT '预存数据', + PRIMARY KEY (`id`) +) ENGINE = InnoDB + DEFAULT CHARSET = utf8mb4 COMMENT ='模板表'; + +BEGIN; +INSERT INTO `core_menu` +VALUES (19, 0, 2, 'template-market', 'template-market', 4, NULL, '/template-market', 0, 1, 0); +INSERT INTO `core_menu` +VALUES (20, 15, 2, 'template-setting', 'system/template-setting', 4, 'icon_template', '/template-setting', 0, 1, 1); +COMMIT; \ No newline at end of file diff --git a/de-xpack b/de-xpack index 1023f4cab4..1a3ef15f6e 160000 --- a/de-xpack +++ b/de-xpack @@ -1 +1 @@ -Subproject commit 1023f4cab4d7960b2a4793161773c8803bb507f3 +Subproject commit 1a3ef15f6e1c1748271296a3eec834b36c24562f From 29f36f1474364ae66458a0b7c7164874a419abf9 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Wed, 8 Nov 2023 18:11:00 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=E5=88=9D=E5=A7=8B=E5=8C=96=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BC=95=E6=93=8E=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/datasource/server/EngineServer.java | 7 +++++-- .../io/dataease/listener/DataSourceInitStartListener.java | 5 ++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/core/core-backend/src/main/java/io/dataease/datasource/server/EngineServer.java b/core/core-backend/src/main/java/io/dataease/datasource/server/EngineServer.java index 676dfa12a3..540f68de30 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/server/EngineServer.java +++ b/core/core-backend/src/main/java/io/dataease/datasource/server/EngineServer.java @@ -122,8 +122,11 @@ public class EngineServer { } mysqlConfiguration.setHost(matcher.group(1)); mysqlConfiguration.setPort(Integer.valueOf(matcher.group(2))); - mysqlConfiguration.setDataBase(matcher.group(3).split("\\?")[0]); - mysqlConfiguration.setExtraParams(matcher.group(3).split("\\?")[1]); + String[] databasePrams = matcher.group(3).split("\\?"); + mysqlConfiguration.setDataBase(databasePrams[0]); + if(databasePrams.length == 2){ + mysqlConfiguration.setExtraParams(databasePrams[1]); + } mysqlConfiguration.setUsername(env.getProperty("spring.datasource.username")); mysqlConfiguration.setPassword(env.getProperty("spring.datasource.password")); engine.setConfiguration(JsonUtil.toJSONString(mysqlConfiguration).toString()); diff --git a/core/core-backend/src/main/java/io/dataease/listener/DataSourceInitStartListener.java b/core/core-backend/src/main/java/io/dataease/listener/DataSourceInitStartListener.java index a54d75b63d..72dbae8e67 100644 --- a/core/core-backend/src/main/java/io/dataease/listener/DataSourceInitStartListener.java +++ b/core/core-backend/src/main/java/io/dataease/listener/DataSourceInitStartListener.java @@ -34,7 +34,10 @@ public class DataSourceInitStartListener implements ApplicationListener