Merge remote-tracking branch 'origin/master'

one_stop_public/libs/MobileDate.jsx

@@ -92,7 +92,12 @@ export default class MobileDate extends Component {
 
   render() {
     let {dates} = this.state;
-    const {format, required} = this.props;
+    const { format, showTime } = this.props;
+    let mode = 'datetime';
+    console.log(showTime);
+    if(!showTime){
+      mode = 'date';
+    }
     const startTime = dates.length > 0 ? dates[0] && dates[0].valueOf() : null;
     const endTime = dates.length > 1 ? dates[1].valueOf() : null;
     const MustSpan = this.MustSpan();
@@ -110,6 +115,7 @@ export default class MobileDate extends Component {
           locale={{okText: '确定', dismissText: '取消'}}
           value={!!startTime ? new Date(startTime) : null}
           format={format ? format : 'YYYY-MM-DD HH:mm:ss'}
+          mode={mode}
           onChange={(date) => this.handelStartChange(date)}>
           <List.Item arrow="horizontal">{MustSpan}开始时间</List.Item>
         </DatePicker>
@@ -124,6 +130,7 @@ export default class MobileDate extends Component {
           }
           value={!!endTime ? new Date(endTime) : null}
           locale={{okText: '确定', dismissText: '取消'}}
+          mode={mode}
           format={format ? format : 'YYYY-MM-DD HH:mm:ss'}
           onChange={(date) => this.handelEndChange(date)}>
           <List.Item arrow="horizontal">{MustSpan}结束时间</List.Item>

one_stop_public/libs/style.less

@@ -271,7 +271,7 @@
   display: grid;
   grid-row: auto;
   grid-template-columns: repeat(auto-fill, 130px);
-  grid-auto-flow: column;
+  //grid-auto-flow: column;
   justify-items: start;
   align-items: center;
   column-gap: 10px;

one_stop_public/tableCompon/index.jsx

@@ -3226,7 +3226,7 @@ ${obj[dataColumn.base52] && obj[dataColumn.base52] !== 'null' ?
                         message: '请选择起止时间',
                       },
                     ],
-              })(<MobileDate disabled={disabled} formate={json.format} required={required} />);
+              })(<MobileDate disabled={disabled}  required={required} format={json.format} showTime={json.showTime}/>);
               if (
                 ((json.isMobileLabel != null && json.isMobileLabel) ||
                   (json.isMobileLabel == null && json.isLabel)) &&

one_stop_public/tableCompon/style.less

@@ -6,53 +6,66 @@
     margin-bottom: 2.5px;
     margin-top: 2.5px;
   }
+
   /*#web_table .ant-form-item-control{
         line-height: 20px;
     }*/
+
   #mobile_table .am-list-item {
     //background-color: rgba(238, 238, 238, 0.801);
     border-radius: 4px;
   }
+
   // 移动端单选无法换行
   #mobile_table .ant-radio-wrapper {
     white-space: inherit;
   }
+
   #mobile_table .ant-form-item-label.ant-col-0,
   #mobile_table .ant-form-item-control-wrapper.ant-col-0 {
     width: 0%;
   }
+
   #mobile_table .ant-form-item-label.ant-col-1,
   #mobile_table .ant-form-item-control-wrapper.ant-col-1 {
     width: 4.16666667%;
   }
+
   #mobile_table .ant-form-item-label.ant-col-2,
   #mobile_table .ant-form-item-control-wrapper.ant-col-2 {
     width: 8.33333333%;
   }
+
   #mobile_table .ant-form-item-label.ant-col-3,
   #mobile_table .ant-form-item-control-wrapper.ant-col-3 {
     width: 12.5%;
   }
+
   #mobile_table .ant-form-item-label.ant-col-4,
   #mobile_table .ant-form-item-control-wrapper.ant-col-4 {
     width: 16.66666667%;
   }
+
   #mobile_table .ant-form-item-label.ant-col-5,
   #mobile_table .ant-form-item-control-wrapper.ant-col-5 {
     width: 20.83333333%;
   }
+
   #mobile_table .ant-form-item-label.ant-col-6,
   #mobile_table .ant-form-item-control-wrapper.ant-col-6 {
     width: 25%;
   }
+
   #mobile_table .ant-form-item-label.ant-col-7,
   #mobile_table .ant-form-item-control-wrapper.ant-col-7 {
     width: 29.16666667%;
   }
+
   #mobile_table .ant-form-item-label.ant-col-8,
   #mobile_table .ant-form-item-control-wrapper.ant-col-8 {
     width: 33.33333333%;
   }
+
   #mobile_table .ant-form-item-label.ant-col-9,
   #mobile_table .ant-form-item-control-wrapper.ant-col-9 {
     width: 37.5%;
@@ -140,6 +153,7 @@
   #mobile_table .am-textarea-control textarea {
     background-color: #f5f5f5d3;
   }
+
   #mobile_table > .am-card {
     min-height: 0;
   }
@@ -147,14 +161,20 @@
   #mobile_table .ant-form-item {
     margin-bottom: 0px;
     background: white;
-
     overflow: auto;
     scrollbar-width: none; /* Firefox */
     -ms-overflow-style: none; /* IE 10+ */
+
+    label {
+      float: left;
+      padding-left: 10px;
+    }
+
     &::-webkit-scrollbar {
       display: none;
     }
   }
+
   #mobile_table .am-checkbox-agree .am-checkbox-inner {
     left: -30px;
     top: 1px;
@@ -165,50 +185,61 @@
     text-align: right;
     font-weight: bold;
   }
+
   #mobile_table .isPreview > .ant-form-item-label {
     padding-top: 0px;
 
   }
+
   #MobileList .am-list-item {
     background-color: #fff;
     border-radius: 4px;
   }
+
   #mobile_table .am-list-item .am-input-label {
     overflow: auto;
     scrollbar-width: none; /* Firefox */
     -ms-overflow-style: none; /* IE 10+ */
+
     &::-webkit-scrollbar {
       display: none;
     }
   }
+
   #mobile_table .ant-form-item-label {
     overflow: auto;
     // scrollbar-width: none; /* Firefox */
     // -ms-overflow-style: none; /* IE 10+ */
     // &::-webkit-scrollbar {display:none}
   }
+
   #mobile_table .am-flexbox {
     padding-left: 25px;
+
     .am-checkbox-agree {
       padding-top: 0px;
     }
   }
+
   #mobile_table .am-list-extra {
     flex-basis: 60%;
     overflow: auto;
     scrollbar-width: none; /* Firefox */
     -ms-overflow-style: none; /* IE 10+ */
+
     &::-webkit-scrollbar {
       display: none;
     }
   }
 }
+
 .form input {
   font-size: 14px !important;
   line-height: 28px !important;
   padding-left: 29px !important;
   background-color: #ccc;
 }
+
 .text {
   display: inline-block;
   font-size: 14px;
@@ -216,9 +247,11 @@
   text-align: right;
   font-family: PingFang-SC-Regular;
 }
+
 .placeholder {
   font-size: 14px;
 }
+
 .text2 {
   width: 72px;
   display: inline-block;
@@ -228,11 +261,13 @@
   font-weight: bold;
   font-family: PingFang-SC-Regular;
 }
-.mobileList{
-  :global{
-    .am-list-item .am-list-line .am-list-extra{
+
+.mobileList {
+  :global {
+    .am-list-item .am-list-line .am-list-extra {
       white-space: normal;
-      ul{
+
+      ul {
         padding-inline-start: 0;
       }
     }
@@ -240,14 +275,15 @@
 
 }
 
-.imageUl{
+.imageUl {
   display: grid;
   //grid-template-rows: 1fr;
   grid-auto-flow: column;
   justify-items: center;
   align-items: center;
   column-gap: 10px;
-  li{
+
+  li {
     width: 120px;
     min-height: 50px;
   }