aidlab/aida_front
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

背景报错

Browse Source
This commit is contained in:
李志鹏
2026-01-22 13:17:11 +08:00
parent eaa94edfac
commit 6c921730ef
3 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/component/Canvas/CanvasEditor/commands/BackgroundCommands.js
View File

@@ -207,7 +207,8 @@ export class BackgroundSizeCommand extends Command {
this.bgLayer = this.layers.value.find((layer) => layer.isBackground); this.bgLayer = this.layers.value.find((layer) => layer.isBackground);
// 记录原尺寸 // 记录原尺寸
this.backgroundObject = findObjectById(this.canvas, this.bgLayer.fabricObject.id).object; this.bgId = this.bgLayer.fabricObject?.id || this.bgLayer.fabricObjects?.[0]?.id;
this.backgroundObject = findObjectById(this.canvas, this.bgId).object;
this.oldWidth = this.backgroundObject.width; this.oldWidth = this.backgroundObject.width;
this.oldHeight = this.backgroundObject.height; this.oldHeight = this.backgroundObject.height;

2
src/component/Canvas/CanvasEditor/components/LayersPanel/LayersList.vue
View File

@@ -242,7 +242,7 @@ const canDeleteComputed = computed(() => {
return parentLayer?.children?.length > 1; return parentLayer?.children?.length > 1;
} }
// 否则直接返回根图层的可删除状态 // 否则直接返回根图层的可删除状态
return props.layers.length > 3; return true;
}); });
</script> </script>

18
src/component/Canvas/CanvasEditor/components/LayersPanel/LayersPanel.vue
View File

@@ -414,14 +414,14 @@ function deleteSelectedLayers() {
} }
// 检查删除后是否还有足够的普通图层 // 检查删除后是否还有足够的普通图层
const remainingNormalLayers = layers.value.filter( // const remainingNormalLayers = layers.value.filter(
(layer) => !layer.isBackground && !layer.isFixed && !selectedLayerIds.value.includes(layer.id) // (layer) => !layer.isBackground && !layer.isFixed && !selectedLayerIds.value.includes(layer.id)
).length; // ).length;
if (remainingNormalLayers < 1) { // if (remainingNormalLayers < 1) {
console.warn("不能删除所有普通图层"); // console.warn("不能删除所有普通图层");
return; // return;
} // }
// 确认删除 // 确认删除
if (selectedLayers.length > 1) { if (selectedLayers.length > 1) {
@@ -876,13 +876,15 @@ function toggleSelectedLayersVisibility() {
function canDeleteLayers() { function canDeleteLayers() {
const selectedLayers = getSelectedLayers(); const selectedLayers = getSelectedLayers();
console.log(selectedLayers);
if (selectedLayers.length === 0) return false; if (selectedLayers.length === 0) return false;
// 检查是否包含不能删除的图层 // 检查是否包含不能删除的图层
const undeletableLayers = selectedLayers.filter((layer) => layer.isBackground || layer.isFixed); const undeletableLayers = selectedLayers.filter((layer) => layer.isBackground || layer.isFixed);
if (undeletableLayers.length > 0) return false; if (undeletableLayers.length > 0) return false;
return true
// 检查删除后是否还有足够的普通图层 // 检查删除后是否还有足够的普通图层
const remainingNormalLayers = layers.value.filter( const remainingNormalLayers = layers.value.filter(
(layer) => !layer.isBackground && !layer.isFixed && !selectedLayerIds.value.includes(layer.id) (layer) => !layer.isBackground && !layer.isFixed && !selectedLayerIds.value.includes(layer.id)