diff --git a/src/components/common/custom-module/model-custom-group/index.vue b/src/components/common/custom-module/model-custom-group/index.vue index 95231f84..b5de6a02 100644 --- a/src/components/common/custom-module/model-custom-group/index.vue +++ b/src/components/common/custom-module/model-custom-group/index.vue @@ -105,7 +105,7 @@ const is_show = computed(() => { // 获取到字段的真实数据 const field_value = custom_condition_data(condition?.field || '', option[0] || {}, props.sourceList, props.isCustom); // 判断条件字段是否为空并且是显示面板才会生效,则直接返回true - if (!isEmpty(condition.field) && !props.isDisplayPanel) { + if (!isEmpty(condition.field) && !isEmpty(condition.type) && props.isDisplayPanel) { return custom_condition_judg(field_value, condition.type, condition.value); } else { return true; diff --git a/src/components/common/custom-module/model-icon/index.vue b/src/components/common/custom-module/model-icon/index.vue index 32847ddc..bb2fe793 100644 --- a/src/components/common/custom-module/model-icon/index.vue +++ b/src/components/common/custom-module/model-icon/index.vue @@ -53,7 +53,7 @@ const is_show = computed(() => { // 获取到字段的真实数据 const field_value = custom_condition_data(condition?.field || '', option[0] || {}, props.sourceList, props.isCustom); // 判断条件字段是否为空并且是显示面板才会生效,则直接返回true - if (!isEmpty(condition.field) && !isEmpty(condition.type) && !props.isDisplayPanel) { + if (!isEmpty(condition.field) && !isEmpty(condition.type) && props.isDisplayPanel) { return custom_condition_judg(field_value, condition.type, condition.value); } else { return true; diff --git a/src/components/common/custom-module/model-image/index.vue b/src/components/common/custom-module/model-image/index.vue index 65fd7f6f..8ca78694 100644 --- a/src/components/common/custom-module/model-image/index.vue +++ b/src/components/common/custom-module/model-image/index.vue @@ -53,8 +53,6 @@ const is_show = computed(() => { const field_value = custom_condition_data(condition?.field || '', option[0] || {}, props.sourceList, props.isCustom); // 判断条件字段是否为空并且是显示面板才会生效,则直接返回true if (!isEmpty(condition.field) && !isEmpty(condition.type) && props.isDisplayPanel) { - console.log(condition, !props.isDisplayPanel); - console.log(custom_condition_judg(field_value, condition.type, condition.value)); return custom_condition_judg(field_value, condition.type, condition.value); } else { return true; diff --git a/src/components/common/custom-module/model-lines/index.vue b/src/components/common/custom-module/model-lines/index.vue index 5b9b82a9..fea5c4c3 100644 --- a/src/components/common/custom-module/model-lines/index.vue +++ b/src/components/common/custom-module/model-lines/index.vue @@ -46,7 +46,7 @@ const is_show = computed(() => { // 获取到字段的真实数据 const field_value = custom_condition_data(condition?.field || '', option[0] || {}, props.sourceList, props.isCustom); // 判断条件字段是否为空并且是显示面板才会生效,则直接返回true - if (!isEmpty(condition.field) && !props.isDisplayPanel) { + if (!isEmpty(condition.field) && !isEmpty(condition.type) && props.isDisplayPanel) { return custom_condition_judg(field_value, condition.type, condition.value); } else { return true; diff --git a/src/components/common/custom-module/model-panel/index.vue b/src/components/common/custom-module/model-panel/index.vue index 9997cd4b..36b1afc3 100644 --- a/src/components/common/custom-module/model-panel/index.vue +++ b/src/components/common/custom-module/model-panel/index.vue @@ -48,7 +48,7 @@ const is_show = computed(() => { // 获取到字段的真实数据 const field_value = custom_condition_data(condition?.field || '', option[0] || {}, props.sourceList, props.isCustom); // 判断条件字段是否为空并且是显示面板才会生效,则直接返回true - if (!isEmpty(condition.field) && !props.isDisplayPanel) { + if (!isEmpty(condition.field) && !isEmpty(condition.type) && props.isDisplayPanel) { return custom_condition_judg(field_value, condition.type, condition.value); } else { return true; diff --git a/src/components/common/custom-module/model-text/index.vue b/src/components/common/custom-module/model-text/index.vue index 274b2738..1b61c45d 100644 --- a/src/components/common/custom-module/model-text/index.vue +++ b/src/components/common/custom-module/model-text/index.vue @@ -64,7 +64,7 @@ const is_show = computed(() => { // 获取到字段的真实数据 const field_value = custom_condition_data(condition?.field || '', option[0] || {}, props.sourceList, props.isCustom); // 判断条件字段是否为空并且是显示面板才会生效,则直接返回true - if (!isEmpty(condition.field) && !props.isDisplayPanel) { + if (!isEmpty(condition.field) && !isEmpty(condition.type) && props.isDisplayPanel) { return custom_condition_judg(field_value, condition.type, condition.value); } else { return true; @@ -72,7 +72,7 @@ const is_show = computed(() => { }); const text_title = computed(() => { - return getTextTitle(form.value, props); + return (form.value?.text_captions || '') + getTextTitle(form.value, props); }); /** * 根据表单值和属性获取文本标题 diff --git a/src/components/common/custom-module/model-text/model-text-style.vue b/src/components/common/custom-module/model-text/model-text-style.vue index e8cece57..e0d35dfd 100644 --- a/src/components/common/custom-module/model-text/model-text-style.vue +++ b/src/components/common/custom-module/model-text/model-text-style.vue @@ -5,6 +5,9 @@