fixing branch divergences
This commit is contained in:
parent
7d13b484bc
commit
344a8013d9
3 changed files with 5 additions and 5 deletions
|
@ -1,13 +1,13 @@
|
|||
<script setup lang="ts">
|
||||
import axios from "axios";
|
||||
import {ref, reactive, watch, computed, onMounted} from "vue";
|
||||
import { archive_page } from "@/composables/content/archive_page.ts";
|
||||
import { archive } from "@/composables/content/archive.js.ts";
|
||||
import FileUpload from "@/components/content/partials/dialogs/FileUpload.vue";
|
||||
import FileEdit from "@/components/content/partials/dialogs/FileEdit.vue";
|
||||
import ConfirmDelete from "@/components/content/partials/dialogs/ConfirmDelete.vue";
|
||||
import Table from "@/components/content/partials/Table.vue";
|
||||
|
||||
const { items, listData, headers, selected, loading, search, getItems, editItem, deleteItem } = archive_page()
|
||||
const { items, listData, headers, selected, loading, search, getItems, editItem, deleteItem } = archive()
|
||||
|
||||
const itemEdited = ref({})
|
||||
const bulk = ref(false)
|
||||
|
|
|
@ -2,9 +2,9 @@
|
|||
import axios from "axios";
|
||||
import {ref, reactive} from "vue";
|
||||
import { trackType } from "@/composables/content/track_type.ts";
|
||||
import {archive_page} from "@/composables/content/archive_page.ts";
|
||||
import {archive} from "@/composables/content/archive.js.ts";
|
||||
|
||||
const { items, headers, selected, loading, uploadItem } = archive_page();
|
||||
const { items, headers, selected, loading, uploadItem } = archive();
|
||||
const trackTypes = trackType(false);
|
||||
const check_analyzer = ref([]);
|
||||
const selectedTrackType = ref();
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
import axios from "axios";
|
||||
import {ref, reactive, computed} from "vue";
|
||||
|
||||
export function archive_page() {
|
||||
export function archive() {
|
||||
const items = ref([])
|
||||
const selected = ref([])
|
||||
const loading = ref(false)
|
Loading…
Add table
Add a link
Reference in a new issue