Skip to content

Commit 2d181c4

Browse files
committed
fix(System-Appearance Settings): Optimize rounded corners to 6px
1 parent 0e1e1e7 commit 2d181c4

File tree

7 files changed

+38
-23
lines changed

7 files changed

+38
-23
lines changed

frontend/src/api/embedded.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ export const embeddedApi = {
1414
}),
1515
updateEmbedded: (data: any) => request.put('/system/embedded', data),
1616
addEmbedded: (data: any) => request.post('/system/embedded', data),
17-
deleteEmbedded: (data: any) => request.delete('/system/embedded', data),
17+
deleteEmbedded: (params: any) => request.delete('/system/embedded', { data: params }),
1818
getOne: (id: any) => request.get(`/system/embedded/${id}`),
1919
}
File renamed without changes.

frontend/src/views/system/appearance/LoginPreview.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ onMounted(() => {
232232
}
233233
234234
.login-container {
235-
height: calc(100% - 24px);
235+
height: calc(100% - 22px);
236236
width: 100%;
237237
display: flex;
238238
.left-img {

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -809,6 +809,8 @@ onUnmounted(() => {
809809
.navigate-preview {
810810
height: calc(100% - 28px);
811811
background-color: #fff;
812+
border-radius: 6px;
813+
overflow: hidden;
812814
813815
.navigate-head {
814816
width: 240px;

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

Lines changed: 31 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,15 @@ defineProps({
2222
},
2323
})
2424
25+
interface Form {
26+
id?: string | null
27+
name: string | null
28+
domain: string | null
29+
type: number
30+
configuration?: string | null
31+
description?: string | null
32+
}
33+
2534
const emits = defineEmits(['btnSelectChange'])
2635
const { t } = useI18n()
2736
const multipleSelectionAll = ref<any[]>([])
@@ -45,6 +54,19 @@ const pageInfo = reactive({
4554
total: 0,
4655
})
4756
57+
const pwd = '**********'
58+
59+
const dialogTitle = ref('')
60+
const defaultForm = {
61+
id: null,
62+
name: null,
63+
domain: null,
64+
type: 4,
65+
// configuration: null,
66+
// description: null,
67+
}
68+
const pageForm = ref<Form>(cloneDeep(defaultForm))
69+
4870
const cancelDelete = () => {
4971
handleToggleRowSelection(false)
5072
multipleSelectionAll.value = []
@@ -54,7 +76,7 @@ const cancelDelete = () => {
5476
const deleteBatchUser = () => {
5577
ElMessageBox.confirm(t('embedded.delete_10_apps', { msg: multipleSelectionAll.value.length }), {
5678
confirmButtonType: 'danger',
57-
confirmButtonText: t('dashboard.delete_success'),
79+
confirmButtonText: t('dashboard.delete'),
5880
cancelButtonText: t('common.cancel'),
5981
customClass: 'confirm-no_icon',
6082
autofocus: false,
@@ -72,7 +94,7 @@ const deleteBatchUser = () => {
7294
const deleteHandler = (row: any) => {
7395
ElMessageBox.confirm(t('embedded.delete', { msg: row.name }), {
7496
confirmButtonType: 'danger',
75-
confirmButtonText: t('dashboard.delete_success'),
97+
confirmButtonText: t('dashboard.delete'),
7698
cancelButtonText: t('common.cancel'),
7799
customClass: 'confirm-no_icon',
78100
autofocus: false,
@@ -187,30 +209,22 @@ const rules = {
187209
const saveHandler = () => {
188210
termFormRef.value.validate((res: any) => {
189211
if (res) {
190-
embeddedApi.addEmbedded(unref(pageForm)).then(() => {
212+
const obj = unref(pageForm)
213+
if (obj.id === '') {
214+
delete obj.id
215+
}
216+
embeddedApi.addEmbedded(obj).then(() => {
191217
ElMessage({
192218
type: 'success',
193219
message: t('common.save_success'),
194220
})
195221
search()
196-
dialogFormVisible.value = false
222+
onFormClose()
197223
})
198224
}
199225
})
200226
}
201227
202-
const pwd = '**********'
203-
204-
const dialogTitle = ref('')
205-
const defaultForm = {
206-
id: null,
207-
name: null,
208-
domain: null,
209-
type: 0,
210-
configuration: null,
211-
description: null,
212-
}
213-
const pageForm = ref(cloneDeep(defaultForm))
214228
const editHandler = (row: any) => {
215229
pageForm.value.id = null
216230
if (row) {
@@ -505,7 +519,7 @@ const copyCode = (row: any, key: any = 'app_secret') => {
505519
{{ $t('datasource.select_all') }}
506520
</el-checkbox>
507521

508-
<button class="danger-button" @click="deleteBatchUser">{{ $t('workspace.remove') }}</button>
522+
<button class="danger-button" @click="deleteBatchUser">{{ $t('dashboard.delete') }}</button>
509523

510524
<span class="selected">{{
511525
$t('user.selected_2_items', { msg: multipleSelectionAll.length })

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<script lang="ts" setup>
2-
import Assistant from '@/views/embedded/assistant.vue'
2+
import Assistant from '@/views/embedded/AssistantPreview.vue'
33
import { ref, unref, reactive, nextTick } from 'vue'
44
import { type UploadUserFile, ElMessage } from 'element-plus-secondary'
55
import { useI18n } from 'vue-i18n'

frontend/src/views/system/user/User.vue

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
</div>
4040
</div>
4141
<div
42-
class="sqlbot-table"
42+
class="sqlbot-table_user"
4343
:class="[
4444
state.filterTexts.length && 'is-filter',
4545
multipleSelectionAll.length && 'show-pagination_height',
@@ -854,8 +854,7 @@ onMounted(() => {
854854
line-height: 28px;
855855
}
856856
}
857-
.sqlbot-table {
858-
border-radius: 6px;
857+
.sqlbot-table_user {
859858
width: 100%;
860859
max-height: calc(100vh - 150px);
861860
overflow-y: auto;

0 commit comments

Comments
 (0)