From cb4716f37d41dbdd5ccb3c4f70bca88daabf4c0c Mon Sep 17 00:00:00 2001
From: qiaochuLei <124648559+qiaochuLei@users.noreply.github.com>
Date: Fri, 20 Oct 2023 16:55:31 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20bug#19135=E3=80=8119137?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: bug#19125、19111

* fix: bug#19135、19137
---
 .../device/Instance/Detail/components/EditTable/index.vue  | 1 +
 src/views/device/Instance/Detail/components/MSelect.vue    | 3 +--
 .../device/Product/Detail/DeviceAccess/accessModal.vue     | 4 ++--
 src/views/device/Product/index.vue                         | 7 +++++--
 src/views/device/components/Metadata/Import/index.vue      | 2 +-
 src/views/rule-engine/Alarm/Config/Io/index.vue            | 2 +-
 6 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/views/device/Instance/Detail/components/EditTable/index.vue b/src/views/device/Instance/Detail/components/EditTable/index.vue
index 31c7b5ff..e2b886d6 100644
--- a/src/views/device/Instance/Detail/components/EditTable/index.vue
+++ b/src/views/device/Instance/Detail/components/EditTable/index.vue
@@ -27,6 +27,7 @@
                                     v-model:value="record[column.dataIndex]"
                                     placeholder="请选择"
                                     allowClear
+                                    show-search 
                                     :filter-option="filterOption"
                                     :options="channelList"
                                     @select="(_, option) => { record.provider = option.provider }"
diff --git a/src/views/device/Instance/Detail/components/MSelect.vue b/src/views/device/Instance/Detail/components/MSelect.vue
index 2f5beda3..06365bf6 100644
--- a/src/views/device/Instance/Detail/components/MSelect.vue
+++ b/src/views/device/Instance/Detail/components/MSelect.vue
@@ -1,11 +1,10 @@
 <template>
-    <j-select allowClear v-model:value="_value" @change="onChange" placeholder="请选择" style="width: 100%">
+    <j-select allowClear v-model:value="_value" @change="onChange" placeholder="请选择" style="width: 100%" show-search :filter-option="filterOption">
         <j-select-option
             v-for="item in list"
             :key="item.id"
             :value="item.id"
             :label="item.name"
-            :filter-option="filterOption"
             >{{ item.name }}</j-select-option
         >
     </j-select>
diff --git a/src/views/device/Product/Detail/DeviceAccess/accessModal.vue b/src/views/device/Product/Detail/DeviceAccess/accessModal.vue
index ca4b8506..357203c6 100644
--- a/src/views/device/Product/Detail/DeviceAccess/accessModal.vue
+++ b/src/views/device/Product/Detail/DeviceAccess/accessModal.vue
@@ -243,11 +243,11 @@ const columns = [
       options: [
         {
           label: '正常',
-          value: 'started',
+          value: 'enabled',
         },
         {
           label: '禁用',
-          value: 'disable',
+          value: 'disabled',
         },
       ],
     },
diff --git a/src/views/device/Product/index.vue b/src/views/device/Product/index.vue
index 8e9a644d..f3753bbd 100644
--- a/src/views/device/Product/index.vue
+++ b/src/views/device/Product/index.vue
@@ -389,8 +389,7 @@ const beforeUpload = (file: any) => {
     reader.readAsText(file);
     reader.onload = async (result) => {
         const text = result.target?.result;
-        // console.log('text: ', text);
-        // console.log(file);
+        console.log(text);
         if (!file.type.includes('json')) {
             onlyMessage('请上传json格式文件', 'error');
             return false;
@@ -410,6 +409,10 @@ const beforeUpload = (file: any) => {
             if(!data?.name){
                 data.name = "产品" + Date.now();
             }
+            if(!data?.deviceType || JSON.stringify(data?.deviceType) === '{}' ){
+                onlyMessage('缺少deviceType字段或对应的值','error')
+                return false
+            }
             const res = await updateDevice(data);
             if (res.status === 200) {
                 onlyMessage('操作成功');
diff --git a/src/views/device/components/Metadata/Import/index.vue b/src/views/device/components/Metadata/Import/index.vue
index 30d33732..8789b971 100644
--- a/src/views/device/components/Metadata/Import/index.vue
+++ b/src/views/device/components/Metadata/Import/index.vue
@@ -158,7 +158,7 @@
                 <template #label>
                     <j-space>
                         物模型
-                        <j-tooltip title="在线编辑器中编写物模型脚本">
+                        <j-tooltip title="在编辑器中编写物模型脚本">
                             <AIcon
                                 type="QuestionCircleOutlined"
                                 style="color: rgb(136, 136, 136)"
diff --git a/src/views/rule-engine/Alarm/Config/Io/index.vue b/src/views/rule-engine/Alarm/Config/Io/index.vue
index 4586c557..c521d7bb 100644
--- a/src/views/rule-engine/Alarm/Config/Io/index.vue
+++ b/src/views/rule-engine/Alarm/Config/Io/index.vue
@@ -141,7 +141,7 @@
                         <div>
                             1、平台支持将告警数据输出到kafka，第三方系统可订阅kafka中的告警数据，进行业务处理。
                         </div>
-                        <h2>输出参数</h2>
+                        <h2>推送参数</h2>
                         <div>
                             <j-table
                                 :dataSource="outputData"

From 0453eb669f467bc662308084e6f3c22e3ad34e87 Mon Sep 17 00:00:00 2001
From: qiaochuLei <124648559+qiaochuLei@users.noreply.github.com>
Date: Fri, 20 Oct 2023 18:09:00 +0800
Subject: [PATCH 2/2] fix: bug#19118

* fix: bug#19118
---
 src/views/system/Platforms/Api/components/ApiTest.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/system/Platforms/Api/components/ApiTest.vue b/src/views/system/Platforms/Api/components/ApiTest.vue
index 3a1de1d8..4f52f9c0 100644
--- a/src/views/system/Platforms/Api/components/ApiTest.vue
+++ b/src/views/system/Platforms/Api/components/ApiTest.vue
@@ -117,7 +117,7 @@
                     v-if="refStr"
                     ref="editorRef"
                     language="json"
-                    style="height: 100%"
+                    style="height: 100% ; min-height: 200px;"
                     theme="vs"
                     v-model:modelValue="requestBody.code"
                 />