diff --git a/src/assets/images/chart/units/contentbgleft.png b/src/assets/images/chart/units/contentbgleft.png new file mode 100644 index 0000000..2235aa3 Binary files /dev/null and b/src/assets/images/chart/units/contentbgleft.png differ diff --git a/src/assets/images/chart/units/qsdbg.png b/src/assets/images/chart/units/qsdbg.png new file mode 100644 index 0000000..e7bd1e3 Binary files /dev/null and b/src/assets/images/chart/units/qsdbg.png differ diff --git a/src/assets/images/chart/units/texttitle02bg.png b/src/assets/images/chart/units/texttitle02bg.png new file mode 100644 index 0000000..187e02e Binary files /dev/null and b/src/assets/images/chart/units/texttitle02bg.png differ diff --git a/src/assets/images/chart/units/texttitlebg.png b/src/assets/images/chart/units/texttitlebg.png new file mode 100644 index 0000000..8fbb7fa Binary files /dev/null and b/src/assets/images/chart/units/texttitlebg.png differ diff --git a/src/packages/components/Decorates/Titles/Titles02/config.ts b/src/packages/components/Decorates/Titles/Titles02/config.ts index fc42424..e88e36e 100644 --- a/src/packages/components/Decorates/Titles/Titles02/config.ts +++ b/src/packages/components/Decorates/Titles/Titles02/config.ts @@ -6,13 +6,7 @@ import cloneDeep from 'lodash/cloneDeep' export const option = { boxId: 'linearGradientColorLeft', - borderTitle: '电子沙盘', - borderTitleWidth: 456, - borderTitleHeight: 190, - borderTitleSize: 18, - borderTitleColor: '#fff', - colors: ['#0E8A6D', '#02261C'], - backgroundColor: '#00000000' + colors: ['#0E8A6D','#0F9F73','#054E3C','#02261C','#098965','#052C31','#031F1A','#073128','#1F926B','#FEFEFE'] } export default class Config extends PublicConfigClass implements CreateComponentType { diff --git a/src/packages/components/Decorates/Titles/Titles02/config.vue b/src/packages/components/Decorates/Titles/Titles02/config.vue index 9258aa5..9fb5093 100644 --- a/src/packages/components/Decorates/Titles/Titles02/config.vue +++ b/src/packages/components/Decorates/Titles/Titles02/config.vue @@ -1,6 +1,6 @@ @@ -104,9 +98,5 @@ const { position: absolute; z-index: -1; } - .text { - color: v-bind('borderTitleColor'); - font-size: v-bind('borderTitleSize+"px"'); - } } diff --git a/src/packages/components/Decorates/Titles/Titles03/config.ts b/src/packages/components/Decorates/Titles/Titles03/config.ts index 2372cf2..8151355 100644 --- a/src/packages/components/Decorates/Titles/Titles03/config.ts +++ b/src/packages/components/Decorates/Titles/Titles03/config.ts @@ -6,13 +6,7 @@ import cloneDeep from 'lodash/cloneDeep' export const option = { boxId: "linearGradientColorRight", - borderTitle: '', - borderTitleWidth: 456, - borderTitleHeight: 190, - borderTitleSize: 18, - borderTitleColor: '#fff', - colors: ['#0E8A6D', '#02261C'], - backgroundColor: '#00000000' + colors: ['#0E8A6D','#0F9F73','#054E3C','#02261C','#098965','#052C31','#031F1A','#073128','#1F926B','#FEFEFE'] } export default class Config extends PublicConfigClass implements CreateComponentType { diff --git a/src/packages/components/Decorates/Titles/Titles03/config.vue b/src/packages/components/Decorates/Titles/Titles03/config.vue index 9258aa5..07a51ec 100644 --- a/src/packages/components/Decorates/Titles/Titles03/config.vue +++ b/src/packages/components/Decorates/Titles/Titles03/config.vue @@ -1,6 +1,6 @@ @@ -114,9 +108,5 @@ const { .stroke { stroke: v-bind('colors[1]'); } - .text { - color: v-bind('borderTitleColor'); - font-size: v-bind('borderTitleSize+"px"'); - } } diff --git a/src/packages/components/Units/Titles/ContentBackground/config.ts b/src/packages/components/Units/Titles/ContentBackground/config.ts new file mode 100644 index 0000000..4cfe64f --- /dev/null +++ b/src/packages/components/Units/Titles/ContentBackground/config.ts @@ -0,0 +1,17 @@ +import { PublicConfigClass } from '@/packages/public' +import { chartInitConfig } from '@/settings/designSetting' +import { CreateComponentType } from '@/packages/index.d' +import { ContentBackgroundConfig } from './index' +import cloneDeep from 'lodash/cloneDeep' + +export const option = { + boxId: 'linearGradientContentBackground', + colors: ['#06463A','#02221B'], +} + +export default class Config extends PublicConfigClass implements CreateComponentType { + public key = ContentBackgroundConfig.key + public attr = { ...chartInitConfig, w: 401, h: 150, zIndex: 1 } + public chartConfig = cloneDeep(ContentBackgroundConfig) + public option = cloneDeep(option) +} diff --git a/src/packages/components/Units/Titles/ContentBackground/config.vue b/src/packages/components/Units/Titles/ContentBackground/config.vue new file mode 100644 index 0000000..c5f2d98 --- /dev/null +++ b/src/packages/components/Units/Titles/ContentBackground/config.vue @@ -0,0 +1,53 @@ + + + diff --git a/src/packages/components/Units/Titles/ContentBackground/index.ts b/src/packages/components/Units/Titles/ContentBackground/index.ts new file mode 100644 index 0000000..34f194f --- /dev/null +++ b/src/packages/components/Units/Titles/ContentBackground/index.ts @@ -0,0 +1,14 @@ +import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d'; +import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d'; + +export const ContentBackgroundConfig: ConfigType = { + key: 'ContentBackground', + chartKey: 'VContentBackground', + conKey: 'VCContentBackground', + title: '模块背景色', + category: ChatCategoryEnum.TITLE, + categoryName: ChatCategoryEnumName.TITLE, + package: PackagesCategoryEnum.UNITS, + chartFrame: ChartFrameEnum.STATIC, + image: 'contentbgleft.png', +}; diff --git a/src/packages/components/Units/Titles/ContentBackground/index.vue b/src/packages/components/Units/Titles/ContentBackground/index.vue new file mode 100644 index 0000000..408a4d4 --- /dev/null +++ b/src/packages/components/Units/Titles/ContentBackground/index.vue @@ -0,0 +1,73 @@ + + + + + diff --git a/src/packages/components/Units/Titles/ContentTitle/config.ts b/src/packages/components/Units/Titles/ContentTitle/config.ts new file mode 100644 index 0000000..77e6f15 --- /dev/null +++ b/src/packages/components/Units/Titles/ContentTitle/config.ts @@ -0,0 +1,17 @@ +import { PublicConfigClass } from '@/packages/public' +import { chartInitConfig } from '@/settings/designSetting' +import { CreateComponentType } from '@/packages/index.d' +import { ContentTitleConfig } from './index' +import cloneDeep from 'lodash/cloneDeep' + +export const option = { + boxId: 'linearGradientContentTitle', + colors: ['#08251E','#00A374','#11B472','#00FF8C','#00F4B6','#00FF77','#00BF6B','#00673F','#00683F','#72A18A','#1CC370'], +} + +export default class Config extends PublicConfigClass implements CreateComponentType { + public key = ContentTitleConfig.key + public attr = { ...chartInitConfig, w: 401, h: 40, zIndex: 1 } + public chartConfig = cloneDeep(ContentTitleConfig) + public option = cloneDeep(option) +} diff --git a/src/packages/components/Units/Titles/ContentTitle/config.vue b/src/packages/components/Units/Titles/ContentTitle/config.vue new file mode 100644 index 0000000..c5f2d98 --- /dev/null +++ b/src/packages/components/Units/Titles/ContentTitle/config.vue @@ -0,0 +1,53 @@ + + + diff --git a/src/packages/components/Units/Titles/ContentTitle/index.ts b/src/packages/components/Units/Titles/ContentTitle/index.ts new file mode 100644 index 0000000..7308427 --- /dev/null +++ b/src/packages/components/Units/Titles/ContentTitle/index.ts @@ -0,0 +1,14 @@ +import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d'; +import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d'; + +export const ContentTitleConfig: ConfigType = { + key: 'ContentTitle', + chartKey: 'VContentTitle', + conKey: 'VCContentTitle', + title: '模块标题', + category: ChatCategoryEnum.TITLE, + categoryName: ChatCategoryEnumName.TITLE, + package: PackagesCategoryEnum.UNITS, + chartFrame: ChartFrameEnum.STATIC, + image: 'texttitlebg.png', +}; diff --git a/src/packages/components/Units/Titles/ContentTitle/index.vue b/src/packages/components/Units/Titles/ContentTitle/index.vue new file mode 100644 index 0000000..9d2a220 --- /dev/null +++ b/src/packages/components/Units/Titles/ContentTitle/index.vue @@ -0,0 +1,117 @@ + + + + + diff --git a/src/packages/components/Units/Titles/ContentTitle01/config.ts b/src/packages/components/Units/Titles/ContentTitle01/config.ts new file mode 100644 index 0000000..746dcd5 --- /dev/null +++ b/src/packages/components/Units/Titles/ContentTitle01/config.ts @@ -0,0 +1,17 @@ +import { PublicConfigClass } from '@/packages/public' +import { chartInitConfig } from '@/settings/designSetting' +import { CreateComponentType } from '@/packages/index.d' +import { ContentTitle01Config } from './index' +import cloneDeep from 'lodash/cloneDeep' + +export const option = { + boxId: 'linearGradientContentTitle01', + colors: [], +} + +export default class Config extends PublicConfigClass implements CreateComponentType { + public key = ContentTitle01Config.key + public attr = { ...chartInitConfig, w: 401, h: 40, zIndex: 1 } + public chartConfig = cloneDeep(ContentTitle01Config) + public option = cloneDeep(option) +} diff --git a/src/packages/components/Units/Titles/ContentTitle01/config.vue b/src/packages/components/Units/Titles/ContentTitle01/config.vue new file mode 100644 index 0000000..158afeb --- /dev/null +++ b/src/packages/components/Units/Titles/ContentTitle01/config.vue @@ -0,0 +1,20 @@ + + + diff --git a/src/packages/components/Units/Titles/ContentTitle01/index.ts b/src/packages/components/Units/Titles/ContentTitle01/index.ts new file mode 100644 index 0000000..1e8130e --- /dev/null +++ b/src/packages/components/Units/Titles/ContentTitle01/index.ts @@ -0,0 +1,14 @@ +import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d'; +import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d'; + +export const ContentTitle01Config: ConfigType = { + key: 'ContentTitle01', + chartKey: 'VContentTitle01', + conKey: 'VCContentTitle01', + title: '模块标题-01', + category: ChatCategoryEnum.TITLE, + categoryName: ChatCategoryEnumName.TITLE, + package: PackagesCategoryEnum.UNITS, + chartFrame: ChartFrameEnum.STATIC, + image: 'texttitlebg.png', +}; diff --git a/src/packages/components/Units/Titles/ContentTitle01/index.vue b/src/packages/components/Units/Titles/ContentTitle01/index.vue new file mode 100644 index 0000000..9d6e5a3 --- /dev/null +++ b/src/packages/components/Units/Titles/ContentTitle01/index.vue @@ -0,0 +1,46 @@ + + + + + diff --git a/src/packages/components/Units/Titles/ContentTitle02/config.ts b/src/packages/components/Units/Titles/ContentTitle02/config.ts new file mode 100644 index 0000000..f8e6db6 --- /dev/null +++ b/src/packages/components/Units/Titles/ContentTitle02/config.ts @@ -0,0 +1,17 @@ +import { PublicConfigClass } from '@/packages/public' +import { chartInitConfig } from '@/settings/designSetting' +import { CreateComponentType } from '@/packages/index.d' +import { ContentTitle02Config } from './index' +import cloneDeep from 'lodash/cloneDeep' + +export const option = { + boxId: 'linearGradientContentTitle02', + colors: [], +} + +export default class Config extends PublicConfigClass implements CreateComponentType { + public key = ContentTitle02Config.key + public attr = { ...chartInitConfig, w: 401, h: 40, zIndex: 1 } + public chartConfig = cloneDeep(ContentTitle02Config) + public option = cloneDeep(option) +} diff --git a/src/packages/components/Units/Titles/ContentTitle02/config.vue b/src/packages/components/Units/Titles/ContentTitle02/config.vue new file mode 100644 index 0000000..158afeb --- /dev/null +++ b/src/packages/components/Units/Titles/ContentTitle02/config.vue @@ -0,0 +1,20 @@ + + + diff --git a/src/packages/components/Units/Titles/ContentTitle02/index.ts b/src/packages/components/Units/Titles/ContentTitle02/index.ts new file mode 100644 index 0000000..16794e6 --- /dev/null +++ b/src/packages/components/Units/Titles/ContentTitle02/index.ts @@ -0,0 +1,14 @@ +import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d'; +import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d'; + +export const ContentTitle02Config: ConfigType = { + key: 'ContentTitle02', + chartKey: 'VContentTitle02', + conKey: 'VCContentTitle02', + title: '模块标题-02', + category: ChatCategoryEnum.TITLE, + categoryName: ChatCategoryEnumName.TITLE, + package: PackagesCategoryEnum.UNITS, + chartFrame: ChartFrameEnum.STATIC, + image: 'texttitle02bg.png', +}; diff --git a/src/packages/components/Units/Titles/ContentTitle02/index.vue b/src/packages/components/Units/Titles/ContentTitle02/index.vue new file mode 100644 index 0000000..7e47d85 --- /dev/null +++ b/src/packages/components/Units/Titles/ContentTitle02/index.vue @@ -0,0 +1,46 @@ + + + + + diff --git a/src/packages/components/Units/Titles/TitlesBtn/config.ts b/src/packages/components/Units/Titles/TitlesBtn/config.ts index ac8184b..356a13c 100644 --- a/src/packages/components/Units/Titles/TitlesBtn/config.ts +++ b/src/packages/components/Units/Titles/TitlesBtn/config.ts @@ -5,14 +5,8 @@ import { TitlesBtnConfig } from './index' import cloneDeep from 'lodash/cloneDeep' export const option = { - dur: 0.5, - borderTitle: '按钮', - borderTitleWidth: 124, - borderTitleHeight: 30, - borderTitleSize: 18, - borderTitleColor: '#fff', - colors: ['#0E8A6D', '#02261C'], - backgroundColor: '#00000000' + boxId: 'linearGradientTitlesLeftBtn', + colors: ['#131415','#008C47','#02C175','#02AD69','#008C46','#06C869','#02B56D','#EBBE10','#02C074'], } export default class Config extends PublicConfigClass implements CreateComponentType { diff --git a/src/packages/components/Units/Titles/TitlesBtn/config.vue b/src/packages/components/Units/Titles/TitlesBtn/config.vue index d04779e..c5f2d98 100644 --- a/src/packages/components/Units/Titles/TitlesBtn/config.vue +++ b/src/packages/components/Units/Titles/TitlesBtn/config.vue @@ -1,49 +1,16 @@ @@ -101,9 +123,5 @@ const { .stroke { stroke: v-bind('colors[1]'); } - .text { - color: v-bind('borderTitleColor'); - font-size: v-bind('borderTitleSize+"px"'); - } } diff --git a/src/packages/components/Units/Titles/TitlesBtnActive/config.ts b/src/packages/components/Units/Titles/TitlesBtnActive/config.ts index 5d26bef..23b181f 100644 --- a/src/packages/components/Units/Titles/TitlesBtnActive/config.ts +++ b/src/packages/components/Units/Titles/TitlesBtnActive/config.ts @@ -5,14 +5,8 @@ import { TitlesBtnActiveConfig } from './index' import cloneDeep from 'lodash/cloneDeep' export const option = { - dur: 0.5, - borderTitle: '按钮选中', - borderTitleWidth: 124, - borderTitleHeight: 30, - borderTitleSize: 18, - borderTitleColor: '#fff', - colors: ['#0E8A6D', '#02261C'], - backgroundColor: '#00000000' + boxId: 'linearGradientTitlesLeftBtnActive', + colors: ['#131415','#EA9607','#EBBE11','#EBBE10','#EBBA0F','#EBB90F'], } export default class Config extends PublicConfigClass implements CreateComponentType { diff --git a/src/packages/components/Units/Titles/TitlesBtnActive/config.vue b/src/packages/components/Units/Titles/TitlesBtnActive/config.vue index d04779e..c5f2d98 100644 --- a/src/packages/components/Units/Titles/TitlesBtnActive/config.vue +++ b/src/packages/components/Units/Titles/TitlesBtnActive/config.vue @@ -1,49 +1,16 @@ diff --git a/src/packages/components/Units/Titles/TopTitles01/config.ts b/src/packages/components/Units/Titles/TopTitles01/config.ts new file mode 100644 index 0000000..70fd7f2 --- /dev/null +++ b/src/packages/components/Units/Titles/TopTitles01/config.ts @@ -0,0 +1,16 @@ +import { PublicConfigClass } from '@/packages/public' +import { chartInitConfig } from '@/settings/designSetting' +import { CreateComponentType } from '@/packages/index.d' +import { TopTitles01Config } from './index' +import cloneDeep from 'lodash/cloneDeep' + +export const option = { + colors: ['#00592C','#009259','#005F2E','#009243','#00E692','#00C552','#00C47F','#009045','#008C46','#00C27F','#EBBE10'], +} + +export default class Config extends PublicConfigClass implements CreateComponentType { + public key = TopTitles01Config.key + public attr = { ...chartInitConfig, w: 1920, h: 85, zIndex: 1 } + public chartConfig = cloneDeep(TopTitles01Config) + public option = cloneDeep(option) +} diff --git a/src/packages/components/Units/Titles/TopTitles01/config.vue b/src/packages/components/Units/Titles/TopTitles01/config.vue new file mode 100644 index 0000000..abce6df --- /dev/null +++ b/src/packages/components/Units/Titles/TopTitles01/config.vue @@ -0,0 +1,43 @@ + + + + \ No newline at end of file diff --git a/src/packages/components/Units/Titles/TopTitles01/index.ts b/src/packages/components/Units/Titles/TopTitles01/index.ts new file mode 100644 index 0000000..7dfc2fd --- /dev/null +++ b/src/packages/components/Units/Titles/TopTitles01/index.ts @@ -0,0 +1,14 @@ +import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d'; +import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d'; + +export const TopTitles01Config: ConfigType = { + key: 'TopTitles01', + chartKey: 'VTopTitles01', + conKey: 'VCTopTitles01', + title: '标题-01', + category: ChatCategoryEnum.TITLE, + categoryName: ChatCategoryEnumName.TITLE, + package: PackagesCategoryEnum.UNITS, + chartFrame: ChartFrameEnum.STATIC, + image: 'toptitle.png', +}; diff --git a/src/packages/components/Units/Titles/TopTitles01/index.vue b/src/packages/components/Units/Titles/TopTitles01/index.vue new file mode 100644 index 0000000..d357030 --- /dev/null +++ b/src/packages/components/Units/Titles/TopTitles01/index.vue @@ -0,0 +1,134 @@ + + + + + diff --git a/src/packages/components/Units/Titles/index.ts b/src/packages/components/Units/Titles/index.ts index 8d74092..e727ef4 100644 --- a/src/packages/components/Units/Titles/index.ts +++ b/src/packages/components/Units/Titles/index.ts @@ -1,9 +1,19 @@ import { TopTitlesConfig } from './TopTitles/index'; +import { TopTitles01Config } from './TopTitles01/index'; import { TitlesBtnConfig } from './TitlesBtn/index'; import { TitlesBtnActiveConfig } from './TitlesBtnActive/index'; +import { ContentBackgroundConfig } from './ContentBackground/index'; +import { ContentTitleConfig } from './ContentTitle/index'; +import { ContentTitle01Config } from './ContentTitle01/index'; +// import { ContentTitle02Config } from './ContentTitle02/index'; export default [ TopTitlesConfig, + TopTitles01Config, TitlesBtnConfig, - TitlesBtnActiveConfig + TitlesBtnActiveConfig, + ContentBackgroundConfig, + ContentTitleConfig, + ContentTitle01Config, + // ContentTitle02Config ]; diff --git a/src/views/chart/ContentConfigurations/components/ChartEvent/components/ChartEventInteractionConfiguration/components/EventItem.vue b/src/views/chart/ContentConfigurations/components/ChartEvent/components/ChartEventInteractionConfiguration/components/EventItem.vue index 5b70e08..6b23321 100644 --- a/src/views/chart/ContentConfigurations/components/ChartEvent/components/ChartEventInteractionConfiguration/components/EventItem.vue +++ b/src/views/chart/ContentConfigurations/components/ChartEvent/components/ChartEventInteractionConfiguration/components/EventItem.vue @@ -178,7 +178,7 @@ } .event-type { .event-type__content { - background-color: #f5f5f5; + // background-color: #f5f5f5; padding: 10px 20px; border-radius: 6px; .event-type__content__item { diff --git a/src/views/chart/index.vue b/src/views/chart/index.vue index 4ac6ceb..2b854c5 100644 --- a/src/views/chart/index.vue +++ b/src/views/chart/index.vue @@ -69,6 +69,16 @@ // 右键 const { menuOptions, onClickOutSide, mousePosition, handleMenuSelect } = useContextMenu(); + // 阻止页面ctrl+鼠标滚轮进行缩放 + document.addEventListener( + 'wheel', + function (event) { + if (event.ctrlKey) { + event.preventDefault(); + } + }, + { passive: false }, + );