github/dataease
github/dataease
3
0
Fork 1
mirror of https://github.com/dataease/dataease.git synced 2025-02-24 19:42:56 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #10904 from dataease/pr@dev-v2_st

Browse Source 
fix(数据源): API数据源接口参数抽屉标题不正确
This commit is contained in:
dataeaseShu 2024-07-11 16:38:03 +08:00 committed by GitHub
commit fa4ab59031
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 33 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
core/core-frontend/src/views/visualized/data/dataset/form/AddSql.vue
View File

@ -455,9 +455,11 @@ const mousedownDrag = () => {
<div class="table-list-top"> <div class="table-list-top">
<p class="select-ds"> <p class="select-ds">
当前数据源 当前数据源
<el-icon class="left-outlined" @click="showLeft = false"> <span class="left-outlined">
<Icon name="group-3400"></Icon> <el-icon style="color: #1f2329" @click="showLeft = false">
</el-icon> <Icon name="icon_left_outlined" />
</el-icon>
</span>
</p> </p>
<el-tree-select <el-tree-select
:check-strictly="false" :check-strictly="false"
@ -928,10 +930,19 @@ const mousedownDrag = () => {
.left-outlined { .left-outlined {
position: absolute; position: absolute;
font-size: 36px; font-size: 12px;
right: -30px; right: -30px;
top: -5px; top: -5px;
z-index: 1; height: 24px;
border: 1px solid #dee0e3;
width: 24px;
border-radius: 50%;
display: flex;
align-items: center;
justify-content: center;
background: #fff;
box-shadow: 0px 5px 10px 0px #1f23291a;
z-index: 10;
} }
} }

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

@ -1257,9 +1257,11 @@ const getDsIconName = data => {
<div class="table-list-top"> <div class="table-list-top">
<p class="select-ds"> <p class="select-ds">
选择数据源 选择数据源
<el-icon class="left-outlined" @click="showLeft = false"> <span class="left-outlined">
<Icon name="group-3400"></Icon> <el-icon style="color: #1f2329" @click="showLeft = false">
</el-icon> <Icon name="icon_left_outlined" />
</el-icon>
</span>
</p> </p>
<el-tree-select <el-tree-select
:check-strictly="false" :check-strictly="false"
@ -2111,10 +2113,19 @@ const getDsIconName = data => {
.left-outlined { .left-outlined {
position: absolute; position: absolute;
font-size: 36px; font-size: 12px;
right: -30px; right: -30px;
top: -5px; top: -5px;
z-index: 5; height: 24px;
border: 1px solid #dee0e3;
width: 24px;
border-radius: 50%;
display: flex;
align-items: center;
justify-content: center;
background: #fff;
box-shadow: 0px 5px 10px 0px #1f23291a;
z-index: 10;
} }
} }

3
core/core-frontend/src/views/visualized/data/datasource/form/ApiHttpRequestDraw.vue
View File

@ -91,7 +91,6 @@ let apiItem = reactive<ApiItem>({
serialNumber: -1 serialNumber: -1
}) })
let errMsg = [] let errMsg = []
const api_table_title = ref('datasource.data_table')
const apiItemForm = ref() const apiItemForm = ref()
const showEmpty = ref(false) const showEmpty = ref(false)
const edit_api_item = ref(false) const edit_api_item = ref(false)
@ -443,7 +442,7 @@ defineExpose({
<template> <template>
<el-drawer <el-drawer
:title="t(api_table_title)" :title="activeName === 'table' ? t('datasource.data_table') : '接口参数'"
v-model="edit_api_item" v-model="edit_api_item"
custom-class="api-datasource-drawer" custom-class="api-datasource-drawer"
size="840px" size="840px"