Merge branch 'f-dev' into 'main'

fix：修改转换脚本编辑问题 style：修改组织列表显隐组件样式问题

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

@@ -344,7 +344,7 @@
     }
     }
 
 
     &-form-container {
     &-form-container {
-      padding: 16px;
+      padding: 16px 16px 0px 36px;
 
 
       .ant-form {
       .ant-form {
         padding: 12px 10px 6px 10px;
         padding: 12px 10px 6px 10px;

@@ -477,14 +477,14 @@
     cursor: pointer;
     cursor: pointer;
     position: absolute;
     position: absolute;
     top: 0.85rem;
     top: 0.85rem;
-    left: 0.5vw;
+    left: 1.1vw;
   }
   }
   .fold-right {
   .fold-right {
     z-index: 9999;
     z-index: 9999;
     cursor: pointer;
     cursor: pointer;
     position: absolute;
     position: absolute;
     top: 0.85rem;
     top: 0.85rem;
-    left: 17.5vw;
+    left: 18.1vw;
   }
   }
   @prefix-cls: ~'@{namespace}-basic-tree';
   @prefix-cls: ~'@{namespace}-basic-tree';
 
 

@@ -44,12 +44,14 @@
   const aceEditor = ref();
   const aceEditor = ref();
   const aceRef = ref();
   const aceRef = ref();
   const getTitle = computed(() => (isUpdate.value ? '编辑转换脚本' : '新增转换脚本'));
   const getTitle = computed(() => (isUpdate.value ? '编辑转换脚本' : '新增转换脚本'));
+  const editId = ref('');
   const [register, { setDrawerProps, closeDrawer }] = useDrawerInner((data) => {
   const [register, { setDrawerProps, closeDrawer }] = useDrawerInner((data) => {
     resetFields();
     resetFields();
     setDrawerProps({ confirmLoading: false });
     setDrawerProps({ confirmLoading: false });
     isUpdate.value = data.isUpdate;
     isUpdate.value = data.isUpdate;
     initEditor(data.record?.configuration.jsScript);
     initEditor(data.record?.configuration.jsScript);
     if (isUpdate.value) {
     if (isUpdate.value) {
+      editId.value = data.record.id;
       setFieldsValue(data.record);
       setFieldsValue(data.record);
     }
     }
   });
   });
@@ -84,6 +86,7 @@
     emit('isStatus', { status: 1, jsCode });
     emit('isStatus', { status: 1, jsCode });
   };
   };
   const handleSubmit = async () => {
   const handleSubmit = async () => {
+    const editIdPost = isUpdate.value ? { id: editId.value } : {};
     try {
     try {
       setDrawerProps({ confirmLoading: true });
       setDrawerProps({ confirmLoading: true });
       const fieldsValue = await validate();
       const fieldsValue = await validate();
@@ -94,6 +97,7 @@
         },
         },
         type: 'org.thingsboard.rule.engine.transform.TbTransformMsgNode',
         type: 'org.thingsboard.rule.engine.transform.TbTransformMsgNode',
         ...fieldsValue,
         ...fieldsValue,
+        ...editIdPost,
       });
       });
       closeDrawer();
       closeDrawer();
       emit('success');
       emit('success');