Merge remote-tracking branch 'origin/dev' into dev

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 }"

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>

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',
         },
       ],
     },

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('操作成功');

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)"

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"

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"
                 />