public/dataease
1
0
Fork 0
mirror of https://github.com/dataease/dataease.git synced 2026-05-23 22:08:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(仪表板、数据大屏): 修复部分组件边框配置圆角只在编辑时生效问题 #17393 (#17431)

Browse Source
This commit is contained in:
王嘉豪
2025-11-17 14:56:32 +08:00
committed by GitHub
parent f835a4faf0
commit ec6ebf08dc
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/core-frontend/src/custom-component/common/CommonAttr.vue
View File

@@ -232,7 +232,7 @@ onMounted(() => {
v-model="element.style.borderActive" v-model="element.style.borderActive"
@modelChange="val => onStyleAttrChange({ key: 'borderActive', value: val })" @modelChange="val => onStyleAttrChange({ key: 'borderActive', value: val })"
:themes="themes" :themes="themes"
:title="t('visualization.board')" :title="t('visualization.board') + '333'"
name="borderSetting" name="borderSetting"
class="common-style-area" class="common-style-area"
> >

9
core/core-frontend/src/utils/canvasUtils.ts
View File

@@ -226,19 +226,14 @@ export function historyItemAdaptor(
if (componentItem.style['borderActive'] === undefined) { if (componentItem.style['borderActive'] === undefined) {
componentItem.style['borderActive'] = false componentItem.style['borderActive'] = false
componentItem.style['borderWidth'] = 1 componentItem.style['borderWidth'] = 1
componentItem.style['borderRadius'] = getNewBorderRadius(5) componentItem.style['borderRadius'] = 5
componentItem.style['borderStyle'] = 'solid' componentItem.style['borderStyle'] = 'solid'
componentItem.style['borderColor'] = '#cccccc' componentItem.style['borderColor'] = '#cccccc'
} else { } else {
componentItem.style['borderWidth'] = componentItem.style['borderWidth'] =
componentItem.style['borderWidth'] === undefined ? 1 : componentItem.style['borderWidth'] componentItem.style['borderWidth'] === undefined ? 1 : componentItem.style['borderWidth']
componentItem.style['borderRadius'] = componentItem.style['borderRadius'] =
componentItem.style['borderRadius'] === undefined componentItem.style['borderRadius'] === undefined ? 5 : componentItem.style['borderRadius']
? getNewBorderRadius(5)
: componentItem.style['borderRadius']
if (isNumber(componentItem.style['borderRadius'])) {
componentItem.style['borderRadius'] = getNewBorderRadius(componentItem.style['borderRadius'])
}
componentItem.style['borderStyle'] = componentItem.style['borderStyle'] =
componentItem.style['borderStyle'] === undefined componentItem.style['borderStyle'] === undefined
? 'solid' ? 'solid'