Merge pull request #7084 from dataease/pr@dev@fix_chart_detail
fix(视图): 表格详情使用原有样式,其他视图统一样式,不使用斑马纹。
This commit is contained in:
commit
380d89086b
@ -13,7 +13,7 @@
|
||||
:title="$t('user.change_password')"
|
||||
:show-close="false"
|
||||
>
|
||||
<PasswordUpdateForm :old-pwd=defaultPwd />
|
||||
<PasswordUpdateForm :old-pwd="defaultPwd" />
|
||||
</el-dialog>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@ -1025,10 +1025,13 @@ export default {
|
||||
const tableChart = deepCopy(this.chart)
|
||||
tableChart.customAttr = JSON.parse(this.chart.customAttr)
|
||||
tableChart.customStyle = JSON.parse(this.chart.customStyle)
|
||||
if (!this.chart.type?.includes('table')) {
|
||||
tableChart.customAttr.color.tableHeaderBgColor = '#f8f8f9'
|
||||
tableChart.customAttr.color.tableItemBgColor = '#ffffff'
|
||||
tableChart.customAttr.color.tableHeaderFontColor = '#7c7e81'
|
||||
tableChart.customAttr.color.tableFontColor = '#7c7e81'
|
||||
tableChart.customAttr.color.enableTableCrossBG = false
|
||||
}
|
||||
tableChart.customAttr.color.tableStripe = true
|
||||
tableChart.customAttr.size.tablePageMode = 'pull'
|
||||
tableChart.customStyle.text.show = false
|
||||
|
||||
@ -14,8 +14,8 @@
|
||||
<span
|
||||
v-if="chart.type"
|
||||
v-show="title_show"
|
||||
:class="titleIsRight"
|
||||
ref="title"
|
||||
:class="titleIsRight"
|
||||
:style="title_class"
|
||||
style="cursor: default;display: block;"
|
||||
>
|
||||
|
||||
@ -606,6 +606,7 @@ export default {
|
||||
this.$set(this.colorForm, 'gradient', this.colorForm.gradient || false)
|
||||
this.colorForm.tableScrollBarColor = this.colorForm.tableScrollBarColor ? this.colorForm.tableScrollBarColor : DEFAULT_COLOR_CASE.tableScrollBarColor
|
||||
this.colorForm.quotaSuffixColor = this.colorForm.quotaSuffixColor ? this.colorForm.quotaSuffixColor : DEFAULT_COLOR_CASE.quotaSuffixColor
|
||||
this.colorForm.tableItemSubBgColor = this.colorForm.tableItemSubBgColor ? this.colorForm.tableItemSubBgColor : DEFAULT_COLOR_CASE.tableItemSubBgColor
|
||||
|
||||
this.colorForm.mapStyle = this.colorForm.mapStyle ? this.colorForm.mapStyle : DEFAULT_COLOR_CASE.mapStyle
|
||||
this.colorForm.mapLineGradient = this.colorForm.mapLineGradient ? this.colorForm.mapLineGradient : DEFAULT_COLOR_CASE.mapLineGradient
|
||||
|
||||
@ -68,8 +68,9 @@
|
||||
@node-click="handleNodeClick"
|
||||
@check-change="handleCheckChange"
|
||||
>
|
||||
<span class="custom-tree-node"
|
||||
<span
|
||||
slot-scope="{ node, data}"
|
||||
class="custom-tree-node"
|
||||
:title="data.excelLabel"
|
||||
>
|
||||
<span class="label">{{ data.excelLabel }}</span>
|
||||
@ -91,7 +92,8 @@
|
||||
v-show="!data.sheet"
|
||||
type="text"
|
||||
size="mini"
|
||||
@click="() => remove(node, data)">
|
||||
@click="() => remove(node, data)"
|
||||
>
|
||||
{{ $t('dataset.delete') }}
|
||||
</el-button>
|
||||
</span>
|
||||
@ -475,10 +477,10 @@ export default {
|
||||
}
|
||||
},
|
||||
remove(node, data) {
|
||||
const parent = node.parent;
|
||||
const children = parent.data.children || parent.data;
|
||||
const index = children.findIndex(d => d.id === data.id);
|
||||
children.splice(index, 1);
|
||||
const parent = node.parent
|
||||
const children = parent.data.children || parent.data
|
||||
const index = children.findIndex(d => d.id === data.id)
|
||||
children.splice(index, 1)
|
||||
},
|
||||
save() {
|
||||
var validate = true
|
||||
|
||||
@ -1164,8 +1164,8 @@ export default {
|
||||
return
|
||||
}
|
||||
let isNumber = false
|
||||
var reg = /^\d+$/;
|
||||
isNumber = reg.test(value);
|
||||
var reg = /^\d+$/
|
||||
isNumber = reg.test(value)
|
||||
if (!isNumber) {
|
||||
callback(new Error(i18n.t('datasource.please_input_query_timeout')))
|
||||
return
|
||||
|
||||
Loading…
Reference in New Issue
Block a user