Merge branch 'StableVersion' of http://18.167.251.121:10003/aidlab/aida_front into dev_vite

This commit is contained in:
李志鹏
2026-04-24 17:13:42 +08:00
6 changed files with 32 additions and 33 deletions

View File

@@ -409,7 +409,7 @@ export class BrushIndicator {
// this.show(e.e); // this.show(e.e);
this._mouseEnterHandler && this._mouseEnterHandler(e) this._mouseEnterHandler && this._mouseEnterHandler(e)
} else { } else {
// requestIdleCallback(() => { // setTimeout(() => {
// this.updatePosition(e.e); // this.updatePosition(e.e);
// }); // });

View File

@@ -133,11 +133,12 @@ export class RedGreenModeManager {
this.canvas.on("mouse:up", (event) => { this.canvas.on("mouse:up", (event) => {
// 可以在这里添加更多逻辑,比如生成图片或更新状态 // 可以在这里添加更多逻辑,比如生成图片或更新状态
nextTick(() => { nextTick(() => {
requestIdleCallback(async () => { setTimeout(async () => {
if (!this.isInitialized) { if (!this.isInitialized) {
console.warn("红绿图模式未初始化,无法处理鼠标事件"); console.warn("红绿图模式未初始化,无法处理鼠标事件");
return; return;
} }
console.log("鼠标抬起事件触发", this.onImageGenerated);
if (this.onImageGenerated) { if (this.onImageGenerated) {
const imageData = await this.canvasManager.exportImage({ const imageData = await this.canvasManager.exportImage({
restoreOpacityInRedGreen: true, // 恢复红绿图模式下的透明度 restoreOpacityInRedGreen: true, // 恢复红绿图模式下的透明度

View File

@@ -37,7 +37,6 @@ export class ThumbnailManager {
// 延迟执行避免阻塞UI // 延迟执行避免阻塞UI
fabricObjects.length > 0 && fabricObjects.length > 0 &&
requestIdleCallback(() => {
setTimeout(async () => { setTimeout(async () => {
const base64 = await this._generateLayerThumbnailNow(fabricObjects, layer); const base64 = await this._generateLayerThumbnailNow(fabricObjects, layer);
// this.layerThumbnails.set(layerId, base64); // this.layerThumbnails.set(layerId, base64);
@@ -55,7 +54,6 @@ export class ThumbnailManager {
console.error("生成图层缩略图时出错:", error); console.error("生成图层缩略图时出错:", error);
} }
}); });
});
} }
/** /**
@@ -65,7 +63,7 @@ export class ThumbnailManager {
generateAllLayerThumbnails(layers) { generateAllLayerThumbnails(layers) {
if (!layers || !Array.isArray(layers)) return; if (!layers || !Array.isArray(layers)) return;
requestIdleCallback(() => { setTimeout(() => {
setTimeout(() => { setTimeout(() => {
layers.forEach((layer) => { layers.forEach((layer) => {
if (layer && layer.id) { if (layer && layer.id) {

View File

@@ -155,7 +155,7 @@ export class LiquifyRealTimeUpdater {
// 使用requestAnimationFrame进行批量渲染优化 // 使用requestAnimationFrame进行批量渲染优化
// if (!this.renderingScheduled && !this.config.skipRenderDuringDrag) { // if (!this.renderingScheduled && !this.config.skipRenderDuringDrag) {
// this.renderingScheduled = true; // this.renderingScheduled = true;
// requestIdleCallback(() => { // setTimeout(() => {
// this.canvas.renderAll(); // this.canvas.renderAll();
// this.renderingScheduled = false; // this.renderingScheduled = false;
// }); // });

View File

@@ -189,11 +189,11 @@ export default defineComponent({
} }
return { scaleX, scaleY, rotate }; return { scaleX, scaleY, rotate };
} }
const initMoveableForSelected = () => { const initMoveableForSelected = async (isDestroy:boolean = false) => {
// 销毁旧的实例 // 销毁旧的实例
if(selectItem.imgDomIndex == -1)return if(selectItem.imgDomIndex == -1)return
if (moveableInstance.value) { if (moveableInstance?.value?.destroy && !isDestroy) {
moveableInstance.value.destroy(); moveableInstance?.value?.destroy();
} }
const selectedEl = elementRefs.value[selectItem.imgDomIndex]; const selectedEl = elementRefs.value[selectItem.imgDomIndex];
@@ -509,7 +509,7 @@ export default defineComponent({
watch(()=>detailData.frontBack.front.length,(newValue,oldValue)=>{ watch(()=>detailData.frontBack.front.length,(newValue,oldValue)=>{
if(selectItem.selectDetail?.id)selectItem.imgDomIndex = detailData.frontBack.front.findIndex((item:any)=>item.id == selectItem.selectDetail?.id) if(selectItem.selectDetail?.id)selectItem.imgDomIndex = detailData.frontBack.front.findIndex((item:any)=>item.id == selectItem.selectDetail?.id)
setTimeout(()=>{ setTimeout(()=>{
initMoveableForSelected() initMoveableForSelected(oldValue == 0)
},100) },100)
}) })
const setRevocation = async ()=>{ const setRevocation = async ()=>{

View File

@@ -684,28 +684,28 @@ function isValidUrl(string) {
} }
export { export {
isEmail, isEmail,
getUploadUrl, getUploadUrl,
getUniversalZoomLevel, getUniversalZoomLevel,
rgbaToHex, rgbaToHex,
getMinioUrl, getMinioUrl,
base64ToFile, base64ToFile,
dataURLtoFile, dataURLtoFile,
blobToFile, blobToFile,
base64toFile, base64toFile,
rgbToHsv, rgbToHsv,
formatTime, formatTime,
dataURLtoBlob, dataURLtoBlob,
isMoible, isMoible,
downloadIamge, downloadIamge,
downloadVideoWithFetch, downloadVideoWithFetch,
getBrowserInfo, getBrowserInfo,
setPubDate, setPubDate,
murmur, murmur,
setGradual, setGradual,
calculateGradientCoordinate, calculateGradientCoordinate,
segmentImage, segmentImage,
UrlToFile, UrlToFile,
sketchToMask, sketchToMask,
isValidUrl isValidUrl
} }