diff --git a/src/resources/components/TimeSelect/TimeSelect.vue b/src/resources/components/TimeSelect/TimeSelect.vue index ddb2341718843a4152a09f6daa54a3631837022a..57fccfacf00ed8cf601f701cd6d82cde328171a4 100644 --- a/src/resources/components/TimeSelect/TimeSelect.vue +++ b/src/resources/components/TimeSelect/TimeSelect.vue @@ -354,7 +354,7 @@ export default { this.$refs.dropdownContain && this.$refs.dropdownContain.$refs.drop && this.$refs.dropdownContain.$refs.drop.update(); } }, - currentValidTimeSelect(currentValue) { + myValid(currentValue) { // 验证时间范围必填 let isValid = true; let currentValidList = this.filterValid(this.validateList) || []; diff --git a/src/resources/mixins/formMixins.js b/src/resources/mixins/formMixins.js index 8f73ffac55c655ec921a8f9f7da85b0d56bb6d8a..51b241ba5805d6e8ba54b02365100a3a29a68eeb 100644 --- a/src/resources/mixins/formMixins.js +++ b/src/resources/mixins/formMixins.js @@ -176,18 +176,17 @@ export default { //校验卡槽存在则为false 移到后面的原因是 this.$slots.validMessage为空的设置需要等下一次render,这个时候validMessage为空导致插件校验显示出错 isValid = false; } - if (isValid && this.currentValidDate) { - isValid = this.currentValidDate(val || this.currentValue); + if (isValid && this.myValid) { + isValid = this.myValid(val || this.currentValue); !isValid && this.$set(this, 'validMesage', this.currentValidMesage); } - if (isValid && this.currentValidTimeSelect) { - // timeSelect 下拉验证 - isValid = this.currentValidTimeSelect(val || this.currentValue); - !isValid && this.$set(this, 'validMesage', this.validMesage); - } this.isValidPass = isValid; return isValid; }, + myValid(currentValue) { + // 组件里面自己单独校验的方法 + return true; + }, canValid(way, validateList) { //是否可以触发校验 way 触发校验的类型 change blur let canWary = false; diff --git a/src/resources/plugins/TsForm/TsFormDatePicker.vue b/src/resources/plugins/TsForm/TsFormDatePicker.vue index f36adafd0f190365cbaa23ca46e5409b65c4dc00..b1930ead408a88f71a0b7d10f9a9ee297f9d1ea0 100755 --- a/src/resources/plugins/TsForm/TsFormDatePicker.vue +++ b/src/resources/plugins/TsForm/TsFormDatePicker.vue @@ -225,7 +225,7 @@ export default { if (!isSame) { typeof _this.onChange == 'function' && _this.onChange(time); - this.currentValidDate(time); + this.myValid(time); if (_this.currentValidList.length > 0) { _this.valid(time); } @@ -362,7 +362,7 @@ export default { } return newValue.toString().trim(); }, - currentValidDate(value) { //当前组件特殊校验 + myValid(value) { //当前组件特殊校验 let isValid = true; if (value && this.selectableRange && typeof this.selectableRange == 'function') { let timeList = this.selectableRange();