Merge pull request #425 from dataease/dev

Dev
This commit is contained in:
fit2cloudrd 2021-07-30 10:46:18 +08:00 committed by GitHub
commit e7c7b0ce93
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 2 deletions

View File

@ -5,7 +5,7 @@
<label-normal v-if="chart.type.includes('text')" :chart="chart" class="table-class" /> <label-normal v-if="chart.type.includes('text')" :chart="chart" class="table-class" />
</de-aside-container> </de-aside-container>
<de-main-container> <de-main-container>
<table-normal :chart="chartTable" class="table-class" /> <table-normal :chart="chartTable" :show-summary="false" class="table-class" />
</de-main-container> </de-main-container>
</de-container> </de-container>
</template> </template>

View File

@ -12,7 +12,7 @@
:row-style="getRowStyle" :row-style="getRowStyle"
class="table-class" class="table-class"
:class="chart.id" :class="chart.id"
show-summary :show-summary="showSummary"
:summary-method="summaryMethod" :summary-method="summaryMethod"
> >
<ux-table-column <ux-table-column
@ -48,6 +48,11 @@ export default {
default: function() { default: function() {
return {} return {}
} }
},
showSummary: {
type: Boolean,
required: false,
default: true
} }
}, },
data() { data() {

View File

@ -133,6 +133,13 @@ export default {
this.$warning(this.$t('chart.name_can_not_empty')) this.$warning(this.$t('chart.name_can_not_empty'))
return false return false
} }
debugger
if (this.editPanel.panelInfo.name.length > 50) {
this.$warning(this.$t('commons.char_can_not_more_50'))
return false
}
if (!this.editPanel.panelInfo.panelData && this.editPanel.optType === 'new' && this.inputType === 'copy') { if (!this.editPanel.panelInfo.panelData && this.editPanel.optType === 'new' && this.inputType === 'copy') {
this.$warning(this.$t('chart.template_can_not_empty')) this.$warning(this.$t('chart.template_can_not_empty'))
return false return false