Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
小 白蛋
Bk Bcs
Commits
8fc98bb4
Unverified
Commit
8fc98bb4
authored
3 years ago
by
hito
Committed by
GitHub
3 years ago
Browse files
Options
Download
Email Patches
Plain Diff
fix: 修复ee版本集群导入和创建问题 (#1581)
parent
80be7045
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
bcs-ui/frontend/src/store/menu.ts
+1
-1
bcs-ui/frontend/src/store/menu.ts
bcs-ui/frontend/src/store/modules/clustermanager.js
+2
-2
bcs-ui/frontend/src/store/modules/clustermanager.js
bcs-ui/frontend/src/views/cluster/create-cluster/create-form-cluster-ee.vue
+6
-1
...c/views/cluster/create-cluster/create-form-cluster-ee.vue
bcs-ui/frontend/src/views/cluster/create-cluster/create-import-cluster.vue
+6
-1
...rc/views/cluster/create-cluster/create-import-cluster.vue
with
15 additions
and
5 deletions
+15
-5
bcs-ui/frontend/src/store/menu.ts
+
1
-
1
View file @
8fc98bb4
...
...
@@ -12,7 +12,7 @@ const publicImage = window.i18n.t('公共镜像')
const
projectImage
=
window
.
i18n
.
t
(
'
项目镜像
'
)
const
operateAudit
=
window
.
i18n
.
t
(
'
操作审计
'
)
const
eventQuery
=
window
.
i18n
.
t
(
'
事件查询
'
)
const
monitor
=
window
.
i18n
.
t
(
'
监控
中心
'
)
const
monitor
=
window
.
i18n
.
t
(
'
容器
监控
'
)
const
release
=
window
.
i18n
.
t
(
'
Release列表
'
)
const
chart
=
window
.
i18n
.
t
(
'
Chart仓库
'
)
const
crdcontroller
=
window
.
i18n
.
t
(
'
组件库
'
)
...
...
This diff is collapsed.
Click to expand it.
bcs-ui/frontend/src/store/modules/clustermanager.js
+
2
-
2
View file @
8fc98bb4
...
...
@@ -54,7 +54,7 @@ export default {
const
data
=
await
deleteCluster
({
...
params
,
operator
:
ctx
.
rootState
.
user
?.
username
}).
catch
(()
=>
false
)
}).
then
(()
=>
true
).
catch
(()
=>
false
)
return
data
},
async
retryCluster
(
ctx
,
params
)
{
...
...
@@ -90,7 +90,7 @@ export default {
const
data
=
await
deleteClusterNode
({
...
params
,
operator
:
ctx
.
rootState
.
user
?.
username
}).
catch
(()
=>
false
)
}).
then
(()
=>
true
).
catch
(()
=>
false
)
return
data
},
async
clusterDetail
(
ctx
,
params
)
{
...
...
This diff is collapsed.
Click to expand it.
bcs-ui/frontend/src/views/cluster/create-cluster/create-form-cluster-ee.vue
+
6
-
1
View file @
8fc98bb4
...
...
@@ -80,7 +80,7 @@
</section>
</template>
<
script
lang=
"ts"
>
import
{
defineComponent
,
onMounted
,
ref
,
computed
}
from
'
@vue/composition-api
'
import
{
defineComponent
,
onMounted
,
ref
,
computed
,
watch
}
from
'
@vue/composition-api
'
import
IpSelector
from
'
@/components/ip-selector/selector-dialog.vue
'
import
useGoHome
from
'
@/common/use-gohome
'
import
KeyValue
from
'
@/components/key-value.vue
'
...
...
@@ -199,6 +199,11 @@
if
(
!
result
)
return
confirmDialog
.
value
=
true
}
watch
(
confirmDialog
,
(
value
)
=>
{
if
(
!
value
)
{
createConfirm
.
value
=
[]
}
})
const
curProject
=
computed
(()
=>
{
return
$store
.
state
.
curProject
})
...
...
This diff is collapsed.
Click to expand it.
bcs-ui/frontend/src/views/cluster/create-cluster/create-import-cluster.vue
+
6
-
1
View file @
8fc98bb4
...
...
@@ -75,7 +75,7 @@
</section>
</template>
<
script
lang=
"ts"
>
import
{
defineComponent
,
ref
,
computed
,
onMounted
}
from
'
@vue/composition-api
'
import
{
defineComponent
,
ref
,
computed
,
onMounted
,
watch
}
from
'
@vue/composition-api
'
import
FormGroup
from
'
./form-group.vue
'
import
Ace
from
'
@/components/ace-editor
'
import
useGoHome
from
'
@/common/use-gohome
'
...
...
@@ -144,6 +144,11 @@
const
handleCancel
=
()
=>
{
$router
.
back
()
}
watch
(
showImportDialog
,
(
value
)
=>
{
if
(
!
value
)
{
importConfirm
.
value
=
[]
}
})
const
curProject
=
computed
(()
=>
{
return
$store
.
state
.
curProject
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment