修改数据魔方和自定义数据的处理逻辑
parent
9802d91edf
commit
836bdeade3
|
|
@ -114,7 +114,7 @@ onBeforeMount(() => {
|
||||||
if (!Object.keys(form.data_source_content).includes('data_auto_list') && !Object.keys(form.data_source_content).includes('data_list')) {
|
if (!Object.keys(form.data_source_content).includes('data_auto_list') && !Object.keys(form.data_source_content).includes('data_list')) {
|
||||||
form.data_source_content.data_list = [ form.data_source_content ];
|
form.data_source_content.data_list = [ form.data_source_content ];
|
||||||
}
|
}
|
||||||
if (!isEmpty(form.data_source) && form.data_source in source_list) {
|
if (!isEmpty(form.data_source) && typeof form.data_source_content_value == 'string' && form.data_source in source_list) {
|
||||||
form.data_source_content_value = source_list[form.data_source as keyof typeof source_list];
|
form.data_source_content_value = source_list[form.data_source as keyof typeof source_list];
|
||||||
}
|
}
|
||||||
if (!data_source_store.is_data_source_api) {
|
if (!data_source_store.is_data_source_api) {
|
||||||
|
|
|
||||||
|
|
@ -133,7 +133,7 @@ watchEffect(() => {
|
||||||
form.value = props.value.data_content;
|
form.value = props.value.data_content;
|
||||||
new_style.value = props.value.data_style;
|
new_style.value = props.value.data_style;
|
||||||
|
|
||||||
const { padding_left, padding_right } = new_style.value.chunk_padding;
|
const { padding_left, padding_right } = new_style.value.data_chunk_padding;
|
||||||
const { margin_left, margin_right } = new_style.value.data_chunk_margin;
|
const { margin_left, margin_right } = new_style.value.data_chunk_margin;
|
||||||
// 当前容器的宽度 减去 左右两边的padding值 再减去 数据间距的一半 再除以 容器的宽度 得到比例 再乘以数据魔方的比例
|
// 当前容器的宽度 减去 左右两边的padding值 再减去 数据间距的一半 再除以 容器的宽度 得到比例 再乘以数据魔方的比例
|
||||||
const width = form.value.width - padding_left - padding_right - margin_left - margin_right - (props.dataSpacing / 2);
|
const width = form.value.width - padding_left - padding_right - margin_left - margin_right - (props.dataSpacing / 2);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue