diff --git a/frontend/src/api/embedded.ts b/frontend/src/api/embedded.ts index 20803106..05ca09a8 100644 --- a/frontend/src/api/embedded.ts +++ b/frontend/src/api/embedded.ts @@ -14,6 +14,6 @@ export const embeddedApi = { }), updateEmbedded: (data: any) => request.put('/system/embedded', data), addEmbedded: (data: any) => request.post('/system/embedded', data), - deleteEmbedded: (data: any) => request.delete('/system/embedded', data), + deleteEmbedded: (params: any) => request.delete('/system/embedded', { data: params }), getOne: (id: any) => request.get(`/system/embedded/${id}`), } diff --git a/frontend/src/views/embedded/assistant.vue b/frontend/src/views/embedded/AssistantPreview.vue similarity index 100% rename from frontend/src/views/embedded/assistant.vue rename to frontend/src/views/embedded/AssistantPreview.vue diff --git a/frontend/src/views/system/appearance/LoginPreview.vue b/frontend/src/views/system/appearance/LoginPreview.vue index 23a82927..a34746c0 100644 --- a/frontend/src/views/system/appearance/LoginPreview.vue +++ b/frontend/src/views/system/appearance/LoginPreview.vue @@ -232,7 +232,7 @@ onMounted(() => { } .login-container { - height: calc(100% - 24px); + height: calc(100% - 22px); width: 100%; display: flex; .left-img { diff --git a/frontend/src/views/system/appearance/index.vue b/frontend/src/views/system/appearance/index.vue index 0bed44ec..18e8201e 100644 --- a/frontend/src/views/system/appearance/index.vue +++ b/frontend/src/views/system/appearance/index.vue @@ -809,6 +809,8 @@ onUnmounted(() => { .navigate-preview { height: calc(100% - 28px); background-color: #fff; + border-radius: 6px; + overflow: hidden; .navigate-head { width: 240px; diff --git a/frontend/src/views/system/embedded/Page.vue b/frontend/src/views/system/embedded/Page.vue index 0387f951..a1252bbc 100644 --- a/frontend/src/views/system/embedded/Page.vue +++ b/frontend/src/views/system/embedded/Page.vue @@ -22,6 +22,15 @@ defineProps({ }, }) +interface Form { + id?: string | null + name: string | null + domain: string | null + type: number + configuration?: string | null + description?: string | null +} + const emits = defineEmits(['btnSelectChange']) const { t } = useI18n() const multipleSelectionAll = ref([]) @@ -45,6 +54,19 @@ const pageInfo = reactive({ total: 0, }) +const pwd = '**********' + +const dialogTitle = ref('') +const defaultForm = { + id: null, + name: null, + domain: null, + type: 4, + // configuration: null, + // description: null, +} +const pageForm = ref
(cloneDeep(defaultForm)) + const cancelDelete = () => { handleToggleRowSelection(false) multipleSelectionAll.value = [] @@ -54,7 +76,7 @@ const cancelDelete = () => { const deleteBatchUser = () => { ElMessageBox.confirm(t('embedded.delete_10_apps', { msg: multipleSelectionAll.value.length }), { confirmButtonType: 'danger', - confirmButtonText: t('dashboard.delete_success'), + confirmButtonText: t('dashboard.delete'), cancelButtonText: t('common.cancel'), customClass: 'confirm-no_icon', autofocus: false, @@ -72,7 +94,7 @@ const deleteBatchUser = () => { const deleteHandler = (row: any) => { ElMessageBox.confirm(t('embedded.delete', { msg: row.name }), { confirmButtonType: 'danger', - confirmButtonText: t('dashboard.delete_success'), + confirmButtonText: t('dashboard.delete'), cancelButtonText: t('common.cancel'), customClass: 'confirm-no_icon', autofocus: false, @@ -187,30 +209,22 @@ const rules = { const saveHandler = () => { termFormRef.value.validate((res: any) => { if (res) { - embeddedApi.addEmbedded(unref(pageForm)).then(() => { + const obj = unref(pageForm) + if (obj.id === '') { + delete obj.id + } + embeddedApi.addEmbedded(obj).then(() => { ElMessage({ type: 'success', message: t('common.save_success'), }) search() - dialogFormVisible.value = false + onFormClose() }) } }) } -const pwd = '**********' - -const dialogTitle = ref('') -const defaultForm = { - id: null, - name: null, - domain: null, - type: 0, - configuration: null, - description: null, -} -const pageForm = ref(cloneDeep(defaultForm)) const editHandler = (row: any) => { pageForm.value.id = null if (row) { @@ -505,7 +519,7 @@ const copyCode = (row: any, key: any = 'app_secret') => { {{ $t('datasource.select_all') }} - + {{ $t('user.selected_2_items', { msg: multipleSelectionAll.length }) diff --git a/frontend/src/views/system/embedded/SetUi.vue b/frontend/src/views/system/embedded/SetUi.vue index 35b72beb..97997753 100644 --- a/frontend/src/views/system/embedded/SetUi.vue +++ b/frontend/src/views/system/embedded/SetUi.vue @@ -1,5 +1,5 @@