From 7f3059eccf93472326239d5be4dc8e69674033f0 Mon Sep 17 00:00:00 2001
From: ulleo <ulleo.wang@gmail.com>
Date: Fri, 17 May 2024 14:49:08 +0800
Subject: [PATCH] =?UTF-8?q?feat(X-Pack):=E3=80=90=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=A1=AB=E6=8A=A5=E3=80=91=E8=A1=A8=E5=8D=95=E5=A1=AB=E6=8A=A5?=
 =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A1=86=E6=95=B0=E6=8D=AE=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E9=80=89=E9=A1=B9=E8=BF=87=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/dataFilling/form/EditFormData.vue        | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/core/frontend/src/views/dataFilling/form/EditFormData.vue b/core/frontend/src/views/dataFilling/form/EditFormData.vue
index dd0e64f264..209e401432 100644
--- a/core/frontend/src/views/dataFilling/form/EditFormData.vue
+++ b/core/frontend/src/views/dataFilling/form/EditFormData.vue
@@ -1,5 +1,5 @@
 <script>
-import { forEach, find, concat, cloneDeep, floor } from 'lodash-es'
+import { forEach, find, concat, cloneDeep, floor, map, filter, includes } from 'lodash-es'
 import { PHONE_REGEX, EMAIL_REGEX } from '@/utils/validate'
 import { newFormRowData, saveFormRowData, userFillFormData } from '@/views/dataFilling/form/dataFilling'
 
@@ -99,7 +99,13 @@ export default {
           const _value = this.data[f.settings.mapping.columnName]
           if (f.type === 'select' && f.settings.multiple || f.type === 'checkbox') {
             if (_value) {
-              f.value = JSON.parse(_value)
+              // 过滤一下选项值
+              if (this.readonly) {
+                f.value = JSON.parse(_value)
+              } else {
+                const options = map(f.settings.options, f => f.value)
+                f.value = filter(JSON.parse(_value), v => includes(options, v))
+              }
             } else {
               f.value = []
             }