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 @@ @@ -122,7 +128,7 @@ onBeforeUnmount(() => { - + admin @@ -132,6 +138,7 @@ onBeforeUnmount(() => { + 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 + } diff --git a/core/core-frontend/src/viewsnew/application/SfcEditor/index.vue b/core/core-frontend/src/viewsnew/application/SfcEditor/NavbarEditor/editNavbar.vue similarity index 96% rename from core/core-frontend/src/viewsnew/application/SfcEditor/index.vue rename to core/core-frontend/src/viewsnew/application/SfcEditor/NavbarEditor/editNavbar.vue index 01df365..9ae6866 100644 --- a/core/core-frontend/src/viewsnew/application/SfcEditor/index.vue +++ b/core/core-frontend/src/viewsnew/application/SfcEditor/NavbarEditor/editNavbar.vue @@ -1,7 +1,5 @@ - @@ -17,7 +15,7 @@ - 导入模板 + 导入模板 保存 @@ -37,7 +35,7 @@ import { loadModule } from 'vue3-sfc-loader' import * as Vue from 'vue/dist/vue.esm-bundler.js' import ElementPlus from 'element-plus' import less from 'less' -import defaultTemplate from '@/viewsnew/application/SfcEditor/Navbar.vue?raw' +import defaultTemplate from '@/viewsnew/application/SfcEditor/NavbarEditor/Navbar.vue?raw' import { getMenuTree } from '@/api/permission/menu' import { moduleUpdate,moduleById } from '@/api/application/module' import 'element-plus/dist/index.css' @@ -81,8 +79,8 @@ const runCode = async () => { vue: Vue, 'element-plus': ElementPlus, 'vue/dist/vue.esm-bundler.js': Vue, - '@/viewsnew/application/SfcEditor/assocPage.vue': Vue.defineAsyncComponent(() => - import('@/viewsnew/application/SfcEditor/assocPage.vue')) + '@/viewsnew/application/SfcEditor/NavbarEditor/assocPage.vue': Vue.defineAsyncComponent(() => + import('@/viewsnew/application/SfcEditor/NavbarEditor/assocPage.vue')) }, getFile: async (fileName) => { if (fileName.startsWith('@/')) { @@ -198,7 +196,6 @@ function getmenuinfo() { if(res.data.data.canvas_style_data){ sfcCode.value = res.data.data.canvas_style_data } - }) } function goBack() { @@ -216,7 +213,6 @@ function handleClick() { } } function saveClick(){ - // console.log(typeof(sfcCode.value)) const params = { canvasStyleData:sfcCode.value, componentData:'', @@ -230,6 +226,9 @@ function saveClick(){ } }) } +function importNav(){ + sfcCode.value = defaultTemplate +} diff --git a/core/core-frontend/src/viewsnew/application/index.vue b/core/core-frontend/src/viewsnew/application/index.vue index c649a60..1aa355f 100644 --- a/core/core-frontend/src/viewsnew/application/index.vue +++ b/core/core-frontend/src/viewsnew/application/index.vue @@ -231,6 +231,7 @@ function preview(row){ border-color: rgba(51, 51, 51, 1); border-radius: 10px; margin-right: 20px; + text-align: center; } .application_list_text{ font-family: 'Arial Normal', 'Arial'; diff --git a/core/core-frontend/src/viewsnew/application/menuconfig/assocmenu.vue b/core/core-frontend/src/viewsnew/application/menuconfig/assocmenu.vue index 13c4cc0..b0d2a08 100644 --- a/core/core-frontend/src/viewsnew/application/menuconfig/assocmenu.vue +++ b/core/core-frontend/src/viewsnew/application/menuconfig/assocmenu.vue @@ -9,7 +9,7 @@ import { ElTree,FormInstance } from 'element-plus' import { publicTree } from '@/utils/validate'; import { setModuleId } from '@/api/permission/menu' import { ElMessage, ElMessageBox } from 'element-plus' -import Navbar from '@/viewsnew/application/SfcEditor/previewNavSfc.vue' +import Navbar from '@/viewsnew/application/SfcEditor/NavbarEditor/previewNavSfc.vue' import { getMenuTree } from '@/api/permission/menu' const props = defineProps({ applicationId:String, @@ -93,7 +93,7 @@ const handleNodeClick = (e: any) => { }else if(e.type == '03'){ busiFlag.value = 'dataV' 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 } else if(e.type == '02'){ diff --git a/core/core-frontend/src/viewsnew/application/menuconfig/assocmodule.vue b/core/core-frontend/src/viewsnew/application/menuconfig/assocmodule.vue index f99fae8..7b6b9bf 100644 --- a/core/core-frontend/src/viewsnew/application/menuconfig/assocmodule.vue +++ b/core/core-frontend/src/viewsnew/application/menuconfig/assocmodule.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 diff --git a/core/core-frontend/src/viewsnew/application/module/Leftmenu/index.vue b/core/core-frontend/src/viewsnew/application/module/Leftmenu/index.vue index 823d12f..e372d4e 100644 --- a/core/core-frontend/src/viewsnew/application/module/Leftmenu/index.vue +++ b/core/core-frontend/src/viewsnew/application/module/Leftmenu/index.vue @@ -66,7 +66,6 @@ onMounted(()=>{ const canvas_style_data= {"width":1920,"height":1080,"refreshViewEnable":false,"refreshViewLoading":false,"refreshUnit":"minute","refreshTime":5,"scale":60,"scaleWidth":100,"scaleHeight":100,"backgroundColorSelect":false,"backgroundImageEnable":true,"backgroundType":"backgroundColor","background":"/static-resource/7127292608094670848.png","openCommonStyle":true,"opacity":1,"fontSize":14,"themeId":"10001","color":"#000000","backgroundColor":"rgba(245, 246, 247, 1)","dashboard":{"gap":"yes","gapSize":5,"resultMode":"all","resultCount":1000,"themeColor":"light","mobileSetting":{"customSetting":false,"imageUrl":null,"backgroundType":"image","color":"#000"}},"component":{"chartTitle":{"show":true,"fontSize":"18","hPosition":"left","vPosition":"top","isItalic":false,"isBolder":true,"remarkShow":false,"remark":"","fontFamily":"Microsoft YaHei","letterSpace":"0","fontShadow":false,"color":"#000000","remarkBackgroundColor":"#ffffff","modifyName":"color"},"chartColor":{"basicStyle":{"colorScheme":"default","colors":["#1E90FF","#90EE90","#00CED1","#E2BD84","#7A90E0","#3BA272","#2BE7FF","#0A8ADA","#FFD700"],"alpha":100,"gradient":true,"mapStyle":"normal","areaBaseColor":"#FFFFFF","areaBorderColor":"#303133","gaugeStyle":"default","tableBorderColor":"#E6E7E4","tableScrollBarColor":"#00000024"},"misc":{"mapLineGradient":false,"mapLineSourceColor":"#146C94","mapLineTargetColor":"#576CBC","nameFontColor":"#000000","valueFontColor":"#5470c6"},"tableHeader":{"tableHeaderBgColor":"#1E90FF","tableHeaderFontColor":"#000000"},"tableCell":{"tableItemBgColor":"#FFFFFF","tableFontColor":"#000000"},"modifyName":"gradient"},"chartCommonStyle":{"backgroundColorSelect":true,"backgroundImageEnable":false,"backgroundType":"innerImage","innerImage":"board/board_1.svg","outerImage":null,"innerPadding":12,"borderRadius":8,"backgroundColor":"rgba(255, 255, 255, 1)","innerImageColor":"rgba(16, 148, 229,1)"},"filterStyle":{"layout":"horizontal","titleLayout":"left","labelColor":"#1F2329","titleColor":"#1F2329","color":"#1f2329","borderColor":"#BBBFC4","text":"#1F2329","bgColor":"#FFFFFF"},"tabStyle":{"headPosition":"left","headFontColor":"#000000","headFontActiveColor":"#000000","headBorderColor":"#ffffff","headBorderActiveColor":"#ffffff"}}} - console.log(canvas_style_data) projectInfo.value = props.projectInfo }) @@ -134,14 +133,19 @@ function editClic(data:any){ window.open('/#/formcreatedesigner?moduleId=' +data.id + '&appId='+projectInfo.value.id, '_blank'); } else if(data.type == '02'){ const route = router.resolve({ - path: '/SfcEditor', + path: '/editNavbar', + query: { dvId: data.id,appId:projectInfo.value.id,name:data.name,appname:projectInfo.value.name } + }); + window.open(route.href, '_blank'); + } else if(data.type == '01'){ + const route = router.resolve({ + path: '/editLogin', query: { dvId: data.id,appId:projectInfo.value.id,name:data.name,appname:projectInfo.value.name } }); window.open(route.href, '_blank'); } - // window.open('/#/dvCanvas?dvId=' + "1097641013486424064", '_blank'); } -function addTreeChildNode(event:any,level:any,data:any){ // // 添加子节点 +function addTreeChildNode(event:any,level:any,data:any){ // 添加子节点 let element = document.getElementById("drag_main_area") if(element !=null){ const x = event.clientX; // 水平坐标(相对于元素边界) diff --git a/core/core-frontend/src/viewsnew/application/module/index.vue b/core/core-frontend/src/viewsnew/application/module/index.vue index 0b381f2..4a8812d 100644 --- a/core/core-frontend/src/viewsnew/application/module/index.vue +++ b/core/core-frontend/src/viewsnew/application/module/index.vue @@ -7,7 +7,8 @@ import { findApplicationById } from "@/api/application/application"; import { useRouter, useRoute } from 'vue-router' import DvPreview from '@/viewsnew/data-visualization/DvPreview.vue' import FormCreate from '@/viewsnew/common/FormCreate.vue' -import Navbar from '@/viewsnew/application/sfcEditor/previewNavSfc.vue' +import Navbar from '@/viewsnew/application/sfcEditor/NavbarEditor/previewNavSfc.vue' +import Login from '@/viewsnew/application/sfcEditor/LoginEditor/previewLogin.vue' import DePreview from '@/components/data-visualization/canvas/DePreview.vue' import { initCanvasData, initCanvasDataPrepare, onInitReady } from '@/utils/canvasUtils' import { dvMainStoreWithOut } from '@/store/modules/data-visualization/dvMain' @@ -29,6 +30,7 @@ const downloadStatus = ref(false) const dvPreviewRef = ref(null) const showPosition = ref("preview") const isNavbar = ref(false) +const isLogin = ref(false) // const noClose = ref(false) // const props = defineProps({ // showPosition: { @@ -105,7 +107,7 @@ const loadCanvasData = (dvId, weight?, ext?) => { dvPreviewRef.value?.restore() }) nextTick(() => { - onInitReloadCanvasDataady({ resourceId: dvId }) + // onInitReloadCanvasDataady({ resourceId: dvId }) }) } ) @@ -116,6 +118,7 @@ function handleNodeClick(e){ isFormCreate.value = false dataInitState.value = false isNavbar.value = false + isLogin.value = false if(e.type == '0301'){ busiFlag.value = 'dashboard' loadCanvasData(e.id,9,0) @@ -137,6 +140,9 @@ function handleNodeClick(e){ menuList.value = res.data isNavbar.value = true }) + }else if(e.type == '01'){ + projectId.value = e.id + isLogin.value = true } } @@ -164,7 +170,8 @@ onBeforeMount(() => { - + + @@ -190,6 +197,10 @@ onBeforeMount(() => { height: calc(100vh - 60px); // overflow: hidden; } + .loginpreview{ + width: calc(100% - 260px); + height: calc(100vh - 60px); + }