Skip to content

Commit 323e619

Browse files
YunaiVgitee-org
YunaiV
authored and
gitee-org
committed
!507 回退 'Pull Request !505 : 【修复】el-input、el-select、el-date-picker宽度；el-radio的label属性兼容下个版本；优化iframe布局'
Merge pull request !507 from 芋道源码/revert-merge-505-master
2 parents ce5d8d3 + 1d07068 commit 323e619

File tree

143 files changed

+344
-436
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

143 files changed

+344
-436
lines changed

‎src/components/Crontab/src/Crontab.vue

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -548,10 +548,10 @@ const inputChange = () => {
548548
<el-form>
549549
<el-form-item label="类型">
550550
<el-radio-group v-model="cronValue.second.type">
551-
<el-radio-button value="0">任意值</el-radio-button>
552-
<el-radio-button value="1">范围</el-radio-button>
553-
<el-radio-button value="2">间隔</el-radio-button>
554-
<el-radio-button value="3">指定</el-radio-button>
551+
<el-radio-button label="0">任意值</el-radio-button>
552+
<el-radio-button label="1">范围</el-radio-button>
553+
<el-radio-button label="2">间隔</el-radio-button>
554+
<el-radio-button label="3">指定</el-radio-button>
555555
</el-radio-group>
556556
</el-form-item>
557557
<el-form-item v-if="cronValue.second.type == '1'" label="范围">
@@ -607,10 +607,10 @@ const inputChange = () => {
607607
<el-form>
608608
<el-form-item label="类型">
609609
<el-radio-group v-model="cronValue.minute.type">
610-
<el-radio-button value="0">任意值</el-radio-button>
611-
<el-radio-button value="1">范围</el-radio-button>
612-
<el-radio-button value="2">间隔</el-radio-button>
613-
<el-radio-button value="3">指定</el-radio-button>
610+
<el-radio-button label="0">任意值</el-radio-button>
611+
<el-radio-button label="1">范围</el-radio-button>
612+
<el-radio-button label="2">间隔</el-radio-button>
613+
<el-radio-button label="3">指定</el-radio-button>
614614
</el-radio-group>
615615
</el-form-item>
616616
<el-form-item v-if="cronValue.minute.type == '1'" label="范围">
@@ -666,10 +666,10 @@ const inputChange = () => {
666666
<el-form>
667667
<el-form-item label="类型">
668668
<el-radio-group v-model="cronValue.hour.type">
669-
<el-radio-button value="0">任意值</el-radio-button>
670-
<el-radio-button value="1">范围</el-radio-button>
671-
<el-radio-button value="2">间隔</el-radio-button>
672-
<el-radio-button value="3">指定</el-radio-button>
669+
<el-radio-button label="0">任意值</el-radio-button>
670+
<el-radio-button label="1">范围</el-radio-button>
671+
<el-radio-button label="2">间隔</el-radio-button>
672+
<el-radio-button label="3">指定</el-radio-button>
673673
</el-radio-group>
674674
</el-form-item>
675675
<el-form-item v-if="cronValue.hour.type == '1'" label="范围">
@@ -725,12 +725,12 @@ const inputChange = () => {
725725
<el-form>
726726
<el-form-item label="类型">
727727
<el-radio-group v-model="cronValue.day.type">
728-
<el-radio-button value="0">任意值</el-radio-button>
729-
<el-radio-button value="1">范围</el-radio-button>
730-
<el-radio-button value="2">间隔</el-radio-button>
731-
<el-radio-button value="3">指定</el-radio-button>
732-
<el-radio-button value="4">本月最后一天</el-radio-button>
733-
<el-radio-button value="5">不指定</el-radio-button>
728+
<el-radio-button label="0">任意值</el-radio-button>
729+
<el-radio-button label="1">范围</el-radio-button>
730+
<el-radio-button label="2">间隔</el-radio-button>
731+
<el-radio-button label="3">指定</el-radio-button>
732+
<el-radio-button label="4">本月最后一天</el-radio-button>
733+
<el-radio-button label="5">不指定</el-radio-button>
734734
</el-radio-group>
735735
</el-form-item>
736736
<el-form-item v-if="cronValue.day.type == '1'" label="范围">
@@ -786,10 +786,10 @@ const inputChange = () => {
786786
<el-form>
787787
<el-form-item label="类型">
788788
<el-radio-group v-model="cronValue.month.type">
789-
<el-radio-button value="0">任意值</el-radio-button>
790-
<el-radio-button value="1">范围</el-radio-button>
791-
<el-radio-button value="2">间隔</el-radio-button>
792-
<el-radio-button value="3">指定</el-radio-button>
789+
<el-radio-button label="0">任意值</el-radio-button>
790+
<el-radio-button label="1">范围</el-radio-button>
791+
<el-radio-button label="2">间隔</el-radio-button>
792+
<el-radio-button label="3">指定</el-radio-button>
793793
</el-radio-group>
794794
</el-form-item>
795795
<el-form-item v-if="cronValue.month.type == '1'" label="范围">
@@ -846,12 +846,12 @@ const inputChange = () => {
846846
<el-form>
847847
<el-form-item label="类型">
848848
<el-radio-group v-model="cronValue.week.type">
849-
<el-radio-button value="0">任意值</el-radio-button>
850-
<el-radio-button value="1">范围</el-radio-button>
851-
<el-radio-button value="2">间隔</el-radio-button>
852-
<el-radio-button value="3">指定</el-radio-button>
853-
<el-radio-button value="4">本月最后一周</el-radio-button>
854-
<el-radio-button value="5">不指定</el-radio-button>
849+
<el-radio-button label="0">任意值</el-radio-button>
850+
<el-radio-button label="1">范围</el-radio-button>
851+
<el-radio-button label="2">间隔</el-radio-button>
852+
<el-radio-button label="3">指定</el-radio-button>
853+
<el-radio-button label="4">本月最后一周</el-radio-button>
854+
<el-radio-button label="5">不指定</el-radio-button>
855855
</el-radio-group>
856856
</el-form-item>
857857
<el-form-item v-if="cronValue.week.type == '1'" label="范围">
@@ -925,11 +925,11 @@ const inputChange = () => {
925925
<el-form>
926926
<el-form-item label="类型">
927927
<el-radio-group v-model="cronValue.year.type">
928-
<el-radio-button value="-1">忽略</el-radio-button>
929-
<el-radio-button value="0">任意值</el-radio-button>
930-
<el-radio-button value="1">范围</el-radio-button>
931-
<el-radio-button value="2">间隔</el-radio-button>
932-
<el-radio-button value="3">指定</el-radio-button>
928+
<el-radio-button label="-1">忽略</el-radio-button>
929+
<el-radio-button label="0">任意值</el-radio-button>
930+
<el-radio-button label="1">范围</el-radio-button>
931+
<el-radio-button label="2">间隔</el-radio-button>
932+
<el-radio-button label="3">指定</el-radio-button>
933933
</el-radio-group>
934934
</el-form-item>
935935
<el-form-item v-if="cronValue.year.type == '1'" label="范围">

‎src/components/DiyEditor/components/ComponentContainerProperty.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<el-form :model="formData" label-width="80px">
1212
<el-form-item label="组件背景" prop="bgType">
1313
<el-radio-group v-model="formData.bgType">
14-
<el-radio value="color">纯色</el-radio>
15-
<el-radio value="img">图片</el-radio>
14+
<el-radio label="color">纯色</el-radio>
15+
<el-radio label="img">图片</el-radio>
1616
</el-radio-group>
1717
</el-form-item>
1818
<el-form-item label="选择颜色" prop="bgColor" v-if="formData.bgType === 'color'">

‎src/components/DiyEditor/components/mobile/Carousel/property.vue

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,21 @@
55
<el-form-item label="样式" prop="type">
66
<el-radio-group v-model="formData.type">
77
<el-tooltip class="item" content="默认" placement="bottom">
8-
<el-radio-button value="default">
8+
<el-radio-button label="default">
99
<Icon icon="system-uicons:carousel" />
1010
</el-radio-button>
1111
</el-tooltip>
1212
<el-tooltip class="item" content="卡片" placement="bottom">
13-
<el-radio-button value="card">
13+
<el-radio-button label="card">
1414
<Icon icon="ic:round-view-carousel" />
1515
</el-radio-button>
1616
</el-tooltip>
1717
</el-radio-group>
1818
</el-form-item>
1919
<el-form-item label="指示器" prop="indicator">
2020
<el-radio-group v-model="formData.indicator">
21-
<el-radio value="dot">小圆点</el-radio>
22-
<el-radio value="number">数字</el-radio>
21+
<el-radio label="dot">小圆点</el-radio>
22+
<el-radio label="number">数字</el-radio>
2323
</el-radio-group>
2424
</el-form-item>
2525
<el-form-item label="是否轮播" prop="autoplay">
@@ -43,8 +43,8 @@
4343
<template #default="{ element }">
4444
<el-form-item label="类型" prop="type" class="m-b-8px!" label-width="40px">
4545
<el-radio-group v-model="element.type">
46-
<el-radio value="img">图片</el-radio>
47-
<el-radio value="video">视频</el-radio>
46+
<el-radio label="img">图片</el-radio>
47+
<el-radio label="video">视频</el-radio>
4848
</el-radio-group>
4949
</el-form-item>
5050
<el-form-item

‎src/components/DiyEditor/components/mobile/CouponCard/property.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,17 @@
2626
<el-form-item label="列数" prop="type">
2727
<el-radio-group v-model="formData.columns">
2828
<el-tooltip class="item" content="一列" placement="bottom">
29-
<el-radio-button :value="1">
29+
<el-radio-button :label="1">
3030
<Icon icon="fluent:text-column-one-24-filled" />
3131
</el-radio-button>
3232
</el-tooltip>
3333
<el-tooltip class="item" content="二列" placement="bottom">
34-
<el-radio-button :value="2">
34+
<el-radio-button :label="2">
3535
<Icon icon="fluent:text-column-two-24-filled" />
3636
</el-radio-button>
3737
</el-tooltip>
3838
<el-tooltip class="item" content="三列" placement="bottom">
39-
<el-radio-button :value="3">
39+
<el-radio-button :label="3">
4040
<Icon icon="fluent:text-column-three-24-filled" />
4141
</el-radio-button>
4242
</el-tooltip>

‎src/components/DiyEditor/components/mobile/Divider/property.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
:key="index"
1212
:content="item.text"
1313
>
14-
<el-radio-button :value="item.type">
14+
<el-radio-button :label="item.type">
1515
<Icon :icon="item.icon" />
1616
</el-radio-button>
1717
</el-tooltip>
@@ -24,12 +24,12 @@
2424
<el-form-item label="左右边距" prop="paddingType">
2525
<el-radio-group v-model="formData!.paddingType">
2626
<el-tooltip content="无边距" placement="top">
27-
<el-radio-button value="none">
27+
<el-radio-button label="none">
2828
<Icon icon="tabler:box-padding" />
2929
</el-radio-button>
3030
</el-tooltip>
3131
<el-tooltip content="左右留边" placement="top">
32-
<el-radio-button value="horizontal">
32+
<el-radio-button label="horizontal">
3333
<Icon icon="vaadin:padding" />
3434
</el-radio-button>
3535
</el-tooltip>

‎src/components/DiyEditor/components/mobile/FloatingActionButton/property.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<el-card header="按钮配置" class="property-group" shadow="never">
44
<el-form-item label="展开方向" prop="direction">
55
<el-radio-group v-model="formData.direction">
6-
<el-radio value="vertical">垂直</el-radio>
7-
<el-radio value="horizontal">水平</el-radio>
6+
<el-radio label="vertical">垂直</el-radio>
7+
<el-radio label="horizontal">水平</el-radio>
88
</el-radio-group>
99
</el-form-item>
1010
<el-form-item label="显示文字" prop="showText">

‎src/components/DiyEditor/components/mobile/MenuGrid/property.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
<el-form label-width="80px" :model="formData" class="m-t-8px">
55
<el-form-item label="每行数量" prop="column">
66
<el-radio-group v-model="formData.column">
7-
<el-radio :value="3">3个</el-radio>
8-
<el-radio :value="4">4个</el-radio>
7+
<el-radio :label="3">3个</el-radio>
8+
<el-radio :label="4">4个</el-radio>
99
</el-radio-group>
1010
</el-form-item>
1111

‎src/components/DiyEditor/components/mobile/MenuSwiper/property.vue

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,21 @@
44
<el-form label-width="80px" :model="formData" class="m-t-8px">
55
<el-form-item label="布局" prop="layout">
66
<el-radio-group v-model="formData.layout">
7-
<el-radio value="iconText">图标+文字</el-radio>
8-
<el-radio value="icon">仅图标</el-radio>
7+
<el-radio label="iconText">图标+文字</el-radio>
8+
<el-radio label="icon">仅图标</el-radio>
99
</el-radio-group>
1010
</el-form-item>
1111
<el-form-item label="行数" prop="row">
1212
<el-radio-group v-model="formData.row">
13-
<el-radio :value="1">1行</el-radio>
14-
<el-radio :value="2">2行</el-radio>
13+
<el-radio :label="1">1行</el-radio>
14+
<el-radio :label="2">2行</el-radio>
1515
</el-radio-group>
1616
</el-form-item>
1717
<el-form-item label="列数" prop="column">
1818
<el-radio-group v-model="formData.column">
19-
<el-radio :value="3">3列</el-radio>
20-
<el-radio :value="4">4列</el-radio>
21-
<el-radio :value="5">5列</el-radio>
19+
<el-radio :label="3">3列</el-radio>
20+
<el-radio :label="4">4列</el-radio>
21+
<el-radio :label="5">5列</el-radio>
2222
</el-radio-group>
2323
</el-form-item>
2424

‎src/components/DiyEditor/components/mobile/NavigationBar/components/CellProperty.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
<template v-if="selectedHotAreaIndex === cellIndex">
1515
<el-form-item label="类型" :prop="`cell[${cellIndex}].type`">
1616
<el-radio-group v-model="cell.type">
17-
<el-radio value="text">文字</el-radio>
18-
<el-radio value="image">图片</el-radio>
19-
<el-radio value="search">搜索框</el-radio>
17+
<el-radio label="text">文字</el-radio>
18+
<el-radio label="image">图片</el-radio>
19+
<el-radio label="search">搜索框</el-radio>
2020
</el-radio-group>
2121
</el-form-item>
2222
<!-- 1. 文字 -->

‎src/components/DiyEditor/components/mobile/NavigationBar/property.vue

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,27 @@
22
<el-form label-width="80px" :model="formData" :rules="rules">
33
<el-form-item label="样式" prop="styleType">
44
<el-radio-group v-model="formData!.styleType">
5-
<el-radio value="normal">标准</el-radio>
5+
<el-radio label="normal">标准</el-radio>
66
<el-tooltip
77
content="沉侵式头部仅支持微信小程序、APP，建议页面第一个组件为图片展示类组件"
88
placement="top"
99
>
10-
<el-radio value="inner">沉浸式</el-radio>
10+
<el-radio label="inner">沉浸式</el-radio>
1111
</el-tooltip>
1212
</el-radio-group>
1313
</el-form-item>
1414
<el-form-item label="常驻显示" prop="alwaysShow" v-if="formData.styleType === 'inner'">
1515
<el-radio-group v-model="formData!.alwaysShow">
16-
<el-radio :value="false">关闭</el-radio>
16+
<el-radio :label="false">关闭</el-radio>
1717
<el-tooltip content="常驻显示关闭后,头部小组件将在页面滑动时淡入" placement="top">
18-
<el-radio :value="true">开启</el-radio>
18+
<el-radio :label="true">开启</el-radio>
1919
</el-tooltip>
2020
</el-radio-group>
2121
</el-form-item>
2222
<el-form-item label="背景类型" prop="bgType">
2323
<el-radio-group v-model="formData.bgType">
24-
<el-radio value="color">纯色</el-radio>
25-
<el-radio value="img">图片</el-radio>
24+
<el-radio label="color">纯色</el-radio>
25+
<el-radio label="img">图片</el-radio>
2626
</el-radio-group>
2727
</el-form-item>
2828
<el-form-item label="背景颜色" prop="bgColor" v-if="formData.bgType === 'color'">

0 commit comments

Comments
 (0)