public/dataease
1
0
Fork 0
mirror of https://github.com/dataease/dataease.git synced 2026-05-16 14:31:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
jianneng-fit2cloud
2025-01-03 09:48:34 +08:00
parent fd25b000d1 bd2a603811
commit cee455d20d
8 changed files with 33 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/core-backend/src/main/java/io/dataease/commons/utils/SqlparserUtils.java
View File

@@ -680,7 +680,7 @@ public class SqlparserUtils {
}
if (variable.getSysVariableDto().getType().equalsIgnoreCase("text")) {
for (SysVariableValueDto sysVariableValueDto : variable.getValueList()) {
if (sysVariableValueDto.getId().equals(variable.getVariableValueId())) {
if (variable.getVariableValueIds().contains(sysVariableValueDto.getId().toString())) {
value = sysVariableValueDto.getValue();
break;
}
@@ -707,8 +707,9 @@ public class SqlparserUtils {
continue;
}
if (variable.getSysVariableDto().getType().equalsIgnoreCase("text")) {
for (SysVariableValueDto sysVariableValueDto : variable.getValueList()) {
if (sysVariableValueDto.getSysVariableId().equals(variable.getVariableId())) {
if (variable.getVariableValueIds().contains(sysVariableValueDto.getId().toString())) {
values.add(sysVariableValueDto.getValue());
}
}

2
core/core-frontend/src/locales/en.ts
View File

@@ -587,6 +587,8 @@ export default {
edit_embedded_application: 'Edit an embedded application',
application_name: 'Application name',
cross_domain_settings: 'Cross-domain settings',
embedded_del_confirm: 'Are you sure you want to delete {0} applications?',
embedded_search_placeholder: 'Search by application name, APP ID, or cross-domain settings',
embedded_secret_len_change:
'The key length has changed. The key will be reset soon. Are you sure?',
embedded_management: 'Embedded management',

5
core/core-frontend/src/views/share/share/ShareHandler.vue
View File

@@ -73,7 +73,7 @@
</el-icon>
</el-tooltip>
</div>
<div class="input-suffix-btn done" v-if="linkCustom" @click="finishEditUuid">
<div class="input-suffix-btn done-finish" v-if="linkCustom" @click="finishEditUuid">
<el-tooltip
class="item"
effect="dark"
@@ -136,6 +136,7 @@
</el-checkbox>
<div class="auto-pwd-container" v-if="passwdEnable">
<el-checkbox
v-show="false"
:disabled="!shareEnable"
v-model="state.detailInfo.autoPwd"
@change="autoEnableSwitcher"
@@ -798,7 +799,7 @@ onMounted(() => {
background-color: #bbbfc4;
margin-right: 4px;
}
.done {
.done-finish {
color: #3370ff;
&:hover {
background-color: #3370ff1a !important;

1
core/core-frontend/src/views/share/share/ShareTicket.vue
View File

@@ -423,6 +423,7 @@ onMounted(() => {
:deep(.ed-table__header) {
background-color: #f5f6f7;
border-bottom: 1px solid #d5d7d8;
thead {
tr {
th {

9
core/core-frontend/src/views/share/share/ShareVisualHead.vue
View File

@@ -75,7 +75,11 @@
</el-icon>
</el-tooltip>
</div>
<div class="input-suffix-btn done" v-if="linkCustom" @click.stop="finishEditUuid">
<div
class="input-suffix-btn done-finish"
v-if="linkCustom"
@click.stop="finishEditUuid"
>
<el-tooltip class="item" effect="dark" :content="t('commons.save')" placement="top">
<el-icon style="cursor: pointer">
<Icon><icon_done_outlined class="svg-icon" /></Icon>
@@ -133,6 +137,7 @@
</el-checkbox>
<div class="auto-pwd-container" v-if="passwdEnable">
<el-checkbox
v-show="false"
:disabled="!shareEnable"
v-model="state.detailInfo.autoPwd"
@change="autoEnableSwitcher"
@@ -815,7 +820,7 @@ defineExpose({
background-color: #bbbfc4;
margin-right: 4px;
}
.done {
.done-finish {
color: #3370ff;
&:hover {
background-color: #3370ff1a !important;

8
core/core-frontend/src/views/share/share/TicketEdit.vue
View File

@@ -273,7 +273,7 @@ defineExpose({
/>
</el-form-item>
<el-form-item prop="args" :label="t('dataset.param')">
<el-form-item prop="args" :label="t('dataset.param')" class="last-form-item">
<template v-slot:label>
<div class="ticket-form-info-tips">
<span class="custom-form-item__label">{{ t('dataset.param') }}</span>
@@ -360,7 +360,10 @@ defineExpose({
</style>
<style scoped lang="less">
.ticket-param-drawer {
.ed-form-item {
.last-form-item {
margin-bottom: 8px;
}
.ed-form-item:not(.last-form-item) {
margin-bottom: 16px;
}
.is-error {
@@ -376,6 +379,7 @@ defineExpose({
line-height: 32px;
column-gap: 8px;
.arg-del-btn {
color: #646a73;
padding: 4px;
width: 24px;
height: 24px;

4
core/core-frontend/src/views/system/parameter/map/Geometry.vue
View File

@@ -203,7 +203,9 @@
<geometry-edit ref="editor" @saved="loadTreeData(false)" />
<el-dialog
v-model="customAreaDialog"
:title="`${editedCustomArea.id ? t('common.edit') : t('common.add') + t('system.custom_area')}`"
:title="`${editedCustomArea.id ? t('common.edit') : t('common.add')} ${t(
'system.custom_area'
)}`"
width="500"
destroy-on-close
>

9
core/core-frontend/src/views/system/parameter/map/MapSetting.vue
View File

@@ -9,7 +9,7 @@
:class="{ active: activeIndex === item.id }"
@click="selectHandler(index)"
>
<span>{{ t(item.name) }}</span>
<span :title="t(item.name)">{{ t(item.name) }}</span>
</div>
</div>
</el-aside>
@@ -65,6 +65,13 @@ const selectHandler = (index: number) => {
&:hover {
background: #1f232926;
}
span {
display: block;
width: 150px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
}
.active {
background: var(--ed-color-primary-1a, #3370ff1a);