Merge branch 'ww' into 'main'

fix: device detail query history data infinity loading

See merge request huang/yun-teng-iot-front!439

@@ -406,12 +406,12 @@ export const step2Schemas: FormSchema[] = [
   },
   },
   {
   {
     label: 'RSA公钥',
     label: 'RSA公钥',
-    component: 'Input',
+    component: 'InputTextArea',
     field: 'publicKey',
     field: 'publicKey',
     required: true,
     required: true,
     ifShow: false,
     ifShow: false,
     componentProps: {
     componentProps: {
-      maxLength: 36,
+      rows: 8,
       placeholder: '请输入RSA公钥',
       placeholder: '请输入RSA公钥',
     },
     },
   },
   },
@@ -604,12 +604,12 @@ export const TokenSchemas: FormSchema[] = [
   },
   },
   {
   {
     label: 'RSA公钥',
     label: 'RSA公钥',
-    component: 'Input',
+    component: 'InputTextArea',
     field: 'publicKey',
     field: 'publicKey',
     required: true,
     required: true,
     ifShow: false,
     ifShow: false,
     componentProps: {
     componentProps: {
-      maxLength: 36,
+      rows: 8,
       placeholder: '请输入RSA公钥',
       placeholder: '请输入RSA公钥',
     },
     },
   },
   },

@@ -108,6 +108,7 @@
         entityId: props.deviceDetail.tbDeviceId,
         entityId: props.deviceDetail.tbDeviceId,
       });
       });
       historyData.value = getTableHistoryData(res);
       historyData.value = getTableHistoryData(res);
+      loading.value = false;
       // 判断数据对象是否为空
       // 判断数据对象是否为空
       if (!Object.keys(res).length) {
       if (!Object.keys(res).length) {
         isNull.value = false;
         isNull.value = false;
@@ -121,7 +122,6 @@
       );
       );
 
 
       setOptions(setChartOptions(res, selectedKeys));
       setOptions(setChartOptions(res, selectedKeys));
-      loading.value = false;
     },
     },
   });
   });
 
 

@@ -107,21 +107,16 @@
     const res = data.record !== undefined ? await deviceConfigGetDetail(data.record.id) : {};
     const res = data.record !== undefined ? await deviceConfigGetDetail(data.record.id) : {};
     isEditId.value = data.record !== undefined ? data.record.id : null;
     isEditId.value = data.record !== undefined ? data.record.id : null;
     isEditCreatTime.value = data.record !== undefined ? data.record.createTime : null;
     isEditCreatTime.value = data.record !== undefined ? data.record.createTime : null;
-    if (!unref(isViewDetail)) {
-      dynamicWidth.value = 55 + 'rem';
-      const title = !unref(isUpdate) ? '编辑产品' : '新增产品';
-      setModalProps({ title, showOkBtn: true, showCancelBtn: true });
-      if (!unref(isUpdate)) {
-        await setDeviceConfEditFormData(res);
-        await setTransConfEditFormData(res);
-        handleStepNext(false, res);
-      }
-    } else {
-      dynamicWidth.value = 60 + 'rem';
-      setModalProps({ showOkBtn: false, showCancelBtn: false, title: '产品详情' });
+
+    const title = unref(isUpdate) ? '编辑产品' : '新增产品';
+    setModalProps({ title, showOkBtn: true, showCancelBtn: true });
+    if (unref(isUpdate)) {
       await setDeviceConfEditFormData(res);
       await setDeviceConfEditFormData(res);
       await setTransConfEditFormData(res);
       await setTransConfEditFormData(res);
       handleStepNext(false, res);
       handleStepNext(false, res);
+      unref(DevConStRef)?.editOrAddDeviceTypeStatus(true);
+    } else {
+      unref(DevConStRef)?.editOrAddDeviceTypeStatus(false);
     }
     }
   });
   });
   const handleChange = (e) => {
   const handleChange = (e) => {
@@ -132,6 +127,9 @@
   const handleStepNext = (e, data) => {
   const handleStepNext = (e, data) => {
     if (e) {
     if (e) {
       current.value++;
       current.value++;
+      unref(isUpdate)
+        ? unref(TransConStRef)?.editOrAddTransportTypeStatus(true)
+        : unref(TransConStRef)?.editOrAddTransportTypeStatus(false);
     } else {
     } else {
       setTransConfEditFormData(data);
       setTransConfEditFormData(data);
     }
     }

@@ -244,16 +244,14 @@
   //新增
   //新增
   function handleCreate() {
   function handleCreate() {
     openModal(true, {
     openModal(true, {
-      isUpdate: true,
-      isView: false,
+      isUpdate: false,
     });
     });
   }
   }
   //编辑
   //编辑
   function handleEdit(record: Recordable) {
   function handleEdit(record: Recordable) {
     openModal(true, {
     openModal(true, {
       record,
       record,
-      isUpdate: false,
-      isView: false,
+      isUpdate: true,
     });
     });
   }
   }
 
 
@@ -261,11 +259,6 @@
   //详情
   //详情
   function handleDetailView(record: Recordable) {
   function handleDetailView(record: Recordable) {
     openDrawer(true, { record });
     openDrawer(true, { record });
-    // openModal(true, {
-    //   record,
-    //   isUpdate: false,
-    //   isView: true,
-    // });
   }
   }
 
 
   function defaultHeader({ filename, bookType }: ExportModalResult) {
   function defaultHeader({ filename, bookType }: ExportModalResult) {

@@ -113,11 +113,21 @@
     deviceConfigPic.value = '';
     deviceConfigPic.value = '';
   };
   };
 
 
+  const editOrAddDeviceTypeStatus = (status: boolean) => {
+    updateSchema({
+      field: 'deviceType',
+      componentProps: {
+        disabled: status,
+      },
+    });
+  };
+
   defineExpose({
   defineExpose({
     editOrAddNameStatus,
     editOrAddNameStatus,
     setFormData,
     setFormData,
     resetFormData,
     resetFormData,
     getFormData,
     getFormData,
+    editOrAddDeviceTypeStatus,
   });
   });
 </script>
 </script>
 <style lang="less" scoped>
 <style lang="less" scoped>

@@ -147,10 +147,19 @@
     return step2Data;
     return step2Data;
   };
   };
 
 
+  const editOrAddTransportTypeStatus = (status: boolean) => {
+    updateSchema({
+      field: 'transportType',
+      componentProps: {
+        disabled: status,
+      },
+    });
+  };
   defineExpose({
   defineExpose({
     getFormData,
     getFormData,
     resetFormData,
     resetFormData,
     setFormData,
     setFormData,
+    editOrAddTransportTypeStatus,
   });
   });
 </script>
 </script>
 <style lang="less" scoped>
 <style lang="less" scoped>

@@ -522,14 +522,12 @@ export const actionSchema: FormSchema[] = [
       const { setFieldsValue } = formActionType;
       const { setFieldsValue } = formActionType;
       return {
       return {
         placeholder: '请选择类型',
         placeholder: '请选择类型',
-        api: async () => {
-          const record = await findDictItemByCode({
-            dictCode: 'custom_define',
-          });
-          return record.map((item) => ({ ...item, itemValue: Number(item.itemValue) }));
-        },
+        api: findDictItemByCode,
         labelField: 'itemText',
         labelField: 'itemText',
         valueField: 'itemValue',
         valueField: 'itemValue',
+        params: {
+          dictCode: 'custom_define',
+        },
         getPopupContainer: () => document.body,
         getPopupContainer: () => document.body,
         onChange: () => {
         onChange: () => {
           setFieldsValue({ doContext: null, thingsModelId: null });
           setFieldsValue({ doContext: null, thingsModelId: null });