From 3b3d0f70b80e7d5fc475b9b6f9348933722b917c Mon Sep 17 00:00:00 2001
From: z9130 <984661593@qq.com>
Date: Fri, 25 Oct 2024 13:13:53 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=9A=82=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/views/dashboard/home/index.vue | 25 +++++++++++++------
1 file changed, 17 insertions(+), 8 deletions(-)
diff --git a/apps/web-test/src/views/dashboard/home/index.vue b/apps/web-test/src/views/dashboard/home/index.vue
index 6a10a8f1..512f2610 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();
@@ -336,17 +343,18 @@ const layoutUpdatedEvent = (e) => {
// 获取当前正在拖动的元素
const dragItem = currentDragItem.value;
console.log('当前拖动的元素', dragItem);
-
+ const firstKey = gridLayoutRefs.keys().next().value;
+ console.log(firstKey); // 'key1'
// 判断当前拖动的元素是否进入目标画布区域
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) });
+ const dom = gridLayoutRefs.get(firstKey);
+ console.log(dom);
+ dragItem.component = pathToComponent(dragItem.component, 'component');
+ dom.layout.push({ ...dragItem, i: generateRandomString(12) });
- // delItem(dragItem);
+ delItem(dragItem);
// console.log(domIdxxxxx.value);
// console.log(dom);
@@ -569,7 +577,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 }}]
From 71018ea21da01bb93f253f6c8ca5be87cc8fe76e Mon Sep 17 00:00:00 2001
From: z9130 <984661593@qq.com>
Date: Fri, 25 Oct 2024 13:32:28 +0800
Subject: [PATCH 2/3] 11
---
.../src/views/_core/authentication/login.vue | 2 +-
.../src/views/dashboard/home/index.vue | 50 ++++++++++---------
.../src/views/dashboard/home/tiles.ts | 14 +++---
3 files changed, 34 insertions(+), 32 deletions(-)
diff --git a/apps/web-test/src/views/_core/authentication/login.vue b/apps/web-test/src/views/_core/authentication/login.vue
index 6b994539..fb7ad85d 100644
--- a/apps/web-test/src/views/_core/authentication/login.vue
+++ b/apps/web-test/src/views/_core/authentication/login.vue
@@ -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 512f2610..0d8c7acd 100644
--- a/apps/web-test/src/views/dashboard/home/index.vue
+++ b/apps/web-test/src/views/dashboard/home/index.vue
@@ -133,23 +133,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}`);
+ // }
});
});
@@ -342,20 +342,22 @@ const layoutUpdatedEvent = (e) => {
// 获取当前正在拖动的元素
const dragItem = currentDragItem.value;
- console.log('当前拖动的元素', dragItem);
- const firstKey = gridLayoutRefs.keys().next().value;
- console.log(firstKey); // 'key1'
- // 判断当前拖动的元素是否进入目标画布区域
- const folderId = isElementInFolder(dragItem, groups);
- console.log('当前拖动的元素是否进入目标画布区域', folderId);
+ // 先写死判断,如果是日志服务
+ 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 dom = gridLayoutRefs.get(firstKey);
- 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);
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',
},
{
From f7eda73c3fbc40a7fb77c8294bfcda5c4113abc2 Mon Sep 17 00:00:00 2001
From: z9130 <984661593@qq.com>
Date: Fri, 25 Oct 2024 13:32:39 +0800
Subject: [PATCH 3/3] 1
---
apps/web-test/src/views/_core/authentication/login.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/apps/web-test/src/views/_core/authentication/login.vue b/apps/web-test/src/views/_core/authentication/login.vue
index fb7ad85d..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',