{
if (!canvasActive.value) {
return
}
- if (batchOptFlag.value) {
- componentEditBarRef.value.batchOptCheckOut()
- e.stopPropagation()
- e.preventDefault()
- return
- }
+ batchSelected(e)
// ctrl or command 按下时 鼠标点击为选择需要组合的组件(取消需要组合的组件在ComposeShow组件中)
if (isCtrlOrCmdDown.value && !areaData.value.components.includes(element)) {
areaDataPush(element.value)
From 9d0453e1eadb227f3fb5c78eda32a26642b19f7c Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 13 Aug 2024 12:27:40 +0800
Subject: [PATCH 3/7] =?UTF-8?q?refactor(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
=?UTF-8?q?=E5=8E=86=E5=8F=B2=E6=95=B0=E6=8D=AE=E5=85=BC=E5=AE=B9=E4=BC=98?=
=?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
core/core-frontend/src/utils/canvasUtils.ts | 104 ++++++++++++--------
1 file changed, 63 insertions(+), 41 deletions(-)
diff --git a/core/core-frontend/src/utils/canvasUtils.ts b/core/core-frontend/src/utils/canvasUtils.ts
index fc0e74841d..60c06f4382 100644
--- a/core/core-frontend/src/utils/canvasUtils.ts
+++ b/core/core-frontend/src/utils/canvasUtils.ts
@@ -120,6 +120,68 @@ function matrixAdaptor(componentItem) {
}
}
+export function historyItemAdaptor(
+ componentItem,
+ reportFilterInfo,
+ attachInfo,
+ canvasVersion,
+ canvasInfo
+) {
+ componentItem['canvasActive'] = false
+ // 定时报告过滤组件适配 如果当前是定时报告默认切有设置对应的过滤组件默认值，则替换过滤组件
+ if (
+ componentItem.component === 'VQuery' &&
+ attachInfo.source === 'report' &&
+ !!reportFilterInfo
+ ) {
+ componentItem.propValue.forEach((filterItem, index) => {
+ if (reportFilterInfo[filterItem.id]) {
+ componentItem.propValue[index] = JSON.parse(reportFilterInfo[filterItem.id].filterInfo)
+ }
+ })
+ }
+ if (componentItem.component === 'Group') {
+ componentItem.expand = componentItem.expand || false
+ }
+
+ if (componentItem.component === 'Picture') {
+ componentItem.style['adaptation'] = componentItem.style['adaptation'] || 'adaptation'
+ }
+ // public
+ componentItem['maintainRadio'] = componentItem['maintainRadio'] || false
+ componentItem['multiDimensional'] =
+ componentItem['multiDimensional'] || deepCopy(MULTI_DIMENSIONAL)
+ componentItem['carousel'] = componentItem['carousel'] || deepCopy(BASE_CAROUSEL)
+ componentItem['aspectRatio'] = componentItem['aspectRatio'] || 1
+ if (componentItem.component === 'UserView') {
+ componentItem.actionSelection = componentItem.actionSelection || deepCopy(ACTION_SELECTION)
+ }
+ // 2 为基础版本 此处需要增加仪表板矩阵密度
+ if ((!canvasVersion || canvasVersion === 2) && canvasInfo.type === 'dashboard') {
+ matrixAdaptor(componentItem)
+ }
+ // 组件事件适配
+ componentItem.events =
+ componentItem.events &&
+ componentItem.events.checked !== undefined &&
+ componentItem.events.type !== 'displayChange'
+ ? componentItem.events
+ : deepCopy(BASE_EVENTS)
+ componentItem['category'] = componentItem['category'] || 'base'
+
+ if (componentItem.component === 'DeTabs') {
+ componentItem.propValue.forEach(tabItem => {
+ tabItem.componentData.forEach(tabComponent => {
+ historyItemAdaptor(tabComponent, reportFilterInfo, attachInfo, canvasVersion, canvasInfo)
+ })
+ })
+ } else if (componentItem.component === 'Group') {
+ componentItem.propValue.forEach(groupItem => {
+ historyItemAdaptor(groupItem, reportFilterInfo, attachInfo, canvasVersion, canvasInfo)
+ })
+ }
+}
+
export function historyAdaptor(
canvasStyleResult,
canvasDataResult,
@@ -138,47 +200,7 @@ export function historyAdaptor(
canvasStyleResult['popupAvailable'] === undefined ? true : canvasStyleResult['popupAvailable'] //兼容弹框区域开关
const reportFilterInfo = canvasInfo.reportFilterInfo
canvasDataResult.forEach(componentItem => {
- componentItem['canvasActive'] = false
- // 定时报告过滤组件适配 如果当前是定时报告默认切有设置对应的过滤组件默认值，则替换过滤组件
- if (
- componentItem.component === 'VQuery' &&
- attachInfo.source === 'report' &&
- !!reportFilterInfo
- ) {
- componentItem.propValue.forEach((filterItem, index) => {
- if (reportFilterInfo[filterItem.id]) {
- componentItem.propValue[index] = JSON.parse(reportFilterInfo[filterItem.id].filterInfo)
- }
- })
- }
- if (componentItem.component === 'Group') {
- componentItem.expand = componentItem.expand || false
- }
-
- if (componentItem.component === 'Picture') {
- componentItem.style['adaptation'] = componentItem.style['adaptation'] || 'adaptation'
- }
- // public
- componentItem['maintainRadio'] = componentItem['maintainRadio'] || false
- componentItem['multiDimensional'] =
- componentItem['multiDimensional'] || deepCopy(MULTI_DIMENSIONAL)
- componentItem['carousel'] = componentItem['carousel'] || deepCopy(BASE_CAROUSEL)
- componentItem['aspectRatio'] = componentItem['aspectRatio'] || 1
- if (componentItem.component === 'UserView') {
- componentItem.actionSelection = componentItem.actionSelection || deepCopy(ACTION_SELECTION)
- }
- // 2 为基础版本 此处需要增加仪表板矩阵密度
- if ((!canvasVersion || canvasVersion === 2) && canvasInfo.type === 'dashboard') {
- matrixAdaptor(componentItem)
- }
- // 组件事件适配
- componentItem.events =
- componentItem.events &&
- componentItem.events.checked !== undefined &&
- componentItem.events.type !== 'displayChange'
- ? componentItem.events
- : deepCopy(BASE_EVENTS)
- componentItem['category'] = componentItem['category'] || 'base'
+ historyItemAdaptor(componentItem, reportFilterInfo, attachInfo, canvasVersion, canvasInfo)
})
}
From 7bcd461ddca5eb73d50421164a8ad238c5854a3b Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 13 Aug 2024 12:30:06 +0800
Subject: [PATCH 4/7] =?UTF-8?q?feat(=E4=BB=AA=E8=A1=A8=E6=9D=BF=E3=80=81?=
=?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F):=20=E6=94=AF=E6=8C=81?=
=?UTF-8?q?=E4=BC=A0=E7=BB=9F=E8=BE=B9=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../custom-component/common/CommonAttr.vue | 20 +++
.../common/CommonBorderSetting.vue | 133 ++++++++++++++++++
.../src/custom-component/component-list.ts | 14 +-
3 files changed, 161 insertions(+), 6 deletions(-)
create mode 100644 core/core-frontend/src/custom-component/common/CommonBorderSetting.vue
diff --git a/core/core-frontend/src/custom-component/common/CommonAttr.vue b/core/core-frontend/src/custom-component/common/CommonAttr.vue
index 56aee1c0e7..116571ac31 100644
--- a/core/core-frontend/src/custom-component/common/CommonAttr.vue
+++ b/core/core-frontend/src/custom-component/common/CommonAttr.vue
@@ -11,6 +11,8 @@ import { snapshotStoreWithOut } from '@/store/modules/data-visualization/snapsho
import CommonStyleSet from '@/custom-component/common/CommonStyleSet.vue'
import CommonEvent from '@/custom-component/common/CommonEvent.vue'
import TabCarouselSetting from '@/custom-component/common/TabCarouselSetting.vue'
+import CommonBorderSetting from '@/custom-component/common/CommonBorderSetting.vue'
+import CollapseSwitchItem from '../../components/collapse-switch-item/src/CollapseSwitchItem.vue'
const snapshotStore = snapshotStoreWithOut()
const { t } = useI18n()
@@ -94,6 +96,10 @@ const colorPickerWidth = computed(() => {
}
})
+const borderSettingShow = computed(() => {
+ return !!element.value.style['borderActive']
+})
+
// 暂时关闭
const eventsShow = computed(() => {
return (
@@ -178,6 +184,20 @@ const stopEvent = e => {
>
+
+
+
+import { computed, reactive, ref, toRefs, watch } from 'vue'
+import { ElFormItem, ElInputNumber } from 'element-plus-secondary'
+import { snapshotStoreWithOut } from '@/store/modules/data-visualization/snapshot'
+import { dvMainStoreWithOut } from '@/store/modules/data-visualization/dvMain'
+import { storeToRefs } from 'pinia'
+import { COLOR_PANEL } from '@/views/chart/components/editor/util/chart'
+const dvMainStore = dvMainStoreWithOut()
+
+const snapshotStore = snapshotStoreWithOut()
+const { canvasStyleData } = storeToRefs(dvMainStore)
+
+const props = withDefaults(
+ defineProps<{
+ themes?: EditorTheme
+ element: any
+ }>(),
+ {
+ themes: 'dark'
+ }
+)
+const emits = defineEmits(['onStyleAttrChange'])
+const { themes, element } = toRefs(props)
+const state = reactive({
+ fontSize: [],
+ isSetting: false,
+ predefineColors: COLOR_PANEL
+})
+const styleMounted = ref({
+ borderWidth: 0,
+ borderRadius: 5
+})
+
+const borderStyleList = [
+ { name: '实线', value: 'solid' },
+ { name: '虚线', value: 'dashed' },
+ { name: '点线', value: 'dotted' }
+]
+
+const styleInit = () => {
+ if (element.value) {
+ Object.keys(styleMounted.value).forEach(key => {
+ styleMounted.value[key] = Math.round(
+ (element.value.style[key] * 100) / canvasStyleData.value.scale
+ )
+ })
+ }
+}
+
+const styleForm = computed(() => element.value.style)
+
+const changeStyle = params => {
+ snapshotStore.recordSnapshotCache()
+ emits('onStyleAttrChange', params)
+}
+
+const changeStylePre = key => {
+ changeStyle({ key: key, value: element.value.style[key] })
+}
+
+const sizeChange = key => {
+ element.value.style[key] = Math.round(
+ (styleMounted.value[key] * canvasStyleData.value.scale) / 100
+ )
+ changeStyle({ key: key, value: element.value.style[key] })
+}
+
+watch(
+ () => element.value,
+ () => {
+ styleInit()
+ },
+ {
+ deep: true,
+ immediate: true
+ }
+)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/core/core-frontend/src/custom-component/component-list.ts b/core/core-frontend/src/custom-component/component-list.ts
index f18cde8084..9868416c47 100644
--- a/core/core-frontend/src/custom-component/component-list.ts
+++ b/core/core-frontend/src/custom-component/component-list.ts
@@ -5,7 +5,12 @@ import { getViewConfig } from '@/views/chart/components/editor/util/chart'
export const commonStyle = {
rotate: 0,
- opacity: 1
+ opacity: 1,
+ borderActive: false,
+ borderWidth: 1,
+ borderRadius: 5,
+ borderStyle: 'solid',
+ borderColor: '#cccccc'
}
// 轮询设置
@@ -466,11 +471,8 @@ const list = [
style: {
width: 200,
height: 200,
- borderWidth: 1,
- borderRadius: 5,
- borderStyle: 'solid',
- borderColor: '#cccccc',
- backgroundColor: 'rgba(236,231,231,0.1)'
+ backgroundColor: 'rgba(236,231,231,0.1)',
+ borderActive: true
}
},
{
From ca2a8b33a912d0db32acaaf6b11b73e030ab3fe8 Mon Sep 17 00:00:00 2001
From: dataeaseShu
Date: Tue, 13 Aug 2024 13:47:03 +0800
Subject: [PATCH 5/7] =?UTF-8?q?feat(xpack):=20=E9=98=88=E5=80=BC=E5=91=8A?=
=?UTF-8?q?=E8=AD=A6=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../rich-text/TinymacEditorAlarm.vue | 79 ++++++++-----------
de-xpack | 2 +-
2 files changed, 36 insertions(+), 45 deletions(-)
diff --git a/core/core-frontend/src/components/rich-text/TinymacEditorAlarm.vue b/core/core-frontend/src/components/rich-text/TinymacEditorAlarm.vue
index 4d6784e3d4..abcd94263b 100644
--- a/core/core-frontend/src/components/rich-text/TinymacEditorAlarm.vue
+++ b/core/core-frontend/src/components/rich-text/TinymacEditorAlarm.vue
@@ -4,7 +4,8 @@