Merge branch 'test' of http://49.233.254.41:5256/z9130/pansoft-plrl into test
Frontend CI/CD / build (web-office) (push) Failing after 1m15s
Details
Frontend CI/CD / build (web-office) (push) Failing after 1m15s
Details
This commit is contained in:
commit
5a8358e132
|
@ -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',
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
// 先写死判断,如果是日志服务
|
||||
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('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 <code>[x, y, w, h]</code>:
|
||||
<div class="columns">
|
||||
<div v-for="item in layout">
|
||||
<b>{{ item.i }}</b>: [{{ item.x }}, {{ item.y }}, {{ item.w }}, {{ item.h }}]
|
||||
<b>{{ item.i }}</b
|
||||
>: [{{ item.x }}, {{ item.y }}, {{ item.w }}, {{ item.h }}]
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
@ -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',
|
||||
},
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue