Skip to content

Commit b50a410

Browse files
committed
fix: bug fix
1 parent 4abf176 commit b50a410

File tree

4 files changed

+52
-27
lines changed

4 files changed

+52
-27
lines changed

frontend/src/i18n/en.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,8 @@
435435
"code_to_embed": "Copy the following code to embed",
436436
"floating_window_mode": "Floating window mode",
437437
"copy_successful": "Copy successful",
438-
"copy_failed": "Copy failed"
438+
"copy_failed": "Copy failed",
439+
"open_the_query": "Public data sources allow all users to open the query; private data sources allow logged-in users to open the query"
439440
},
440441
"chat": {
441442
"type": "Chart Type",

frontend/src/i18n/zh-CN.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,8 @@
447447
"code_to_embed": "复制以下代码进行嵌入",
448448
"floating_window_mode": "浮窗模式",
449449
"copy_successful": "复制成功",
450-
"copy_failed": "复制失败"
450+
"copy_failed": "复制失败",
451+
"open_the_query": "公共的数据源,允许所有用户开启问数;私有数据源,登录状态的用户可以开启问数"
451452
},
452453
"chat": {
453454
"type": "图表类型",

frontend/src/views/system/embedded/DsCard.vue

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,6 @@ const handlePublic = () => {
174174
175175
.methods {
176176
align-items: center;
177-
display: none;
178177
179178
.more {
180179
position: relative;

frontend/src/views/system/embedded/index.vue

Lines changed: 48 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ const dsFormRef = ref()
2828
const urlFormRef = ref()
2929
const dialogTitle = ref('')
3030
const embeddedList = ref<any[]>([])
31-
const systemCredentials = ['localStorage', 'cookie', 'sessionStorage']
31+
const systemCredentials = ['localStorage', 'custom', 'cookie', 'sessionStorage']
3232
const credentials = ['header', 'cookie', 'param']
3333
const workspaces = ref<any[]>([])
3434
@@ -133,6 +133,21 @@ const beforeClose = () => {
133133
ruleConfigvVisible.value = false
134134
activeStep.value = 0
135135
isCreate.value = false
136+
Object.assign(currentEmbedded, cloneDeep(defaultEmbedded))
137+
Object.assign(dsForm, cloneDeep(defaultForm))
138+
Object.assign(urlForm, cloneDeep(defaultUrlForm))
139+
140+
if (embeddedFormRef.value) {
141+
embeddedFormRef.value.clearValidate()
142+
}
143+
144+
if (dsFormRef.value) {
145+
dsFormRef.value.clearValidate()
146+
}
147+
148+
if (urlFormRef.value) {
149+
urlFormRef.value.clearValidate()
150+
}
136151
}
137152
138153
const handleActive = (row: any) => {
@@ -210,14 +225,6 @@ const rules = {
210225
trigger: 'blur',
211226
},
212227
],
213-
description: [
214-
{
215-
required: true,
216-
message:
217-
t('datasource.please_enter') + t('common.empty') + t('embedded.application_description'),
218-
trigger: 'blur',
219-
},
220-
],
221228
domain: [
222229
{
223230
required: true,
@@ -287,14 +294,6 @@ const urlRules = {
287294
trigger: 'blur',
288295
},
289296
],
290-
291-
target_val: [
292-
{
293-
required: true,
294-
message: t('datasource.please_enter') + t('common.empty') + t('embedded.target_credential'),
295-
trigger: 'blur',
296-
},
297-
],
298297
}
299298
300299
const preview = () => {
@@ -380,6 +379,7 @@ const copyCode = () => {
380379
style="width: 240px; margin-right: 12px"
381380
:placeholder="$t('dashboard.search')"
382381
@keyup.enter="handleSearch"
382+
clearable
383383
@blur="handleSearch"
384384
>
385385
<template #prefix>
@@ -526,6 +526,8 @@ const copyCode = () => {
526526
v-model="currentEmbedded.description"
527527
:rows="3"
528528
type="textarea"
529+
maxlength="200"
530+
show-word-limit
529531
:placeholder="$t('datasource.please_enter')"
530532
autocomplete="off"
531533
/>
@@ -534,11 +536,7 @@ const copyCode = () => {
534536
<el-form-item prop="domain" :label="t('embedded.cross_domain_settings')">
535537
<el-input
536538
v-model="currentEmbedded.domain"
537-
:placeholder="
538-
$t('datasource.please_enter') +
539-
$t('common.empty') +
540-
$t('embedded.third_party_address')
541-
"
539+
:placeholder="$t('embedded.third_party_address')"
542540
autocomplete="off"
543541
/>
544542
</el-form-item>
@@ -645,7 +643,7 @@ const copyCode = () => {
645643
class="form-content_error"
646644
@submit.prevent
647645
>
648-
<el-form-item prop="workspace" :label="t('user.workspace')">
646+
<el-form-item prop="oid" :label="t('user.workspace')">
649647
<el-select
650648
v-model="dsForm.oid"
651649
filterable
@@ -662,7 +660,13 @@ const copyCode = () => {
662660
</el-select>
663661
</el-form-item>
664662

665-
<el-form-item prop="private_list" :label="t('embedded.set_data_source')">
663+
<el-form-item class="private-list_form" prop="private_list">
664+
<template #label>
665+
<div class="private-list">
666+
{{ t('embedded.set_data_source') }}
667+
<span class="open-the_query">{{ $t('embedded.open_the_query') }} </span>
668+
</div>
669+
</template>
666670
<div class="card-ds_content">
667671
<DsCard
668672
v-for="ele in dsListOptions"
@@ -783,11 +787,31 @@ const copyCode = () => {
783787
margin-bottom: 16px;
784788
}
785789
790+
.private-list_form {
791+
.ed-form-item__label:after {
792+
display: none;
793+
}
794+
}
795+
796+
.private-list {
797+
display: flex;
798+
align-items: center;
799+
.open-the_query {
800+
color: #ff8800;
801+
&::before {
802+
color: var(--ed-color-danger);
803+
content: '*';
804+
margin-left: 2px;
805+
}
806+
}
807+
}
808+
786809
.card-ds_content {
787810
width: 100%;
788811
display: flex;
789812
align-items: center;
790813
flex-wrap: wrap;
814+
padding-bottom: 50px;
791815
792816
.card {
793817
width: 392px;

0 commit comments

Comments
 (0)