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

Merge pull request #6668 from dataease/pr@dev-v2_dzz

Browse Source 
Pr@dev v2 dzz
This commit is contained in:
dataeaseShu 2023-11-13 17:45:14 +08:00 committed by GitHub
commit 3786aec205
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
View File

@ -364,14 +364,12 @@ const init = (queryId: string) => {
const datasetMapKeyList = Object.keys(datasetMap)
getSqlParams([
...new Set(
datasetFieldList.value
.map(ele => ele.tableId)
.filter(ele => !datasetMapKeyList.includes(ele) && ele)
)
]).then(res => {
parameters.value = res || []
nextTick(() => {
getSqlParams([
...new Set(datasetFieldList.value.map(ele => ele.tableId).filter(ele => !!ele))
]).then(res => {
parameters.value = res || []
})
})
if (datasetFieldIdList.every(ele => datasetMapKeyList.includes(ele))) {

4
core/core-frontend/src/views/visualized/data/dataset/form/index.vue
View File

@ -2130,7 +2130,7 @@ const getDsIconName = data => {
}
.custom-tree-node {
flex: 1;
width: calc(100% - 32px);
display: flex;
align-items: center;
padding-right: 8px;
@ -2138,7 +2138,7 @@ const getDsIconName = data => {
.label-tooltip {
margin-left: 5.33px;
width: 60%;
width: 70%;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;