From e6cba52cf33eec19e4a3d02c6e8dec4ee286e950 Mon Sep 17 00:00:00 2001
From: XieYongHong <18010623010@163.com>
Date: Tue, 28 Nov 2023 15:52:17 +0800
Subject: [PATCH] fix: bug#20430

---
 src/views/init-home/Menu/index.vue                    | 11 ++++++++---
 .../Scene/Save/action/ListItem/FilterCondition.vue    |  2 +-
 src/views/system/Menu/Detail/BasicInfo.vue            |  6 +++---
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/views/init-home/Menu/index.vue b/src/views/init-home/Menu/index.vue
index 6ce235ff..1c4be267 100644
--- a/src/views/init-home/Menu/index.vue
+++ b/src/views/init-home/Menu/index.vue
@@ -40,9 +40,14 @@ const getProvidersFn = async () => {
     if (version ==='community') {
         return undefined
     } else {
-        const res: any = await getProviders();
-        const ids = res.result?.map?.(item => item.id) || []
-        return protocolList.some(item => ids.includes(item.value))
+        try {
+            const res: any = await getProviders();
+            const ids = res.result?.map?.(item => item.id) || []
+            return protocolList.some(item => ids.includes(item.value))
+        } catch (error) {
+            return false
+        }
+
     }
 }
 
diff --git a/src/views/rule-engine/Scene/Save/action/ListItem/FilterCondition.vue b/src/views/rule-engine/Scene/Save/action/ListItem/FilterCondition.vue
index 08a81d47..4753a41f 100644
--- a/src/views/rule-engine/Scene/Save/action/ListItem/FilterCondition.vue
+++ b/src/views/rule-engine/Scene/Save/action/ListItem/FilterCondition.vue
@@ -193,7 +193,7 @@ const handOptionByColumn = (option: any) => {
         ]
       }
     } else if(option.type === 'enum') {
-      valueOptions.value = _options?.map((item: any) => ({ ...item, label: item.name, value: item.id})) || []
+      valueOptions.value = _options?.elements?.map((item: any) => ({ ...item, label: item.text, value: item.value})) || []
     } else{
       valueOptions.value = _options?.map((item: any) => ({ ...item, label: item.name, value: item.id})) || []
     }
diff --git a/src/views/system/Menu/Detail/BasicInfo.vue b/src/views/system/Menu/Detail/BasicInfo.vue
index 3c8623fe..74e0cb62 100644
--- a/src/views/system/Menu/Detail/BasicInfo.vue
+++ b/src/views/system/Menu/Detail/BasicInfo.vue
@@ -61,14 +61,14 @@
                             </j-form-item>
                         </j-col>
                         <j-col :span="12">
-                            <j-form-item label="页面地址" name="url" :rules="[
+                            <j-form-item :rules="[
                                 {
                                     required: true,
                                     message: '请输入页面地址',
                                 },
                                 { max: 128, message: '最多可输入128字符' },
                                 { pattern: /^\//, message: '请正确填写地址，以/开头' },
-                            ]">
+                            ]" :validateFirst="true" label="页面地址" name="url">
                                 <j-input v-model:value="form.data.url" placeholder="请输入页面地址" />
                             </j-form-item>
                         </j-col>
@@ -337,7 +337,7 @@ type assetType = {
     padding: 24px;
     .card {
         margin-bottom: 24px;
-        
+
         h3 {
             position: relative;
             display: flex;