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

feat #1568

Merged
merged 15 commits into from
Oct 12, 2021
Rate limit · GitHub

Access has been restricted

You have triggered a rate limit.

Please wait a few minutes before you try again;
in some cases this may take up to an hour.

Merged

feat #1568

Changes from 1 commit
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
Prev Previous commit
Next Next commit
Merge branch 'master' of https://github.com/Tencent/bk-bcs-saas into …
…dev_hwweng
  • Loading branch information
vhwweng committed Sep 26, 2021
commit 3566fcb81d894e878b171fbc533a2106810724c2
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
ref="selectorRef"
v-bkloading="{ isLoading }"
:panels="panels"
:height="dialogHeight"
:height="height"
:active.sync="active"
:preview-data="previewData"
:get-default-data="handleGetDefaultData"
@@ -297,9 +297,9 @@
const params: any = {
desire_all_data: true
}
if (state.curTreeNode?.bk_obj_id === 'set') {
if (state.curTreeNode.bk_obj_id === 'set') {
params.set_id = state.curTreeNode.bk_inst_id
} else if (state.curTreeNode?.bk_obj_id === 'module') {
} else if (state.curTreeNode.bk_obj_id === 'module') {
params.module_id = state.curTreeNode.bk_inst_id
}
const data = await fetchBizHosts(params).catch(() => ({ results: [] }))
Original file line number Diff line number Diff line change
@@ -35,11 +35,13 @@
default: () => ([])
}
},

setup (props, ctx) {
const { emit } = ctx
const { modelValue } = toRefs(props)
const dialogWidth = ref<any>(0)
const dialogWidth = ref(1200)
const dialogHeight = ref(600)

const selectorKey = ref(String(new Date().getTime()))
watch(modelValue, () => {
selectorKey.value = String(new Date().getTime())
@@ -67,12 +69,14 @@

onMounted(() => {
dialogWidth.value = document.body.clientWidth < 1650 ? 1200 : document.body.clientWidth - 650
dialogHeight.value = document.body.clientHeight < 1000 ? 600 : document.body.clientHeight - 320
})

return {
selector,
selectorKey,
dialogWidth,
dialogHeight,
handleValueChange,
handleConfirm,
handleIpSelectorChange
You are viewing a condensed version of this merge commit. You can view the full changes here.