diff --git a/frontend/src/pages/AppManagement.vue b/frontend/src/pages/AppManagement.vue
index 57fd178..cf59a10 100644
--- a/frontend/src/pages/AppManagement.vue
+++ b/frontend/src/pages/AppManagement.vue
@@ -30,7 +30,7 @@
-
+
diff --git a/frontend/src/pages/AppVersionManagement.vue b/frontend/src/pages/AppVersionManagement.vue
index cb2e1e1..bb161cf 100644
--- a/frontend/src/pages/AppVersionManagement.vue
+++ b/frontend/src/pages/AppVersionManagement.vue
@@ -3,31 +3,22 @@
-
-
-
-
-
-
-
-
-
- {{ prop.row.url }}
-
-
-
-
-
-
-
-
-
-
-
+
@@ -35,11 +26,12 @@
+
{{ p.row.id }}
- 現在
+ 適用中
@@ -60,8 +52,6 @@
-
-
@@ -93,20 +83,7 @@ const route = useRoute()
const $q = useQuasar();
-const appLoading = ref(false);
const app = ref({} as IAppDisplay);
-const appColumns = [
- { name: 'id', label: 'ID', field: 'id', align: 'left', classes: 'q-td--no-hover' },
- { name: 'name', label: 'アプリ名', field: 'name', align: 'left', classes: 'q-td--no-hover' },
- { name: 'url', label: 'URL', field: 'url', align: 'left', classes: 'q-td--no-hover' },
- { name: 'updateUser', label: '最後更新者', field: (row: IAppDisplay) => row?.updateUser?.fullName, align: 'left', classes: 'q-td--no-hover'},
- { name: 'updateTime', label: '最後更新日', field: 'updateTime', align: 'left', classes: 'q-td--no-hover'},
- { name: 'version', label: 'バージョン', field: 'version', align: 'left', classes: 'q-td--no-hover' },
- { name: 'actions', label: '', field: 'actions', classes: 'q-td--no-hover' }
-];
-const appActionList = ref([
- { label: '設定', icon: 'account_tree', action: toEditFlowPage },
-]);
const rows = ref([]);
const columns = [
@@ -129,8 +106,6 @@ const store = useFlowEditorStore();
const confirmDialog = ref(false);
const deleteUserLoading = ref(false);
-
-
const actionList = ref([
{ label: 'プル', icon: 'flag', action: changeVersion },
// { label: 'プレビュー', icon: 'visibility', action: toVersionHistoryPage },
@@ -138,12 +113,8 @@ const actionList = ref([
// { label: '削除', icon: 'delete_outline', class: 'text-red', action: removeRow },
]);
-const getApps = async (suppressLoading: false) => {
- if (!suppressLoading) {
- appLoading.value = true;
- }
+const getApps = async () => {
await appStore.loadApps();
- appLoading.value = false;
}
const getAppById = () => {
@@ -183,7 +154,7 @@ async function changeVersion(version: IAppVersionDisplay) {
versionLoading.value = true;
target.value = version;
await appStore.changeVersion(app.value, version);
- await getApps(true);
+ await getApps();
getAppById();
versionLoading.value = false;
}
@@ -198,14 +169,14 @@ async function changeVersion(version: IAppVersionDisplay) {
// }
// }
-async function toEditFlowPage(app:IAppDisplay) {
+async function toEditFlowPage() {
store.setApp({
- appId: app.id,
- name: app.name
+ appId: app.value.id,
+ name: app.value.name
});
store.selectFlow(undefined);
try {
- await router.push('/FlowChart/' + app.id);
+ await router.push('/FlowChart/' + app.value.id);
} catch (e) {
console.log(e);
}
@@ -214,9 +185,9 @@ async function toEditFlowPage(app:IAppDisplay) {