diff --git a/bcs-app/frontend/src/views/configuration/k8s-create/daemonset.vue b/bcs-app/frontend/src/views/configuration/k8s-create/daemonset.vue
index 1d5dedc9aca90f7db7c5e659e82735cf4ad5a99f..923b46668ee6d7f4054f512fcdfea610937c8b36 100644
--- a/bcs-app/frontend/src/views/configuration/k8s-create/daemonset.vue
+++ b/bcs-app/frontend/src/views/configuration/k8s-create/daemonset.vue
@@ -3173,7 +3173,7 @@
// 鍒╃敤setTimeout浜嬩欢鏉ュ厛璁╁綋鍓嶅鍣ㄧ殑blur浜嬩欢鎵ц瀹屾墠鍒囨崲
setTimeout(() => {
// 鍒囨崲container
- this.resetPreContainerParams()
+ // this.resetPreContainerParams()
this.renderImageIndex++
this.curContainer = container
this.curContainerIndex = index
@@ -3736,7 +3736,7 @@
const data = res.data
setTimeout(() => {
data.forEach(item => {
- item._id = item.value
+ item._id = `${item.name}:${item.value}`
item._name = item.name
})
this.imageList.splice(0, this.imageList.length, ...data)
diff --git a/bcs-app/frontend/src/views/configuration/k8s-create/deployment.vue b/bcs-app/frontend/src/views/configuration/k8s-create/deployment.vue
index 4ecae2ccbc230467df9896edf8b88c49d6fbfb99..b6220472095f47e4f89762720f179b65b05813e0 100644
--- a/bcs-app/frontend/src/views/configuration/k8s-create/deployment.vue
+++ b/bcs-app/frontend/src/views/configuration/k8s-create/deployment.vue
@@ -672,6 +672,7 @@
</template>
<template v-else>
<div class="bk-dropdown-box" style="width: 375px;">
+ {{curContainer.webCache.imageName}}
<bk-combox
style="width: 325px;"
type="text"
@@ -2656,6 +2657,7 @@
// 鍏煎鍘熸暟鎹畐ebcache
container.webCache.imageName = container.imageName
+ debugger
delete container.imageName
container.webCache.env_list = []
@@ -3457,7 +3459,7 @@
// 鍒╃敤setTimeout浜嬩欢鏉ュ厛璁╁綋鍓嶅鍣ㄧ殑blur浜嬩欢鎵ц瀹屾墠鍒囨崲
setTimeout(() => {
// 鍒囨崲container
- this.resetPreContainerParams()
+ // this.resetPreContainerParams()
container.ports.forEach(port => {
if (!port.protocol) {
port.protocol = 'TCP'
@@ -3815,7 +3817,7 @@
const data = res.data
setTimeout(() => {
data.forEach(item => {
- item._id = item.value
+ item._id = `${item.name}:${item.value}`
item._name = item.name
})
this.imageList.splice(0, this.imageList.length, ...data)
diff --git a/bcs-app/frontend/src/views/configuration/k8s-create/job.vue b/bcs-app/frontend/src/views/configuration/k8s-create/job.vue
index be3ef4181a0c8eea6028f8e1cc3f59a757344b90..1019c7d4de6ea4cecf9d708e8f57b7cdfaffd850 100644
--- a/bcs-app/frontend/src/views/configuration/k8s-create/job.vue
+++ b/bcs-app/frontend/src/views/configuration/k8s-create/job.vue
@@ -3123,7 +3123,7 @@
// 鍒╃敤setTimeout浜嬩欢鏉ュ厛璁╁綋鍓嶅鍣ㄧ殑blur浜嬩欢鎵ц瀹屾墠鍒囨崲
setTimeout(() => {
// 鍒囨崲container
- this.resetPreContainerParams()
+ // this.resetPreContainerParams()
this.renderImageIndex++
this.curContainer = container
this.curContainerIndex = index
@@ -3686,7 +3686,7 @@
const data = res.data
setTimeout(() => {
data.forEach(item => {
- item._id = item.value
+ item._id = `${item.name}:${item.value}`
item._name = item.name
})
this.imageList.splice(0, this.imageList.length, ...data)
diff --git a/bcs-app/frontend/src/views/configuration/k8s-create/statefulset.vue b/bcs-app/frontend/src/views/configuration/k8s-create/statefulset.vue
index 51c97131731f8da673f49a12d96b519804099fd7..f02c6a3b8dec101d8bf53b5263f5c3d8ac9f9c51 100644
--- a/bcs-app/frontend/src/views/configuration/k8s-create/statefulset.vue
+++ b/bcs-app/frontend/src/views/configuration/k8s-create/statefulset.vue
@@ -3320,7 +3320,7 @@
// 鍒╃敤setTimeout浜嬩欢鏉ュ厛璁╁綋鍓嶅鍣ㄧ殑blur浜嬩欢鎵ц瀹屾墠鍒囨崲
setTimeout(() => {
// 鍒囨崲container
- this.resetPreContainerParams()
+ // this.resetPreContainerParams()
this.renderImageIndex++
this.curContainer = container
this.curContainerIndex = index
@@ -3883,7 +3883,7 @@
const data = res.data
setTimeout(() => {
data.forEach(item => {
- item._id = item.value
+ item._id = `${item.name}:${item.value}`
item._name = item.name
})
this.imageList.splice(0, this.imageList.length, ...data)
diff --git a/bcs-app/frontend/src/views/configuration/mesos-create/application.vue b/bcs-app/frontend/src/views/configuration/mesos-create/application.vue
index 32fa5262a0d4d9d3d96b89560ac1598434ec72ec..d19cf32cec262d7bcd0611bac2ccc38fa712a4fe 100644
--- a/bcs-app/frontend/src/views/configuration/mesos-create/application.vue
+++ b/bcs-app/frontend/src/views/configuration/mesos-create/application.vue
@@ -2416,7 +2416,7 @@
setCurContainer (container, index) {
// 鍒╃敤setTimeout浜嬩欢鏉ュ厛璁╁綋鍓嶅鍣ㄧ殑blur浜嬩欢鎵ц瀹屾墠鍒囨崲
setTimeout(() => {
- this.resetPreContainerParams()
+ // this.resetPreContainerParams()
// 淇濆瓨褰撳墠container鏁版嵁
const httpHeaders = this.$refs.headerKeyer.getKeyObject()
this.curContainer.healthChecks[0].http.headers = httpHeaders
@@ -2749,7 +2749,7 @@
const data = res.data
setTimeout(() => {
data.forEach(item => {
- item._id = item.value
+ item._id = `${item.name}:${item.value}`
item._name = item.name
})
this.imageList.splice(0, this.imageList.length, ...data)
diff --git a/bcs-app/frontend/src/views/depot/image-detail.vue b/bcs-app/frontend/src/views/depot/image-detail.vue
index ee3f7367b160ab18db9646352b70958c7dba4a7d..1e1a8c6e8d084ecfd467d26ac5ed9d154a0d1864 100644
--- a/bcs-app/frontend/src/views/depot/image-detail.vue
+++ b/bcs-app/frontend/src/views/depot/image-detail.vue
@@ -197,9 +197,11 @@
limit: limit,
projectId: this.projectId
}
+ if (this.$route.query.public) {
+ params.is_public = true
+ }
try {
const res = await this.$store.dispatch('depot/getImageLibraryDetail', params)
-
if (this.showScrollLoading) {
this.hasNext = res.data.has_next
this.hasPrevious = res.data.has_previous
diff --git a/bcs-app/frontend/src/views/depot/image-library.css b/bcs-app/frontend/src/views/depot/image-library.css
index b75251fbe19222f14667ead8e54de436fdffb8eb..cde1ee8c35da1589dc0bf513951d84025721403e 100644
--- a/bcs-app/frontend/src/views/depot/image-library.css
+++ b/bcs-app/frontend/src/views/depot/image-library.css
@@ -257,9 +257,3 @@
}
}
}
-
-.biz-actions {
- position: absolute;
- right: 20px;
- top: 19px;
-}
diff --git a/bcs-app/frontend/src/views/depot/image-library.vue b/bcs-app/frontend/src/views/depot/image-library.vue
index 35100be8c0c8c7002b3a6a777d28a31d9bd5febe..5a7c0a2ab04d8d2bd4ed5827e9dc7257a7a38142 100644
--- a/bcs-app/frontend/src/views/depot/image-library.vue
+++ b/bcs-app/frontend/src/views/depot/image-library.vue
@@ -5,7 +5,7 @@
{{$t('鍏叡闀滃儚')}}
</div>
<div class="biz-actions">
- <a :href="PROJECT_CONFIG.doc.harborGuide" target="_blank" class="bk-text-button ml10">{{$t('濡備綍鎺ㄩ暅鍍忥紵')}}</a>
+ <a :href="PROJECT_CONFIG.doc.harborGuide" target="_blank" class="bk-text-button ml10 mb10">{{$t('濡備綍鎺ㄩ暅鍍忥紵')}}</a>
</div>
</div>
<div class="biz-content-wrapper" style="padding: 0;" v-bkloading="{ isLoading: isInitLoading, opacity: 0.1 }">
@@ -171,6 +171,9 @@
name: 'imageDetail',
params: {
repo: item.repo
+ },
+ query: {
+ public: true
}
})
},
diff --git a/bcs-app/frontend/src/views/depot/project-image.css b/bcs-app/frontend/src/views/depot/project-image.css
index c84609c929dcce876ca1296b6e94bf3bc832df9a..4caddd94db1cce2e04c3b1c46cb89076e6f58197 100644
--- a/bcs-app/frontend/src/views/depot/project-image.css
+++ b/bcs-app/frontend/src/views/depot/project-image.css
@@ -288,12 +288,6 @@
}
}
-.biz-actions {
- position: absolute;
- right: 20px;
- top: 19px;
-}
-
.biz-project-image-dialog {
.bk-dialog-tool {
position: absolute;
diff --git a/bcs-app/frontend/src/views/depot/project-image.vue b/bcs-app/frontend/src/views/depot/project-image.vue
index ba0fbfdf9da279bc17ede1ceae94059612af8c4f..13bae43201a0907410b2cf7cf80f01193d575559 100644
--- a/bcs-app/frontend/src/views/depot/project-image.vue
+++ b/bcs-app/frontend/src/views/depot/project-image.vue
@@ -4,8 +4,8 @@
<div class="biz-project-image-title">
{{$t('椤圭洰闀滃儚')}}
</div>
- <div class="biz-actions">
- <a :href="PROJECT_CONFIG.doc.harborGuide" target="_blank" class="bk-text-button ml10">{{$t('濡備綍鎺ㄩ暅鍍忥紵')}}</a>
+ <div class="biz-actions" style="top: 0;">
+ <a :href="PROJECT_CONFIG.doc.harborGuide" target="_blank" class="bk-text-button ml10 mb10">{{$t('濡備綍鎺ㄩ暅鍍忥紵')}}</a>
</div>
</div>