From 63a40e3da5f24b449122fb8b50c16dcbf69d5907 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 06 三月 2023 09:22:43 +0800
Subject: [PATCH] Merge branch 'master' into positec

---
 src/tabviews/basetable/index.jsx |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/src/tabviews/basetable/index.jsx b/src/tabviews/basetable/index.jsx
index 0e5c7d9..e6a783a 100644
--- a/src/tabviews/basetable/index.jsx
+++ b/src/tabviews/basetable/index.jsx
@@ -388,6 +388,14 @@
             cell = this.getPrinter(cell, item.uuid)
           }
 
+          if (cell.controlField) {
+            if (/,/ig.test(cell.controlVal)) {
+              cell.controlVals = cell.controlVal.split(',')
+            } else {
+              cell.controlVals = [(cell.controlVal || '')]
+            }
+          }
+
           return skip || permAction[cell.uuid]
         })
       }
@@ -416,6 +424,14 @@
             cell = this.getPrinter(cell, item.uuid)
           }
 
+          if (cell.controlField) {
+            if (/,/ig.test(cell.controlVal)) {
+              cell.controlVals = cell.controlVal.split(',')
+            } else {
+              cell.controlVals = [(cell.controlVal || '')]
+            }
+          }
+
           return skip || permAction[cell.uuid]
         })
         return col.elements.length !== 0

--
Gitblit v1.8.0