From ec87799962a4e51f056b53ccbfcaff39180153b5 Mon Sep 17 00:00:00 2001
From: yaojn <yaojn@techsure.com.cn>
Date: Wed, 12 Nov 2025 11:30:39 +0800
Subject: [PATCH] =?UTF-8?q?-=20[=E5=8A=9F=E8=83=BD]=E4=BC=98=E5=8C=96formM?=
 =?UTF-8?q?ixin.js=EF=BC=8C=E7=89=B9=E6=AE=8A=E6=A0=A1=E9=AA=8C=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E7=BB=9F=E4=B8=80=E8=B0=83=E6=95=B4=E4=B8=BAmyValid?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=20=20=20=20-=20[=E5=85=B3=E8=81=94]#[1552805?=
 =?UTF-8?q?590958080]=E4=BC=98=E5=8C=96formMixin.js=EF=BC=8C=E7=89=B9?=
 =?UTF-8?q?=E6=AE=8A=E6=A0=A1=E9=AA=8C=E9=80=BB=E8=BE=91=E7=BB=9F=E4=B8=80?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=BAmyValid=E6=96=B9=E6=B3=95=20http://1?=
 =?UTF-8?q?92.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/93?=
 =?UTF-8?q?9050947543042/1552805590958080?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/resources/components/TimeSelect/TimeSelect.vue |  2 +-
 src/resources/mixins/formMixins.js                 | 13 ++++++-------
 src/resources/plugins/TsForm/TsFormDatePicker.vue  |  4 ++--
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/resources/components/TimeSelect/TimeSelect.vue b/src/resources/components/TimeSelect/TimeSelect.vue
index ddb23417..57fccfac 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 8f73ffac..51b241ba 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 f36adafd..b1930ead 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();
-- 
Gitee