!507 回退 'Pull Request !505 : 【修复】el-input、el-select、el-date-picker宽度；el-radio的label属性兼容下个版本；优化iframe布局'

Merge pull request !507 from 芋道源码/revert-merge-505-master

src/components/Crontab/src/Crontab.vue

@@ -548,10 +548,10 @@ const inputChange = () => {
           <el-form>
             <el-form-item label="类型">
               <el-radio-group v-model="cronValue.second.type">
-                <el-radio-button value="0">任意值</el-radio-button>
-                <el-radio-button value="1">范围</el-radio-button>
-                <el-radio-button value="2">间隔</el-radio-button>
-                <el-radio-button value="3">指定</el-radio-button>
+                <el-radio-button label="0">任意值</el-radio-button>
+                <el-radio-button label="1">范围</el-radio-button>
+                <el-radio-button label="2">间隔</el-radio-button>
+                <el-radio-button label="3">指定</el-radio-button>
               </el-radio-group>
             </el-form-item>
             <el-form-item v-if="cronValue.second.type == '1'" label="范围">
@@ -607,10 +607,10 @@ const inputChange = () => {
           <el-form>
             <el-form-item label="类型">
               <el-radio-group v-model="cronValue.minute.type">
-                <el-radio-button value="0">任意值</el-radio-button>
-                <el-radio-button value="1">范围</el-radio-button>
-                <el-radio-button value="2">间隔</el-radio-button>
-                <el-radio-button value="3">指定</el-radio-button>
+                <el-radio-button label="0">任意值</el-radio-button>
+                <el-radio-button label="1">范围</el-radio-button>
+                <el-radio-button label="2">间隔</el-radio-button>
+                <el-radio-button label="3">指定</el-radio-button>
               </el-radio-group>
             </el-form-item>
             <el-form-item v-if="cronValue.minute.type == '1'" label="范围">
@@ -666,10 +666,10 @@ const inputChange = () => {
           <el-form>
             <el-form-item label="类型">
               <el-radio-group v-model="cronValue.hour.type">
-                <el-radio-button value="0">任意值</el-radio-button>
-                <el-radio-button value="1">范围</el-radio-button>
-                <el-radio-button value="2">间隔</el-radio-button>
-                <el-radio-button value="3">指定</el-radio-button>
+                <el-radio-button label="0">任意值</el-radio-button>
+                <el-radio-button label="1">范围</el-radio-button>
+                <el-radio-button label="2">间隔</el-radio-button>
+                <el-radio-button label="3">指定</el-radio-button>
               </el-radio-group>
             </el-form-item>
             <el-form-item v-if="cronValue.hour.type == '1'" label="范围">
@@ -725,12 +725,12 @@ const inputChange = () => {
           <el-form>
             <el-form-item label="类型">
               <el-radio-group v-model="cronValue.day.type">
-                <el-radio-button value="0">任意值</el-radio-button>
-                <el-radio-button value="1">范围</el-radio-button>
-                <el-radio-button value="2">间隔</el-radio-button>
-                <el-radio-button value="3">指定</el-radio-button>
-                <el-radio-button value="4">本月最后一天</el-radio-button>
-                <el-radio-button value="5">不指定</el-radio-button>
+                <el-radio-button label="0">任意值</el-radio-button>
+                <el-radio-button label="1">范围</el-radio-button>
+                <el-radio-button label="2">间隔</el-radio-button>
+                <el-radio-button label="3">指定</el-radio-button>
+                <el-radio-button label="4">本月最后一天</el-radio-button>
+                <el-radio-button label="5">不指定</el-radio-button>
               </el-radio-group>
             </el-form-item>
             <el-form-item v-if="cronValue.day.type == '1'" label="范围">
@@ -786,10 +786,10 @@ const inputChange = () => {
           <el-form>
             <el-form-item label="类型">
               <el-radio-group v-model="cronValue.month.type">
-                <el-radio-button value="0">任意值</el-radio-button>
-                <el-radio-button value="1">范围</el-radio-button>
-                <el-radio-button value="2">间隔</el-radio-button>
-                <el-radio-button value="3">指定</el-radio-button>
+                <el-radio-button label="0">任意值</el-radio-button>
+                <el-radio-button label="1">范围</el-radio-button>
+                <el-radio-button label="2">间隔</el-radio-button>
+                <el-radio-button label="3">指定</el-radio-button>
               </el-radio-group>
             </el-form-item>
             <el-form-item v-if="cronValue.month.type == '1'" label="范围">
@@ -846,12 +846,12 @@ const inputChange = () => {
             <el-form>
               <el-form-item label="类型">
                 <el-radio-group v-model="cronValue.week.type">
-                  <el-radio-button value="0">任意值</el-radio-button>
-                  <el-radio-button value="1">范围</el-radio-button>
-                  <el-radio-button value="2">间隔</el-radio-button>
-                  <el-radio-button value="3">指定</el-radio-button>
-                  <el-radio-button value="4">本月最后一周</el-radio-button>
-                  <el-radio-button value="5">不指定</el-radio-button>
+                  <el-radio-button label="0">任意值</el-radio-button>
+                  <el-radio-button label="1">范围</el-radio-button>
+                  <el-radio-button label="2">间隔</el-radio-button>
+                  <el-radio-button label="3">指定</el-radio-button>
+                  <el-radio-button label="4">本月最后一周</el-radio-button>
+                  <el-radio-button label="5">不指定</el-radio-button>
                 </el-radio-group>
               </el-form-item>
               <el-form-item v-if="cronValue.week.type == '1'" label="范围">
@@ -925,11 +925,11 @@ const inputChange = () => {
           <el-form>
             <el-form-item label="类型">
               <el-radio-group v-model="cronValue.year.type">
-                <el-radio-button value="-1">忽略</el-radio-button>
-                <el-radio-button value="0">任意值</el-radio-button>
-                <el-radio-button value="1">范围</el-radio-button>
-                <el-radio-button value="2">间隔</el-radio-button>
-                <el-radio-button value="3">指定</el-radio-button>
+                <el-radio-button label="-1">忽略</el-radio-button>
+                <el-radio-button label="0">任意值</el-radio-button>
+                <el-radio-button label="1">范围</el-radio-button>
+                <el-radio-button label="2">间隔</el-radio-button>
+                <el-radio-button label="3">指定</el-radio-button>
               </el-radio-group>
             </el-form-item>
             <el-form-item v-if="cronValue.year.type == '1'" label="范围">

src/components/DiyEditor/components/ComponentContainerProperty.vue

@@ -11,8 +11,8 @@
         <el-form :model="formData" label-width="80px">
           <el-form-item label="组件背景" prop="bgType">
             <el-radio-group v-model="formData.bgType">
-              <el-radio value="color">纯色</el-radio>
-              <el-radio value="img">图片</el-radio>
+              <el-radio label="color">纯色</el-radio>
+              <el-radio label="img">图片</el-radio>
             </el-radio-group>
           </el-form-item>
           <el-form-item label="选择颜色" prop="bgColor" v-if="formData.bgType === 'color'">

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

@@ -5,12 +5,12 @@
         <el-form-item label="样式" prop="type">
           <el-radio-group v-model="formData.type">
             <el-tooltip class="item" content="默认" placement="bottom">
-              <el-radio-button value="default">
+              <el-radio-button label="default">
                 <Icon icon="system-uicons:carousel" />
               </el-radio-button>
             </el-tooltip>
             <el-tooltip class="item" content="卡片" placement="bottom">
-              <el-radio-button value="card">
+              <el-radio-button label="card">
                 <Icon icon="ic:round-view-carousel" />
               </el-radio-button>
             </el-tooltip>
@@ -18,8 +18,8 @@
         </el-form-item>
         <el-form-item label="指示器" prop="indicator">
           <el-radio-group v-model="formData.indicator">
-            <el-radio value="dot">小圆点</el-radio>
-            <el-radio value="number">数字</el-radio>
+            <el-radio label="dot">小圆点</el-radio>
+            <el-radio label="number">数字</el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="是否轮播" prop="autoplay">
@@ -43,8 +43,8 @@
           <template #default="{ element }">
             <el-form-item label="类型" prop="type" class="m-b-8px!" label-width="40px">
               <el-radio-group v-model="element.type">
-                <el-radio value="img">图片</el-radio>
-                <el-radio value="video">视频</el-radio>
+                <el-radio label="img">图片</el-radio>
+                <el-radio label="video">视频</el-radio>
               </el-radio-group>
             </el-form-item>
             <el-form-item

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

@@ -26,17 +26,17 @@
         <el-form-item label="列数" prop="type">
           <el-radio-group v-model="formData.columns">
             <el-tooltip class="item" content="一列" placement="bottom">
-              <el-radio-button :value="1">
+              <el-radio-button :label="1">
                 <Icon icon="fluent:text-column-one-24-filled" />
               </el-radio-button>
             </el-tooltip>
             <el-tooltip class="item" content="二列" placement="bottom">
-              <el-radio-button :value="2">
+              <el-radio-button :label="2">
                 <Icon icon="fluent:text-column-two-24-filled" />
               </el-radio-button>
             </el-tooltip>
             <el-tooltip class="item" content="三列" placement="bottom">
-              <el-radio-button :value="3">
+              <el-radio-button :label="3">
                 <Icon icon="fluent:text-column-three-24-filled" />
               </el-radio-button>
             </el-tooltip>

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

@@ -11,7 +11,7 @@
           :key="index"
           :content="item.text"
         >
-          <el-radio-button :value="item.type">
+          <el-radio-button :label="item.type">
             <Icon :icon="item.icon" />
           </el-radio-button>
         </el-tooltip>
@@ -24,12 +24,12 @@
       <el-form-item label="左右边距" prop="paddingType">
         <el-radio-group v-model="formData!.paddingType">
           <el-tooltip content="无边距" placement="top">
-            <el-radio-button value="none">
+            <el-radio-button label="none">
               <Icon icon="tabler:box-padding" />
             </el-radio-button>
           </el-tooltip>
           <el-tooltip content="左右留边" placement="top">
-            <el-radio-button value="horizontal">
+            <el-radio-button label="horizontal">
               <Icon icon="vaadin:padding" />
             </el-radio-button>
           </el-tooltip>

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

@@ -3,8 +3,8 @@
     <el-card header="按钮配置" class="property-group" shadow="never">
       <el-form-item label="展开方向" prop="direction">
         <el-radio-group v-model="formData.direction">
-          <el-radio value="vertical">垂直</el-radio>
-          <el-radio value="horizontal">水平</el-radio>
+          <el-radio label="vertical">垂直</el-radio>
+          <el-radio label="horizontal">水平</el-radio>
         </el-radio-group>
       </el-form-item>
       <el-form-item label="显示文字" prop="showText">

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

@@ -4,8 +4,8 @@
     <el-form label-width="80px" :model="formData" class="m-t-8px">
       <el-form-item label="每行数量" prop="column">
         <el-radio-group v-model="formData.column">
-          <el-radio :value="3">3个</el-radio>
-          <el-radio :value="4">4个</el-radio>
+          <el-radio :label="3">3个</el-radio>
+          <el-radio :label="4">4个</el-radio>
         </el-radio-group>
       </el-form-item>
 

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

@@ -4,21 +4,21 @@
     <el-form label-width="80px" :model="formData" class="m-t-8px">
       <el-form-item label="布局" prop="layout">
         <el-radio-group v-model="formData.layout">
-          <el-radio value="iconText">图标+文字</el-radio>
-          <el-radio value="icon">仅图标</el-radio>
+          <el-radio label="iconText">图标+文字</el-radio>
+          <el-radio label="icon">仅图标</el-radio>
         </el-radio-group>
       </el-form-item>
       <el-form-item label="行数" prop="row">
         <el-radio-group v-model="formData.row">
-          <el-radio :value="1">1行</el-radio>
-          <el-radio :value="2">2行</el-radio>
+          <el-radio :label="1">1行</el-radio>
+          <el-radio :label="2">2行</el-radio>
         </el-radio-group>
       </el-form-item>
       <el-form-item label="列数" prop="column">
         <el-radio-group v-model="formData.column">
-          <el-radio :value="3">3列</el-radio>
-          <el-radio :value="4">4列</el-radio>
-          <el-radio :value="5">5列</el-radio>
+          <el-radio :label="3">3列</el-radio>
+          <el-radio :label="4">4列</el-radio>
+          <el-radio :label="5">5列</el-radio>
         </el-radio-group>
       </el-form-item>
 

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

@@ -14,9 +14,9 @@
     <template v-if="selectedHotAreaIndex === cellIndex">
       <el-form-item label="类型" :prop="`cell[${cellIndex}].type`">
         <el-radio-group v-model="cell.type">
-          <el-radio value="text">文字</el-radio>
-          <el-radio value="image">图片</el-radio>
-          <el-radio value="search">搜索框</el-radio>
+          <el-radio label="text">文字</el-radio>
+          <el-radio label="image">图片</el-radio>
+          <el-radio label="search">搜索框</el-radio>
         </el-radio-group>
       </el-form-item>
       <!-- 1. 文字 -->

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

@@ -2,27 +2,27 @@
   <el-form label-width="80px" :model="formData" :rules="rules">
     <el-form-item label="样式" prop="styleType">
       <el-radio-group v-model="formData!.styleType">
-        <el-radio value="normal">标准</el-radio>
+        <el-radio label="normal">标准</el-radio>
         <el-tooltip
           content="沉侵式头部仅支持微信小程序、APP，建议页面第一个组件为图片展示类组件"
           placement="top"
         >
-          <el-radio value="inner">沉浸式</el-radio>
+          <el-radio label="inner">沉浸式</el-radio>
         </el-tooltip>
       </el-radio-group>
     </el-form-item>
     <el-form-item label="常驻显示" prop="alwaysShow" v-if="formData.styleType === 'inner'">
       <el-radio-group v-model="formData!.alwaysShow">
-        <el-radio :value="false">关闭</el-radio>
+        <el-radio :label="false">关闭</el-radio>
         <el-tooltip content="常驻显示关闭后,头部小组件将在页面滑动时淡入" placement="top">
-          <el-radio :value="true">开启</el-radio>
+          <el-radio :label="true">开启</el-radio>
         </el-tooltip>
       </el-radio-group>
     </el-form-item>
     <el-form-item label="背景类型" prop="bgType">
       <el-radio-group v-model="formData.bgType">
-        <el-radio value="color">纯色</el-radio>
-        <el-radio value="img">图片</el-radio>
+        <el-radio label="color">纯色</el-radio>
+        <el-radio label="img">图片</el-radio>
       </el-radio-group>
     </el-form-item>
     <el-form-item label="背景颜色" prop="bgColor" v-if="formData.bgType === 'color'">

src/components/DiyEditor/components/mobile/Popover/property.vue

@@ -11,10 +11,10 @@
         <el-form-item label="显示次数" :prop="`list[${index}].showType`">
           <el-radio-group v-model="element.showType">
             <el-tooltip content="只显示一次，下次打开时不显示" placement="bottom">
-              <el-radio value="once">一次</el-radio>
+              <el-radio label="once">一次</el-radio>
             </el-tooltip>
             <el-tooltip content="每次打开时都会显示" placement="bottom">
-              <el-radio value="always">不限</el-radio>
+              <el-radio label="always">不限</el-radio>
             </el-tooltip>
           </el-radio-group>
         </el-form-item>

src/components/DiyEditor/components/mobile/ProductCard/property.vue

@@ -8,17 +8,17 @@
         <el-form-item label="布局" prop="type">
           <el-radio-group v-model="formData.layoutType">
             <el-tooltip class="item" content="单列大图" placement="bottom">
-              <el-radio-button value="oneColBigImg">
+              <el-radio-button label="oneColBigImg">
                 <Icon icon="fluent:text-column-one-24-filled" />
               </el-radio-button>
             </el-tooltip>
             <el-tooltip class="item" content="单列小图" placement="bottom">
-              <el-radio-button value="oneColSmallImg">
+              <el-radio-button label="oneColSmallImg">
                 <Icon icon="fluent:text-column-two-left-24-filled" />
               </el-radio-button>
             </el-tooltip>
             <el-tooltip class="item" content="双列" placement="bottom">
-              <el-radio-button value="twoCol">
+              <el-radio-button label="twoCol">
                 <Icon icon="fluent:text-column-two-24-filled" />
               </el-radio-button>
             </el-tooltip>
@@ -74,8 +74,8 @@
       <el-card header="按钮" class="property-group" shadow="never">
         <el-form-item label="按钮类型" prop="btnBuy.type">
           <el-radio-group v-model="formData.btnBuy.type">
-            <el-radio-button value="text">文字</el-radio-button>
-            <el-radio-button value="img">图片</el-radio-button>
+            <el-radio-button label="text">文字</el-radio-button>
+            <el-radio-button label="img">图片</el-radio-button>
           </el-radio-group>
         </el-form-item>
         <template v-if="formData.btnBuy.type === 'text'">

src/components/DiyEditor/components/mobile/ProductList/property.vue

@@ -8,17 +8,17 @@
         <el-form-item label="布局" prop="type">
           <el-radio-group v-model="formData.layoutType">
             <el-tooltip class="item" content="双列" placement="bottom">
-              <el-radio-button value="twoCol">
+              <el-radio-button label="twoCol">
                 <Icon icon="fluent:text-column-two-24-filled" />
               </el-radio-button>
             </el-tooltip>
             <el-tooltip class="item" content="三列" placement="bottom">
-              <el-radio-button value="threeCol">
+              <el-radio-button label="threeCol">
                 <Icon icon="fluent:text-column-three-24-filled" />
               </el-radio-button>
             </el-tooltip>
             <el-tooltip class="item" content="水平滑动" placement="bottom">
-              <el-radio-button value="horizSwiper">
+              <el-radio-button label="horizSwiper">
                 <Icon icon="system-uicons:carousel" />
               </el-radio-button>
             </el-tooltip>

src/components/DiyEditor/components/mobile/PromotionCombination/property.vue

@@ -17,12 +17,12 @@
         <el-form-item label="布局" prop="type">
           <el-radio-group v-model="formData.layoutType">
             <el-tooltip class="item" content="单列" placement="bottom">
-              <el-radio-button value="oneCol">
+              <el-radio-button label="oneCol">
                 <Icon icon="fluent:text-column-one-24-filled" />
               </el-radio-button>
             </el-tooltip>
             <el-tooltip class="item" content="三列" placement="bottom">
-              <el-radio-button value="threeCol">
+              <el-radio-button label="threeCol">
                 <Icon icon="fluent:text-column-three-24-filled" />
               </el-radio-button>
             </el-tooltip>

src/components/DiyEditor/components/mobile/PromotionSeckill/property.vue

@@ -17,12 +17,12 @@
         <el-form-item label="布局" prop="type">
           <el-radio-group v-model="formData.layoutType">
             <el-tooltip class="item" content="单列" placement="bottom">
-              <el-radio-button value="oneCol">
+              <el-radio-button label="oneCol">
                 <Icon icon="fluent:text-column-one-24-filled" />
               </el-radio-button>
             </el-tooltip>
             <el-tooltip class="item" content="三列" placement="bottom">
-              <el-radio-button value="threeCol">
+              <el-radio-button label="threeCol">
                 <Icon icon="fluent:text-column-three-24-filled" />
               </el-radio-button>
             </el-tooltip>

src/components/DiyEditor/components/mobile/SearchBar/property.vue

@@ -13,12 +13,12 @@
         <el-form-item label="框体样式">
           <el-radio-group v-model="formData!.borderRadius">
             <el-tooltip content="方形" placement="top">
-              <el-radio-button :value="0">
+              <el-radio-button :label="0">
                 <Icon icon="tabler:input-search" />
               </el-radio-button>
             </el-tooltip>
             <el-tooltip content="圆形" placement="top">
-              <el-radio-button :value="10">
+              <el-radio-button :label="10">
                 <Icon icon="iconoir:input-search" />
               </el-radio-button>
             </el-tooltip>
@@ -30,12 +30,12 @@
         <el-form-item label="文本位置" prop="placeholderPosition">
           <el-radio-group v-model="formData!.placeholderPosition">
             <el-tooltip content="居左" placement="top">
-              <el-radio-button value="left">
+              <el-radio-button label="left">
                 <Icon icon="ant-design:align-left-outlined" />
               </el-radio-button>
             </el-tooltip>
             <el-tooltip content="居中" placement="top">
-              <el-radio-button value="center">
+              <el-radio-button label="center">
                 <Icon icon="ant-design:align-center-outlined" />
               </el-radio-button>
             </el-tooltip>

src/components/DiyEditor/components/mobile/TabBar/property.vue

@@ -27,8 +27,8 @@
       </el-form-item>
       <el-form-item label="导航背景">
         <el-radio-group v-model="formData!.style.bgType">
-          <el-radio-button value="color">纯色</el-radio-button>
-          <el-radio-button value="img">图片</el-radio-button>
+          <el-radio-button label="color">纯色</el-radio-button>
+          <el-radio-button label="img">图片</el-radio-button>
         </el-radio-group>
       </el-form-item>
       <el-form-item label="选择颜色" v-if="formData!.style.bgType === 'color'">

src/components/DiyEditor/components/mobile/TitleBar/property.vue

@@ -10,12 +10,12 @@
         <el-form-item label="标题位置" prop="textAlign">
           <el-radio-group v-model="formData!.textAlign">
             <el-tooltip content="居左" placement="top">
-              <el-radio-button value="left">
+              <el-radio-button label="left">
                 <Icon icon="ant-design:align-left-outlined" />
               </el-radio-button>
             </el-tooltip>
             <el-tooltip content="居中" placement="top">
-              <el-radio-button value="center">
+              <el-radio-button label="center">
                 <Icon icon="ant-design:align-center-outlined" />
               </el-radio-button>
             </el-tooltip>
@@ -88,9 +88,9 @@
         <template v-if="formData.more.show">
           <el-form-item label="样式" prop="more.type">
             <el-radio-group v-model="formData.more.type">
-              <el-radio value="text">文字</el-radio>
-              <el-radio value="icon">图标</el-radio>
-              <el-radio value="all">文字+图标</el-radio>
+              <el-radio label="text">文字</el-radio>
+              <el-radio label="icon">图标</el-radio>
+              <el-radio label="all">文字+图标</el-radio>
             </el-radio-group>
           </el-form-item>
           <el-form-item label="更多文字" prop="more.text" v-show="formData.more.type !== 'icon'">

src/components/IFrame/src/IFrame.vue

@@ -7,41 +7,26 @@ const props = defineProps({
   src: propTypes.string.def('')
 })
 const loading = ref(true)
+const height = ref('')
 const frameRef = ref<HTMLElement | null>(null)
 const init = () => {
-  nextTick(() => {
-    loading.value = true
-    if (!frameRef.value) return
-    frameRef.value.onload = () => {
-      loading.value = false
-    }
-  })
+  height.value = document.documentElement.clientHeight - 94.5 + 'px'
+  loading.value = false
 }
 onMounted(() => {
-  init()
-})
-watch(
-  () => props.src,
-  () => {
+  setTimeout(() => {
     init()
-  }
-)
+  }, 300)
+})
 </script>
 <template>
-  <div
-    v-loading="loading"
-    class="w-full h-[calc(100vh-var(--top-tool-height)-var(--tags-view-height)-var(--app-content-padding)-var(--app-content-padding)-2px)]"
-  >
+  <div v-loading="loading" :style="'height:' + height">
     <iframe
       ref="frameRef"
       :src="props.src"
-      frameborder="0"
+      frameborder="no"
       scrolling="auto"
-      height="100%"
-      width="100%"
-      allowfullscreen="true"
-      webkitallowfullscreen="true"
-      mozallowfullscreen="true"
+      style="width: 100%; height: 100%"
     ></iframe>
   </div>
 </template>

src/components/Icon/src/IconSelect.vue

@@ -122,7 +122,7 @@ watch(
             placement: 'auto'
           }"
           :visible="visible"
-          :width="355"
+          :width="350"
           popper-class="pure-popper"
           trigger="click"
         >
@@ -147,7 +147,7 @@ watch(
             >
               <ElDivider border-style="dashed" class="tab-divider" />
               <ElScrollbar height="220px">
-                <ul class="ml-2 flex flex-wrap">
+                <ul class="ml-2 flex flex-wrap px-2">
                   <li
                     v-for="(item, key) in pageList"
                     :key="key"
@@ -171,7 +171,7 @@ watch(
             background
             class="h-10 flex items-center justify-center"
             layout="prev, pager, next"
-            size="small"
+            small
             @current-change="onCurrentChange"
           />
         </ElPopover>

src/components/ShortcutDateRangePicker/index.vue

@@ -1,9 +1,9 @@
 <template>
   <div class="flex flex-row items-center gap-2">
     <el-radio-group v-model="shortcutDays" @change="handleShortcutDaysChange">
-      <el-radio-button :value="1">昨天</el-radio-button>
-      <el-radio-button :value="7">最近7天</el-radio-button>
-      <el-radio-button :value="30">最近30天</el-radio-button>
+      <el-radio-button :label="1">昨天</el-radio-button>
+      <el-radio-button :label="7">最近7天</el-radio-button>
+      <el-radio-button :label="30">最近30天</el-radio-button>
     </el-radio-group>
     <el-date-picker
       v-model="times"

src/layout/components/TabMenu/src/TabMenu.vue

@@ -199,7 +199,7 @@ export default defineComponent({
             {
               '!left-[var(--tab-menu-min-width)]': unref(collapse),
               '!left-[var(--tab-menu-max-width)]': !unref(collapse),
-              '!w-[var(--left-menu-max-width)]': unref(showMenu) || unref(fixedMenu),
+              '!w-[calc(var(--left-menu-max-width)+1px)]': unref(showMenu) || unref(fixedMenu),
               '!w-0': !unref(showMenu) && !unref(fixedMenu)
             }
           ]}

src/layout/components/TagsView/src/TagsView.vue

@@ -491,10 +491,10 @@ $prefix-cls: #{$namespace}-tags-view;
 
     &::before {
       position: absolute;
-      top: 0;
+      top: 1px;
       left: 0;
       width: 100%;
-      height: 100%;
+      height: calc(100% - 1px);
       border-left: 1px solid var(--el-border-color);
       content: '';
     }
@@ -502,10 +502,10 @@ $prefix-cls: #{$namespace}-tags-view;
     &--first {
       &::before {
         position: absolute;
-        top: 0;
+        top: 1px;
         left: 0;
         width: 100%;
-        height: 100%;
+        height: calc(100% - 1px);
         border-right: 1px solid var(--el-border-color);
         border-left: none;
         content: '';

src/utils/formatTime.ts

@@ -56,11 +56,11 @@ export const defaultShortcuts = [
  * 时间日期转换
  * @param date 当前时间，new Date() 格式
  * @param format 需要转换的时间格式字符串
- * @description format 字符串随意，如 `YYYY-mm、YYYY-MM-DD`
- * @description format 季度："YYYY-MM-DD HH:MM:SS QQQQ"
- * @description format 星期："YYYY-MM-DD HH:MM:SS WWW"
- * @description format 几周："YYYY-MM-DD HH:MM:SS ZZZ"
- * @description format 季度 + 星期 + 几周："YYYY-MM-DD HH:MM:SS WWW QQQQ ZZZ"
+ * @description format 字符串随意，如 `YYYY-mm、YYYY-mm-dd`
+ * @description format 季度："YYYY-mm-dd HH:MM:SS QQQQ"
+ * @description format 星期："YYYY-mm-dd HH:MM:SS WWW"
+ * @description format 几周："YYYY-mm-dd HH:MM:SS ZZZ"
+ * @description format 季度 + 星期 + 几周："YYYY-mm-dd HH:MM:SS WWW QQQQ ZZZ"
  * @returns 返回拼接后的时间字符串
  */
 export function formatDate(date: Date, format?: string): string {
@@ -110,7 +110,7 @@ export function getWeek(dateTime: Date): number {
  * @description param 3天：   60 * 60* 24 * 1000 * 3
  * @returns 返回拼接后的时间字符串
  */
-export function formatPast(param: string | Date, format = 'YYYY-MM-DD HH:MM:SS'): string {
+export function formatPast(param: string | Date, format = 'YYYY-mm-dd HH:MM:SS'): string {
   // 传入格式处理、存储转换值
   let t: any, s: number
   // 获取js 时间戳

src/views/Profile/components/BasicInfo.vue

@@ -2,8 +2,8 @@
   <Form ref="formRef" :labelWidth="200" :rules="rules" :schema="schema">
     <template #sex="form">
       <el-radio-group v-model="form['sex']">
-        <el-radio :value="1">{{ t('profile.user.man') }}</el-radio>
-        <el-radio :value="2">{{ t('profile.user.woman') }}</el-radio>
+        <el-radio :label="1">{{ t('profile.user.man') }}</el-radio>
+        <el-radio :label="2">{{ t('profile.user.woman') }}</el-radio>
       </el-radio-group>
     </template>
   </Form>
@@ -27,7 +27,7 @@ defineOptions({ name: 'BasicInfo' })
 
 const { t } = useI18n()
 const message = useMessage() // 消息弹窗
-const userStore = useUserStore()
+const userStore = useUserStore() 
 // 表单校验
 const rules = reactive<FormRules>({
   nickname: [{ required: true, message: t('profile.rules.nickname'), trigger: 'blur' }],

src/views/ai/image/manager/index.vue

@@ -71,7 +71,7 @@
           start-placeholder="开始日期"
           end-placeholder="结束日期"
           :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-240px"
+          class="!w-220px"
         />
       </el-form-item>
       <el-form-item>

src/views/ai/image/square/index.vue

@@ -9,7 +9,6 @@
       placeholder="请输入要搜索的内容"
       :suffix-icon="Search"
       @keyup.enter="handleQuery"
-      class="!w-240px"
     />
     <div class="gallery">
       <!-- TODO @fan：这个图片的风格，要不和 ImageCard.vue 界面一致？（只有卡片，没有操作）；因为看着更有相框的感觉~~~ -->
@@ -67,8 +66,8 @@ onMounted(async () => {
 </script>
 <style scoped lang="scss">
 .square-container {
-  padding: 20px;
   background-color: #fff;
+  padding: 20px;
 
   .gallery {
     display: grid;
@@ -76,21 +75,21 @@ onMounted(async () => {
     gap: 10px;
     //max-width: 1000px;
     background-color: #fff;
-    box-shadow: 0 0 10px rgb(0 0 0 / 10%);
+    box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
   }
 
   .gallery-item {
     position: relative;
     overflow: hidden;
-    cursor: pointer;
     background: #f0f0f0;
+    cursor: pointer;
     transition: transform 0.3s;
   }
 
   .gallery-item img {
-    display: block;
     width: 100%;
     height: auto;
+    display: block;
     transition: transform 0.3s;
   }
 

src/views/ai/mindmap/manager/index.vue

@@ -40,7 +40,7 @@
           start-placeholder="开始日期"
           end-placeholder="结束日期"
           :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-240px"
+          class="!w-220px"
         />
       </el-form-item>
       <el-form-item>

src/views/ai/model/apiKey/ApiKeyForm.vue

@@ -31,7 +31,7 @@
           <el-radio
             v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
             :key="dict.value"
-            :value="dict.value"
+            :label="dict.value"
           >
             {{ dict.label }}
           </el-radio>

src/views/ai/model/chatModel/ChatModelForm.vue

@@ -41,7 +41,7 @@
           <el-radio
             v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
             :key="dict.value"
-            :value="dict.value"
+            :label="dict.value"
           >
             {{ dict.label }}
           </el-radio>

src/views/ai/model/chatRole/ChatRoleForm.vue

@@ -37,7 +37,7 @@
           <el-radio
             v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
             :key="dict.value"
-            :value="dict.value"
+            :label="dict.value"
           >
             {{ dict.label }}
           </el-radio>
@@ -51,7 +51,7 @@
           <el-radio
             v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
             :key="dict.value"
-            :value="dict.value"
+            :label="dict.value"
           >
             {{ dict.label }}
           </el-radio>
@@ -69,7 +69,7 @@ import { getIntDictOptions, getBoolDictOptions, DICT_TYPE } from '@/utils/dict'
 import { ChatRoleApi, ChatRoleVO } from '@/api/ai/model/chatRole'
 import { CommonStatusEnum } from '@/utils/constants'
 import { ChatModelApi, ChatModelVO } from '@/api/ai/model/chatModel'
-import { FormRules } from 'element-plus'
+import {FormRules} from "element-plus";
 
 /** AI 聊天角色 表单 */
 defineOptions({ name: 'ChatRoleForm' })

src/views/ai/music/index/mode/index.vue

@@ -1,14 +1,20 @@
 <template>
   <ContentWrap class="w-300px h-full mb-[0!important]">
     <el-radio-group v-model="generateMode" class="mb-15px">
-      <el-radio-button value="desc"> 描述模式 </el-radio-button>
-      <el-radio-button value="lyric"> 歌词模式 </el-radio-button>
+      <el-radio-button label="desc">
+        描述模式
+      </el-radio-button>
+      <el-radio-button label="lyric">
+        歌词模式
+      </el-radio-button>
     </el-radio-group>
 
     <!-- 描述模式/歌词模式 切换 -->
-    <component :is="generateMode === 'desc' ? desc : lyric" ref="modeRef" />
+    <component :is="generateMode === 'desc' ? desc : lyric" ref="modeRef"/>
 
-    <el-button type="primary" round class="w-full" @click="generateMusic"> 创作音乐 </el-button>
+    <el-button type="primary" round class="w-full" @click="generateMusic">
+      创作音乐
+    </el-button>
   </ContentWrap>
 </template>
 
@@ -28,8 +34,8 @@ const modeRef = ref<Nullable<{ formData: Recordable }>>(null)
  *@Description: 根据信息生成音乐
  *@MethodAuthor: xiaohong
  *@Date: 2024-06-27 16:40:16
- */
-function generateMusic() {
-  emits('generate-music', { formData: unref(modeRef)?.formData })
+*/
+function generateMusic () {
+  emits('generate-music', {formData: unref(modeRef)?.formData})
 }
 </script>

src/views/ai/music/manager/index.vue

@@ -70,7 +70,7 @@
           start-placeholder="开始日期"
           end-placeholder="结束日期"
           :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-240px"
+          class="!w-220px"
         />
       </el-form-item>
       <el-form-item label="是否发布" prop="publicStatus">

src/views/ai/write/manager/index.vue

@@ -39,12 +39,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="平台" prop="platform">
-        <el-select
-          v-model="queryParams.platform"
-          placeholder="请选择平台"
-          clearable
-          class="!w-240px"
-        >
+        <el-select v-model="queryParams.platform" placeholder="请选择平台" clearable class="!w-240px">
           <el-option
             v-for="dict in getStrDictOptions(DICT_TYPE.AI_PLATFORM)"
             :key="dict.value"
@@ -148,7 +143,7 @@
       <el-table-column label="错误信息" align="center" prop="errorMessage" />
       <el-table-column label="操作" align="center">
         <template #default="scope">
-          <!--          TODO @YunaiV 目前没有修改接口，写作要可以更改吗-->
+<!--          TODO @YunaiV 目前没有修改接口，写作要可以更改吗-->
           <el-button
             link
             type="primary"

src/views/bpm/category/CategoryForm.vue

@@ -18,7 +18,7 @@
           <el-radio
             v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
             :key="dict.value"
-            :value="dict.value"
+            :label="dict.value"
           >
             {{ dict.label }}
           </el-radio>

src/views/bpm/form/editor/index.vue

@@ -22,7 +22,7 @@
           <el-radio
             v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
             :key="dict.value"
-            :value="dict.value"
+            :label="dict.value"
           >
             {{ dict.label }}
           </el-radio>

src/views/bpm/group/UserGroupForm.vue

@@ -28,7 +28,7 @@
           <el-radio
             v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
             :key="dict.value"
-            :value="dict.value"
+            :label="dict.value"
           >
             {{ dict.label }}
           </el-radio>

src/views/bpm/model/ModelForm.vue

@@ -62,7 +62,7 @@
             <el-radio
               v-for="dict in getIntDictOptions(DICT_TYPE.BPM_MODEL_FORM_TYPE)"
               :key="dict.value"
-              :value="dict.value"
+              :label="dict.value"
             >
               {{ dict.label }}
             </el-radio>

src/views/bpm/processExpression/ProcessExpressionForm.vue

@@ -15,7 +15,7 @@
           <el-radio
             v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
             :key="dict.value"
-            :value="dict.value"
+            :label="dict.value"
           >
             {{ dict.label }}
           </el-radio>

src/views/bpm/processInstance/detail/dialog/TaskSignDeleteForm.vue

@@ -9,7 +9,7 @@
     >
       <el-form-item label="减签任务" prop="id">
         <el-radio-group v-model="formData.id">
-          <el-radio-button v-for="item in childrenTaskList" :key="item.id" :value="item.id">
+          <el-radio-button v-for="item in childrenTaskList" :key="item.id" :label="item.id">
             {{ item.name }}
             ({{ item.assigneeUser?.deptName || item.ownerUser?.deptName }} -
             {{ item.assigneeUser?.nickname || item.ownerUser?.nickname }})

src/views/bpm/processInstance/manager/index.vue

@@ -76,7 +76,7 @@
           start-placeholder="开始日期"
           end-placeholder="结束日期"
           :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-240px"
+          class="!w-220px"
         />
       </el-form-item>
     </el-form>

src/views/bpm/processListener/ProcessListenerForm.vue

@@ -15,7 +15,7 @@
           <el-radio
             v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
             :key="dict.value"
-            :value="dict.value"
+            :label="dict.value"
           >
             {{ dict.label }}
           </el-radio>

src/views/bpm/task/copy/index.vue

@@ -11,7 +11,6 @@
       <el-form-item label="流程名称" prop="name">
         <el-input
           v-model="queryParams.processInstanceName"
-          @keyup.enter="handleQuery"
           class="!w-240px"
           clearable
           placeholder="请输入流程名称"

src/views/crm/contact/ContactForm.vue

@@ -90,7 +90,7 @@
               <el-radio
                 v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
                 :key="dict.value"
-                :value="dict.value"
+                :label="dict.value"
               >
                 {{ dict.label }}
               </el-radio>

src/views/crm/contract/config/index.vue

@@ -27,8 +27,8 @@
             @change="changeNotifyEnable"
             class="ml-4"
           >
-            <el-radio :value="false" size="large">不提醒</el-radio>
-            <el-radio :value="true" size="large">提醒</el-radio>
+            <el-radio :label="false" size="large">不提醒</el-radio>
+            <el-radio :label="true" size="large">提醒</el-radio>
           </el-radio-group>
         </el-form-item>
         <div v-if="formData.notifyEnabled">

src/views/crm/customer/poolConfig/index.vue

@@ -27,8 +27,8 @@
         <!-- 表单 -->
         <el-form-item label="客户公海规则设置" prop="enabled">
           <el-radio-group v-model="formData.enabled" @change="changeEnable" class="ml-4">
-            <el-radio :value="false" size="large">不启用</el-radio>
-            <el-radio :value="true" size="large">启用</el-radio>
+            <el-radio :label="false" size="large">不启用</el-radio>
+            <el-radio :label="true" size="large">启用</el-radio>
           </el-radio-group>
         </el-form-item>
         <div v-if="formData.enabled">
@@ -44,8 +44,8 @@
               @change="changeNotifyEnable"
               class="ml-4"
             >
-              <el-radio :value="false" size="large">不提醒</el-radio>
-              <el-radio :value="true" size="large">提醒</el-radio>
+              <el-radio :label="false" size="large">不提醒</el-radio>
+              <el-radio :label="true" size="large">提醒</el-radio>
             </el-radio-group>
           </el-form-item>
           <div v-if="formData.notifyEnabled">

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

@@ -23,7 +23,7 @@
             v-for="dict in getIntDictOptions(DICT_TYPE.CRM_PERMISSION_LEVEL)"
             :key="dict.value"
           >
-            <el-radio v-if="dict.value != PermissionLevelEnum.OWNER" :value="dict.value">
+            <el-radio v-if="dict.value != PermissionLevelEnum.OWNER" :label="dict.value">
               {{ dict.label }}
             </el-radio>
           </template>

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

@@ -20,8 +20,8 @@
       </el-form-item>
       <el-form-item label="老负责人">
         <el-radio-group v-model="oldOwnerHandler" @change="handleOwnerChange">
-          <el-radio :value="false" size="large">移除</el-radio>
-          <el-radio :value="true" size="large">加入团队</el-radio>
+          <el-radio :label="false" size="large">移除</el-radio>
+          <el-radio :label="true" size="large">加入团队</el-radio>
         </el-radio-group>
       </el-form-item>
       <el-form-item v-if="oldOwnerHandler" label="老负责人权限级别" prop="oldOwnerPermissionLevel">
@@ -30,7 +30,7 @@
             v-for="dict in getIntDictOptions(DICT_TYPE.CRM_PERMISSION_LEVEL)"
             :key="dict.value"
           >
-            <el-radio v-if="dict.value != PermissionLevelEnum.OWNER" :value="dict.value">
+            <el-radio v-if="dict.value != PermissionLevelEnum.OWNER" :label="dict.value">
               {{ dict.label }}
             </el-radio>
           </template>

src/views/crm/receivable/ReceivableForm.vue

@@ -124,7 +124,6 @@
               placeholder="选择回款日期"
               type="date"
               value-format="x"
-              class="!w-100%"
             />
           </el-form-item>
         </el-col>

src/views/crm/receivable/plan/ReceivablePlanForm.vue

@@ -89,7 +89,6 @@
               placeholder="选择计划回款日期"
               type="date"
               value-format="x"
-              class="!w-100%"
             />
           </el-form-item>
         </el-col>

src/views/erp/finance/account/AccountForm.vue

@@ -21,7 +21,7 @@
           <el-radio
             v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
             :key="dict.value"
-            :value="dict.value"
+            :label="dict.value"
           >
             {{ dict.label }}
           </el-radio>

src/views/erp/finance/payment/index.vue

@@ -30,7 +30,7 @@
           start-placeholder="开始日期"
           end-placeholder="结束日期"
           :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-240px"
+          class="!w-220px"
         />
       </el-form-item>
       <el-form-item label="供应商" prop="supplierId">

src/views/erp/finance/receipt/index.vue

@@ -30,7 +30,7 @@
           start-placeholder="开始日期"
           end-placeholder="结束日期"
           :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-240px"
+          class="!w-220px"
         />
       </el-form-item>
       <el-form-item label="供应商" prop="supplierId">

src/views/erp/product/category/ProductCategoryForm.vue

@@ -31,7 +31,7 @@
           <el-radio
             v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
             :key="dict.value"
-            :value="dict.value"
+            :label="dict.value"
           >
             {{ dict.label }}
           </el-radio>

src/views/erp/product/product/ProductForm.vue

@@ -50,7 +50,7 @@
               <el-radio
                 v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
                 :key="dict.value"
-                :value="dict.value"
+                :label="dict.value"
               >
                 {{ dict.label }}
               </el-radio>

src/views/erp/product/unit/ProductUnitForm.vue

@@ -15,7 +15,7 @@
           <el-radio
             v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
             :key="dict.value"
-            :value="dict.value"
+            :label="dict.value"
           >
             {{ dict.label }}
           </el-radio>

src/views/erp/purchase/in/index.vue

@@ -43,7 +43,7 @@
           start-placeholder="开始日期"
           end-placeholder="结束日期"
           :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-240px"
+          class="!w-220px"
         />
       </el-form-item>
       <el-form-item label="供应商" prop="supplierId">

src/views/erp/purchase/order/components/PurchaseOrderInEnableList.vue

@@ -64,7 +64,7 @@
         <el-table-column align="center" width="65">
           <template #default="scope">
             <el-radio
-              :value="scope.row.id"
+              :label="scope.row.id"
               v-model="currentRowValue"
               @change="handleCurrentChange(scope.row)"
             >

src/views/erp/purchase/order/components/PurchaseOrderReturnEnableList.vue

@@ -64,7 +64,7 @@
         <el-table-column align="center" width="65">
           <template #default="scope">
             <el-radio
-              :value="scope.row.id"
+              :label="scope.row.id"
               v-model="currentRowValue"
               @change="handleCurrentChange(scope.row)"
             >

src/views/erp/purchase/order/index.vue

@@ -43,7 +43,7 @@
           start-placeholder="开始日期"
           end-placeholder="结束日期"
           :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-240px"
+          class="!w-220px"
         />
       </el-form-item>
       <el-form-item label="供应商" prop="supplierId">

src/views/erp/purchase/return/index.vue

@@ -43,7 +43,7 @@
           start-placeholder="开始日期"
           end-placeholder="结束日期"
           :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-240px"
+          class="!w-220px"
         />
       </el-form-item>
       <el-form-item label="供应商" prop="supplierId">

src/views/erp/purchase/supplier/SupplierForm.vue

@@ -44,7 +44,7 @@
               <el-radio
                 v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
                 :key="dict.value"
-                :value="dict.value"
+                :label="dict.value"
               >
                 {{ dict.label }}
               </el-radio>

src/views/erp/sale/customer/CustomerForm.vue

@@ -44,7 +44,7 @@
               <el-radio
                 v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
                 :key="dict.value"
-                :value="dict.value"
+                :label="dict.value"
               >
                 {{ dict.label }}
               </el-radio>

src/views/erp/sale/order/components/SaleOrderOutEnableList.vue

@@ -64,7 +64,7 @@
         <el-table-column align="center" width="65">
           <template #default="scope">
             <el-radio
-              :value="scope.row.id"
+              :label="scope.row.id"
               v-model="currentRowValue"
               @change="handleCurrentChange(scope.row)"
             >

src/views/erp/sale/order/components/SaleOrderReturnEnableList.vue

@@ -64,7 +64,7 @@
         <el-table-column align="center" width="65">
           <template #default="scope">
             <el-radio
-              :value="scope.row.id"
+              :label="scope.row.id"
               v-model="currentRowValue"
               @change="handleCurrentChange(scope.row)"
             >

src/views/erp/sale/order/index.vue

@@ -43,7 +43,7 @@
           start-placeholder="开始日期"
           end-placeholder="结束日期"
           :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-240px"
+          class="!w-220px"
         />
       </el-form-item>
       <el-form-item label="客户" prop="customerId">

src/views/erp/sale/out/index.vue

@@ -43,7 +43,7 @@
           start-placeholder="开始日期"
           end-placeholder="结束日期"
           :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-240px"
+          class="!w-220px"
         />
       </el-form-item>
       <el-form-item label="客户" prop="customerId">

src/views/erp/sale/return/index.vue

@@ -43,7 +43,7 @@
           start-placeholder="开始日期"
           end-placeholder="结束日期"
           :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-240px"
+          class="!w-220px"
         />
       </el-form-item>
       <el-form-item label="客户" prop="customerId">

src/views/erp/stock/in/index.vue

@@ -43,7 +43,7 @@
           start-placeholder="开始日期"
           end-placeholder="结束日期"
           :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-240px"
+          class="!w-220px"
         />
       </el-form-item>
       <el-form-item label="供应商" prop="supplierId">

src/views/erp/stock/record/index.vue

@@ -75,7 +75,7 @@
           start-placeholder="开始日期"
           end-placeholder="结束日期"
           :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-240px"
+          class="!w-220px"
         />
       </el-form-item>
       <el-form-item>

src/views/erp/stock/warehouse/WarehouseForm.vue

@@ -19,7 +19,7 @@
           <el-radio
             v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
             :key="dict.value"
-            :value="dict.value"
+            :label="dict.value"
           >
             {{ dict.label }}
           </el-radio>

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

@@ -285,8 +285,8 @@
             </span>
           </template>
           <el-radio-group v-model="formData.subJoinMany" placeholder="请选择">
-            <el-radio :value="true">一对多</el-radio>
-            <el-radio :value="false">一对一</el-radio>
+            <el-radio :label="true">一对多</el-radio>
+            <el-radio :label="false">一对一</el-radio>
           </el-radio-group>
         </el-form-item>
       </el-col>

src/views/infra/config/ConfigForm.vue

@@ -24,7 +24,7 @@
           <el-radio
             v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
             :key="dict.value as string"
-            :value="dict.value"
+            :label="dict.value"
           >
             {{ dict.label }}
           </el-radio>

src/views/infra/demo/demo01/Demo01ContactForm.vue

@@ -15,7 +15,7 @@
           <el-radio
             v-for="dict in getIntDictOptions(DICT_TYPE.SYSTEM_USER_SEX)"
             :key="dict.value"
-            :value="dict.value"
+            :label="dict.value"
           >
             {{ dict.label }}
           </el-radio>

src/views/infra/demo/demo03/erp/Demo03StudentForm.vue

@@ -15,7 +15,7 @@
           <el-radio
             v-for="dict in getIntDictOptions(DICT_TYPE.SYSTEM_USER_SEX)"
             :key="dict.value"
-            :value="dict.value"
+            :label="dict.value"
           >
             {{ dict.label }}
           </el-radio>

src/views/infra/demo/demo03/inner/Demo03StudentForm.vue

@@ -15,7 +15,7 @@
           <el-radio
             v-for="dict in getIntDictOptions(DICT_TYPE.SYSTEM_USER_SEX)"
             :key="dict.value"
-            :value="dict.value"
+            :label="dict.value"
           >
             {{ dict.label }}
           </el-radio>

src/views/infra/demo/demo03/normal/Demo03StudentForm.vue

@@ -15,7 +15,7 @@
           <el-radio
             v-for="dict in getIntDictOptions(DICT_TYPE.SYSTEM_USER_SEX)"
             :key="dict.value"
-            :value="dict.value"
+            :label="dict.value"
           >
             {{ dict.label }}
           </el-radio>

src/views/infra/druid/index.vue

@@ -2,8 +2,8 @@
   <doc-alert title="数据库 MyBatis" url="https://doc.iocoder.cn/mybatis/" />
   <doc-alert title="多数据源（读写分离）" url="https://doc.iocoder.cn/dynamic-datasource/" />
 
-  <ContentWrap :bodyStyle="{ padding: '0px' }" class="!mb-0">
-    <IFrame v-if="!loading" v-loading="loading" :src="url" />
+  <ContentWrap>
+    <IFrame v-if="!loading" :src="url" />
   </ContentWrap>
 </template>
 <script lang="ts" setup>

src/views/infra/file/index.vue

@@ -15,7 +15,6 @@
           placeholder="请输入文件路径"
           clearable
           @keyup.enter="handleQuery"
-          class="!w-240px"
         />
       </el-form-item>
       <el-form-item label="文件类型" prop="type" width="80">
@@ -24,7 +23,6 @@
           placeholder="请输入文件类型"
           clearable
           @keyup.enter="handleQuery"
-          class="!w-240px"
         />
       </el-form-item>
       <el-form-item label="创建时间" prop="createTime">
@@ -35,7 +33,6 @@
           start-placeholder="开始日期"
           end-placeholder="结束日期"
           :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-240px"
         />
       </el-form-item>
       <el-form-item>

src/views/infra/fileConfig/FileConfigForm.vue

@@ -66,8 +66,8 @@
       </el-form-item>
       <el-form-item v-if="formData.storage === 11" label="连接模式" prop="config.mode">
         <el-radio-group v-model="formData.config.mode">
-          <el-radio key="Active" value="Active">主动模式</el-radio>
-          <el-radio key="Passive" value="Passive">被动模式</el-radio>
+          <el-radio key="Active" label="Active">主动模式</el-radio>
+          <el-radio key="Passive" label="Passive">被动模式</el-radio>
         </el-radio-group>
       </el-form-item>
       <!-- S3 -->

src/views/infra/server/index.vue

@@ -1,7 +1,7 @@
 <template>
   <doc-alert title="服务监控" url="https://doc.iocoder.cn/server-monitor/" />
 
-  <ContentWrap :bodyStyle="{ padding: '0px' }" class="!mb-0">
+  <ContentWrap>
     <IFrame v-if="!loading" v-loading="loading" :src="src" />
   </ContentWrap>
 </template>

src/views/infra/skywalking/index.vue

@@ -1,7 +1,7 @@
 <template>
   <doc-alert title="服务监控" url="https://doc.iocoder.cn/server-monitor/" />
 
-  <ContentWrap :bodyStyle="{ padding: '0px' }" class="!mb-0">
+  <ContentWrap>
     <IFrame v-if="!loading" v-loading="loading" :src="src" />
   </ContentWrap>
 </template>

src/views/infra/swagger/index.vue

@@ -1,8 +1,8 @@
 <template>
   <doc-alert title="接口文档" url="https://doc.iocoder.cn/api-doc/" />
 
-  <ContentWrap :bodyStyle="{ padding: '0px' }" class="!mb-0">
-    <IFrame v-if="!loading" v-loading="loading" :src="src" />
+  <ContentWrap>
+    <IFrame :src="src" />
   </ContentWrap>
 </template>
 <script lang="ts" setup>

src/views/mall/home/components/TradeTrendCard.vue

@@ -6,7 +6,7 @@
         <!-- 查询条件 -->
         <div class="flex flex-row items-center gap-2">
           <el-radio-group v-model="timeRangeType" @change="handleTimeRangeTypeChange">
-            <el-radio-button v-for="[key, value] in timeRange.entries()" :key="key" :value="key">
+            <el-radio-button v-for="[key, value] in timeRange.entries()" :key="key" :label="key">
               {{ value.name }}
             </el-radio-button>
           </el-radio-group>

src/views/mall/product/brand/BrandForm.vue

@@ -21,7 +21,7 @@
           <el-radio
             v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
             :key="dict.value"
-            :value="dict.value"
+            :label="dict.value"
           >
             {{ dict.label }}
           </el-radio>

src/views/mall/product/category/CategoryForm.vue

@@ -33,7 +33,7 @@
           <el-radio
             v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
             :key="dict.value"
-            :value="dict.value"
+            :label="dict.value"
           >
             {{ dict.label }}
           </el-radio>

src/views/mall/product/comment/index.vue

@@ -11,34 +11,19 @@
       label-width="68px"
     >
       <el-form-item label="回复状态" prop="replyStatus">
-        <el-select v-model="queryParams.replyStatus" class="!w-240px">
+        <el-select v-model="queryParams.replyStatus">
           <el-option label="已回复" :value="true" />
           <el-option label="未回复" :value="false" />
         </el-select>
       </el-form-item>
       <el-form-item label="商品名称" prop="spuName">
-        <el-input
-          v-model="queryParams.spuName"
-          placeholder="请输入商品名称"
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
+        <el-input v-model="queryParams.spuName" placeholder="请输入商品名称" />
       </el-form-item>
       <el-form-item label="用户名称" prop="userNickname">
-        <el-input
-          v-model="queryParams.userNickname"
-          placeholder="请输入用户名称"
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
+        <el-input v-model="queryParams.userNickname" placeholder="请输入用户名称" />
       </el-form-item>
       <el-form-item label="订单编号" prop="orderId">
-        <el-input
-          v-model="queryParams.orderId"
-          placeholder="请输入订单编号"
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
+        <el-input v-model="queryParams.orderId" placeholder="请输入订单编号" />
       </el-form-item>
       <el-form-item label="评论时间" prop="createTime">
         <el-date-picker

src/views/mall/product/spu/components/SkuTableSelect.vue

@@ -3,7 +3,7 @@
     <el-table v-loading="loading" :data="list" show-overflow-tooltip>
       <el-table-column label="#" width="55">
         <template #default="{ row }">
-          <el-radio :value="row.id" v-model="selectedSkuId" @change="handleSelected(row)"
+          <el-radio :label="row.id" v-model="selectedSkuId" @change="handleSelected(row)"
             >&nbsp;
           </el-radio>
         </template>

src/views/mall/product/spu/components/SpuTableSelect.vue

@@ -70,7 +70,7 @@
         <!-- 2. 单选模式 -->
         <el-table-column label="#" width="55" v-else>
           <template #default="{ row }">
-            <el-radio :value="row.id" v-model="selectedSpuId" @change="handleSingleSelected(row)">
+            <el-radio :label="row.id" v-model="selectedSpuId" @change="handleSingleSelected(row)">
               <!-- 空格不能省略，是为了让单选框不显示label，如果不指定label不会有选中的效果 -->
               &nbsp;
             </el-radio>

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

@@ -14,14 +14,14 @@
         class="w-80"
         @change="changeSubCommissionType"
       >
-        <el-radio :value="false">默认设置</el-radio>
-        <el-radio :value="true" class="radio">单独设置</el-radio>
+        <el-radio :label="false">默认设置</el-radio>
+        <el-radio :label="true" class="radio">单独设置</el-radio>
       </el-radio-group>
     </el-form-item>
     <el-form-item label="商品规格" props="specType">
       <el-radio-group v-model="formData.specType" class="w-80" @change="onChangeSpec">
-        <el-radio :value="false" class="radio">单规格</el-radio>
-        <el-radio :value="true">多规格</el-radio>
+        <el-radio :label="false" class="radio">单规格</el-radio>
+        <el-radio :label="true">多规格</el-radio>
       </el-radio-group>
     </el-form-item>
     <!-- 多规格添加-->

src/views/mall/promotion/article/ArticleForm.vue

@@ -51,7 +51,7 @@
               <el-radio
                 v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
                 :key="dict.value"
-                :value="dict.value"
+                :label="dict.value"
               >
                 {{ dict.label }}
               </el-radio>
@@ -64,7 +64,7 @@
               <el-radio
                 v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
                 :key="dict.value"
-                :value="dict.value"
+                :label="dict.value"
               >
                 {{ dict.label }}
               </el-radio>
@@ -77,7 +77,7 @@
               <el-radio
                 v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
                 :key="dict.value"
-                :value="dict.value"
+                :label="dict.value"
               >
                 {{ dict.label }}
               </el-radio>

src/views/mall/promotion/article/category/ArticleCategoryForm.vue

@@ -20,7 +20,7 @@
           <el-radio
             v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
             :key="dict.value"
-            :value="dict.value"
+            :label="dict.value"
           >
             {{ dict.label }}
           </el-radio>

src/views/mall/promotion/banner/BannerForm.vue

@@ -34,7 +34,7 @@
               <el-radio
                 v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
                 :key="dict.value"
-                :value="dict.value"
+                :label="dict.value"
               >
                 {{ dict.label }}
               </el-radio>
@@ -47,7 +47,7 @@
               <el-radio
                 v-for="dict in getIntDictOptions(DICT_TYPE.PROMOTION_BANNER_POSITION)"
                 :key="dict.value"
-                :value="dict.value"
+                :label="dict.value"
               >
                 {{ dict.label }}
               </el-radio>

src/views/mall/promotion/coupon/template/CouponTemplateForm.vue

@@ -15,7 +15,7 @@
           <el-radio
             v-for="dict in getIntDictOptions(DICT_TYPE.PROMOTION_PRODUCT_SCOPE)"
             :key="dict.value"
-            :value="dict.value"
+            :label="dict.value"
           >
             {{ dict.label }}
           </el-radio>
@@ -40,7 +40,7 @@
           <el-radio
             v-for="dict in getIntDictOptions(DICT_TYPE.PROMOTION_DISCOUNT_TYPE)"
             :key="dict.value"
-            :value="dict.value"
+            :label="dict.value"
           >
             {{ dict.label }}
           </el-radio>
@@ -101,8 +101,8 @@
       </el-form-item>
       <el-form-item label="领取方式" prop="takeType">
         <el-radio-group v-model="formData.takeType">
-          <el-radio :key="1" :value="1">直接领取</el-radio>
-          <el-radio :key="2" :value="2">指定发放</el-radio>
+          <el-radio :key="1" :label="1">直接领取</el-radio>
+          <el-radio :key="2" :label="2">指定发放</el-radio>
         </el-radio-group>
       </el-form-item>
       <el-form-item v-if="formData.takeType === 1" label="发放数量" prop="totalCount">
@@ -130,7 +130,7 @@
           <el-radio
             v-for="dict in getIntDictOptions(DICT_TYPE.PROMOTION_COUPON_TEMPLATE_VALIDITY_TYPE)"
             :key="dict.value"
-            :value="dict.value"
+            :label="dict.value"
           >
             {{ dict.label }}
           </el-radio>

src/views/mall/promotion/diy/template/decorate.vue

@@ -18,7 +18,7 @@
         @change="handleTemplateItemChange"
       >
         <el-tooltip v-for="(item, index) in templateItems" :key="index" :content="item.name">
-          <el-radio-button :value="index">
+          <el-radio-button :label="index">
             <Icon :icon="item.icon" :size="24" />
           </el-radio-button>
         </el-tooltip>

src/views/mall/promotion/kefu/components/KeFuConversationList.vue

@@ -23,7 +23,7 @@
           <div class="flex justify-between items-center w-100%">
             <span class="username">{{ item.userNickname }}</span>
             <span class="color-[#989EA6]">
-              {{ formatPast(item.lastMessageTime, 'YYYY-MM-DD') }}
+              {{ formatPast(item.lastMessageTime, 'YYYY-mm-dd') }}
             </span>
           </div>
           <!-- 最后聊天内容 -->
@@ -186,11 +186,11 @@ watch(showRightMenu, (val) => {
     transition: border-left 0.05s ease-in-out; /* 设置过渡效果 */
 
     .username {
-      display: -webkit-box;
-      max-width: 60%;
       min-width: 0;
+      max-width: 60%;
       overflow: hidden;
       text-overflow: ellipsis;
+      display: -webkit-box;
       -webkit-box-orient: vertical;
       -webkit-line-clamp: 1;
     }
@@ -198,14 +198,14 @@ watch(showRightMenu, (val) => {
     .last-message {
       width: 200px;
       overflow: hidden; // 隐藏超出的文本
-      text-overflow: ellipsis; // 添加省略号
       white-space: nowrap; // 禁止换行
+      text-overflow: ellipsis; // 添加省略号
     }
   }
 
   .active {
-    background-color: #eff0f1;
     border-left: 5px #3271ff solid;
+    background-color: #eff0f1;
   }
 
   .pinned {
@@ -214,13 +214,13 @@ watch(showRightMenu, (val) => {
 
   .right-menu-ul {
     position: absolute;
-    width: 130px;
+    background-color: #fff;
     padding: 10px;
     margin: 0;
     list-style-type: none; /* 移除默认的项目符号 */
-    background-color: #fff;
     border-radius: 12px;
-    box-shadow: 0 2px 4px rgb(0 0 0 / 10%); /* 阴影效果 */
+    box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1); /* 阴影效果 */
+    width: 130px;
 
     li {
       padding: 8px 16px;

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

@@ -24,7 +24,7 @@
           <el-radio
             v-for="dict in getIntDictOptions(DICT_TYPE.PROMOTION_CONDITION_TYPE)"
             :key="dict.value"
-            :value="dict.value"
+            :label="dict.value"
           >
             {{ dict.label }}
           </el-radio>
@@ -110,7 +110,7 @@
           <el-radio
             v-for="dict in getIntDictOptions(DICT_TYPE.PROMOTION_PRODUCT_SCOPE)"
             :key="dict.value"
-            :value="dict.value"
+            :label="dict.value"
           >
             {{ dict.label }}
           </el-radio>

src/views/mall/promotion/seckill/config/SeckillConfigForm.vue

@@ -32,7 +32,7 @@
           <el-radio
             v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
             :key="dict.value"
-            :value="dict.value"
+            :label="dict.value"
           >
             {{ dict.label }}
           </el-radio>

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

@@ -81,7 +81,7 @@
         <el-date-picker
           v-model="queryParams.createTime"
           :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-280px"
+          class="!w-260px"
           end-placeholder="自定义时间"
           start-placeholder="自定义时间"
           type="daterange"

src/views/mall/trade/brokerage/user/BrokerageOrderListDialog.vue

@@ -12,8 +12,8 @@
         <el-form-item label="用户类型" prop="level">
           <el-radio-group v-model="queryParams.level" @change="handleQuery">
             <el-radio-button checked>全部</el-radio-button>
-            <el-radio-button value="1">一级推广人</el-radio-button>
-            <el-radio-button value="2">二级推广人</el-radio-button>
+            <el-radio-button label="1">一级推广人</el-radio-button>
+            <el-radio-button label="2">二级推广人</el-radio-button>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="状态" prop="status">