Skip to content

Commit fbb362d

Browse files
committed
fix: update downloadbase64
1 parent 1b95877 commit fbb362d

File tree

2 files changed

+16
-15
lines changed

2 files changed

+16
-15
lines changed

src/composable/downloadBase64.ts

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { extension as getExtensionFromMimeType, extension as getMimeTypeFromExtension } from 'mime-types';
2-
import type { Ref } from 'vue';
2+
import type { MaybeRef, Ref } from 'vue';
33
import _ from 'lodash';
4+
import { get } from '@vueuse/core';
45

56
export {
67
getMimeTypeFromBase64,
@@ -75,21 +76,11 @@ function downloadFromBase64({ sourceValue, filename, extension, fileMimeType }:
7576
}
7677

7778
function useDownloadFileFromBase64(
78-
{ source, filename, extension, fileMimeType }:
79-
{ source: Ref<string>; filename?: string; extension?: string; fileMimeType?: string }) {
80-
return {
81-
download() {
82-
downloadFromBase64({ sourceValue: source.value, filename, extension, fileMimeType });
83-
},
84-
};
85-
}
86-
87-
function useDownloadFileFromBase64Refs(
8879
{ source, filename, extension }:
89-
{ source: Ref<string>; filename?: Ref<string>; extension?: Ref<string> }) {
80+
{ source: MaybeRef<string>; filename?: MaybeRef<string>; extension?: MaybeRef<string> }) {
9081
return {
9182
download() {
92-
downloadFromBase64({ sourceValue: source.value, filename: filename?.value, extension: extension?.value });
83+
downloadFromBase64({ sourceValue: get(source), filename: get(filename), extension: get(extension) });
9384
},
9485
};
9586
}
@@ -116,3 +107,13 @@ function previewImageFromBase64(base64String: string): HTMLImageElement {
116107

117108
return img;
118109
}
110+
111+
function useDownloadFileFromBase64Refs(
112+
{ source, filename, extension }:
113+
{ source: Ref<string>; filename?: Ref<string>; extension?: Ref<string> }) {
114+
return {
115+
download() {
116+
downloadFromBase64({ sourceValue: source.value, filename: filename?.value, extension: extension?.value });
117+
},
118+
};
119+
}

src/tools/heic-converter/heic-converter.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<script setup lang="ts">
22
import { Base64 } from 'js-base64';
33
import heicConvert from 'heic-convert/browser';
4-
import { useDownloadFileFromBase64Refs } from '@/composable/downloadBase64';
4+
import { useDownloadFileFromBase64 } from '@/composable/downloadBase64';
55
66
const status = ref<'idle' | 'done' | 'error' | 'processing'>('idle');
77
const file = ref<File | null>(null);
@@ -13,7 +13,7 @@ const formats = [
1313
{ value: 'jpg', label: 'JPEG' },
1414
{ value: 'png', label: 'PNG' },
1515
];
16-
const { download } = useDownloadFileFromBase64Refs(
16+
const { download } = useDownloadFileFromBase64(
1717
{
1818
source: base64OutputImage,
1919
filename: fileName,

0 commit comments

Comments
 (0)