|
@@ -164,15 +164,13 @@ export async function preDrawImage(_currentTask: Task) {
|
|
const hasSliceConfig = store.currentTask?.sliceConfig?.length;
|
|
const hasSliceConfig = store.currentTask?.sliceConfig?.length;
|
|
|
|
|
|
const images = [];
|
|
const images = [];
|
|
- const urls = [];
|
|
|
|
|
|
|
|
if (hasSliceConfig) {
|
|
if (hasSliceConfig) {
|
|
// 必须要先加载一遍,把“选择整图”的宽高重置后,再算总高度
|
|
// 必须要先加载一遍,把“选择整图”的宽高重置后,再算总高度
|
|
for (const sliceConfig of _currentTask.sliceConfig) {
|
|
for (const sliceConfig of _currentTask.sliceConfig) {
|
|
const url = _currentTask.sliceUrls[sliceConfig.i - 1];
|
|
const url = _currentTask.sliceUrls[sliceConfig.i - 1];
|
|
const image = await loadImage(url);
|
|
const image = await loadImage(url);
|
|
- images.push(image);
|
|
|
|
- urls.push(url);
|
|
|
|
|
|
+ images[sliceConfig.i] = image;
|
|
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;
|
|
@@ -185,8 +183,7 @@ export async function preDrawImage(_currentTask: Task) {
|
|
// 用来保存sliceImage在整个图片容器中(不包括image-seperator)的高度范围
|
|
// 用来保存sliceImage在整个图片容器中(不包括image-seperator)的高度范围
|
|
for (const sliceConfig of _currentTask.sliceConfig) {
|
|
for (const sliceConfig of _currentTask.sliceConfig) {
|
|
const url = _currentTask.sliceUrls[sliceConfig.i - 1];
|
|
const url = _currentTask.sliceUrls[sliceConfig.i - 1];
|
|
- const indexInSliceUrls = sliceConfig.i;
|
|
|
|
- const image = images[indexInSliceUrls - 1];
|
|
|
|
|
|
+ const image = images[sliceConfig.i];
|
|
|
|
|
|
(await getDataUrlForSliceConfig(
|
|
(await getDataUrlForSliceConfig(
|
|
image,
|
|
image,
|