forked from github/dataease
Merge branch 'dev-v2' into pr@dev-v2_dzz
This commit is contained in:
dataeaseShu
commit
da3412fa04
1
.gitignore
vendored
1
.gitignore
vendored
@ -50,3 +50,4 @@ core/core-frontend/src/assets/fsSvg.html
|
||||
/sdk/dataease-plugin-view/
|
||||
/extensions/
|
||||
.vite/
|
||||
/core/backend/
|
||||
|
||||
@ -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());
|
||||
|
||||
@ -34,7 +34,10 @@ public class DataSourceInitStartListener implements ApplicationListener<Applicat
|
||||
public void onApplicationEvent(ApplicationReadyEvent applicationReadyEvent) {
|
||||
try {
|
||||
engineServer.initSimpleEngine();
|
||||
datasourceServer.updateDemoDs();
|
||||
}catch (Exception e){
|
||||
e.printStackTrace();
|
||||
}
|
||||
try {
|
||||
calciteProvider.initConnectionPool();
|
||||
}catch (Exception e){
|
||||
e.printStackTrace();
|
||||
|
||||
@ -42,6 +42,7 @@ public class MenuManage {
|
||||
@Cacheable(cacheNames = CORE_MENU_CACHE, key = "'-dataease-'")
|
||||
public List<CoreMenu> coreMenus() {
|
||||
QueryWrapper<CoreMenu> wrapper = new QueryWrapper<>();
|
||||
wrapper.orderByAsc("menu_sort");
|
||||
return coreMenuMapper.selectList(wrapper);
|
||||
}
|
||||
|
||||
|
||||
@ -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:
|
||||
|
||||
@ -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='模板表';
|
||||
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;
|
||||
@ -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
|
||||
|
||||
3
core/core-frontend/src/assets/svg/icon_template.svg
Normal file
3
core/core-frontend/src/assets/svg/icon_template.svg
Normal file
@ -0,0 +1,3 @@
|
||||
<svg width="24" height="24" viewBox="0 0 24 24" fill="" xmlns="http://www.w3.org/2000/svg">
|
||||
<path fill-rule="" clip-rule="evenodd" d="M5 3H16V5.5195C16 5.65211 16.0527 5.77928 16.1464 5.87305C16.2402 5.96682 16.3674 6.0195 16.5 6.0195H19V21H5V3ZM17.0855 1H4C3.73478 1 3.48043 1.10536 3.29289 1.29289C3.10536 1.48043 3 1.73478 3 2V22C3 22.2652 3.10536 22.5196 3.29289 22.7071C3.48043 22.8946 3.73478 23 4 23H20C20.2652 23 20.5196 22.8946 20.7071 22.7071C20.8946 22.5196 21 22.2652 21 22V4.9155C21.0001 4.65038 20.8949 4.39607 20.7075 4.2085L17.793 1.293C17.7001 1.20008 17.5898 1.12637 17.4684 1.07609C17.347 1.02582 17.2169 0.999962 17.0855 1ZM7.5 8C7.22386 8 7 8.22386 7 8.5V9.5C7 9.77614 7.22386 10 7.5 10H16.5C16.7761 10 17 9.77614 17 9.5V8.5C17 8.22386 16.7761 8 16.5 8H7.5ZM11 12.5C11 12.2239 11.2239 12 11.5 12H16.5C16.7761 12 17 12.2239 17 12.5V17.5C17 17.7761 16.7761 18 16.5 18H11.5C11.2239 18 11 17.7761 11 17.5V12.5ZM7.5 12C7.22386 12 7 12.2239 7 12.5V17.5C7 17.7761 7.22386 18 7.5 18H8.5C8.77614 18 9 17.7761 9 17.5V12.5C9 12.2239 8.77614 12 8.5 12H7.5Z" fill=""/>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 1.1 KiB |
@ -0,0 +1,3 @@
|
||||
<template>
|
||||
<h2>template setting page for jiahao.wang</h2>
|
||||
</template>
|
||||
3
core/core-frontend/src/views/template-market/index.vue
Normal file
3
core/core-frontend/src/views/template-market/index.vue
Normal file
@ -0,0 +1,3 @@
|
||||
<template>
|
||||
<h2>template marget page for jiahao.wang</h2>
|
||||
</template>
|
||||
2
de-xpack
2
de-xpack
@ -1 +1 @@
|
||||
Subproject commit e3143e3176ca189c35729fa7bb195264c061a824
|
||||
Subproject commit 1a3ef15f6e1c1748271296a3eec834b36c24562f
|
||||
Loading…
Reference in New Issue
Block a user