Skip to content

Commit 484826a

Browse files
YunaiVgitee-org
authored andcommitted
!520 【优化】el-checkbox的label属性修改为value以兼容下个版本
Merge pull request !520 from 半栈幼儿员/hotfix/el-checkbox
2 parents 323e619 + 70efcad commit 484826a

File tree

9 files changed

+38
-23
lines changed

9 files changed

+38
-23
lines changed

src/components/bpmnProcessDesigner/package/penal/multi-instance/ElementMultiInstance.vue

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,17 +45,20 @@
4545
<el-checkbox
4646
v-model="loopInstanceForm.asyncBefore"
4747
label="异步前"
48+
value="异步前"
4849
@change="updateLoopAsync('asyncBefore')"
4950
/>
5051
<el-checkbox
5152
v-model="loopInstanceForm.asyncAfter"
5253
label="异步后"
54+
value="异步后"
5355
@change="updateLoopAsync('asyncAfter')"
5456
/>
5557
<el-checkbox
5658
v-model="loopInstanceForm.exclusive"
5759
v-if="loopInstanceForm.asyncAfter || loopInstanceForm.asyncBefore"
5860
label="排除"
61+
value="排除"
5962
@change="updateLoopAsync('exclusive')"
6063
/>
6164
</el-form-item>

src/components/bpmnProcessDesigner/package/penal/task/ElementTask.vue

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,20 @@
66
<el-checkbox
77
v-model="taskConfigForm.asyncBefore"
88
label="异步前"
9+
value="异步前"
10+
@change="changeTaskAsync"
11+
/>
12+
<el-checkbox
13+
v-model="taskConfigForm.asyncAfter"
14+
label="异步后"
15+
value="异步后"
916
@change="changeTaskAsync"
1017
/>
11-
<el-checkbox v-model="taskConfigForm.asyncAfter" label="异步后" @change="changeTaskAsync" />
1218
<el-checkbox
1319
v-model="taskConfigForm.exclusive"
1420
v-if="taskConfigForm.asyncAfter || taskConfigForm.asyncBefore"
1521
label="排除"
22+
value="排除"
1623
@change="changeTaskAsync"
1724
/>
1825
</el-form-item>

src/views/Login/components/SSOLogin.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<el-checkbox
1515
v-for="scope in queryParams.scopes"
1616
:key="scope"
17-
:label="scope"
17+
:value="scope"
1818
style="display: block; margin-bottom: -10px"
1919
>
2020
{{ formatScope(scope) }}

src/views/crm/permission/components/PermissionForm.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@
3434
label="同时添加至"
3535
>
3636
<el-checkbox-group v-model="formData.toBizTypes">
37-
<el-checkbox :label="BizTypeEnum.CRM_CONTACT">联系人</el-checkbox>
38-
<el-checkbox :label="BizTypeEnum.CRM_BUSINESS">商机</el-checkbox>
39-
<el-checkbox :label="BizTypeEnum.CRM_CONTRACT">合同</el-checkbox>
37+
<el-checkbox :value="BizTypeEnum.CRM_CONTACT">联系人</el-checkbox>
38+
<el-checkbox :value="BizTypeEnum.CRM_BUSINESS">商机</el-checkbox>
39+
<el-checkbox :value="BizTypeEnum.CRM_CONTRACT">合同</el-checkbox>
4040
</el-checkbox-group>
4141
</el-form-item>
4242
</el-form>

src/views/crm/permission/components/TransferForm.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@
3838
</el-form-item>
3939
<el-form-item v-if="bizType === BizTypeEnum.CRM_CUSTOMER" label="同时转移">
4040
<el-checkbox-group v-model="formData.toBizTypes">
41-
<el-checkbox :label="BizTypeEnum.CRM_CONTACT">联系人</el-checkbox>
42-
<el-checkbox :label="BizTypeEnum.CRM_BUSINESS">商机</el-checkbox>
43-
<el-checkbox :label="BizTypeEnum.CRM_CONTRACT">合同</el-checkbox>
41+
<el-checkbox :value="BizTypeEnum.CRM_CONTACT">联系人</el-checkbox>
42+
<el-checkbox :value="BizTypeEnum.CRM_BUSINESS">商机</el-checkbox>
43+
<el-checkbox :value="BizTypeEnum.CRM_CONTRACT">合同</el-checkbox>
4444
</el-checkbox-group>
4545
</el-form-item>
4646
</el-form>

src/views/infra/codegen/components/ColumInfoForm.vue

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,26 +37,26 @@
3737
</el-table-column>
3838
<el-table-column label="插入" min-width="4%">
3939
<template #default="scope">
40-
<el-checkbox v-model="scope.row.createOperation" false-label="false" true-label="true" />
40+
<el-checkbox v-model="scope.row.createOperation" false-value="false" true-value="true" />
4141
</template>
4242
</el-table-column>
4343
<el-table-column label="编辑" min-width="4%">
4444
<template #default="scope">
45-
<el-checkbox v-model="scope.row.updateOperation" false-label="false" true-label="true" />
45+
<el-checkbox v-model="scope.row.updateOperation" false-value="false" true-value="true" />
4646
</template>
4747
</el-table-column>
4848
<el-table-column label="列表" min-width="4%">
4949
<template #default="scope">
5050
<el-checkbox
5151
v-model="scope.row.listOperationResult"
52-
false-label="false"
53-
true-label="true"
52+
false-value="false"
53+
true-value="true"
5454
/>
5555
</template>
5656
</el-table-column>
5757
<el-table-column label="查询" min-width="4%">
5858
<template #default="scope">
59-
<el-checkbox v-model="scope.row.listOperation" false-label="false" true-label="true" />
59+
<el-checkbox v-model="scope.row.listOperation" false-value="false" true-value="true" />
6060
</template>
6161
</el-table-column>
6262
<el-table-column label="查询方式" min-width="10%">
@@ -75,7 +75,7 @@
7575
</el-table-column>
7676
<el-table-column label="允许空" min-width="5%">
7777
<template #default="scope">
78-
<el-checkbox v-model="scope.row.nullable" false-label="false" true-label="true" />
78+
<el-checkbox v-model="scope.row.nullable" false-value="false" true-value="true" />
7979
</template>
8080
</el-table-column>
8181
<el-table-column label="显示类型" min-width="12%">

src/views/mall/product/spu/form/DeliveryForm.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<el-checkbox
77
v-for="dict in getIntDictOptions(DICT_TYPE.TRADE_DELIVERY_TYPE)"
88
:key="dict.value"
9-
:label="dict.value"
9+
:value="dict.value"
1010
>
1111
{{ dict.label }}
1212
</el-checkbox>

src/views/mall/promotion/rewardActivity/RewardForm.vue

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<el-form-item label="优惠设置">
3434
<template v-for="(item, index) in formData.rules" :key="index">
3535
<el-row type="flex">
36-
<el-col :span="24" style="font-weight: bold; display: flex">
36+
<el-col :span="24" style="display: flex; font-weight: bold">
3737
活动层级{{ index + 1 }}
3838
<el-button
3939
link
@@ -45,7 +45,7 @@
4545
删除
4646
</el-button>
4747
</el-col>
48-
<e-form :ref="'formRef' + index" :model="item">
48+
<el-form :ref="'formRef' + index" :model="item">
4949
<el-form-item
5050
label="优惠门槛:"
5151
prop="limit"
@@ -64,7 +64,7 @@
6464
<el-form-item label="优惠内容:" label-width="100px" style="padding-left: 50px">
6565
<el-checkbox-group v-model="activityRules[index]" style="width: 100%">
6666
<el-col :span="24">
67-
<el-checkbox label="订单金额优惠" name="type" />
67+
<el-checkbox label="订单金额优惠" value="订单金额优惠" name="type" />
6868
<el-form-item v-if="activityRules[index].includes('订单金额优惠')">
6969
7070
<el-input
@@ -77,10 +77,15 @@
7777
</el-form-item>
7878
</el-col>
7979
<el-col :span="24">
80-
<el-checkbox v-model="item.freeDelivery" label="包邮" name="type" />
80+
<el-checkbox
81+
v-model="item.freeDelivery"
82+
label="包邮"
83+
value="包邮"
84+
name="type"
85+
/>
8186
</el-col>
8287
<el-col :span="24">
83-
<el-checkbox label="送积分" name="type" />
88+
<el-checkbox label="送积分" value="送积分" name="type" />
8489
<el-form-item v-if="activityRules[index].includes('送积分')">
8590
8691
<el-input
@@ -95,11 +100,11 @@
95100
<!-- 优惠券待处理 也可以参考优惠劵的SpuShowcase-->
96101
<!-- TODO 待实现!-->
97102
<el-col :span="24">
98-
<el-checkbox label="送优惠券" name="type" />
103+
<el-checkbox label="送优惠券" value="送优惠券" name="type" />
99104
</el-col>
100105
</el-checkbox-group>
101106
</el-form-item>
102-
</e-form>
107+
</el-form>
103108
</el-row>
104109
</template>
105110
<!-- TODO 实现:建议改成放在每一个【活动层级】的下面,有点类似主子表 -->

src/views/mall/trade/config/index.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@
182182
<el-checkbox
183183
v-for="dict in getIntDictOptions(DICT_TYPE.BROKERAGE_WITHDRAW_TYPE)"
184184
:key="dict.value"
185-
:label="dict.value"
185+
:value="dict.value"
186186
>
187187
{{ dict.label }}
188188
</el-checkbox>

0 commit comments

Comments
 (0)