center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
wangjiahao 2022-08-03 18:34:35 +08:00
commit a61253ec4e
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
frontend/src/components/widget/DeWidget/customInput.js
View File

@ -51,7 +51,11 @@ export default {
const newValue = { brColor, wordColor, innerBgColor } const newValue = { brColor, wordColor, innerBgColor }
const cssVar = this.typeTransform() const cssVar = this.typeTransform()
this.styleAttrs.forEach((ele, index) => { this.styleAttrs.forEach((ele, index) => {
document.documentElement.style.setProperty(cssVar[index], !isPanelDe ? '' : newValue[ele]) if (newValue[ele]) {
document.documentElement.style.setProperty(cssVar[index], !isPanelDe ? '' : newValue[ele])
} else {
document.documentElement.style.removeProperty(cssVar[index])
}
}) })
}, },
} }

9
frontend/src/views/system/datasource/DsConfiguration.vue
View File

@ -497,7 +497,7 @@
row-key="jsonPath" row-key="jsonPath"
ref="apiItemTable" ref="apiItemTable"
> >
<el-table-column prop="originName" :label="$t('dataset.parse_filed')" width="255"> <el-table-column prop="originName" :label="$t('dataset.parse_filed')" :show-overflow-tooltip="true" width="255">
<template slot-scope="scope"> <template slot-scope="scope">
<el-checkbox <el-checkbox
v-model="scope.row.checked" v-model="scope.row.checked"
@ -1316,5 +1316,12 @@ export default {
background: #FFFFFF; background: #FFFFFF;
box-shadow: 0px -1px 4px rgba(0, 0, 0, 0.05); box-shadow: 0px -1px 4px rgba(0, 0, 0, 0.05);
} }
.el-checkbox__label{
width:150px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
} }
</style> </style>