forked from github/dataease
feat: 设置必须绑定数据集字段
This commit is contained in:
parent
5ec60144e8
commit
b87766adce
@ -11,7 +11,7 @@
|
||||
<el-card
|
||||
v-show="showSeason"
|
||||
class="box-card"
|
||||
style="width:322px;padding: 0 3px 20px;margin-top:10px;position:fixed;z-index:9999"
|
||||
style="width:322px !important;padding: 0 3px 20px;margin-top:10px;position:fixed;z-index:9999"
|
||||
>
|
||||
<div slot="header" class="clearfix" style="text-align:center;padding:0">
|
||||
<button
|
||||
|
@ -9,7 +9,7 @@ const leftPanel = {
|
||||
const dialogPanel = {
|
||||
options: {
|
||||
attrs: {
|
||||
placeholder: '请选择年份'
|
||||
placeholder: '请选择季度'
|
||||
},
|
||||
value: ''
|
||||
},
|
||||
|
@ -97,7 +97,7 @@
|
||||
<div style="text-align: end !important;margin: 0 15px !important;">
|
||||
<span slot="footer">
|
||||
<el-button @click="cancelFilter">取 消</el-button>
|
||||
<el-button type="primary" @click="sureFilter">确 定</el-button>
|
||||
<el-button :disabled="!currentFilterCom.options.attrs.fieldId" type="primary" @click="sureFilter">确 定</el-button>
|
||||
</span>
|
||||
</div>
|
||||
</el-dialog>
|
||||
@ -342,6 +342,7 @@ export default {
|
||||
},
|
||||
reFreshComponent(component) {
|
||||
this.currentFilterCom = component
|
||||
this.$forceUpdate()
|
||||
},
|
||||
eidtDialog() {
|
||||
const serviceName = this.curComponent.serviceName
|
||||
|
@ -249,6 +249,9 @@ export default {
|
||||
this.componentInfo.options.attrs.dragItems = values
|
||||
this.$emit('re-fresh-component', this.componentInfo)
|
||||
}
|
||||
} else if (this.componentInfo && this.componentInfo.options.attrs.fieldId) {
|
||||
this.componentInfo.options.attrs.fieldId = null
|
||||
this.$emit('re-fresh-component', this.componentInfo)
|
||||
}
|
||||
}
|
||||
},
|
||||
|
@ -45,7 +45,7 @@ export default {
|
||||
'时间过滤组件': [
|
||||
'timeYearWidget',
|
||||
'timeMonthWidget',
|
||||
'timeQuarterWidget',
|
||||
// 'timeQuarterWidget',
|
||||
'timeDateWidget',
|
||||
'timeDateRangeWidget'
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user