Merge branch 'develop'

ziteh · Jul 18, 2024 · b6a39f4 · b6a39f4
2 parents bfdd8c4 + e0be0e1
commit b6a39f4
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/elebox-tauri/src/components/ManufacturerField.vue b/elebox-tauri/src/components/ManufacturerField.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { onMounted, ref, reactive } from "vue";
+import { onMounted, ref } from "vue";
 import { DbManufacturer as Db } from "../db_cmd_manufacturer";
 
 const props = defineProps<{ origin_name?: string }>();

diff --git a/elebox-tauri/src/components/PartSupplier.vue b/elebox-tauri/src/components/PartSupplier.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { readonly, ref, watch } from "vue";
+import { ref, watch } from "vue";
 import { Supplier } from "../interface";
 
 const props = defineProps<{

diff --git a/elebox-tauri/src/views/Part.vue b/elebox-tauri/src/views/Part.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts">
 import { onMounted, ref, reactive } from "vue";
-import { invoke } from "@tauri-apps/api/tauri";
 import { CustomField, PkgType, Supplier } from "../interface";
 import PartCustomField from "../components/PartCustomField.vue";
 import PartSupplier from "../components/PartSupplier.vue";
@@ -21,7 +20,7 @@ const part = ref<DbPart.Part>({
 
 const qty_input = ref<number | undefined>(undefined);
 const favorite = ref();
-const alert = ref(false);
+// const alert = ref(false);
 
 const new_custom_field = ref<CustomField>({
   name: "",
@@ -160,7 +159,12 @@ onMounted(() => {
     route.params.origin_name !== undefined &&
     route.params.origin_name !== ""
   ) {
-    origin_name.value = route.params.origin_name; // FIXME
+    if (Array.isArray(route.params.origin_name)) {
+      origin_name.value = route.params.origin_name[0];
+    } else {
+      origin_name.value = route.params.origin_name;
+    }
+
     getPart(origin_name.value);
   }