diff --git a/apps/web-test/src/views/_core/authentication/login.vue b/apps/web-test/src/views/_core/authentication/login.vue index 6b994539..bad0ca7e 100644 --- a/apps/web-test/src/views/_core/authentication/login.vue +++ b/apps/web-test/src/views/_core/authentication/login.vue @@ -42,7 +42,7 @@ const formSchema = computed((): VbenFormSchema[] => { .string() .min(1, { message: $t('authentication.selectAccount') }) .optional() - .default('vben'), + .default('xbj'), }, { component: 'VbenInput', @@ -58,7 +58,7 @@ const formSchema = computed((): VbenFormSchema[] => { if (findUser) { form.setValues({ password: '123456', - username: findUser.value, + username: 'vben', }); } } diff --git a/apps/web-test/src/views/dashboard/home/index.vue b/apps/web-test/src/views/dashboard/home/index.vue index 2b42ee57..49f222b6 100644 --- a/apps/web-test/src/views/dashboard/home/index.vue +++ b/apps/web-test/src/views/dashboard/home/index.vue @@ -40,7 +40,14 @@ import { storeToRefs } from 'pinia'; import { useCanvasStore, UseTilesStore } from '#/store'; import { groupList, tilesList } from './tiles'; -import { debounce, isElementInFolder, isGroup, updateRowHeight } from './utils'; +import { + debounce, + generateRandomString, + isElementInFolder, + isGroup, + pathToComponent, + updateRowHeight, +} from './utils'; const tilesStore = UseTilesStore(); const canvasStore = useCanvasStore(); @@ -132,23 +139,23 @@ onMounted(() => { // 获取鼠标的坐标 const mouseX = event.clientX; const mouseY = event.clientY; - console.log('mousemove', mouseX, mouseY); + // console.log('mousemove', mouseX, mouseY); // 使用 elementFromPoint 获取鼠标位于哪个元素上方 const hoveredElement = document.elementFromPoint(mouseX, mouseY); // 输出当前鼠标悬停的元素 - if (hoveredElement) { - console.log('hoveredElement', hoveredElement); - const gridItem = hoveredElement.closest('.grid-item'); + // if (hoveredElement) { + // // console.log('hoveredElement', hoveredElement); + // const gridItem = hoveredElement.closest('.grid-item'); - if (gridItem) { - console.log('鼠标松开时位于 grid-item 上:', gridItem); - console.log('grid-item ID:', gridItem.dataset.id); - } else { - console.log('鼠标松开时不在任何 grid-item 上'); - } - // console.log(`鼠标位于: ${hoveredElement.id || hoveredElement.tagName}`); - } + // if (gridItem) { + // console.log('鼠标松开时位于 grid-item 上:', gridItem); + // console.log('grid-item ID:', gridItem.dataset.id); + // } else { + // console.log('鼠标松开时不在任何 grid-item 上'); + // } + // // console.log(`鼠标位于: ${hoveredElement.id || hoveredElement.tagName}`); + // } }); }); @@ -341,19 +348,22 @@ const layoutUpdatedEvent = (e) => { // 获取当前正在拖动的元素 const dragItem = currentDragItem.value; - console.log('当前拖动的元素', dragItem); + // 先写死判断,如果是日志服务 + if (dragItem.name === '日志服务') { + console.log('当前拖动的元素', dragItem); + const firstKey = gridLayoutRefs.keys().next().value; + console.log(firstKey); // 'key1' + // 判断当前拖动的元素是否进入目标画布区域 + const folderId = isElementInFolder(dragItem, groups); + console.log('当前拖动的元素是否进入目标画布区域', folderId); - // 判断当前拖动的元素是否进入目标画布区域 - const folderId = isElementInFolder(dragItem, groups); - console.log('当前拖动的元素是否进入目标画布区域', folderId); - - // const dom = gridLayoutRefs.get('7303'); - // console.log(dom); - // dragItem.component = pathToComponent(dragItem.component, 'component'); - // dom.layout.push({ ...dragItem, i: generateRandomString(12) }); - - // delItem(dragItem); + const dom = gridLayoutRefs.get(firstKey); + console.log(dom); + dragItem.component = pathToComponent(dragItem.component, 'component'); + dom.layout.push({ ...dragItem, i: generateRandomString(12) }); + delItem(dragItem); + } // console.log(domIdxxxxx.value); // console.log(dom); console.log('layoutUpdatedEvent', e); @@ -575,7 +585,8 @@ const formState = reactive({ Displayed as [x, y, w, h]:
- {{ item.i }}: [{{ item.x }}, {{ item.y }}, {{ item.w }}, {{ item.h }}] + {{ item.i }}: [{{ item.x }}, {{ item.y }}, {{ item.w }}, {{ item.h }}]
diff --git a/apps/web-test/src/views/dashboard/home/tiles.ts b/apps/web-test/src/views/dashboard/home/tiles.ts index 8ce16232..a6ca168f 100644 --- a/apps/web-test/src/views/dashboard/home/tiles.ts +++ b/apps/web-test/src/views/dashboard/home/tiles.ts @@ -634,7 +634,7 @@ const tilesList = [ h: 2, component: './components/Output1/index.vue', i: generateRandomString(), - group: 'htgl', + group: 'workbench', type: 'kjrk', }, { @@ -646,7 +646,7 @@ const tilesList = [ h: 2, component: './components/Output1/index.vue', i: generateRandomString(), - group: 'htgl', + group: 'workbench', type: 'kjrk', }, { @@ -670,7 +670,7 @@ const tilesList = [ h: 2, component: './components/Output1/index.vue', i: generateRandomString(), - group: 'htgl', + group: 'workbench', type: 'kjrk', }, { @@ -695,7 +695,7 @@ const tilesList = [ h: 2, component: './components/Output1/index.vue', i: generateRandomString(), - group: 'htgl', + group: 'workbench', type: 'kjrk', }, { @@ -707,7 +707,7 @@ const tilesList = [ h: 2, component: './components/Output1/index.vue', i: generateRandomString(), - group: 'htgl', + group: 'workbench', type: 'kjrk', }, { @@ -719,7 +719,7 @@ const tilesList = [ h: 2, component: './components/Output1/index.vue', i: generateRandomString(), - group: 'htgl', + group: 'workbench', type: 'kjrk', }, { @@ -743,7 +743,7 @@ const tilesList = [ h: 2, component: './components/Output1/index.vue', i: generateRandomString(), - group: 'htgl', + group: 'workbench', type: 'kjrk', }, {