Merge branch 'master' into dev

src/mobile/components/xFrom/field.vue

@@ -613,10 +613,8 @@ export default {
           const component = JSON.parse(JSON.stringify(fieldItem));
           if (component.setting) {
             component.setting = component.setting.map((item) => {
-              return {
-                text: item.label,
-                value: item.value,
-              };
+              item.text = item.label
+              return item;
             });
           }
           let value = component.value;

src/mobile/components/xFrom/sysComponents/ExpectBeginTimeSelect.vue

@@ -139,7 +139,7 @@ export default {
       }
       return item;
     });
-    console.log(this.setting);
+
     this.minDate = moment(this.setting[0].value).toDate();
     this.maxDate = moment(this.setting[this.setting.length - 1].value).toDate();
   },