From 7b0dbecd1d6155d26ec67be0a47a16264c738c85 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 09 五月 2023 14:48:10 +0800
Subject: [PATCH] 2023-05-09

---
 src/templates/sharecomponent/searchcomponent/searchform/index.jsx |   22 ++++++++++++++--------
 1 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/templates/sharecomponent/searchcomponent/searchform/index.jsx b/src/templates/sharecomponent/searchcomponent/searchform/index.jsx
index 6588635..9cb4ffc 100644
--- a/src/templates/sharecomponent/searchcomponent/searchform/index.jsx
+++ b/src/templates/sharecomponent/searchcomponent/searchform/index.jsx
@@ -104,6 +104,8 @@
   datemonth: ['label', 'field', 'initval', 'type', 'match', 'ratio', 'blacklist', 'required', 'Hide', 'labelShow', 'advanced', 'query', 'labelwidth'],
   daterange: ['label', 'field', 'initval', 'type', 'match', 'ratio', 'blacklist', 'required', 'Hide', 'labelShow', 'advanced', 'query', 'precision', 'labelwidth'],
   group: ['label', 'type', 'field', 'datefield', 'initval', 'blacklist', 'ratio', 'items', 'required', 'labelShow', 'query', 'labelwidth'],
+  switch: ['label', 'field', 'initval', 'type', 'match', 'ratio', 'blacklist', 'openVal', 'closeVal', 'openText', 'closeText', 'Hide', 'labelShow', 'advanced', 'query', 'labelwidth'],
+  check: ['label', 'field', 'initval', 'type', 'match', 'ratio', 'blacklist', 'openVal', 'closeVal', 'checkTip', 'Hide', 'labelShow', 'advanced', 'query', 'labelwidth'],
   range: ['label', 'type', 'field', 'initval', 'match', 'blacklist', 'Hide', 'required', 'maxValue', 'minValue', 'step', 'labelShow', 'query', 'labelwidth']
 }
 
@@ -226,22 +228,24 @@
     }
 
     if (type === 'text') {
-      reOptions.match = matchReg.text
+      reOptions.match = matchReg.class1
     } else if (type === 'multiselect') {
-      reOptions.match = matchReg.multiselect
+      reOptions.match = matchReg.class3
     } else if (type === 'select' || type === 'link') {
-      reOptions.match = matchReg.select
+      reOptions.match = matchReg.class1
+    } else if (type === 'switch' || type === 'check') {
+      reOptions.match = matchReg.class2
     } else if (type === 'date') {
-      reOptions.match = matchReg.date
+      reOptions.match = matchReg.class4
     } else if (type === 'datemonth') {
-      reOptions.match = matchReg.datemonth
+      reOptions.match = matchReg.class5
     } else if (type === 'dateweek' || type === 'daterange' || type === 'range') {
-      reOptions.match = matchReg.daterange
+      reOptions.match = matchReg.class5
     } else if (type === 'checkcard') {
       if (this.record.multiple === 'false') {
-        reOptions.match = matchReg.select
+        reOptions.match = matchReg.class1
       } else if (this.record.multiple === 'true') {
-        reOptions.match = matchReg.multiselect
+        reOptions.match = matchReg.class3
       }
     }
 
@@ -738,6 +742,8 @@
               })
               return
             }
+          } else if (values.type === 'switch' || values.type === 'check') {
+            values.initval = values.initval === values.openVal ? values.openVal : values.closeVal
           }
 
           ['linkField', 'valueField', 'valueText', 'orderBy'].forEach(item => {

--
Gitblit v1.8.0