From 27404a80e8dd7c1cca77e284b0fe9b1da95e1b1c Mon Sep 17 00:00:00 2001
From: ForeverSmiYng <fengsiyuan@zwgczx.com>
Date: Thu, 31 Oct 2024 16:39:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=98=8E=E7=BB=86=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 明细行筛选.js | 78 ++++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 65 insertions(+), 13 deletions(-)

diff --git a/明细行筛选.js b/明细行筛选.js
index 4888401..895c65b 100644
--- a/明细行筛选.js
+++ b/明细行筛选.js
@@ -1,5 +1,5 @@
 //浏览框或选择框字段的筛选功能函数
-function exactlyFilterForBrowserOrSelector(mainFieldIds, detFieldIds, det_id, rows = undefined) {
+function myFilter(mainFieldIds, detFieldIds, det_id, comparators, emptyValues = undefined, mainFieldSeparators = undefined, detFieldSeparators = undefined, rows = undefined) {
     let all_rows_str = WfForm.getDetailAllRowIndexStr("detail_" + det_id);
     if (all_rows_str.length == 0) {
         //如果明细为空，函数结束
@@ -17,8 +17,8 @@ function exactlyFilterForBrowserOrSelector(mainFieldIds, detFieldIds, det_id, ro
     mainFieldIds.forEach((mfi, i) => {
         let mfi_value = WfForm.getFieldValue(mfi);
         if (mfi_value.length > 0) {
-            mainFieldValues.push(mfi_value.split(","));
-            new_detFieldIds.push(detFieldIds[i]);
+            mainFieldValues.push(mfi_value.split(mainFieldSeparators == undefined ? "," : mainFieldSeparators[i]).filter(e => e.length > 0));
+            new_detFieldIds.push([detFieldIds[i], detFieldSeparators == undefined ? "," : detFieldSeparators[i], comparators[i], emptyValues == undefined ? undefined : emptyValues[i]]);
         }
     });
     //如果所有主表筛选字段均为空值，即无筛选，显示所有明细行，函数结束
@@ -33,21 +33,14 @@ function exactlyFilterForBrowserOrSelector(mainFieldIds, detFieldIds, det_id, ro
             let check_res1 = false;
             let i = 0;
             for (const dfi of new_detFieldIds) {
-                let dfi_values = WfForm.getFieldValue(dfi + "_" + rowIndex);
-                if (dfi_values.length == 0) {
+                let dfi_values = WfForm.getFieldValue(dfi[0] + "_" + rowIndex);
+                if (dfi_values.length == 0 && dfi[2] != "check框" && dfi[2] != "有无") {
                     //如果明细行对应字段为空,匹配失败，中止循环
                     check_res1 = true;
                     break;
                 } else {
                     //如果明细行对应字段为非空，逐个判断是否在筛选范围内
-                    let check_res2 = false;
-                    for (const dfi_value of dfi_values.split(",")) {
-                        if (mainFieldValues[i].includes(dfi_value)) {
-                            //如果明细行对应字段值在筛选范围，中止最近循环
-                            check_res2 = true;
-                            break;
-                        }
-                    }
+                    let check_res2 = myFilterComparator(mainFieldValues[i], dfi_values, dfi[1], dfi[2], dfi[3]);
                     if (check_res2 == false) {
                         //匹配失败，中止循环
                         check_res1 = true;
@@ -59,4 +52,63 @@ function exactlyFilterForBrowserOrSelector(mainFieldIds, detFieldIds, det_id, ro
             WfForm.controlDetailRowDisplay("detail_" + det_id, rowIndex + "", check_res1);
         }
     });
+}
+
+function myFilterComparator(mainFV, detFV, detSeparators, index, emptyValue) {
+    switch (index) {
+        case "文本":
+            for (const mfi_value of mainFV) {
+                if (detFV.includes(mfi_value)) {
+                    return true;
+                }
+            }
+            return false;
+        case "浏览框":
+            for (const dfi_value of detFV.split(detSeparators).filter(e => e.length > 0)) {
+                if (mainFV.includes(dfi_value)) {
+                    return true;
+                }
+            }
+            return false;
+        case "选择框":
+            for (const dfi_value of detFV.split(detSeparators).filter(e => e.length > 0)) {
+                if (mainFV.includes(dfi_value)) {
+                    return true;
+                }
+            }
+            return false;
+        case "有无":
+            if (["0", "1", 0, 1].includes(emptyValue)) {
+                if (detFV.length == 0) {
+                    if (mainFV.includes(emptyValue + "")) {
+                        return true;
+                    }
+                } else {
+                    if (mainFV.includes(emptyValue + "" == "1" ? "0" : "1")) {
+                        return true;
+                    }
+                }
+            }
+            return false;
+        case "check框":
+            if (["0", "1", 0, 1].includes(emptyValue)) {
+                if (detFV == 0 || detFV.length == 0) {
+                    if (mainFV.includes(emptyValue + "")) {
+                        return true;
+                    }
+                } else {
+                    if (mainFV.includes(emptyValue + "" == "1" ? "0" : "1")) {
+                        return true;
+                    }
+                }
+            }
+            return false;
+        default:
+            for (const mfi_value of mainFV) {
+                if (detFV.includes(mfi_value)) {
+                    return true;
+                }
+            }
+            return false;
+    }
 }
\ No newline at end of file