From 6489cbe4882f28899074fc63c7570864a19c973d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9C=E6=80=80=E7=A3=8A=E2=80=9D?= <2280131253@qq.com>
Date: Tue, 18 Jan 2022 17:53:59 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E5=BA=94=E7=94=A8?=
 =?UTF-8?q?=E6=8E=88=E6=9D=83=E5=85=8B=E9=9A=86=E6=8A=A5=E9=94=99=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/GenericCreateUpdateForm/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/layout/components/GenericCreateUpdateForm/index.vue b/src/layout/components/GenericCreateUpdateForm/index.vue
index 19dddfe6a..4a4746faf 100644
--- a/src/layout/components/GenericCreateUpdateForm/index.vue
+++ b/src/layout/components/GenericCreateUpdateForm/index.vue
@@ -283,8 +283,8 @@ export default {
       let object = this.object
       if (!object || Object.keys(object).length === 0) {
         if (cloneFrom) {
-          this.$log.debug('Clone from: ', cloneFrom)
-          const url = `${this.url}${cloneFrom}/`
+          const [curUrl, query] = this.url.split('?')
+          const url = `${curUrl}${cloneFrom}/${query ? ('?' + query) : ''}`
           object = await this.getObjectDetail(url)
           if (object['name']) {
             object.name = this.$t('common.cloneFrom') + ' ' + object.name

From d5fc939a40c5851e30d073e354bb6108381de9c5 Mon Sep 17 00:00:00 2001
From: feng626 <1304903146@qq.com>
Date: Tue, 18 Jan 2022 19:05:22 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E6=94=B9=E5=AF=86=E7=BF=BB=E8=AF=91?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ChangeAuthPlanExecutionTaskList.vue                      | 5 ++++-
 .../ChangeAuthPlanExecutionTaskList.vue                      | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/views/accounts/ChangeAuthPlan/AppChangeAuthPlan/ChangeAuthPlanDetail/AppChangeAuthPlanExecution/ChangeAuthPlanExecutionDetail/ChangeAuthPlanExecutionTaskList.vue b/src/views/accounts/ChangeAuthPlan/AppChangeAuthPlan/ChangeAuthPlanDetail/AppChangeAuthPlanExecution/ChangeAuthPlanExecutionDetail/ChangeAuthPlanExecutionTaskList.vue
index bc41adef3..166caf94e 100644
--- a/src/views/accounts/ChangeAuthPlan/AppChangeAuthPlan/ChangeAuthPlanDetail/AppChangeAuthPlanExecution/ChangeAuthPlanExecutionDetail/ChangeAuthPlanExecutionTaskList.vue
+++ b/src/views/accounts/ChangeAuthPlan/AppChangeAuthPlan/ChangeAuthPlanDetail/AppChangeAuthPlanExecution/ChangeAuthPlanExecutionDetail/ChangeAuthPlanExecutionTaskList.vue
@@ -22,7 +22,7 @@ export default {
       tableConfig: {
         url: `/api/v1/xpack/change-auth-plan/app-plan-execution-subtask/?plan_execution_id=${this.object.id}`,
         columns: [
-          'app_display', 'system_user_display', 'is_success', 'reason', 'timedelta', 'date_start', 'actions'
+          'app_display', 'system_user_display', 'is_success', 'reason_display', 'timedelta', 'date_start', 'actions'
         ],
         columnsMeta: {
           app_display: {
@@ -35,6 +35,9 @@ export default {
               return <router-link to={ to } >{ row.app_display }</router-link>
             }
           },
+          reason_display: {
+            label: this.$t('xpack.AccountBackupPlan.Reason')
+          },
           system_user_display: {
             label: this.$t('xpack.ChangeAuthPlan.SystemUser')
           },
diff --git a/src/views/accounts/ChangeAuthPlan/AssetChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanExecution/ChangeAuthPlanExecutionDetail/ChangeAuthPlanExecutionTaskList.vue b/src/views/accounts/ChangeAuthPlan/AssetChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanExecution/ChangeAuthPlanExecutionDetail/ChangeAuthPlanExecutionTaskList.vue
index d71dfe06e..8dd0e3ec5 100644
--- a/src/views/accounts/ChangeAuthPlan/AssetChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanExecution/ChangeAuthPlanExecutionDetail/ChangeAuthPlanExecutionTaskList.vue
+++ b/src/views/accounts/ChangeAuthPlan/AssetChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanExecution/ChangeAuthPlanExecutionDetail/ChangeAuthPlanExecutionTaskList.vue
@@ -22,7 +22,7 @@ export default {
       tableConfig: {
         url: `/api/v1/xpack/change-auth-plan/plan-execution-subtask/?plan_execution_id=${this.object.id}`,
         columns: [
-          'username', 'asset', 'is_success', 'reason', 'timedelta', 'date_start', 'actions'
+          'username', 'asset', 'is_success', 'timedelta', 'date_start', 'reason_display', 'actions'
         ],
         columnsMeta: {
           asset: {
@@ -42,6 +42,9 @@ export default {
               return row.timedelta.toFixed(2) + 's'
             }
           },
+          reason_display: {
+            label: this.$t('xpack.AccountBackupPlan.Reason')
+          },
           actions: {
             formatterArgs: {
               hasDelete: false,