diff --git a/backend/src/main/resources/db/migration/V33__1.9.sql b/backend/src/main/resources/db/migration/V33__1.9.sql index 2a2fd7a965..256d528cb1 100644 --- a/backend/src/main/resources/db/migration/V33__1.9.sql +++ b/backend/src/main/resources/db/migration/V33__1.9.sql @@ -30,7 +30,7 @@ CREATE TABLE `chart_view_cache` ( `chart_type` varchar(255) DEFAULT 'private' COMMENT '视图类型 public 公共 历史可复用的视图,private 私有 专属某个仪表板', `is_plugin` bit(1) DEFAULT NULL COMMENT '是否插件', PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_general_ci; SET FOREIGN_KEY_CHECKS = 1; @@ -55,7 +55,7 @@ CREATE TABLE `panel_group_extend` ( `template_dynamic_data` longtext COMMENT '模板动态数据', `template_version` varchar(255) DEFAULT NULL COMMENT '模板版本号(预留)', PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_general_ci; -- ---------------------------- -- Table structure for panel_group_extend_data @@ -69,7 +69,7 @@ CREATE TABLE `panel_group_extend_data` ( `copy_from` varchar(255) DEFAULT NULL, `copy_id` varchar(255) DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_general_ci; SET FOREIGN_KEY_CHECKS = 1; @@ -86,7 +86,7 @@ CREATE TABLE `de_engine` ( `create_by` varchar(50) DEFAULT NULL COMMENT '创建人ID', `status` varchar(45) DEFAULT NULL COMMENT '状态', PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_general_ci; INSERT INTO `system_parameter`(`param_key`, `param_value`, `type`, `sort`) VALUES ('ui.mobileBG', NULL, 'file', 14); @@ -290,5 +290,49 @@ END ;; delimiter ; + +SET NAMES utf8mb4; +SET FOREIGN_KEY_CHECKS = 0; + +-- ---------------------------- +-- Table structure for panel_outer_params +-- ---------------------------- +CREATE TABLE `panel_outer_params` ( + `params_id` varchar(50) NOT NULL, + `panel_id` varchar(50) DEFAULT NULL, + `checked` tinyint(1) DEFAULT NULL, + `remark` varchar(255) DEFAULT NULL, + `copy_from` varchar(50) DEFAULT NULL, + `copy_id` varchar(50) DEFAULT NULL, + PRIMARY KEY (`params_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_general_ci; + +-- ---------------------------- +-- Table structure for panel_outer_params_info +-- ---------------------------- +CREATE TABLE `panel_outer_params_info` ( + `params_info_id` varchar(50) NOT NULL, + `params_id` varchar(50) DEFAULT NULL, + `param_name` varchar(255) DEFAULT NULL COMMENT '参数名', + `checked` tinyint(1) DEFAULT NULL COMMENT '是否启用', + `copy_from` varchar(255) DEFAULT NULL, + `copy_id` varchar(50) DEFAULT NULL, + PRIMARY KEY (`params_info_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_general_ci; + +-- ---------------------------- +-- Table structure for panel_outer_params_target_view_info +-- ---------------------------- +CREATE TABLE `panel_outer_params_target_view_info` ( + `target_id` varchar(50) NOT NULL, + `params_info_id` varchar(50) DEFAULT NULL, + `target_view_id` varchar(50) DEFAULT NULL, + `target_field_id` varchar(50) DEFAULT NULL, + `copy_from` varchar(255) DEFAULT NULL, + `copy_id` varchar(50) DEFAULT NULL, + PRIMARY KEY (`target_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_general_ci; + +SET FOREIGN_KEY_CHECKS = 1; update `my_plugin` set `name` = 'X-Pack默认插件' where `plugin_id` = 1; update `my_plugin` set `module_name` = 'view-bubblemap-backend' where `plugin_id` = 2; diff --git a/frontend/src/components/canvas/custom-component/component-list.js b/frontend/src/components/canvas/custom-component/component-list.js index 272d82fb5a..78dfb8cd48 100644 --- a/frontend/src/components/canvas/custom-component/component-list.js +++ b/frontend/src/components/canvas/custom-component/component-list.js @@ -28,6 +28,18 @@ export const COMMON_BACKGROUND = { innerPadding: 0 } +// 空组件仪表板样式 +export const COMMON_BACKGROUND_NONE = { + enable: false, + backgroundType: 'color', + color: '#FFFFFF', + innerImage: null, + outerImage: null, + alpha: 100, + borderRadius: 0, + innerPadding: 0 +} + // 公共样式 export const commonStyle = { rotate: 0, diff --git a/frontend/src/components/canvas/utils/utils.js b/frontend/src/components/canvas/utils/utils.js index 8607116ae4..d97aeddb12 100644 --- a/frontend/src/components/canvas/utils/utils.js +++ b/frontend/src/components/canvas/utils/utils.js @@ -1,5 +1,5 @@ import { - BASE_MOBILE_STYLE, COMMON_BACKGROUND, + BASE_MOBILE_STYLE, COMMON_BACKGROUND, COMMON_BACKGROUND_NONE, HYPERLINKS } from '@/components/canvas/custom-component/component-list' @@ -93,7 +93,7 @@ export function panelInit(componentData, componentStyle) { if (item.type === 'picture-add') { item.hyperlinks = (item.hyperlinks || HYPERLINKS) } - item.commonBackground = item.commonBackground || deepCopy(COMMON_BACKGROUND) + item.commonBackground = item.commonBackground || deepCopy(COMMON_BACKGROUND_NONE) }) // style初始化 componentStyle.refreshTime = (componentStyle.refreshTime || 5)