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

fix: 兼容vue2在画布上单选框组&多选框组不同方式改变选中值时渲染异常修复 #1428

Merged
merged 1 commit into from
Dec 27, 2024
Merged

fix: 兼容vue2在画布上单选框组&多选框组不同方式改变选中值时渲染异常修复 #1428

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion lib/client/src/components/render/pc/render-slot.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ export default {
// 选中值变化优先级： 指令 > 属性modelValue > 单个选项，另外属性modelValue(数据格式为值)< 单个选项
const isValidChecked = () => {
if (['bk-radio-group', 'bk-checkbox-group'].includes(comType)) {
const isFormatValue = comRenderProps?.modelValue?.format === 'value'
const modelAttr = framework === 'vue3' ? 'modelValue' : 'value'
const isFormatValue = !comRenderProps?.[modelAttr]?.format || comRenderProps?.[modelAttr].format === 'value'
const isModelDirective = comRenderDirectives.find((item) => {
if (item?.type === 'v-model') {
return item?.code?.length > 0
Expand Down
8 changes: 4 additions & 4 deletions lib/client/src/element-materials/modifier/component/slots/render-config/vue2/bk/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ function getVal (val) {
}

const bkRenderMap = {
'bk-checkbox' ({ val, from, valueKeys }) {
'bk-checkbox' ({ val, from, valueKeys, isChecked }) {
const displayVal = getVal(val)
const labelKey = valueKeys?.label || 'label'
const valueKey = valueKeys?.value || 'value'
Expand All @@ -14,12 +14,12 @@ const bkRenderMap = {
v-for="(item, index) in ${displayVal}"
:key="index"
:value="item.${valueKey}"
${from !== 'canvas' ? '' : `:class="item.${checkedKey} ? \'is-checked\' : \'\'"`}
${from !== 'canvas' ? '' : `:class="${`item.${checkedKey} && ${isChecked} `} ? \'is-checked\' : \'\'"`}
style="margin-right: 20px"
>{{item.${labelKey}}}</bk-checkbox>
`
},
'bk-radio' ({ val, from, valueKeys }) {
'bk-radio' ({ val, from, valueKeys, isChecked }) {
const displayVal = getVal(val)
const labelKey = valueKeys?.label || 'label'
const valueKey = valueKeys?.value || 'value'
Expand All @@ -30,7 +30,7 @@ const bkRenderMap = {
:label="item.${labelKey}"
:value="item.${valueKey}"
:disabled="item.disabled"
${from !== 'canvas' ? '' : ':checked="item.checked"'}
${from !== 'canvas' ? '' : `:checked="${`item.checked && ${isChecked}`}"`}
style="margin-right: 20px"
>{{item.${labelKey}}}</bk-radio>
`
Expand Down