|
@@ -57,8 +57,11 @@ export const create = async (store, canvas) => {
|
|
},
|
|
},
|
|
};
|
|
};
|
|
const update = (newData) => {
|
|
const update = (newData) => {
|
|
- console.log("set", newData);
|
|
|
|
- layer.uiControl.setAttributes(type, "update", { ...newData, version: 2 });
|
|
|
|
|
|
+ layer.uiControl.setAttributes(
|
|
|
|
+ type,
|
|
|
|
+ type === bgImage ? "upload" : "update",
|
|
|
|
+ { ...newData, version: 2 }
|
|
|
|
+ );
|
|
};
|
|
};
|
|
refs.bus.emit("selectShape", shape);
|
|
refs.bus.emit("selectShape", shape);
|
|
});
|
|
});
|
|
@@ -87,7 +90,7 @@ export const create = async (store, canvas) => {
|
|
const shapes = [];
|
|
const shapes = [];
|
|
|
|
|
|
if (floor) {
|
|
if (floor) {
|
|
- const bgImage = floor.image.src;
|
|
|
|
|
|
+ const bgImage = floor.image.src || floor.image.url;
|
|
if (bgImage && bgImage.includes("blob:")) {
|
|
if (bgImage && bgImage.includes("blob:")) {
|
|
const url = await fetch(bgImage)
|
|
const url = await fetch(bgImage)
|
|
.then((res) => res.blob())
|
|
.then((res) => res.blob())
|
|
@@ -147,11 +150,11 @@ export const create = async (store, canvas) => {
|
|
history.handleRedo();
|
|
history.handleRedo();
|
|
},
|
|
},
|
|
setImage(url) {
|
|
setImage(url) {
|
|
- layer.uiControl.setAttributes(bgImage, "update", url);
|
|
|
|
|
|
+ layer.uiControl.setAttributes(bgImage, "upload", { url, scale: 1 });
|
|
},
|
|
},
|
|
export() {
|
|
export() {
|
|
return new Promise((resolve) => {
|
|
return new Promise((resolve) => {
|
|
- layer.uiControl.exportImg(canvas, 'cover.jpg', resolve)
|
|
|
|
|
|
+ layer.uiControl.exportImg(canvas, "cover.jpg", resolve);
|
|
});
|
|
});
|
|
const $canvas = document.createElement("canvas");
|
|
const $canvas = document.createElement("canvas");
|
|
$canvas.width = canvas.width;
|
|
$canvas.width = canvas.width;
|
|
@@ -161,7 +164,17 @@ export const create = async (store, canvas) => {
|
|
cctx.rect(0, 0, $canvas.width, $canvas.height);
|
|
cctx.rect(0, 0, $canvas.width, $canvas.height);
|
|
cctx.fillStyle = "rgba(255,255,255,1)";
|
|
cctx.fillStyle = "rgba(255,255,255,1)";
|
|
cctx.fill();
|
|
cctx.fill();
|
|
- cctx.drawImage(canvas, 0, 0, $canvas.width, $canvas.height, 0, 0, canvas.width, canvas.height);
|
|
|
|
|
|
+ cctx.drawImage(
|
|
|
|
+ canvas,
|
|
|
|
+ 0,
|
|
|
|
+ 0,
|
|
|
|
+ $canvas.width,
|
|
|
|
+ $canvas.height,
|
|
|
|
+ 0,
|
|
|
|
+ 0,
|
|
|
|
+ canvas.width,
|
|
|
|
+ canvas.height
|
|
|
|
+ );
|
|
|
|
|
|
return new Promise((resolve) => {
|
|
return new Promise((resolve) => {
|
|
// resolve(layer.uiControl.menu_screenShot())
|
|
// resolve(layer.uiControl.menu_screenShot())
|