diff --git a/backend/src/main/resources/db/migration/V2__dataease_ddl.sql b/backend/src/main/resources/db/migration/V2__dataease_ddl.sql index 8432027788..b9f4db1691 100644 --- a/backend/src/main/resources/db/migration/V2__dataease_ddl.sql +++ b/backend/src/main/resources/db/migration/V2__dataease_ddl.sql @@ -438,4 +438,31 @@ CREATE TABLE IF NOT EXISTS `dataset_table_union` `create_time` bigint(13) COMMENT '创建时间', PRIMARY KEY (`id`) ) ENGINE = InnoDB - DEFAULT CHARSET = utf8mb4; \ No newline at end of file + DEFAULT CHARSET = utf8mb4; + +DROP TABLE IF EXISTS `license`; +CREATE TABLE `license` ( + `id` varchar(50) NOT NULL, + `update_time` datetime DEFAULT NULL COMMENT '更新时间', + `license` longtext COMMENT 'license', + `f2c_license` longtext COMMENT 'F2C License', + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; + +DROP TABLE IF EXISTS `my_plugin`; +CREATE TABLE `my_plugin` ( + `plugin_id` bigint(20) NOT NULL COMMENT '主键', + `name` varchar(255) DEFAULT NULL COMMENT '插件名称', + `free` tinyint(1) DEFAULT NULL COMMENT '是否免费', + `cost` int(10) DEFAULT NULL COMMENT '费用', + `descript` varchar(255) DEFAULT NULL COMMENT '描述', + `version` varchar(255) DEFAULT NULL COMMENT '版本号', + `install_type` int(4) DEFAULT NULL COMMENT '安装类型', + `creator` varchar(255) DEFAULT NULL COMMENT '开发者', + `release_time` bigint(13) DEFAULT NULL COMMENT '发布时间', + `install_time` bigint(13) DEFAULT NULL COMMENT '安装时间', + `module_name` varchar(255) DEFAULT NULL COMMENT 'jar包名称', + `bean_name` varchar(40) DEFAULT NULL COMMENT 'bean名称', + `icon` varchar(255) DEFAULT NULL COMMENT '图标', + PRIMARY KEY (`plugin_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; \ No newline at end of file diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index d4a9e3d59f..06332c721c 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -821,7 +821,7 @@ export default { back: 'Back', view: 'Chart', edit: 'Edit', - panel_list: 'Panel List', + panel_list: 'Panel', module: 'Component', filter_module: 'Filter Component', select_by_module: 'Select by Component', diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index bf9037fb98..fe55b5b9d6 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -807,7 +807,7 @@ export default { datalist: '視圖列表', group: '目錄', panel: '儀表盤', - panel_list: '儀表盤列表', + panel_list: '儀表盤', groupAdd: '新建目錄', panelAdd: '新建儀表盤', delete: '刪除', diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index 41844c03cb..eba65a1690 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -808,7 +808,7 @@ export default { datalist: '视图列表', group: '目录', panel: '仪表盘', - panel_list: '仪表盘列表', + panel_list: '仪表盘', groupAdd: '新建目录', panelAdd: '新建仪表盘', delete: '删除', diff --git a/frontend/src/layout/components/Licbar.vue b/frontend/src/layout/components/Licbar.vue index 66575df2fe..4cc2b023d1 100644 --- a/frontend/src/layout/components/Licbar.vue +++ b/frontend/src/layout/components/Licbar.vue @@ -1,6 +1,6 @@ @@ -22,6 +22,9 @@ export default { }, licstatus() { return this.$store.state.lic.validate + }, + licMsg() { + return this.$store.state.lic.licMsg } }, diff --git a/frontend/src/store/getters.js b/frontend/src/store/getters.js index c3159803c6..e7030857aa 100644 --- a/frontend/src/store/getters.js +++ b/frontend/src/store/getters.js @@ -23,6 +23,7 @@ const getters = { dialogWidgetMap: state => state.application.dialogWidgetMap, drawWidgetMap: state => state.application.drawWidgetMap, validate: state => state.lic.validate, + licMsg: state => state.lic.licMsg, uiInfo: state => state.user.uiInfo } export default getters diff --git a/frontend/src/store/modules/lic.js b/frontend/src/store/modules/lic.js index bce435be97..64f5ee8254 100644 --- a/frontend/src/store/modules/lic.js +++ b/frontend/src/store/modules/lic.js @@ -1,11 +1,15 @@ import { validateLic } from '@/api/system/lic' const state = { - validate: true + validate: true, + licMsg: null } const mutations = { SET_VALIDATE: (state, data) => { state.validate = data + }, + SET_LIC_MSG: (state, msg) => { + state.licMsg = msg } } @@ -19,9 +23,11 @@ const actions = { validateLic().then(response => { const { data } = response commit('SET_VALIDATE', true) + commit('SET_LIC_MSG', null) resolve(data) }).catch(error => { commit('SET_VALIDATE', false) + commit('SET_LIC_MSG', error.response.data.message) reject(error) }) }) diff --git a/frontend/src/views/panel/list/PanelMain.vue b/frontend/src/views/panel/list/PanelMain.vue index 8d8b54f66c..1fc7311ba1 100644 --- a/frontend/src/views/panel/list/PanelMain.vue +++ b/frontend/src/views/panel/list/PanelMain.vue @@ -3,15 +3,15 @@ - {{ $t('panel.panel_list')}} + {{ $t('panel.panel_list') }} - {{ $t('panel.store')}} + {{ $t('panel.store') }} - {{ $t('panel.share')}} + {{ $t('panel.share') }}