@zscreate/zhxy-app-component 1.0.185 → 1.0.187

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

@@ -840,7 +840,26 @@ export default {
         }
       })
     },
-
+    /**
+     * @param date Moment
+     * @returns {boolean}
+     */
+    disabledDate(val) {
+      const { min, max, format, type } = this.widget.options
+      let flag = false
+      const date = moment(new Date())
+      if (min) {
+        const ago = moment(val, format).subtract(min + (type === 'month' ? 1 : 0), 'months')
+        flag = date.diff(ago) < 0
+        if (flag) return true
+      }
+      if (max) {
+        const after = moment(val, format).add(max, 'months')
+        flag = date.diff(after) > 0
+        if (flag) return true
+      }
+      return flag
+    },
     //切换时间
     dateChange(val) {
       if (this.tableKey) {
@@ -1640,7 +1659,6 @@ export default {
       if (this.tableKey) {
         this.tableValueSet(v);
       } else {
-        this.models[this.widget.model] = v
         if (this.widget.type === 'userSelector') {
           if (v === "") {
             this.dataModel = []
@@ -1677,7 +1695,22 @@ export default {
           // }
           this.widget.key = v
           this.$emit('upDateWidget', this.widget)
+        } else if( this.widget.type === 'date') {
+          if (this.widget.options.type === 'range' && !Array.isArray(v)) {
+            this.dataModel = v =[]
+          }
+          const concatData = [].concat(v)
+          if (v && concatData.length > 0 && !concatData.every(item => !this.disabledDate(item))) {
+            this.$refs.uToast.show({
+              title: "超出允许选择范围",
+              duration: 2000,
+            });
+            this.dataModel = undefined
+            v = undefined
+          }
+
         }
+        this.models[this.widget.model] = v
 
         this.$emit("update:models", {
           ...this.models,

package/components/userSelectByRole/userSelectByRole.vue

@@ -20,7 +20,7 @@
           <u-tr>
             <u-th width="50px" style="box-sizing: border-box">
               <view v-if="multiple">
-                <u-checkbox :value="isAllCheck" @change="roleCheckAll">
+                <u-checkbox :value="isAllCheck" @change="roleCheckAll" >
                 </u-checkbox>
               </view>
               <view v-else>选择</view>
@@ -31,7 +31,7 @@
           <u-tr v-for="user in roleUserList" :key="user.id">
             <u-td width="50px" >
               <view style="width: 33px;">
-                <u-checkbox v-model="user.checked" @change="handleCheck" :name="user.id">
+                <u-checkbox v-model="user.checked" @change="handleCheck" :name="user.id"  >
                 </u-checkbox>
               </view>
             </u-td>
@@ -39,23 +39,19 @@
             <u-td style="flex: 1; word-break: break-all; white-space: nowrap;  overflow: hidden; text-overflow: ellipsis;"><view>{{ user.departName }}</view></u-td>
           </u-tr>
         </u-table>
-
       </view>
-
-      <view style="display: flex; justify-content: space-between; margin-top: 20rpx">
-        <u-button type="primary" size="medium" @click="handleSelectRoleUserOk">确定</u-button>
-        <u-button size="medium" @click="roleSelectShow = false">取消</u-button>
+      <view style="display: flex; justify-content: space-between; margin-top: 20rpx; gap: 20px">
+        <u-button type="primary" size="medium" @click="handleSelectRoleUserOk" :custom-style="{borderRadius: '5px'}">确定</u-button>
+        <u-button size="medium" @click="roleSelectShow = false" :custom-style="{borderRadius: '5px'}">取消</u-button>
       </view>
     </view>
 
-
     <t-loading :isLoading="isLoading"/>
   </u-popup>
 </template>
 
 <script>
 import {cloneObj} from "../../utils/util";
-
 export default {
   name: "userSelectByRole",
   props: {
@@ -204,7 +200,6 @@ export default {
   }
 }
 </script>
-
 <style scoped lang="less">
 /deep/ u-th:nth-child(1) {
   flex: 0 0 40px;
@@ -212,7 +207,6 @@ export default {
 /deep/ u-th {
   flex: 1;
 }
-
 /deep/ .u-icon__icon {
   top: -2px !important;
 }

package/package.json

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