From 07f24aed1cddcbfa4d1324a103cef725a01d0299 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Wed, 15 Nov 2023 15:46:25 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20=E4=BB=AA?=
 =?UTF-8?q?=E8=A1=A8=E6=9D=BF=E5=A4=96=E9=83=A8=E5=8F=82=E6=95=B0=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E5=8C=B9=E9=85=8D=E8=BF=87=E6=BB=A4=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?,=E5=85=BC=E5=AE=B9=E5=A4=9A=E9=80=89=E8=8C=83=E5=9B=B4?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=20#5891?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/frontend/src/store/index.js              | 12 +++++++++-
 .../src/views/panel/outerParamsSet/index.vue  | 24 +++++++++----------
 2 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/core/frontend/src/store/index.js b/core/frontend/src/store/index.js
index a2054d3fb2..28b151f961 100644
--- a/core/frontend/src/store/index.js
+++ b/core/frontend/src/store/index.js
@@ -472,10 +472,20 @@ const data = {
           Object.keys(params).forEach(function(sourceInfo) {
             // 获取外部参数的值 sourceInfo 是外部参数名称 支持数组传入
             let paramValue = params[sourceInfo]
+            let paramValueStr = params[sourceInfo]
             let operator = 'in'
             if (paramValue && !Array.isArray(paramValue)) {
               paramValue = [paramValue]
               operator = 'eq'
+            } else if (paramValue && Array.isArray(paramValue)) {
+              paramValueStr = ''
+              paramValue.forEach((innerValue, index) => {
+                if (index === 0) {
+                  paramValueStr = innerValue
+                } else {
+                  paramValueStr = paramValueStr + ',' + innerValue
+                }
+              })
             }
             // 获取所有目标联动信息
             const targetInfoList = trackInfo[sourceInfo] || []
@@ -499,7 +509,7 @@ const data = {
                 currentFilters.push(condition)
               }
               if (element.type === 'custom' && element.id === targetViewId) { // 过滤组件处理
-                element.options.value = paramValue
+                element.options.value = paramValueStr
               }
             })
             if (element.type === 'view') {
diff --git a/core/frontend/src/views/panel/outerParamsSet/index.vue b/core/frontend/src/views/panel/outerParamsSet/index.vue
index 908725201c..fe0bc86c9c 100644
--- a/core/frontend/src/views/panel/outerParamsSet/index.vue
+++ b/core/frontend/src/views/panel/outerParamsSet/index.vue
@@ -130,7 +130,7 @@
                     <div class="select-filed">
                       <el-select
                         v-model="targetViewInfo.targetFieldId"
-                        :disabled="viewIdFieldArrayMap[targetViewInfo.targetViewId].length===1 && viewIdFieldArrayMap[targetViewInfo.targetViewId][0].id === 0"
+                        :disabled="viewIdFieldArrayMap[targetViewInfo.targetViewId].length===1 && viewIdFieldArrayMap[targetViewInfo.targetViewId][0].id === 'empty'"
                         style="width: 100%"
                         size="mini"
                         :placeholder="$t('fu.search_bar.please_select')"
@@ -190,8 +190,8 @@
                   round
                   @click="addOuterParamsField"
                 >{{
-                    $t('panel.add_param_link_field')
-                  }}
+                  $t('panel.add_param_link_field')
+                }}
                 </el-button>
               </el-row>
 
@@ -240,12 +240,12 @@
 </template>
 
 <script>
-import {detailList} from '@/api/panel/panelView'
-import {mapState} from 'vuex'
-import {queryWithPanelId, updateOuterParamsSet} from '@/api/panel/outerParams'
-import {uuid} from 'vue-uuid'
-import {deepCopy} from '@/components/canvas/utils/utils'
-import {checkRepeat} from '@/utils/check'
+import { detailList } from '@/api/panel/panelView'
+import { mapState } from 'vuex'
+import { queryWithPanelId, updateOuterParamsSet } from '@/api/panel/outerParams'
+import { uuid } from 'vue-uuid'
+import { deepCopy } from '@/components/canvas/utils/utils'
+import { checkRepeat } from '@/utils/check'
 
 export default {
   name: 'OuterParamsSet',
@@ -376,7 +376,7 @@ export default {
               type: 'filter',
               name: componentItem.options.attrs.title ? componentItem.options.attrs.title : '过滤组件'
             })
-            this.viewIdFieldArrayMap[componentItem.id] = [{id: 0, name: this.$t('panel.filter_no_select')}]
+            this.viewIdFieldArrayMap[componentItem.id] = [{ id: 'empty', name: this.$t('panel.filter_no_select') }]
           }
         })
       })
@@ -408,8 +408,8 @@ export default {
       }
     },
     viewInfoOnChange(targetViewInfo) {
-      if (this.viewIdFieldArrayMap[targetViewInfo.targetViewId].length === 1 && this.viewIdFieldArrayMap[targetViewInfo.targetViewId][0].id === 0) {
-        targetViewInfo.targetFieldId = 0
+      if (this.viewIdFieldArrayMap[targetViewInfo.targetViewId].length === 1 && this.viewIdFieldArrayMap[targetViewInfo.targetViewId][0].id === 'empty') {
+        targetViewInfo.targetFieldId = 'empty'
       } else {
         targetViewInfo.targetFieldId = null
       }