@zscreate/zhxy-app-component 1.0.198 → 1.0.202

package/components/evan-form-item/evan-form-item.vue

@@ -183,7 +183,7 @@
           /> -->
 
           <view class="evan-form-item-container__main--body">
-            <uni-datetime-picker @change="dateChange" @click.native="isClickByUser = true" :type="widget.options.type"
+            <uni-datetime-picker ref="datetime_picker" @change="dateChange" @click.native="isClickByUser = true" :type="widget.options.type"
               :format="widget.options.format" :clearIcon="!widget.options.disabled && widget.options.clearable"
               v-model="dataModel" @maskClick="maskClick" :border="false" :disabled="widget.options.disabled">
               <view class="option-font-size">
@@ -1287,7 +1287,7 @@ export default {
             value = dateStr + ''
           }
           this.dataModel = value
-        } else {
+        } else if(this.widget.type === 'number') {
           const { max, min } = this.widget.options
           if (max && value > max) {
             this.dataModel = max
@@ -1297,6 +1297,7 @@ export default {
             this.dataModel = min
             return
           }
+        } else {
           this.dataModel = value
         }
       }
@@ -1709,14 +1710,22 @@ export default {
           if (this.widget.options.type === 'range' && !Array.isArray(v)) {
             this.dataModel = v =[]
           }
+          if (this.widget.options.type !== 'range' && typeof v !== 'string') {
+            v = undefined
+          }
           const concatData = [].concat(v)
+          concatData.forEach((item, idx) => {
+            if (typeof item !== 'string') concatData[idx] = undefined
+          })
+
           if (v && concatData.length > 0 && !concatData.every(item => !this.disabledDate(item))) {
             this.$refs.uToast.show({
               title: "超出允许选择范围",
               duration: 2000,
             });
-            this.dataModel = undefined
-            v = undefined
+            this.dataModel = ''
+            v = ''
+            this.$refs.datetime_picker.initPicker(v)
           }
 
         }

package/components/fullModal/fullModal.vue

@@ -50,6 +50,9 @@ export default {
   .show{
     width: 100vw;
     height: 100vh;
+    // #ifdef MP-WEIXIN
+    padding-top: 40px;
+    // #endif
     position: fixed;
     left: 0;
     right: 0;

package/components/userSelectByRole/userSelectByRole.vue

@@ -30,7 +30,7 @@
           </u-tr>
           <u-tr v-for="user in roleUserList" :key="user.id">
             <u-td width="50px" >
-              <view style="width: 33px;">
+              <view style="min-width: 33px;">
                 <u-checkbox v-model="user.checked" @change="handleCheck" :name="user.id"  >
                 </u-checkbox>
               </view>

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@zscreate/zhxy-app-component",
-	"version": "1.0.198",
+	"version": "1.0.202",
 	"private": false,
 	"description": "zhxy-app-component",
 	"main": "index.js",