fix: bug#10824

src/views/rule-engine/Scene/Save/Device/Product.vue

@@ -192,28 +192,30 @@ const columns = [
     hideInTable: true,
     search: {
       type: 'treeSelect',
-      options: getTreeData_api({ paging: false }).then((resp: any) => {
+      options: () => new Promise((resolve) => {
-        const formatValue = (list: any[]) => {
+        getTreeData_api({ paging: false }).then((resp: any) => {
-          return list.map((item: any) => {
+          const formatValue = (list: any[]) => {
-            if (item.children) {
+            return list.map((item: any) => {
-              item.children = formatValue(item.children);
+              if (item.children) {
-            }
+                item.children = formatValue(item.children);
-            return {
+              }
-              ...item,
+              return {
-              value: JSON.stringify({
+                ...item,
-                assetType: 'product',
+                value: JSON.stringify({
-                targets: [
+                  assetType: 'product',
-                  {
+                  targets: [
-                    type: 'org',
+                    {
-                    id: item.id,
+                      type: 'org',
-                  },
+                      id: item.id,
-                ],
+                    },
-              }),
+                  ],
-            }
+                }),
-          })
+              }
-        }
+            })
-        return formatValue(resp.result)
+          }
-      }),
+          resolve(formatValue(resp.result) || [])
+        })
+      })
     }
   }
 ]

src/views/rule-engine/Scene/Save/action/ListItem/FilterCondition.vue

@@ -175,14 +175,14 @@ const handOptionByColumn = (option: any) => {
     termTypeOptions.value = option.termTypes || []
     tabsOptions.value[0].component = option.type
     if (option.type === 'boolean') {
-      valueOptions.value = [
+      valueOptions.value = option.options?.map((item: any) => ({ ...item, label: item.name, value: item.id})) || [
-        { name: '是', id: true },
+        { label: '是', value: true },
-        { name: '否', id: false },
+        { label: '否', value: false },
       ]
     } else if(option.type === 'enum') {
       valueOptions.value = option.options?.map((item: any) => ({ ...item, label: item.name, value: item.id})) || []
     } else{
-      valueOptions.value = option.options || []
+      valueOptions.value = (option.options || []).map((item: any) => ({ ...item, label: item.name, value: item.id}))
     }
     valueColumnOptions.value = treeFilter(cloneDeep(columnOptions.value), option.type, 'type')
   } else {

src/views/rule-engine/Scene/Save/components/Terms/ParamsItem.vue

@@ -176,14 +176,14 @@ const handOptionByColumn = (option: any) => {
     }
 
     if (option.dataType === 'boolean') {
-      valueOptions.value = [
+      valueOptions.value = option.options?.map((item: any) => ({ ...item, label: item.name, value: item.id})) || [
         { label: '是', value: true },
         { label: '否', value: false },
       ]
     } else if(option.dataType === 'enum') {
       valueOptions.value = option.options?.map((item: any) => ({ ...item, label: item.name, value: item.id})) || []
     } else{
-      valueOptions.value = option.options || []
+      valueOptions.value = (option.options || []).map((item: any) => ({ ...item, label: item.name, value: item.id}))
     }
   } else {
     termTypeOptions.value = []