|
@@ -203,18 +203,20 @@ async function processSliceConfig() {
|
|
const image = await loadImage(url);
|
|
const image = await loadImage(url);
|
|
images[sliceConfig.i] = image;
|
|
images[sliceConfig.i] = image;
|
|
const { x, y, w, h } = sliceConfig;
|
|
const { x, y, w, h } = sliceConfig;
|
|
- if (x < 1 && y < 1 && w < 1 && h < 1) {
|
|
|
|
- sliceConfig.x = (image.naturalWidth * x) / 100;
|
|
|
|
- sliceConfig.y = (image.naturalHeight * y) / 100;
|
|
|
|
- sliceConfig.w = (image.naturalWidth * w) / 100;
|
|
|
|
- sliceConfig.h = (image.naturalHeight * h) / 100;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
|
|
+
|
|
if (sliceConfig.w === 0 && sliceConfig.h === 0) {
|
|
if (sliceConfig.w === 0 && sliceConfig.h === 0) {
|
|
// 选择整图时,w/h 为0
|
|
// 选择整图时,w/h 为0
|
|
sliceConfig.w = image.naturalWidth;
|
|
sliceConfig.w = image.naturalWidth;
|
|
sliceConfig.h = image.naturalHeight;
|
|
sliceConfig.h = image.naturalHeight;
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ if (x < 1 && y < 1 && w < 1 && h < 1) {
|
|
|
|
+ sliceConfig.x = (image.naturalWidth * x);
|
|
|
|
+ sliceConfig.y = (image.naturalHeight * y);
|
|
|
|
+ sliceConfig.w = (image.naturalWidth * w);
|
|
|
|
+ sliceConfig.h = (image.naturalHeight * h);
|
|
|
|
+ }
|
|
|
|
+
|
|
}
|
|
}
|
|
|
|
|
|
theFinalHeight = store.currentTask.sliceConfig
|
|
theFinalHeight = store.currentTask.sliceConfig
|