code refactor

This commit is contained in:
MaysWind
2025-01-05 13:14:08 +08:00
parent a19cc81391
commit 061ea6aab4
3 changed files with 11 additions and 11 deletions
+7 -7
View File
@@ -26,8 +26,8 @@ const props = defineProps<{
const { tt, getCurrentLanguageInfo } = useI18n();
const mapContainer: Ref<HTMLElement> = useTemplateRef('mapContainer');
const mapInstance: Ref<MapInstance> = ref(createMapInstance());
const mapContainer: Ref<HTMLElement | null> = useTemplateRef('mapContainer');
const mapInstance: Ref<MapInstance | null> = ref(createMapInstance());
const initCenter: Ref<MapPosition> = ref({
latitude: 0,
longitude: 0
@@ -39,11 +39,11 @@ const mapSupported = computed<boolean>(() => {
});
const mapDependencyLoaded = computed<boolean>(() => {
return mapInstance.value && mapInstance.value.dependencyLoaded;
return mapInstance.value?.dependencyLoaded || false;
});
const finalMapStyle = computed<Record<string, string>>(() => {
const styles = copyObjectTo(props.mapStyle, {});
const finalMapStyle = computed<Record<string, unknown>>(() => {
const styles: Record<string, unknown> = copyObjectTo(props.mapStyle, {});
if (props.height) {
styles.height = props.height;
@@ -60,7 +60,7 @@ function init() {
let isFirstInit = false;
let centerChanged = false;
if (!mapSupported.value || !mapDependencyLoaded.value) {
if (!mapSupported.value || !mapDependencyLoaded.value || !mapInstance.value) {
return;
}
@@ -85,7 +85,7 @@ function init() {
if (!mapInstance.value.inited) {
const languageInfo = getCurrentLanguageInfo();
mapInstance.value.initMapInstance(mapContainer.value, {
mapInstance.value.initMapInstance(mapContainer.value as HTMLElement, {
language: languageInfo?.alternativeLanguageTag,
initCenter: initCenter.value,
zoomLevel: zoomLevel.value,
+2 -2
View File
@@ -43,9 +43,9 @@ const emit = defineEmits<{
(e: 'info:copied'): void
}>();
const iconCopyToClipboard: Ref<HTMLElement> = useTemplateRef('copyToClipboardIcon');
const iconCopyToClipboard: Ref<unknown> = useTemplateRef('copyToClipboardIcon');
let clipboardHolder: ClipboardHolder = null;
let clipboardHolder: ClipboardHolder | null = null;
function makeCopyToClipboardClickable() {
if (clipboardHolder) {
+2 -2
View File
@@ -13,7 +13,7 @@ const { style, getAccountIcon, getCategoryIcon } = useItemIcon(props);
const f7IconValue = computed<string>(() => {
if (props.iconType === 'fixed-f7') {
return props.iconId;
return props.iconId.toString();
} else {
return '';
}
@@ -25,7 +25,7 @@ const icon = computed<string>(() => {
} else if (props.iconType === 'category') {
return getCategoryIcon(props.iconId);
} else if (props.iconType === 'fixed') {
return props.iconId;
return props.iconId.toString();
} else {
return '';
}