7691-testToMaster #537

Merged
alexm merged 395 commits from 7691-testToMaster into master 2024-07-09 05:39:56 +00:00
1 changed files with 12 additions and 2 deletions
Showing only changes of commit d9d54a351f - Show all commits

View File

@ -385,15 +385,24 @@ defineExpose({
:key="col.name"
class="fields"
>
<VnLv :label="col.label && `${col.label}:`">
<VnLv
:label="
!col.component &&
col.label &&
`${col.label}:`
"
>
<template #value>
<span
@click="stopEventPropagation($event)"
>
<VnTableColumn
:column="col"
:row
:row="row"
:is-editable="false"
v-model="row[col.name]"
component-prop="columnField"
:show-label="true"
/>
</span>
</template>
@ -450,6 +459,7 @@ defineExpose({
:row="{}"
default="input"
v-model="data[column.name]"
:show-label="true"
/>
<slot name="more-create-dialog" :data="data" />
</div>