diff --git a/core/core-frontend/src/components/visualization/UserViewEnlarge.vue b/core/core-frontend/src/components/visualization/UserViewEnlarge.vue index dc62abd..c8bdf55 100644 --- a/core/core-frontend/src/components/visualization/UserViewEnlarge.vue +++ b/core/core-frontend/src/components/visualization/UserViewEnlarge.vue @@ -585,4 +585,30 @@ defineExpose({ .ed-select-group__wrap:not(:last-of-type)::after{ background: #434343 !important; } + .ed-select .ed-input.is-focus .ed-input__wrapper{ + box-shadow: none !important; + } + .ed-select:hover:not(.ed-select--disabled) .ed-input__wrapper{ + box-shadow: none !important; + } + .ed-select .ed-input__wrapper.is-focus{ + box-shadow: none !important; + } + .ed-dropdown-menu{ + background-color: rgb(41, 41, 41); + + } + .ed-dropdown-menu__item{ + color: #fff; + } + .ed-dropdown-menu__item--divided{ + border-top: 1px solid #5f5f5f; + } + .ed-dropdown-menu__item:not(.is-disabled):hover{ + background-color: rgb(61, 61, 61); + } + .ed-dropdown__popper.ed-popper{ + border: 1px solid #5f5f5f; + background:transparent; + } diff --git a/core/core-frontend/src/router/index.ts b/core/core-frontend/src/router/index.ts index a228104..88749ee 100644 --- a/core/core-frontend/src/router/index.ts +++ b/core/core-frontend/src/router/index.ts @@ -228,11 +228,18 @@ export const routes: AppRouteRecordRaw[] = [ component: () => import('@/viewsnew/application/PreviewSystem.vue') }, { - path: '/SfcEditor', - name: 'SfcEditor', + path: '/editNavbar', + name: 'editNavbar', hidden: true, meta: {}, - component: () => import('@/viewsnew/application/SfcEditor/index.vue') + component: () => import('@/viewsnew/application/SfcEditor/NavbarEditor/editNavbar.vue') + }, + { + path: '/editLogin', + name: 'editLogin', + hidden: true, + meta: {}, + component: () => import('@/viewsnew/application/SfcEditor/LoginEditor/editlogin.vue') }, { path: '/SystemLogin', diff --git a/core/core-frontend/src/viewsnew/application/PreviewSystem.vue b/core/core-frontend/src/viewsnew/application/PreviewSystem.vue index 033a771..cc772f7 100644 --- a/core/core-frontend/src/viewsnew/application/PreviewSystem.vue +++ b/core/core-frontend/src/viewsnew/application/PreviewSystem.vue @@ -1,7 +1,6 @@ + + \ No newline at end of file diff --git a/core/core-frontend/src/viewsnew/application/SfcEditor/login.vue b/core/core-frontend/src/viewsnew/application/SfcEditor/LoginEditor/login.vue similarity index 97% rename from core/core-frontend/src/viewsnew/application/SfcEditor/login.vue rename to core/core-frontend/src/viewsnew/application/SfcEditor/LoginEditor/login.vue index 961282f..8525c0b 100644 --- a/core/core-frontend/src/viewsnew/application/SfcEditor/login.vue +++ b/core/core-frontend/src/viewsnew/application/SfcEditor/LoginEditor/login.vue @@ -1,11 +1,13 @@ + \ No newline at end of file diff --git a/core/core-frontend/src/viewsnew/application/SfcEditor/Navbar.vue b/core/core-frontend/src/viewsnew/application/SfcEditor/NavbarEditor/Navbar.vue similarity index 93% rename from core/core-frontend/src/viewsnew/application/SfcEditor/Navbar.vue rename to core/core-frontend/src/viewsnew/application/SfcEditor/NavbarEditor/Navbar.vue index 8508e80..d605f16 100644 --- a/core/core-frontend/src/viewsnew/application/SfcEditor/Navbar.vue +++ b/core/core-frontend/src/viewsnew/application/SfcEditor/NavbarEditor/Navbar.vue @@ -1,7 +1,8 @@ diff --git a/core/core-frontend/src/viewsnew/application/SfcEditor/assocPage.vue b/core/core-frontend/src/viewsnew/application/SfcEditor/NavbarEditor/assocPage.vue similarity index 93% rename from core/core-frontend/src/viewsnew/application/SfcEditor/assocPage.vue rename to core/core-frontend/src/viewsnew/application/SfcEditor/NavbarEditor/assocPage.vue index 663d171..02cd1c2 100644 --- a/core/core-frontend/src/viewsnew/application/SfcEditor/assocPage.vue +++ b/core/core-frontend/src/viewsnew/application/SfcEditor/NavbarEditor/assocPage.vue @@ -5,7 +5,7 @@ import FormCreate from '@/viewsnew/common/FormCreate.vue' import { initCanvasData } from '@/utils/canvasUtils' import { dvMainStoreWithOut } from '@/store/modules/data-visualization/dvMain' import { moduleList } from '@/api/application/module' -import Navbar from '@/viewsnew/application/SfcEditor/assocPage.vue' +import Navbar from '@/viewsnew/application/SfcEditor/NavbarEditor/assocPage.vue' const props = defineProps({ moduleinfo:Object, applicationId:String @@ -89,16 +89,20 @@ function handleNodeClick(e){ if(e.type == '0301'){ busiFlag.value = 'dashboard' loadCanvasData(e.id,9,0) + loading.value = false }else if(e.type == '03'){ busiFlag.value = 'dataV' + loading.value = false loadCanvasData(e.id,9,0) - }else if(e.type == '09'){ + }else if(e.type == '04'||e.type == '05'||e.type == '06'){ moduleInfo.value = e isFormCreate.value = true + loading.value = false } else if(e.type == '02'){ isNavbar.value = true + loading.value = false } - loading.value = false + }