From 9c909edafd80c614770058f75496f3b7294d1fcd Mon Sep 17 00:00:00 2001
From: xieyonghong <18010623010@163.com>
Date: Sat, 1 Apr 2023 16:02:06 +0800
Subject: [PATCH] fix: bug#11328

---
 .../Product/Detail/DeviceAccess/index.vue     |  7 +++++--
 .../Save/components/Terms/ParamsItem.vue      | 20 ++++++++++++++-----
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/views/device/Product/Detail/DeviceAccess/index.vue b/src/views/device/Product/Detail/DeviceAccess/index.vue
index b7aa4c1c..afda69df 100644
--- a/src/views/device/Product/Detail/DeviceAccess/index.vue
+++ b/src/views/device/Product/Detail/DeviceAccess/index.vue
@@ -412,7 +412,6 @@ import {
     modify,
 } from '@/api/device/product';
 import { isNoCommunity } from '@/utils/utils';
-const productStore = useProductStore();
 import Driver from 'driver.js';
 import 'driver.js/dist/driver.min.css';
 import { marked } from 'marked';
@@ -420,7 +419,9 @@ import type { TableColumnType } from 'ant-design-vue';
 import { useMenuStore } from '@/store/menu';
 import _ from 'lodash';
 import { accessConfigTypeFilter } from '@/utils/setting';
+import DeviceApi from '@/api/media/device';
 
+const productStore = useProductStore();
 const tableRef = ref();
 const formRef = ref();
 const menuStore = useMenuStore();
@@ -844,7 +845,9 @@ const submitData = async () => {
                 obj.metadata = JSON.stringify(mdata);
             }
         }
-        // 保存或者更新设备接入
+      // DeviceApi.getConfiguration(current.value?.protocol, current.value?.transport)
+      // visible.value = false;
+      //   保存或者更新设备接入
         const resp: any = obj.id
             ? await updateDevice(obj)
             : await saveDevice(obj);
diff --git a/src/views/rule-engine/Scene/Save/components/Terms/ParamsItem.vue b/src/views/rule-engine/Scene/Save/components/Terms/ParamsItem.vue
index bbbb5630..31037e00 100644
--- a/src/views/rule-engine/Scene/Save/components/Terms/ParamsItem.vue
+++ b/src/views/rule-engine/Scene/Save/components/Terms/ParamsItem.vue
@@ -81,7 +81,7 @@ import { ContextKey, arrayParamsKey, timeTypeKeys } from './util'
 import { useSceneStore } from 'store/scene'
 import { storeToRefs } from 'pinia';
 import { Form } from 'jetlinks-ui-components'
-import {isArray, pick} from 'lodash-es'
+import { isArray, isObject, pick } from 'lodash-es'
 
 const sceneStore = useSceneStore()
 const { data: formModel } = storeToRefs(sceneStore)
@@ -178,10 +178,20 @@ const handOptionByColumn = (option: any) => {
     }
 
     if (option.dataType === 'boolean') {
-      valueOptions.value = option.options?.map((item: any) => ({ ...item, label: item.name, value: item.id})) || [
-        { label: '是', value: 'true' },
-        { label: '否', value: 'false' },
-      ]
+      // 处理_options为Object时
+      const _options = option.options || option.others
+      if (isObject(_options)) {
+        const bool = (_options as any)?.bool
+        valueOptions.value = [
+          { label: bool.falseText, value: String(bool.falseValue)},
+          { label: bool.trueText, value: String(bool.trueValue)},
+        ]
+      } else {
+        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{