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 be23dae42e..9b92b7000f 100644 --- a/backend/src/main/resources/db/migration/V33__1.9.sql +++ b/backend/src/main/resources/db/migration/V33__1.9.sql @@ -89,3 +89,4 @@ INSERT INTO `system_parameter`(`param_key`, `param_value`, `type`, `sort`) VALUE UPDATE `demo_gdp_district_top100` set `province` = '新疆维吾尔自治区' WHERE `province` = '新疆维吾尔族自治区'; +INSERT INTO `my_plugin`(`plugin_id`, `name`, `store`, `free`, `cost`, `category`, `descript`, `version`, `install_type`, `creator`, `load_mybatis`, `release_time`, `install_time`, `module_name`, `icon`) VALUES (3, 'tabs插件', 'default', 0, 20000, 'panel', 'tabs插件', '1.0-SNAPSHOT', NULL, 'fit2cloud-chenyw', 0, NULL, NULL, 'dataease-extensions-tabs-backend', NULL); \ No newline at end of file diff --git a/frontend/src/components/AsyncSoltComponent/index.vue b/frontend/src/components/AsyncSoltComponent/index.vue new file mode 100644 index 0000000000..891e1a6900 --- /dev/null +++ b/frontend/src/components/AsyncSoltComponent/index.vue @@ -0,0 +1,76 @@ + + + diff --git a/frontend/src/components/canvas/components/TextAttr.vue b/frontend/src/components/canvas/components/TextAttr.vue index 13688f3b5d..94cdc24b5c 100644 --- a/frontend/src/components/canvas/components/TextAttr.vue +++ b/frontend/src/components/canvas/components/TextAttr.vue @@ -140,6 +140,12 @@ +
+ + + +
+ @@ -150,7 +156,6 @@ import Hyperlinks from '@/components/canvas/components/Editor/Hyperlinks' import VideoLinks from '@/components/canvas/components/Editor/VideoLinks' import DateFormat from '@/components/canvas/components/Editor/DateFormat' import { COLOR_PANEL } from '@/views/chart/chart/chart' -import { chartTransStr2Object } from '@/views/panel/panel' export default { components: { Hyperlinks, DateFormat, VideoLinks }, @@ -245,7 +250,8 @@ export default { 'borderWidth', 'borderRadius', 'opacity', - 'borderColor' + 'borderColor', + 'deTabStyle' ], // 矩形组件显示的属性 'rect-shape': [ @@ -416,6 +422,18 @@ export default { }, styleChange() { this.$store.commit('recordStyleChange') + }, + goHeadFontColor() { + this.$refs.headFontColorPicker.handleTrigger() + }, + goHeadFontActiveColor() { + this.$refs.headFontActiveColorPicker.handleTrigger() + }, + goHeadBorderColor() { + this.$refs.headBorderColorPicker.handleTrigger() + }, + goHeadBorderActiveColor() { + this.$refs.headBorderActiveColorPicker.handleTrigger() } } } @@ -448,7 +466,6 @@ export default { display: inline!important; } - ::v-deep input::-webkit-outer-spin-button, ::v-deep input::-webkit-inner-spin-button { -webkit-appearance: none !important; diff --git a/frontend/src/components/widget/DeWidget/DeTabs.vue b/frontend/src/components/widget/DeWidget/DeTabs.vue index 359fd7945b..94adcab6a3 100644 --- a/frontend/src/components/widget/DeWidget/DeTabs.vue +++ b/frontend/src/components/widget/DeWidget/DeTabs.vue @@ -1,6 +1,19 @@