Merge branch 'ft' into 'main_dev'

fix: 修改Teambiton上的问题

See merge request yunteng/thingskit-front!558

@@ -408,7 +408,7 @@
           :key="item.value"
         >
           <span>
-            {{ item.label }}
+            {{ item.alias + '/' + item.name }}
           </span>
         </Tag>
         <Tag class="!px-2 !py-1 !bg-gray-50 !border-gray-100" v-if="getSurplusOptionsLength">

@@ -162,7 +162,7 @@ export const step1Schemas: FormSchema[] = [
           transportType,
         },
         valueField: 'tbDeviceId',
-        labelField: 'name',
+        labelField: 'alias',
       };
     },
   },

@@ -18,10 +18,12 @@
           v-show="current === 0"
           ref="DevConStRef"
           @next="handleStepNext(true, null)"
+          @emitDeviceType="handleGetDeviceType"
         />
         <TransportConfigurationStep
           v-show="current === 1"
           ref="TransConStRef"
+          :deviceTypeStr="deviceTypeStr"
           @prev="handleStepPrev"
         />
       </div>
@@ -68,7 +70,7 @@
   </div>
 </template>
 <script lang="ts" setup>
-  import { ref, unref, reactive } from 'vue';
+  import { ref, unref, reactive, nextTick } from 'vue';
   import { BasicModal, useModalInner } from '/@/components/Modal';
   import { deviceConfigAddOrEdit, deviceConfigGetDetail } from '/@/api/device/deviceConfigApi';
   import { useMessage } from '/@/hooks/web/useMessage';
@@ -134,6 +136,13 @@
       setTransConfEditFormData(data);
     }
   };
+  const deviceTypeStr = ref('');
+  const handleGetDeviceType = async (e) => {
+    console.log(e);
+    deviceTypeStr.value = e;
+    await nextTick();
+    TransConStRef.value?.updateDisabled(e);
+  };
   const handleStepPrev = () => {
     current.value--;
   };

@@ -37,7 +37,7 @@
   import { useMessage } from '/@/hooks/web/useMessage';
   import type { FileItem } from '/@/components/Upload/src/typing';
 
-  const emits = defineEmits(['next']);
+  const emits = defineEmits(['next', 'emitDeviceType']);
   const loading = ref(false);
   const { createMessage } = useMessage();
   const deviceConfigPic = ref('');
@@ -94,6 +94,7 @@
     const values = await validate();
     if (!values) return;
     emits('next', true, null);
+    emits('emitDeviceType', values?.deviceType);
   }
   //回显数据
   const setFormData = (v) => {

@@ -32,7 +32,7 @@
         <SnmpCpns ref="snmpRef" />
       </div>
       <div style="margin-top: 5vh; margin-left: -102px" v-else-if="isMqttType == 'TCP'">
-        <TcpCpns ref="tcpRef" />
+        <TcpCpns :deviceTypeStr="deviceTypeStr" ref="tcpRef" />
       </div>
       <div v-if="ifShowBtn" class="btn-style">
         <div style="display: flex; width: 4vw; height: 4vh; margin-top: 1.65vh; margin-left: 44px">
@@ -58,6 +58,7 @@
   const emits = defineEmits(['prev']);
   const props = defineProps({
     ifShowBtn: { type: Boolean, default: true },
+    deviceTypeStr: { type: String, default: '' },
   });
   const mqttRef = ref<InstanceType<typeof MqttCpns>>();
   const coapRef = ref<InstanceType<typeof CoapCpns>>();
@@ -166,11 +167,16 @@
       },
     });
   };
+  const updateDisabled = async (e) => {
+    await nextTick();
+    tcpRef.value?.updateDisabled(e);
+  };
   defineExpose({
     getFormData,
     resetFormData,
     setFormData,
     editOrAddTransportTypeStatus,
+    updateDisabled,
   });
 </script>
 <style lang="less" scoped>

 <template>
   <div>
-    <BasicForm :showResetButton="false" :showSubmitButton="false" @register="register">
-      <template #authScriptId="{ model, field }">
+    <a-form
+      ref="formRef"
+      :model="scriptForm"
+      name="basic"
+      :label-col="{ span: 4 }"
+      :wrapper-col="{ span: 16 }"
+      style="margin-left: 2.4rem"
+      autocomplete="off"
+    >
+      <a-form-item
+        v-if="deviceTypeStr !== 'SENSOR'"
+        label="鉴权脚本"
+        name="'params'"
+        :rules="[{ required: true, message: '请选择鉴权脚本' }]"
+      >
         <div style="display: flex; align-items: center">
           <div>
             <Select
               @change="handleAuthChange"
               placeholder="请选择"
-              v-model:value="model[field]"
+              v-model:value="scriptForm.authScriptId"
               style="width: 305px"
               show-search
               :options="selectAuthOptions"
@@ -28,14 +41,18 @@
         <a-button @click="handleCreateOrEditAuth('test')" class="mt-4" type="primary"
           >测试脚本</a-button
         >
-      </template>
-      <template #upScriptId="{ model, field }">
+      </a-form-item>
+      <a-form-item
+        label="上行脚本"
+        name="'params'"
+        :rules="[{ required: true, message: '请选择上行脚本' }]"
+      >
         <div style="display: flex; align-items: center">
           <div>
             <Select
               @change="handleUpChange"
               placeholder="请选择"
-              v-model:value="model[field]"
+              v-model:value="scriptForm.upScriptId"
               style="width: 305px"
               show-search
               :options="selectUpOptions"
@@ -56,16 +73,14 @@
         <a-button @click="handleCreateOrEdit('test')" class="mt-4" type="primary"
           >测试脚本</a-button
         >
-      </template>
-    </BasicForm>
+      </a-form-item>
+    </a-form>
     <ConverScriptModal @register="registerModal" @success="handleSuccess" />
     <ConverScriptModal @register="registerAuthModal" @success="handleAuthSuccess" />
   </div>
 </template>
 <script lang="ts" setup name="index">
-  import { ref, Ref, onMounted } from 'vue';
-  import { BasicForm, useForm } from '/@/components/Form';
-  import { tcpSchemas } from './config';
+  import { ref, Ref, onMounted, reactive } from 'vue';
   import { SelectTypes } from 'ant-design-vue/es/select';
   import { Select } from 'ant-design-vue';
   import { useModal } from '/@/components/Modal';
@@ -73,6 +88,14 @@
   import ConverScriptModal from '/@/views/scriptmanage/converscript/ConverScriptModal.vue';
   import { useMessage } from '/@/hooks/web/useMessage';
 
+  const props = defineProps({
+    deviceTypeStr: { type: String, default: '' },
+  });
+
+  const scriptForm = reactive({
+    authScriptId: '',
+    upScriptId: '',
+  });
   const selectUpOptions: Ref<SelectTypes['options']> = ref([]);
 
   const selectAuthOptions: Ref<SelectTypes['options']> = ref([]);
@@ -97,7 +120,7 @@
     if (text !== 'test') {
       const rest = await getAllScriptType('TRANSPORT_TCP_UP');
       selectUpOptions.value = rest;
-      setFieldsValue({ upScriptId: res?.id });
+      scriptForm.upScriptId = res?.id;
       upScriptIdStr.value = res?.id;
     }
   };
@@ -106,22 +129,20 @@
     if (text !== 'test') {
       const rest = await getAllScriptType('TRANSPORT_TCP_AUTH');
       selectAuthOptions.value = rest;
-      setFieldsValue({ authScriptId: res?.id });
+      scriptForm.authScriptId = res?.id;
       authScriptIdStr.value = res?.id;
     }
   };
 
-  const [register, { validate, resetFields, setFieldsValue }] = useForm({
-    labelWidth: 180,
-    schemas: tcpSchemas,
-    actionColOptions: {
-      span: 14,
-    },
-  });
-
-  const handleUpChange = (v) => (upScriptIdStr.value = v);
+  const handleUpChange = (v) => {
+    upScriptIdStr.value = v;
+    scriptForm.upScriptId = v;
+  };
 
-  const handleAuthChange = (v) => (authScriptIdStr.value = v);
+  const handleAuthChange = (v) => {
+    authScriptIdStr.value = v;
+    scriptForm.authScriptId = v;
+  };
 
   const [registerModal, { openModal }] = useModal();
 
@@ -172,20 +193,35 @@
   };
 
   const getFormData = async () => {
-    const values = await validate();
-    if (!values) return;
+    if (props.deviceTypeStr === 'SENSOR') {
+      if (!scriptForm.upScriptId) {
+        createMessage.error('请先选择对应脚本');
+        throw new Error('请先选择对应脚本');
+      }
+    } else {
+      if (!scriptForm.authScriptId) {
+        createMessage.error('请先选择对应脚本');
+        throw new Error('请先选择对应脚本');
+      }
+      if (!scriptForm.upScriptId) {
+        createMessage.error('请先选择对应脚本');
+        throw new Error('请先选择对应脚本');
+      }
+    }
     return {
-      ...values,
+      ...scriptForm,
       type: 'TCP',
     };
   };
 
   const resetFormData = () => {
-    resetFields();
+    // resetFields();
   };
 
   const setFormData = (v) => {
-    setFieldsValue(v);
+    scriptForm.authScriptId = v?.authScriptId;
+    scriptForm.upScriptId = v?.upScriptId;
+    // setFieldsValue(v);
     upScriptIdStr.value = v?.upScriptId;
     authScriptIdStr.value = v?.authScriptId;
   };

@@ -123,10 +123,10 @@ const deviceTableColumn: BasicColumn[] = [
   {
     title: '设备名称/设备SN',
     dataIndex: 'name',
-    customRender: ({ text, record }) => {
+    customRender: ({ record }) => {
       return h('div', [
-        h('div', text),
-        h('div', { class: 'text-blue-400 truncate', title: record.sn }, record.sn),
+        h('div', `${record.alias}/${record.name}`),
+        // h('div', { class: 'text-blue-400 truncate', title: record.sn }, record.sn),
       ]);
     },
   },