Merge branch 'local_dev_ft' into 'perf/main_dev'

fix: 组态，修改获取设备接口，新增传组织id

See merge request yunteng/thingskit-scada!153

@@ -56,9 +56,9 @@ export const getDeviceAttributes = (deviceProfileId: string) => {
   })
   })
 }
 }
 
 
-export const getListByDeviceProfileIds = (deviceProfileIds: string[]) => {
+export const getListByDeviceProfileIds = ({ deviceProfileIds, organizationId }: Recordable) => {
   return defHttp.post<DeviceItemType[]>({
   return defHttp.post<DeviceItemType[]>({
-    url: Api.GET_DEVICE_BY_DEVICE_PROFILED_IDS,
+    url: `${Api.GET_DEVICE_BY_DEVICE_PROFILED_IDS}?organizationId=${organizationId}`,
     data: deviceProfileIds,
     data: deviceProfileIds,
   })
   })
 }
 }

@@ -65,9 +65,11 @@ const handleDeleteRow = (data: TableRecordItemType) => {
 }
 }
 
 
 async function getDeviceList() {
 async function getDeviceList() {
+  const organizationId = window.useParseParams().organizationId
+  if (!organizationId) return
   const productIds = unref(contentDataStore.getProductIds)
   const productIds = unref(contentDataStore.getProductIds)
-  const result = await getListByDeviceProfileIds(productIds || [])
-  deviceList.value = result.map(item => ({
+  const result = await getListByDeviceProfileIds({ deviceProfileIds: productIds || [], organizationId })
+  deviceList.value = result.map((item: Recordable) => ({
     ...item,
     ...item,
     label: item.alias || item.name,
     label: item.alias || item.name,
     value: item.tbDeviceId,
     value: item.tbDeviceId,

@@ -42,10 +42,15 @@ export const formSchemas = (componentKey?: string): FormSchema[] => {
       ifShow: !isTemplate,
       ifShow: !isTemplate,
       required: !isTemplate,
       required: !isTemplate,
       componentProps: ({ formModel }) => {
       componentProps: ({ formModel }) => {
+        const organizationId = window.useParseParams().organizationId
+        if (!organizationId) return
         return {
         return {
           showSearch: true,
           showSearch: true,
           api: getListByDeviceProfileIds,
           api: getListByDeviceProfileIds,
-          params: (unref(contentDataStore.getProductAndDevice) || []).map((item: ProductAndDevice) => item?.profileId),
+          params: {
+            deviceProfileIds: (unref(contentDataStore.getProductAndDevice) || []).map((item: ProductAndDevice) => item?.profileId),
+            organizationId,
+          },
           labelField: ['alias', 'name'],
           labelField: ['alias', 'name'],
           valueField: 'tbDeviceId',
           valueField: 'tbDeviceId',
           onSelect(value: string, option: DeviceItemType) {
           onSelect(value: string, option: DeviceItemType) {

@@ -111,11 +111,16 @@ export const formSchemas: FormSchema[] = [
     component: ComponentEnum.API_SELECT,
     component: ComponentEnum.API_SELECT,
     required: true,
     required: true,
     componentProps: ({ formModel }) => {
     componentProps: ({ formModel }) => {
+      const organizationId = window.useParseParams().organizationId
+      if (!organizationId) return
       return {
       return {
         mode: 'multiple',
         mode: 'multiple',
         showSearch: true,
         showSearch: true,
         api: getListByDeviceProfileIds,
         api: getListByDeviceProfileIds,
-        params: unref(contentDataStore.getProductIds),
+        params: {
+          deviceProfileIds: unref(contentDataStore.getProductIds),
+          organizationId,
+        },
         labelField: ['alias', 'name'],
         labelField: ['alias', 'name'],
         valueField: 'id',
         valueField: 'id',
         maxTagCount: 4,
         maxTagCount: 4,