Merge branch 'fix/DEFECT-1799' into 'main_dev'

fix: 修复组态引用模板时先选择启用模板没选择组织设备没数据

See merge request yunteng/thingskit-front!1082

@@ -19,7 +19,7 @@
   };
   };
 </script>
 </script>
 <script lang="ts" setup name="SelectAttributes">
 <script lang="ts" setup name="SelectAttributes">
-  import { reactive, UnwrapRef, watchEffect, ref } from 'vue';
+  import { reactive, UnwrapRef, watchEffect, ref, watch } from 'vue';
   import { propTypes } from '/@/utils/propTypes';
   import { propTypes } from '/@/utils/propTypes';
   import { Select } from 'ant-design-vue';
   import { Select } from 'ant-design-vue';
   import { createPickerSearch } from '/@/utils/pickerSearch';
   import { createPickerSearch } from '/@/utils/pickerSearch';
@@ -40,6 +40,19 @@
 
 
   const initVal = async () => {
   const initVal = async () => {
     if (props.value) {
     if (props.value) {
+      dynamicInput.params.push({
+        name: props.value.label,
+        profileId: props.value.value,
+        deviceType: props.value?.deviceType,
+        transportType: props.value?.transportType,
+        deviceList: props.value.deviceList?.filter(Boolean)?.map((item) => item.deviceId),
+      });
+    }
+  };
+
+  watch(
+    () => props.organizationId,
+    async () => {
       if (props.organizationId) {
       if (props.organizationId) {
         const resp = await byOrganizationIdGetMasterDevice({
         const resp = await byOrganizationIdGetMasterDevice({
           organizationId: props.organizationId,
           organizationId: props.organizationId,
@@ -51,15 +64,11 @@
           value: item.tbDeviceId,
           value: item.tbDeviceId,
         }));
         }));
       }
       }
-      dynamicInput.params.push({
-        name: props.value.label,
-        profileId: props.value.value,
-        deviceType: props.value?.deviceType,
-        transportType: props.value?.transportType,
-        deviceList: props.value.deviceList?.filter(Boolean)?.map((item) => item.deviceId),
-      });
+    },
+    {
+      immediate: true,
     }
     }
-  };
+  );
 
 
   //数值改变
   //数值改变
   const valEffect = watchEffect(() => {
   const valEffect = watchEffect(() => {