Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: 升级axios版本 #3532

Merged
merged 4 commits into from
Sep 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions bcs-services/bcs-bscp/ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"@blueking/platform-config": "^1.0.3",
"@types/js-cookie": "^3.0.2",
"@types/lodash.clonedeep": "^4.5.7",
"axios": "^1.6.0",
"axios": "^1.7.7",
"bkui-vue": "1.0.3-beta.32",
"crypto-js": "^4.2.0",
"dayjs": "^1.11.9",
Expand Down Expand Up @@ -59,6 +59,6 @@
"vite-plugin-compression": "^0.5.1",
"vite-plugin-eslint": "^1.8.1",
"vue-eslint-parser": "^9.3.1",
"vue-tsc": "^2.0.7"
"vue-tsc": "2.0.7"
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
class="action-icon bk-bscp-icon icon-download"
v-bk-tooltips="{ content: $t('可下钻图表') }" />
</div>
<TriggerBtn v-model:currentType="currentType" />
<TriggerBtn v-model:current-type="currentType" />
</div>
</template>
<bk-loading class="loading-wrap" :loading="loading">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
content: `${$t('支持点击数据下钻')}\n${$t('下钻维度')}\: ${selectedDownDimension}`,
}" />
</div>
<TriggerBtn v-model:currentType="currentType" />
<TriggerBtn v-model:current-type="currentType" />
</div>
</template>
<bk-loading class="loading-wrap" :loading="loading">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
@toggle-full-screen="isOpenFullScreen = !isOpenFullScreen" />
</template>
<template #head-suffix>
<TriggerBtn v-model:currentType="currentType" style="margin-left: 16px" />
<TriggerBtn v-model:current-type="currentType" style="margin-left: 16px" />
</template>
<bk-loading class="loading-wrap" :loading="loading">
<component
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
{{ t('批量删除') }}
</bk-button>
<DeleteConfirmDialog
v-model:isShow="isBatchDeleteDialogShow"
v-model:is-show="isBatchDeleteDialogShow"
:title="t('确认删除所选的 {n} 项分组?', { n: props.selectedIds.length })"
:pending="batchDeletePending"
@confirm="handleBatchDeleteConfirm">
Expand Down
2 changes: 1 addition & 1 deletion bcs-services/bcs-bscp/ui/src/views/space/groups/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@
:name="editingGroup.name"></services-to-published>
</section>
<DeleteConfirmDialog
v-model:isShow="isDeleteGroupDialogShow"
v-model:is-show="isDeleteGroupDialogShow"
:title="t('确认删除该分组?')"
@confirm="handleDeleteGroupConfirm">
<div style="margin-bottom: 8px">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
{
cnName: t('配置根目录'),
shellVar: '${bk_bscp_temp_dir}',
pythonVar: "os.environ.get( 'bk_bscp_temp_dir' )",
pythonVar: 'os.environ.get( \'bk_bscp_temp_dir\' )',
batVar: '%bk_bscp_temp_dir%',
PSVar: '$env:bk_bscp_temp_dir',
tips: t('客户端配置的配置存放临时目录,默认值为 {n}', { n: ' /data/bscp' }),
Expand All @@ -40,7 +40,7 @@
{
cnName: t('业务ID'),
shellVar: '${bk_bscp_biz}',
pythonVar: "os.environ.get( 'bk_bscp_biz' )",
pythonVar: 'os.environ.get( \'bk_bscp_biz\' )',
batVar: '%bk_bscp_biz%',
PSVar: '$env:bk_bscp_biz',
tips: t('蓝鲸配置平台上的业务ID,例如:2'),
Expand All @@ -49,7 +49,7 @@
{
cnName: t('服务名称'),
shellVar: '${bk_bscp_app}',
pythonVar: "os.environ.get( 'bk_bscp_app' )",
pythonVar: 'os.environ.get( \'bk_bscp_app\' )',
batVar: '%bk_bscp_app%',
PSVar: '$env:bk_bscp_app',
tips: t('服务配置中心上的服务名称,例如:demo_service'),
Expand All @@ -58,7 +58,7 @@
{
cnName: t('服务配置目录'),
shellVar: '${bk_bscp_app_temp_dir}',
pythonVar: "os.environ.get( 'bk_bscp_app_temp_dir' )",
pythonVar: 'os.environ.get( \'bk_bscp_app_temp_dir\' )',
batVar: '%bk_bscp_app_temp_dir%',
PSVar: '$env:bk_bscp_app_temp_dir',
tips: t(
Expand All @@ -71,7 +71,7 @@
{
cnName: t('当前配置版本名称'),
shellVar: '${bk_bscp_current_version_name}',
pythonVar: "os.environ.get( 'bk_bscp_current_version_name' )",
pythonVar: 'os.environ.get( \'bk_bscp_current_version_name\' )',
batVar: '%bk_bscp_current_version_name%',
PSVar: '$env:bk_bscp_current_version_name',
tips: t(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
{{ t('批量删除') }}
</bk-button>
<DeleteConfirmDialog
v-model:isShow="isBatchDeleteDialogShow"
v-model:is-show="isBatchDeleteDialogShow"
:title="
t('确认删除所选的 {n} 项脚本?', {
n: isAcrossChecked ? dataCount - props.selectedIds.length : props.selectedIds.length,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@
<ScriptCited v-model:show="showCiteSlider" :id="currentId" />
</section>
<DeleteConfirmDialog
v-model:isShow="isDeleteScriptDialogShow"
v-model:is-show="isDeleteScriptDialogShow"
:title="t('确认删除该脚本?')"
@confirm="handleDeleteScriptConfirm">
<div style="margin-bottom: 8px">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
:space-id="spaceId"
:script-id="scriptId" />
<DeleteConfirmDialog
v-model:isShow="isDeleteScriptVersionDialogShow"
v-model:is-show="isDeleteScriptVersionDialogShow"
:title="t('确认删除该脚本版本?')"
@confirm="handleDeleteScriptVersionConfirm">
<div style="margin-bottom: 8px">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
{{ t('批量删除') }}
</bk-button>
<DeleteConfirmDialog
v-model:isShow="isBatchDeleteDialogShow"
v-model:is-show="isBatchDeleteDialogShow"
:title="
t('确认删除所选的 {n} 项配置项?', {
n: isAcrossChecked ? dataCount - props.selectedIds.length : props.selectedIds.length,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<ConfigForm
ref="formRef"
class="config-form-wrapper"
v-model:fileUploading="fileUploading"
v-model:file-uploading="fileUploading"
:config="configForm"
:content="content"
:is-edit="false"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
v-if="!configDetailLoading"
ref="formRef"
class="config-form-wrapper"
v-model:fileUploading="fileUploading"
v-model:file-uploading="fileUploading"
:config="configForm"
:content="content"
:is-edit="true"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@
@open-edit="handleSwitchToEdit" />
<VersionDiff v-model:show="isDiffPanelShow" :current-version="versionData" :selected-kv-config-id="diffConfig" />
<DeleteConfirmDialog
v-model:isShow="isDeleteConfigDialogShow"
v-model:is-show="isDeleteConfigDialogShow"
:title="t('确认删除该配置项?')"
@confirm="handleDeleteConfigConfirm">
<div style="margin-bottom: 8px">
Expand All @@ -160,7 +160,7 @@
<div>{{ deleteConfigTips }}</div>
</DeleteConfirmDialog>
<DeleteConfirmDialog
v-model:isShow="isRecoverConfigDialogShow"
v-model:is-show="isRecoverConfigDialogShow"
:title="t('确认恢复该配置项?')"
:confirm-text="t('恢复')"
@confirm="handleRecoverConfigConfirm">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@
:app-id="props.appId"
@updated="getAllConfigList" />
<DeleteConfirmDialog
v-model:isShow="isDeleteConfigDialogShow"
v-model:is-show="isDeleteConfigDialogShow"
:title="t('确认删除该配置文件?')"
@confirm="handleDeleteConfigConfirm">
<div style="margin-bottom: 8px">
Expand All @@ -270,7 +270,7 @@
<div>{{ deleteConfigTips }}</div>
</DeleteConfirmDialog>
<DeleteConfirmDialog
v-model:isShow="isDeletePkgDialogShow"
v-model:is-show="isDeletePkgDialogShow"
:title="t('确认移除该配置模板套餐?')"
:confirm-text="t('移除')"
:pending="removePkgLoading"
Expand All @@ -281,7 +281,7 @@
<div>{{ t('移除后本服务配置将不再引用该配置模板套餐,以后需要时可以重新从配置模板导入') }}</div>
</DeleteConfirmDialog>
<DeleteConfirmDialog
v-model:isShow="isRecoverConfigDialogShow"
v-model:is-show="isRecoverConfigDialogShow"
:title="t('确认恢复该配置文件?')"
:confirm-text="t('恢复')"
@confirm="handleRecoverConfigConfirm">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<div class="slider-content-container">
<ConfigForm
ref="formRef"
v-model:fileUploading="fileUploading"
v-model:file-uploading="fileUploading"
:config="configForm"
:content="content"
:editable="true"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<ConfigForm
v-if="!configDetailLoading"
ref="formRef"
v-model:fileUploading="fileUploading"
v-model:file-uploading="fileUploading"
class="config-form-wrapper"
:config="configForm"
:content="content"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<CommonConfigTable
v-model:selectedConfigs="selectedConfigs"
v-model:selected-configs="selectedConfigs"
ref="configTable"
current-pkg="all"
:show-cited-by-pkgs-col="true"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<CommonConfigTable
v-model:selectedConfigs="selectedConfigs"
v-model:selected-configs="selectedConfigs"
ref="configTable"
:key="currentPkg"
:show-cited-by-pkgs-col="true"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<CommonConfigTable
ref="configTable"
v-model:selectedConfigs="selectedConfigs"
v-model:selected-configs="selectedConfigs"
:current-template-space="currentTemplateSpace"
current-pkg="no_specified"
:space-id="spaceId"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<Create v-model:show="isShowCreateDialog" @created="handleCreated" />
<Edit v-model:show="editingData.open" :data="editingData.data" @edited="loadList" />
<DeleteConfirmDialog
v-model:isShow="isDeleteTemplateSpaceDialogShow"
v-model:is-show="isDeleteTemplateSpaceDialogShow"
:title="t('确认删除该配置模板空间?')"
@confirm="handleDeleteTemplateSpaceConfirm">
<div style="margin-bottom: 8px">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
{{ t('批量删除') }}
</bk-button>
<DeleteConfirmDialog
v-model:isShow="isBatchDeleteDialogShow"
v-model:is-show="isBatchDeleteDialogShow"
:title="
t('确认删除所选的 {n} 项变量?', {
n: isAcrossChecked ? dataCount - props.selectedIds.length : props.selectedIds.length,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
<VariableImport v-model:show="isImportVariableShow" @edited="refreshList" />
</section>
<DeleteConfirmDialog
v-model:isShow="isDeleteVariableDialogShow"
v-model:is-show="isDeleteVariableDialogShow"
:title="t('确认删除该全局变量?')"
@confirm="handleDeleteVarConfirm">
<div style="margin-bottom: 8px">
Expand Down
Loading
Loading