diff --git a/core/core-frontend/src/style/index.less b/core/core-frontend/src/style/index.less index d393da52ac..dfd88a0461 100644 --- a/core/core-frontend/src/style/index.less +++ b/core/core-frontend/src/style/index.less @@ -135,11 +135,11 @@ body { } .field-icon-text { - color: var(--ed-color-primary); + color: #3370ff; } .field-icon-time { - color: var(--ed-color-primary); + color: #3370ff; } .field-icon-value { @@ -147,7 +147,7 @@ body { } .field-icon-location { - color: var(--ed-color-primary); + color: #3370ff; } .field-icon-red { @@ -161,7 +161,7 @@ body { } .field-icon-dimension { - color: var(--ed-color-primary); + color: #3370ff; } .field-icon-quota { diff --git a/core/core-frontend/src/views/system/common/InfoTemplate.vue b/core/core-frontend/src/views/system/common/InfoTemplate.vue index b1762ea864..c75313e8cc 100644 --- a/core/core-frontend/src/views/system/common/InfoTemplate.vue +++ b/core/core-frontend/src/views/system/common/InfoTemplate.vue @@ -6,6 +6,9 @@
{{ t('commons.edit') }} + {{ + t('datasource.validate') + }}
@@ -102,6 +105,10 @@ const props = defineProps({ type: Boolean, default: false }, + showValidate: { + type: Boolean, + default: false + }, copyList: { type: Array as PropType, default: () => [] @@ -169,10 +176,14 @@ const switchPwd = (pkey: string) => { pwdItem.value[pkey]['hidden'] = !pwdItem.value[pkey]['hidden'] } -const emits = defineEmits(['edit']) +const emits = defineEmits(['edit', 'check']) const edit = () => { emits('edit') } + +const check = () => { + emits('check') +} defineExpose({ init }) @@ -194,6 +205,8 @@ formatLabel() padding: 24px; .info-template-header { display: flex; + margin-top: -4px; + align-items: center; justify-content: space-between; .info-template-title { height: 24px; diff --git a/core/core-frontend/src/views/system/parameter/engine/EngineEdit.vue b/core/core-frontend/src/views/system/parameter/engine/EngineEdit.vue index 2a28b27a0a..95f783b8cc 100644 --- a/core/core-frontend/src/views/system/parameter/engine/EngineEdit.vue +++ b/core/core-frontend/src/views/system/parameter/engine/EngineEdit.vue @@ -5,6 +5,7 @@ import { useI18n } from '@/hooks/web/useI18n' import request from '@/config/axios' import { dsTypes, Node } from '@/views/visualized/data/datasource/form/option' import { cloneDeep } from 'lodash-es' +import { getDeEngine } from '@/api/datasource' import { CustomPassword } from '@/components/custom-password' import { Base64 } from 'js-base64' const { t } = useI18n() @@ -128,15 +129,63 @@ const defaultInfo = { nodeType: '', type: '', fileName: '', - configuration: {}, + configuration: { + host: '', + port: 8081, + dataBase: '', + username: '', + password: '', + extraParams: '', + initialPoolSize: 5, + minPoolSize: 5, + maxPoolSize: 5, + queryTimeout: 30 + }, syncSetting: null, apiConfiguration: [], weight: 0 } -const nodeInfo = reactive(cloneDeep(defaultInfo)) -const edit = info => { - Object.assign(nodeInfo, cloneDeep(info)) - dialogVisible.value = true +const nodeInfo = reactive(cloneDeep(defaultInfo)) +const edit = () => { + getDeEngine() + .then(res => { + let { + name, + createBy, + id, + createTime, + creator, + type, + pid, + configuration, + syncSetting, + fileName, + size, + description, + lastSyncTime + } = res.data + if (configuration) { + configuration = JSON.parse(configuration) + } + Object.assign(nodeInfo, { + name, + pid, + description, + fileName, + size, + createTime, + creator, + createBy, + id, + type, + configuration, + syncSetting, + lastSyncTime + }) + }) + .finally(() => { + dialogVisible.value = true + }) } const basicForm = ref() diff --git a/core/core-frontend/src/views/system/parameter/engine/EngineInfo.vue b/core/core-frontend/src/views/system/parameter/engine/EngineInfo.vue index 9cc3c48031..740b5a77dc 100644 --- a/core/core-frontend/src/views/system/parameter/engine/EngineInfo.vue +++ b/core/core-frontend/src/views/system/parameter/engine/EngineInfo.vue @@ -1,482 +1,21 @@ - - - diff --git a/core/core-frontend/src/views/system/parameter/engine/EngineInfoTemplate.vue b/core/core-frontend/src/views/system/parameter/engine/EngineInfoTemplate.vue index 22b161f0d7..baddadbc73 100644 --- a/core/core-frontend/src/views/system/parameter/engine/EngineInfoTemplate.vue +++ b/core/core-frontend/src/views/system/parameter/engine/EngineInfoTemplate.vue @@ -1,515 +1,177 @@ - -