diff --git a/core/frontend/src/components/canvas/customComponent/UserView.vue b/core/frontend/src/components/canvas/customComponent/UserView.vue
index a5c3b61b28..31b9412d49 100644
--- a/core/frontend/src/components/canvas/customComponent/UserView.vue
+++ b/core/frontend/src/components/canvas/customComponent/UserView.vue
@@ -830,7 +830,6 @@ export default {
const filters = this.filter.filter
const group = this.groupRequiredInvalid(filters)
if (group.unReady?.length) {
- this.view && (this.view.unReadyMsg = '请先完成必填项过滤器!')
this.getDataLoading = false
return
} else {
diff --git a/core/frontend/src/components/dataease/DeOutWidget.vue b/core/frontend/src/components/dataease/DeOutWidget.vue
index 237796980c..068d0feee9 100644
--- a/core/frontend/src/components/dataease/DeOutWidget.vue
+++ b/core/frontend/src/components/dataease/DeOutWidget.vue
@@ -28,10 +28,21 @@
class="condition-content"
:class="{'condition-content-default' : !(element.options.attrs.showTitle && element.options.attrs.title)}"
>
+
+
+ *
+
+
@@ -281,13 +287,13 @@ export default {
width: 100%;
.widget-required {
width: calc(100% - 12px) !important;
- float: left !important;
+ float: right !important;
}
.widget-required-symbol {
color: #f54a45;
height: 40px;
line-height: 40px;
- float: right;
+ float: left;
width: 12px;
}
}
diff --git a/core/frontend/src/components/widget/deWidget/DeDate.vue b/core/frontend/src/components/widget/deWidget/DeDate.vue
index 36b42c5827..ff391cf5d9 100644
--- a/core/frontend/src/components/widget/deWidget/DeDate.vue
+++ b/core/frontend/src/components/widget/deWidget/DeDate.vue
@@ -5,11 +5,12 @@
ref="dateRef"
v-model="values"
:popper-class="'coustom-date-picker' + ' ' + extPoperClass"
+ :class="{'show-required-tips': showRequiredTips}"
:type="componentType"
:range-separator="$t(element.options.attrs.rangeSeparator)"
- :start-placeholder="$t(element.options.attrs.startPlaceholder)"
- :end-placeholder="$t(element.options.attrs.endPlaceholder)"
- :placeholder="$t(element.options.attrs.placeholder)"
+ :start-placeholder="showRequiredTips ? $t('panel.required_tips') : $t(element.options.attrs.startPlaceholder)"
+ :end-placeholder="showRequiredTips ? $t('panel.required_tips') : $t(element.options.attrs.endPlaceholder)"
+ :placeholder="showRequiredTips ? $t('panel.required_tips') : $t(element.options.attrs.placeholder)"
:append-to-body="inScreen"
value-format="timestamp"
:format="labelFormat"
@@ -219,6 +220,9 @@ export default {
}
return null
},
+ showRequiredTips() {
+ return this.inDraw && this.element.options.attrs.required && (!this.values || this.values.length === 0)
+ },
...mapState([
'canvasStyleData',
'mobileStatus'
@@ -516,7 +520,31 @@ export default {
}
+
diff --git a/core/frontend/src/components/widget/deWidget/DeNumberRange.vue b/core/frontend/src/components/widget/deWidget/DeNumberRange.vue
index bc20b38d30..55414ff536 100644
--- a/core/frontend/src/components/widget/deWidget/DeNumberRange.vue
+++ b/core/frontend/src/components/widget/deWidget/DeNumberRange.vue
@@ -7,7 +7,10 @@
style="width: 100%;"
:rules="rules"
>
-