From 44f07ac0c2136d798a7e0d9ca4459e21adfbb4f0 Mon Sep 17 00:00:00 2001 From: luofann Date: Fri, 1 Mar 2024 10:43:07 +0800 Subject: [PATCH 1/3] =?UTF-8?q?refactor:=20=E6=A8=A1=E6=9D=BF=E4=B8=8B?= =?UTF-8?q?=E8=BD=BD=E6=96=87=E4=BB=B6=E5=90=8D=E5=B8=A6=E4=B8=8A=E6=9C=80?= =?UTF-8?q?=E6=96=B0=E7=89=88=E6=9C=AC=E5=8F=B7=20#=20Reviewed,=20transact?= =?UTF-8?q?ion=20id:=203155?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operations/download-config/download-config.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bcs-services/bcs-bscp/ui/src/views/space/templates/list/package-detail/operations/download-config/download-config.vue b/bcs-services/bcs-bscp/ui/src/views/space/templates/list/package-detail/operations/download-config/download-config.vue index b4ef207bff..8cc8b36088 100644 --- a/bcs-services/bcs-bscp/ui/src/views/space/templates/list/package-detail/operations/download-config/download-config.vue +++ b/bcs-services/bcs-bscp/ui/src/views/space/templates/list/package-detail/operations/download-config/download-config.vue @@ -29,9 +29,9 @@ try { pending.value = true; const res = await getTemplateVersionsNameByIds(props.spaceId, [props.templateId]); - const { template_name, latest_signature } = res.details[0]; + const { template_name, latest_signature, latest_revision_name } = res.details[0]; const content = await downloadTemplateContent(props.spaceId, props.templateSpaceId, latest_signature); - fileDownload(content, template_name); + fileDownload(content, `${template_name}_${latest_revision_name}`); } catch (e) { console.error(e); } finally { From a08d3edf54bacd50f8b3a2eff8c2ae275b8c04f4 Mon Sep 17 00:00:00 2001 From: luofann Date: Fri, 1 Mar 2024 10:44:12 +0800 Subject: [PATCH 2/3] Merge branch 'master' into feat_template_download , # Reviewed, transaction id: 3156 From 50b1f22a9fadb73f45203622f87b90797ff55247 Mon Sep 17 00:00:00 2001 From: luofann Date: Fri, 1 Mar 2024 11:30:09 +0800 Subject: [PATCH 3/3] =?UTF-8?q?refactor:=20=E6=96=87=E4=BB=B6=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E5=A4=A7=E5=B0=8F=E9=85=8D=E7=BD=AE=E5=B1=9E=E6=80=A7?= =?UTF-8?q?key=E4=BF=AE=E6=94=B9=20#=20Reviewed,=20transaction=20id:=20316?= =?UTF-8?q?7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config-table-list/create-config/manual-create.vue | 2 +- .../detail/config/config-list/config-table-list/edit-config.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bcs-services/bcs-bscp/ui/src/views/space/service/detail/config/config-list/config-table-list/create-config/manual-create.vue b/bcs-services/bcs-bscp/ui/src/views/space/service/detail/config/config-list/config-table-list/create-config/manual-create.vue index 6000b10122..613a4667a7 100644 --- a/bcs-services/bcs-bscp/ui/src/views/space/service/detail/config/config-list/config-table-list/create-config/manual-create.vue +++ b/bcs-services/bcs-bscp/ui/src/views/space/service/detail/config/config-list/config-table-list/create-config/manual-create.vue @@ -14,7 +14,7 @@ :editable="true" :bk-biz-id="props.bkBizId" :id="props.appId" - :file-size-limit="spaceFeatureFlags.RESOURCE_LIMIT.maxConfigItemSize" + :file-size-limit="spaceFeatureFlags.RESOURCE_LIMIT.maxFileSize" @change="handleFormChange" />
diff --git a/bcs-services/bcs-bscp/ui/src/views/space/service/detail/config/config-list/config-table-list/edit-config.vue b/bcs-services/bcs-bscp/ui/src/views/space/service/detail/config/config-list/config-table-list/edit-config.vue index 8bf19ac8a6..1d50ff64af 100644 --- a/bcs-services/bcs-bscp/ui/src/views/space/service/detail/config/config-list/config-table-list/edit-config.vue +++ b/bcs-services/bcs-bscp/ui/src/views/space/service/detail/config/config-list/config-table-list/edit-config.vue @@ -16,7 +16,7 @@ :editable="true" :bk-biz-id="props.bkBizId" :id="props.appId" - :file-size-limit="spaceFeatureFlags.RESOURCE_LIMIT.maxConfigItemSize" + :file-size-limit="spaceFeatureFlags.RESOURCE_LIMIT.maxFileSize" @change="handleChange" />