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.

Sign up for GitHub

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

Jump to bottom

chore: 更新前端yarn.lock文件 #3293

Merged
merged 3 commits into from
Jun 19, 2024
Merged

chore: 更新前端yarn.lock文件 #3293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6e3c1ce
chore: 更新前端yarn.lock文件
luofann Jun 19, 2024
aeb4dae
refactor: 解决ts校验错误
luofann Jun 19, 2024
debd546
refactor: 解决构建报错
luofann Jun 19, 2024
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
7 changes: 2 additions & 5 deletions bcs-services/bcs-bscp/ui/src/views/space/service/detail/components/publish-version/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
import ConfirmDialog from './confirm-dialog.vue';
import SelectGroup from './select-group/index.vue';
import VersionDiff from '../../config/components/version-diff/index.vue';
import { useRoute, useRouter } from 'vue-router';
import { useRouter } from 'vue-router';
import { getConfigVersionList } from '../../../../../../api/config';
import { IConfigVersion } from '../../../../../../../types/config';

Expand All @@ -92,10 +92,7 @@

const emit = defineEmits(['confirm']);

const route = useRoute();
const router = useRouter();
const bkBizId = String(route.params.spaceId);
const appId = Number(route.params.appId);
const versionList = ref<IConfigVersion[]>([]);
const isSelectGroupPanelOpen = ref(false);
const isDiffSliderShow = ref(false);
Expand Down Expand Up @@ -139,7 +136,7 @@
// 获取所有对比基准版本
const getVersionList = async () => {
try {
const res = await getConfigVersionList(bkBizId, appId, { start: 0, all: true });
const res = await getConfigVersionList(props.bkBizId, props.appId, { start: 0, all: true });
versionList.value = res.data.details.filter((item: IConfigVersion) => {
const { id, status } = item;
return id !== versionData.value.id && status.publish_status === 'partial_released';
Expand Down
4 changes: 2 additions & 2 deletions bcs-services/bcs-bscp/ui/src/views/space/service/list/components/service-list-content.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
import Message from 'bkui-vue/lib/message';
import { debounce } from 'lodash';

const { spaceId, permissionQuery, showApplyPermDialog } = storeToRefs(useGlobalStore());
const { permissionQuery, showApplyPermDialog } = storeToRefs(useGlobalStore());
const { userInfo } = storeToRefs(useUserStore());
const { t } = useI18n();

Expand Down Expand Up @@ -208,7 +208,7 @@
const loadAppList = async () => {
isLoading.value = true;
try {
const bizId = spaceId.value;
const bizId = props.spaceId;
const resp = await getAppList(bizId, filters.value);
if (resp.details.length > 0) {
const appIds = resp.details.map((item: IAppItem) => item.id);
Expand Down
6 changes: 3 additions & 3 deletions ...lates/list/package-detail/operations/move-out-from-pkg/batch-move-out-from-pkg-dialog.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
import LinkToApp from '../../../components/link-to-app.vue';

const { spaceId } = storeToRefs(useGlobalStore());
const { packageList, currentTemplateSpace, currentPkg } = storeToRefs(useTemplateStore());
const { packageList, currentTemplateSpace } = storeToRefs(useTemplateStore());
const { t } = useI18n();

const props = defineProps<{
Expand Down Expand Up @@ -100,13 +100,13 @@
};

const handleConfirm = async () => {
const pkg = packageList.value.find((item) => item.id === currentPkg.value);
const pkg = packageList.value.find((item) => item.id === props.currentPkg);
if (!pkg) return;

try {
pending.value = true;
const ids = props.value.map((item) => item.id);
await moveOutTemplateFromPackage(spaceId.value, currentTemplateSpace.value, ids, [currentPkg.value as number]);
await moveOutTemplateFromPackage(spaceId.value, currentTemplateSpace.value, ids, [props.currentPkg as number]);
emits('movedOut');
close();
Message({
Expand Down
1 change: 0 additions & 1 deletion bcs-services/bcs-bscp/ui/vite.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ export default defineConfig(({ command, mode }) => {
build: {
outDir: 'dist',
assetsDir: 'static',
target: 'es2015',
commonjsOptions: {
transformMixedEsModules: true,
},
Expand Down
Loading
Loading