diff --git a/ui/src/views/application-overview/component/DisplaySettingDialog.vue b/ui/src/views/application-overview/component/DisplaySettingDialog.vue index a98d56912..9f35c6ff6 100644 --- a/ui/src/views/application-overview/component/DisplaySettingDialog.vue +++ b/ui/src/views/application-overview/component/DisplaySettingDialog.vue @@ -8,99 +8,15 @@ - - - - - - - - - - - - {{ - $t('views.applicationOverview.appInfo.EditAvatarDialog.upload') - }} - - - 建议尺寸 32*32,支持 JPG、PNG、GIF,大小不超过 10 MB - - - - - - - - - - - - - - {{ - $t('views.applicationOverview.appInfo.EditAvatarDialog.upload') - }} - - - 建议尺寸 32*32,支持 JPG、PNG、GIF,大小不超过 10 MB - - - - - - 恢复默认 - {{ $t('views.applicationOverview.appInfo.LimitDialog.cancelButtonText') }} @@ -116,11 +32,9 @@ import { ref, watch } from 'vue' import { useRoute } from 'vue-router' import type { FormInstance, FormRules, UploadFiles } from 'element-plus' import applicationApi from '@/api/application' -import applicationXpackApi from '@/api/application-xpack' +import { isWorkFlow } from '@/utils/application' import { MsgSuccess, MsgError } from '@/utils/message' import { t } from '@/locales' -import useStore from '@/stores' -const { user } = useStore() const route = useRoute() const { @@ -129,33 +43,13 @@ const { const emit = defineEmits(['refresh']) -const defaultSetting = { - show_source: false, - show_history: true, - draggable: true, - show_guide: true, - avatar: '', - float_icon: '' -} const displayFormRef = ref() const form = ref({ show_source: false }) -const xpackForm = ref({ - show_source: false, - show_history: false, - draggable: false, - show_guide: false, - avatar: '', - float_icon: '' -}) - -const imgUrl = ref({ - avatar: '', - float_icon: '' -}) +const detail = ref(null) const dialogVisible = ref(false) const loading = ref(false) @@ -165,50 +59,12 @@ watch(dialogVisible, (bool) => { form.value = { show_source: false } - imgUrl.value = { - avatar: '', - float_icon: '' - } } }) -function resetForm() { - form.value = { - ...defaultSetting - } - imgUrl.value = { - avatar: '', - float_icon: '' - } -} - -const onChange = (file: any, fileList: UploadFiles, attr: string) => { - //1、判断文件大小是否合法,文件限制不能大于 10 MB - const isLimit = file?.size / 1024 / 1024 < 10 - if (!isLimit) { - // @ts-ignore - MsgError(t('views.applicationOverview.appInfo.EditAvatarDialog.fileSizeExceeded')) - return false - } else { - xpackForm.value[attr] = file.raw - imgUrl.value[attr] = URL.createObjectURL(file.raw) - } -} - -const open = (data: any) => { - if (user.isEnterprise()) { - xpackForm.value.show_source = data.show_source - xpackForm.value.show_history = data.show_history - xpackForm.value.draggable = data.draggable - xpackForm.value.show_guide = data.show_guide - xpackForm.value.avatar = data.avatar - xpackForm.value.float_icon = data.float_icon - imgUrl.value.avatar = data.avatar - imgUrl.value.float_icon = data.float_icon - form.value = xpackForm.value - } else { - form.value.show_source = data.show_source - } +const open = (data: any, content: any) => { + detail.value = content + form.value.show_source = data.show_source dialogVisible.value = true } @@ -217,28 +73,15 @@ const submit = async (formEl: FormInstance | undefined) => { if (!formEl) return await formEl.validate((valid, fields) => { if (valid) { - if (user.isEnterprise()) { - let fd = new FormData() - Object.keys(form.value).map((item) => { - fd.append(item, form.value[item]) - }) - applicationXpackApi.putAccessToken(id as string, fd, loading).then((res) => { - emit('refresh') - // @ts-ignore - MsgSuccess(t('views.applicationOverview.appInfo.LimitDialog.settingSuccessMessage')) - dialogVisible.value = false - }) - } else { - const obj = { - show_source: form.value.show_source - } - applicationApi.putAccessToken(id as string, obj, loading).then((res) => { - emit('refresh') - // @ts-ignore - MsgSuccess(t('views.applicationOverview.appInfo.LimitDialog.settingSuccessMessage')) - dialogVisible.value = false - }) + const obj = { + show_source: form.value.show_source } + applicationApi.putAccessToken(id as string, obj, loading).then((res) => { + emit('refresh') + // @ts-ignore + MsgSuccess(t('views.applicationOverview.appInfo.LimitDialog.settingSuccessMessage')) + dialogVisible.value = false + }) } }) } diff --git a/ui/src/views/application-overview/component/XPackDisplaySettingDialog.vue b/ui/src/views/application-overview/component/XPackDisplaySettingDialog.vue index 681dbdf36..60269828d 100644 --- a/ui/src/views/application-overview/component/XPackDisplaySettingDialog.vue +++ b/ui/src/views/application-overview/component/XPackDisplaySettingDialog.vue @@ -264,7 +264,10 @@ - + @@ -298,7 +301,7 @@ import { computed, ref, watch } from 'vue' import { useRoute } from 'vue-router' import type { FormInstance, FormRules, UploadFiles } from 'element-plus' -import { isAppIcon } from '@/utils/application' +import { isAppIcon, isWorkFlow } from '@/utils/application' import applicationXpackApi from '@/api/application-xpack' import { MsgSuccess, MsgError } from '@/utils/message' import { t } from '@/locales' diff --git a/ui/src/views/application-overview/index.vue b/ui/src/views/application-overview/index.vue index 113846988..c5008ecb5 100644 --- a/ui/src/views/application-overview/index.vue +++ b/ui/src/views/application-overview/index.vue @@ -274,7 +274,7 @@ function openDisplaySettingDialog() { if (user.isEnterprise()) { XPackDisplaySettingDialogRef.value?.open(accessToken.value, detail.value) } else { - DisplaySettingDialogRef.value?.open(accessToken.value) + DisplaySettingDialogRef.value?.open(accessToken.value, detail.value) } } function openEditAvatar() {