Merge pull request #1442 from TaleLin/fix-bug

Fix bug

Author: smileShirmy

README.md

@@ -31,7 +31,6 @@
 
 ---
 
-
 ## 目录
 
 - [目录](#目录)

src/behaviors/countdown.js

@@ -3,7 +3,7 @@ export default Behavior({
   behaviors: [],
   properties: {
     time: {
-      type: Date,
+      type: Object,
       value: new Date().getTime() + 86400000,
       observer: function (newVal, oldVal) {
         if (newVal && !oldVal) {

src/behaviors/rules.js

@@ -10,7 +10,7 @@ export default Behavior({
   properties: {
     // 校验
     rules: {
-      type: [Object, Array],
+      optionalTypes: [Object, Array],
       value: []
     },
     tipType: {

src/calendar/components/mounth/index.js

@@ -6,12 +6,10 @@ Component({
   },
   properties: {
     minDate: {
-      type: [Date,String,null],
-      // observer: 'setDays'
+      optionalTypes: [Object,String],
     },
     maxDate: {
-      type: [Date,String,null],
-      // observer: 'setDays'
+      optionalTypes: [Object,String],
     },
     formatter: {
       type: null,
@@ -22,7 +20,7 @@ Component({
       observer: 'setDays'
     },
     currentDate: {
-      type: [null, Array],
+      optionalTypes: [Array],
       observer() {
         this.setDays();
       }

src/calendar/index.js

@@ -35,39 +35,37 @@ Component({
       value: ''
     },
     defaultDate: {
-      type: [String, Number, Date, Array],
-      value: '',
+      optionalTypes: [String, Number, Date, Array],
       observer() {
         this.setData({ currentDate: this.initCurrentDate() });
       }
     },
     format: {
       type: String,
       value: 'timestamp'
-      // value: 'yyyy-MM-dd',
     },
     formatter: {
-      type: [Function, null],
+      type: Object,
       value: null
     },
     minDate: {
-      type: [String, Number, null],
+      optionalTypes: [String, Number],
       value: Date.now()
     },
     maxDate: {
-      type: [String, Number, null],
+      optionalTypes: [String, Number],
       value: new Date(
         new Date().getFullYear(),
         new Date().getMonth() + 6,
         new Date().getDate()
       ).getTime()
     },
     minSelect: {
-      type: [Number, null],
+      type: Number,
       value: null
     },
     maxSelect: {
-      type: [Number, null],
+      type: Number,
       value: null
     },
     allowSameDay: Boolean,

src/checkbox-group/index.js

@@ -26,13 +26,13 @@ Component({
     },
     // 最多选中值
     maxSelected: {
-      type: [Number,null],
+      type: Number,
       value: null
     },
     minSelected: {
-      type: [Number,null],
+      type: Number,
       value: null
-    }
+    },
   },
   data: {
   },

src/image-picker/index.js

@@ -49,7 +49,7 @@ Component({
     },
     sizeType: {
       // 该写法经测试有效
-      type: Array | String,
+      optionalTypes: [Array, String],
       value: ['original', 'compressed']
     },
     // 所选图片最大限制，单位字节

src/input/index.wxml

@@ -3,7 +3,7 @@
   class='form-item {{disabled? "disabled": ""}} l-class form-item-{{labelLayout}}'
   style="width:{{width===null?'auto':width+'rpx'}}">
   <view class='mask' wx:if="{{disabled}}"></view>
-  <view class='row l-row-class' hidden="{{ showRow ? '' : 'hidden' }}" style="width:{{width}}rpx;"></view>
+  <view class='row l-row-class' hidden="{{ showRow ? '' : 'hidden' }}" style="width:{{width===null?'100%':width+'rpx'}}"></view>
   <view wx:if="{{label && !labelCustom}}" hidden="{{hideLabel}}" class='form-label l-label-class form-label-{{labelLayout}}' style='{{labelLayout !== "top" ? "width:"+ labelWidth+ "rpx;" : "" }} height:{{labelLayout=== "top" ? labelWidth + "rpx" : "" }}'>
     <text><text class='text-require' wx:if="{{required}}">* </text>{{label}}<text wx:if="{{colon}}">：</text>
     </text>

src/mask/index.js

@@ -13,7 +13,7 @@ Component({
     },
     // 不透明度
     opacity: {
-      type: [String, Number],
+      optionalTypes: [String, Number],
       value: .4
     },
     // mask的z-index值

src/message/index.less

@@ -2,7 +2,7 @@
 
 .l-message {
   width: 750rpx;
-  height: 72rpx;
+  height: 0;
   border-radius: 0rpx 0rpx 16rpx 16rpx;
   display: flex;
   justify-content: center;
@@ -36,6 +36,7 @@
 
 .l-message-show {
   transform: translateX(-50%) translateZ(0) translateY(0);
+  height: 72rpx;
   opacity: 1;
 }