From 8a6ce370f1aa1c061b76fa3e9d2d4d1df53ca4c5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 21 五月 2024 16:38:09 +0800
Subject: [PATCH] Merge branch 'master' into positec

---
 src/tabviews/zshare/mutilform/index.jsx |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/src/tabviews/zshare/mutilform/index.jsx b/src/tabviews/zshare/mutilform/index.jsx
index f3de88e..483d428 100644
--- a/src/tabviews/zshare/mutilform/index.jsx
+++ b/src/tabviews/zshare/mutilform/index.jsx
@@ -154,6 +154,17 @@
 
       let key = item.field.toLowerCase()
 
+      // positecgroup 琛ㄥ崟闅愯棌
+      if (item.tooltip && /@[a-z0-9_]+@/.test(item.tooltip)) {
+        let field = item.tooltip.replace(/@|\s/ig, '').toLowerCase()
+        
+        if (data[field] === 'N') {
+          item.hidden = true
+        }
+
+        item.tooltip = ''
+      }
+
       if (item.type === 'funcvar') {
         readin = false
         item.readin = false
@@ -393,11 +404,13 @@
           message: item.label + '涓嶅彲涓虹┖!'
         }]
 
-        if (typeof(item.min) === 'number' || typeof(item.max) === 'number') {
+        if (typeof(item.min) === 'number' || typeof(item.max) === 'number' || item.notZero === 'true') {
           item.rules.push({
             validator: (rule, value, callback) => {
               if (isNaN(value)) {
                 callback()
+              } else if (item.notZero === 'true' && value === 0) {
+                callback(item.label + '涓嶅彲涓�0')
               } else if (typeof(item.min) === 'number' && value < item.min) {
                 if (item.min < 1e-6) {
                   if (item.min === 1e-6) {

--
Gitblit v1.8.0