Merge branch 'dev3' of https://dev.azure.com/alicorn-dev/KintoneAppBuilder/_git/KintoneAppBuilder into dev3

backend/app/db/cruddb/dbapp.py

@@ -151,7 +151,7 @@ class dbapp(crudbase):
         flow.flowid = flowhistory.flowid
         flow.eventid=flowhistory.eventid
         flow.name=flowhistory.name
-        flow.content=flow.content
+        flow.content=flowhistory.content
         flow.updateuserid=userid
         db.add(flow)
         db.commit()

frontend/src/pages/AppManagement.vue

@@ -100,8 +100,8 @@ const deleteDialog = ref(false);
 const deleteUserLoading = ref(false);
 
 const actionList =  [
-  { label: '設定', icon: 'account_tree', action: toEditFlowPage },
-  { label: '履歴', icon: 'history', action: toVersionHistoryPage },
+  { label: 'フローの編集', icon: 'account_tree', action: toEditFlowPage },
+  { label: 'バージョンの管理', icon: 'history', action: toVersionHistoryPage },
   { separator: true },
   { label: '削除', icon: 'delete_outline', class: 'text-red', action: removeRow },
 ];

frontend/src/pages/TenantDomain.vue

@@ -122,12 +122,12 @@
         </q-card-section>
         <q-card-section v-else class="row items-center">
           <q-icon name="error" color="negative" size="2em" />
-          <span class="q-ml-sm">ドメイン利用権限が存在し、キャンセルする必要がある</span>
+          <span class="q-ml-sm">ドメインは使用中です。削除してもよろしいですか？</span>
         </q-card-section>
 
         <q-card-actions align="right">
-          <q-btn flat label="Cancel" color="primary" v-close-popup />
-          <q-btn v-if="deleteLoadingState > 0" label="処理に行く" color="primary" v-close-popup @click="openShareDg(editId)" />
+          <q-btn flat label="キャンセル" color="primary" v-close-popup />
+          <q-btn v-if="deleteLoadingState > 0" label="実行" color="primary" v-close-popup @click="openShareDg(editId)" />
           <q-btn flat v-else label="OK" :disabled="deleteLoadingState" color="primary" v-close-popup @click="deleteDomain()" />
         </q-card-actions>
       </q-card>
@@ -194,7 +194,7 @@ const shareDg = ref(false);
 const shareDomain = ref<IDomainOwnerDisplay>({} as IDomainOwnerDisplay);
 
 const activeOptions = [
-  { value: 0, label: '全状態' },
+  { value: 0, label: 'すべて' },
   { value: 1, label: '使用' },
   { value: 2, label: '未使用'}
 ]