Merge branch 'develop'

ziteh · Jul 13, 2024 · d158230 · d158230
2 parents 556e4e8 + ba14bfe
commit d158230
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/elebox-tauri/package.json b/elebox-tauri/package.json
@@ -1,7 +1,7 @@
 {
   "name": "elebox",
   "private": true,
-  "version": "1.0.0-alpha.1",
+  "version": "1.0.0-beta.1",
   "type": "module",
   "scripts": {
     "tauri dev": "tauri dev",
@@ -25,4 +25,4 @@
     "vite": "^5.0.12",
     "vue-tsc": "^1.8.5"
   }
-}
+}
diff --git a/elebox-tauri/src-tauri/Cargo.toml b/elebox-tauri/src-tauri/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "elebox"
-version = "1.0.0-alpha.1"
+version = "1.0.0-beta.1"
 license = "MIT OR Apache-2.0"
 description = "Lightweight personal electronic parts inventory management tool"
 repository = "https://github.com/ziteh/elebox"

diff --git a/elebox-tauri/src/components/TreeItem.vue b/elebox-tauri/src/components/TreeItem.vue
@@ -7,7 +7,7 @@ defineProps({
 </script>
 
 <template>
-  <v-list selectable="true" select-strategy="classic" variant="plain">
+  <v-list selectable select-strategy="classic" variant="plain">
     <v-list-item
       color="primary"
       v-for="n in nodes!"

diff --git a/elebox-tauri/src/views/CategoriesTree.vue b/elebox-tauri/src/views/CategoriesTree.vue
@@ -7,9 +7,10 @@ import { TreeNode } from "../interface";
 const catNodes = ref<TreeNode[]>([]);
 
 async function getCategories() {
-  const cs = await invoke("get_tree", {});
-  console.log(cs);
-  catNodes.value = cs;
+  // const cs = await invoke("get_tree", {});
+  // console.log(cs);
+  // catNodes.value = cs;
+  catNodes.value = await invoke("get_tree", {});
 }
 
 onMounted(async () => {

diff --git a/elebox-tauri/src/views/Settings.vue b/elebox-tauri/src/views/Settings.vue
@@ -32,7 +32,7 @@ async function import_csv() {
     <div class="flex-fill"></div>
     <div class="d-flex align-end ga-2 mt-auto">
       <v-label>Version</v-label>
-      <code>1.0.0-alpha.1</code>
+      <code>1.0.0-beta.1</code>
     </div>
   </v-container>
 </template>