zentao site admin

ui/src/locales/en-US.ts

@@ -91,7 +91,8 @@ export default {
     'confirm_delete': 'Confirm to delete {name}?',
     'save': 'Save',
     'create': 'Create',
-    'view':  'View', 
+    'view':  'View',
+    'edit': 'Edit',
     'delete':  'Delete', 
     'pass':  'Pass', 
     'fail':  'Fail', 
@@ -105,7 +106,8 @@ export default {
     'submit_to_zentao':  'Submit to ZenTao', 
     'submit_bug_to_zentao':  'Submit Bug to ZenTao', 
     'submit_result_to_zentao':  'Submit Result to ZenTao', 
-    'confirm_to_delete_result':  'Confirm to delete test result?', 
+    'confirm_to_delete_result':  'Confirm to delete test result?',
+    'confirm_to_delete_site':  'Confirm to delete Zentao site?',
     'submit_success':  'Submit successfully.', 
     'submit_failed':  'Submit failed.', 
     'view_error':  'View Error', 

ui/src/locales/zh-CN.ts

@@ -91,7 +91,8 @@ export default {
     'confirm_delete': '确认删除{name}？',
     'save': '保存',
     'create': '新建',
-    'view':  '查看', 
+    'view':  '查看',
+    'edit': '编辑',
     'delete':  '删除', 
     'pass':  '通过', 
     'fail':  '失败', 
@@ -105,7 +106,8 @@ export default {
     'submit_to_zentao':  '提交到禅道', 
     'submit_bug_to_zentao':  '提交缺陷到禅道', 
     'submit_result_to_zentao':  '提交结果到禅道', 
-    'confirm_to_delete_result':  '确定删除执行结果吗？', 
+    'confirm_to_delete_result':  '确定删除执行结果吗？',
+    'confirm_to_delete_site':  '确定删除禅道站点吗？',
     'submit_success':  '提交成功', 
     'submit_failed':  '提交失败', 
     'view_error':  '查看错误', 

ui/src/views/site/edit.vue

 <template>
-  <a-card :title="t('edit_site')">
+  <a-card>
+    <template #title>
+      {{t('edit_site')}}
+    </template>
+
+    <template #extra>
+      <div class="opt">
+        <a-button @click="back" type="link">{{ t('back') }}</a-button>
+      </div>
+    </template>
+
     <a-form :label-col="labelCol" :wrapper-col="wrapperCol">
       <a-form-item :label="t('name')" v-bind="validateInfos.name">
         <a-input v-model:value="modelRef.name"
@@ -49,6 +59,7 @@ interface SiteFormSetupData {
   validateInfos: validateInfos
   submitForm:  () => void;
   resetFields:  () => void;
+  back:  () => void;
 }
 
 export default defineComponent({
@@ -111,6 +122,11 @@ export default defineComponent({
       .catch((e) => {console.log('')})
     };
 
+    const back = () => {
+      console.log('back')
+      router.push(`/site/list`)
+    }
+
     return {
       t,
       labelCol: { span: 4 },
@@ -121,6 +137,7 @@ export default defineComponent({
       validate,
       validateInfos,
       submitForm,
+      back,
     }
 
   }

ui/src/views/site/index.vue

@@ -42,8 +42,8 @@
           </template>
 
           <template #action="{ record }">
-            <a-button @click="() => edit(record.id)" type="link" size="small">{{ t('view') }}</a-button>
-            <a-button @click="() => record(record)" type="link" size="small"
+            <a-button @click="() => edit(record.id)" type="link" size="small">{{ t('edit') }}</a-button>
+            <a-button @click="() => remove(record.id)" type="link" size="small"
                       :loading="removeLoading.includes(record.seq)">{{ t('delete') }}
             </a-button>
           </template>
@@ -82,7 +82,7 @@ interface SiteListSetupData {
 
   edit: (id) => void;
   removeLoading: Ref<string[]>;
-  remove: (item) => void;
+  remove: (id) => void;
 
   onSearch: () => void;
   momentUtc: (tm) => string;
@@ -182,14 +182,14 @@ export default defineComponent({
     }
 
     const removeLoading = ref<string[]>([]);
-    const remove = (item) => {
+    const remove = (id) => {
       Modal.confirm({
-        title: t('confirm_to_delete_result'),
+        title: t('confirm_to_delete_site'),
         okText: t('confirm'),
         cancelText: t('cancel'),
         onOk: async () => {
-          removeLoading.value = [item.seq];
-          const res: boolean = await store.dispatch('History/delete', item.seq);
+          removeLoading.value = [id];
+          const res: boolean = await store.dispatch('Site/delete', id);
           if (res === true) {
             message.success(t('delete_success'));
             await getList(pagination.value.page);