Merge pull request #7084 from dataease/pr@dev@fix_chart_detail

fix(视图): 表格详情使用原有样式,其他视图统一样式,不使用斑马纹。
This commit is contained in:
wisonic-s 2023-12-08 14:40:33 +08:00 committed by GitHub
commit 380d89086b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 58 additions and 52 deletions

View File

@ -13,7 +13,7 @@
:title="$t('user.change_password')"
:show-close="false"
>
<PasswordUpdateForm :old-pwd=defaultPwd />
<PasswordUpdateForm :old-pwd="defaultPwd" />
</el-dialog>
</div>
</template>

View File

@ -145,7 +145,7 @@
:target="curComponent.hyperlinks.openMode "
:href="curComponent.hyperlinks.content "
>
<i class="icon iconfont icon-com-jump"/>
<i class="icon iconfont icon-com-jump" />
</a>
</span>
@ -193,7 +193,7 @@
</template>
<script>
import {mapState} from 'vuex'
import { mapState } from 'vuex'
import bus from '@/utils/bus'
import SettingMenu from '@/components/canvas/components/editor/SettingMenu'
import LinkageField from '@/components/canvas/components/editor/LinkageField'
@ -202,13 +202,13 @@ import FieldsList from '@/components/canvas/components/editor/FieldsList'
import LinkJumpSet from '@/views/panel/linkJumpSet'
import Background from '@/views/background/index'
import MapLayerController from '@/views/chart/components/map/MapLayerController'
import {uploadFileResult} from '@/api/staticResource/staticResource'
import { uploadFileResult } from '@/api/staticResource/staticResource'
import eventBus from '@/components/canvas/utils/eventBus'
import {hasDataPermission} from '@/utils/permission'
import {exportExcelDownload} from '@/components/canvas/utils/utils'
import { hasDataPermission } from '@/utils/permission'
import { exportExcelDownload } from '@/components/canvas/utils/utils'
export default {
components: {Background, LinkJumpSet, FieldsList, SettingMenu, LinkageField, MapLayerController},
components: { Background, LinkJumpSet, FieldsList, SettingMenu, LinkageField, MapLayerController },
props: {
canvasId: {
@ -467,7 +467,7 @@ export default {
}
},
showViewDetails(openType = 'details') {
this.$emit('showViewDetails', {openType: openType})
this.$emit('showViewDetails', { openType: openType })
},
exportExcelDownload() {
exportExcelDownload(this.chart)

View File

@ -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

View File

@ -495,7 +495,7 @@ export default {
bus.$off('add-new-tab', this.addNewTab)
},
methods: {
setTabLayout: _.debounce(function () {
setTabLayout: _.debounce(function() {
this.headClassScroll = !!this.$refs?.deTabsConstom?.$refs?.tabsConstom?.$refs?.nav?.scrollable ? 'head-class-scroll' : ''
}, 100),
calcTabLength() {

View File

@ -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;"
>

View File

@ -605,7 +605,8 @@ export default {
this.colorForm.tableHeaderFontColor = this.colorForm.tableHeaderFontColor ? this.colorForm.tableHeaderFontColor : this.colorForm.tableFontColor
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.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

View File

@ -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

View File

@ -1164,13 +1164,13 @@ 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
}
if(value <= 0 || value > 300){
if (value <= 0 || value > 300) {
callback(new Error(i18n.t('datasource.please_input_query_timeout')))
return
}