Merge branch 'perf/template-mode-device-query' into 'main_dev'

Perf/template mode device query

See merge request yunteng/thingskit-scada!193

@@ -24,6 +24,7 @@ export interface ConfigurationContentType {
   productIds?: string[]
   productIds?: string[]
   isTemplate?: string | number
   isTemplate?: string | number
   productAndDevice?: ProductAndDevice[]
   productAndDevice?: ProductAndDevice[]
+  templateId?: string
 }
 }
 
 
 export interface ConfigurationContentListItemType {
 export interface ConfigurationContentListItemType {

@@ -19,6 +19,8 @@ enum Api {
 
 
   GEN_MODBUS_COMMAND = '/js/modbus',
   GEN_MODBUS_COMMAND = '/js/modbus',
   GET_DEVICE_DETAIL = '/device/', // 获取设备详情
   GET_DEVICE_DETAIL = '/device/', // 获取设备详情
+
+  GET_LIST_BY_CONFIGURATION_ID = '/configuration/center/getListByConfigurationId',
 }
 }
 
 
 export interface GenModbusCommandType {
 export interface GenModbusCommandType {
@@ -132,3 +134,8 @@ export const getDeviceInfo = (deviceId: string) => {
   )
   )
 }
 }
 
 
+export const getListByConfigurationId = (configurationId: string) => {
+  return defHttp.post({
+    url: `${Api.GET_LIST_BY_CONFIGURATION_ID}?configurationId=${configurationId}`,
+  })
+}

@@ -12,16 +12,20 @@ import { BasicTable, TableAction, useTable } from '@/components/Table'
 import type { EventTypeEnum } from '@/enums/datasource'
 import type { EventTypeEnum } from '@/enums/datasource'
 import { CommandWayEnum, CommandWayNameEnum } from '@/enums/commandEnum'
 import { CommandWayEnum, CommandWayNameEnum } from '@/enums/commandEnum'
 import { buildUUID } from '@/utils/uuid'
 import { buildUUID } from '@/utils/uuid'
-import { getListByDeviceProfileIds } from '@/api/device'
+import { getListByConfigurationId, getListByDeviceProfileIds } from '@/api/device'
 import { useModal } from '@/components/Modal'
 import { useModal } from '@/components/Modal'
 import type { DeviceItemType } from '@/api/device/model'
 import type { DeviceItemType } from '@/api/device/model'
 import { useContentDataStore } from '@/store/modules/contentData'
 import { useContentDataStore } from '@/store/modules/contentData'
 import { useJsonParse } from '@/hooks/business/useJSONParse'
 import { useJsonParse } from '@/hooks/business/useJSONParse'
 import type { DeviceCommandListItemType, MouseDownEventDataType } from '@/api/node/model'
 import type { DeviceCommandListItemType, MouseDownEventDataType } from '@/api/node/model'
 import type { ProductAndDevice } from '@/api/content/model'
 import type { ProductAndDevice } from '@/api/content/model'
+import { useParseParams } from '@/core/LoadData'
 
 
 const props = defineProps<{ event: EventTypeEnum }>()
 const props = defineProps<{ event: EventTypeEnum }>()
 
 
+const params = useParseParams()
+const { configurationId } = params
+
 const contentDataStore = useContentDataStore()
 const contentDataStore = useContentDataStore()
 const validateTable = ref<boolean>(false)
 const validateTable = ref<boolean>(false)
 
 
@@ -73,7 +77,7 @@ async function getDeviceList() {
   const organizationId = window.useParseParams().organizationId
   const organizationId = window.useParseParams().organizationId
   if (!organizationId) return
   if (!organizationId) return
   const productIds = unref(contentDataStore.getProductIds)
   const productIds = unref(contentDataStore.getProductIds)
-  const result = await getListByDeviceProfileIds({ deviceProfileIds: productIds || [], organizationId })
+  const result = unref(contentDataStore.getIsTemplateLink) ? await getListByConfigurationId(configurationId!) : await getListByDeviceProfileIds({ deviceProfileIds: productIds || [], organizationId })
   deviceList.value = result.map(item => ({
   deviceList.value = result.map(item => ({
     ...item,
     ...item,
     label: item.alias || item.name,
     label: item.alias || item.name,

 import { toRaw, unref } from 'vue'
 import { toRaw, unref } from 'vue'
-import { getDeviceAttributes, getListByDeviceProfileIds } from '@/api/device'
+import { getDeviceAttributes, getListByConfigurationId, getListByDeviceProfileIds } from '@/api/device'
 import type { DeviceItemType, ThingsModelItemType } from '@/api/device/model'
 import type { DeviceItemType, ThingsModelItemType } from '@/api/device/model'
 import type { FormSchema } from '@/components/Form'
 import type { FormSchema } from '@/components/Form'
 import { ComponentEnum } from '@/components/Form/src/enum'
 import { ComponentEnum } from '@/components/Form/src/enum'
@@ -7,10 +7,14 @@ import { ContentDataFieldsEnum, ContentDataFieldsNameEnum, DataTypeEnum } from '
 import { useContentDataStoreWithOut } from '@/store/modules/contentData'
 import { useContentDataStoreWithOut } from '@/store/modules/contentData'
 import type { ProductAndDevice } from '@/api/content/model'
 import type { ProductAndDevice } from '@/api/content/model'
 import { ControlComponentEnum } from '@/core/Library/packages/Control'
 import { ControlComponentEnum } from '@/core/Library/packages/Control'
+import { useParseParams } from '@/core/LoadData'
 
 
 const contentDataStore = useContentDataStoreWithOut()
 const contentDataStore = useContentDataStoreWithOut()
 export const formSchemas = (componentKey?: string): FormSchema[] => {
 export const formSchemas = (componentKey?: string): FormSchema[] => {
   const isTemplate = contentDataStore.isTemplate // 判断是否是模板组态
   const isTemplate = contentDataStore.isTemplate // 判断是否是模板组态
+  const isTemplateLink = contentDataStore.getIsTemplateLink
+  const params = useParseParams()
+  const { configurationId } = params
   return [
   return [
     {
     {
       field: ContentDataFieldsEnum.DEVICE_PROFILE_ID,
       field: ContentDataFieldsEnum.DEVICE_PROFILE_ID,
@@ -47,7 +51,10 @@ export const formSchemas = (componentKey?: string): FormSchema[] => {
         if (!organizationId) return
         if (!organizationId) return
         return {
         return {
           showSearch: true,
           showSearch: true,
-          api: getListByDeviceProfileIds,
+          api: async (params: Recordable) => {
+            if (isTemplateLink) return await getListByConfigurationId(configurationId!)
+            return await getListByDeviceProfileIds(params)
+          },
           params: {
           params: {
             deviceProfileIds: unref(contentDataStore.getProductIds),
             deviceProfileIds: unref(contentDataStore.getProductIds),
             organizationId,
             organizationId,

@@ -46,9 +46,10 @@ export function useContentData() {
     const result = mode === PageModeEnum.SHARE ? await shareModeBootstrap() : await getContent()
     const result = mode === PageModeEnum.SHARE ? await shareModeBootstrap() : await getContent()
 
 
     if (result) {
     if (result) {
-      const { productAndDevice, nodelist, isTemplate } = result
+      const { productAndDevice, nodelist, isTemplate, templateId } = result
       if (nodelist) contentDataStore.saveContentData(nodelist)
       if (nodelist) contentDataStore.saveContentData(nodelist)
       if (isTemplate) contentDataStore.setIsTemplate(isTemplate)
       if (isTemplate) contentDataStore.setIsTemplate(isTemplate)
+      if (templateId) contentDataStore.setIsTemplateLink(templateId)
       if (productAndDevice) contentDataStore.setProductAndDevice(productAndDevice)
       if (productAndDevice) contentDataStore.setProductAndDevice(productAndDevice)
     }
     }
     return result
     return result

@@ -23,6 +23,8 @@ interface ContentDataStoreType {
   diveceDetailMap: Record<string, DeviceList>
   diveceDetailMap: Record<string, DeviceList>
   hasDesignAuth?: boolean
   hasDesignAuth?: boolean
   hasPerviewAuth?: boolean
   hasPerviewAuth?: boolean
+  isTemplateLink?: boolean
+
 }
 }
 
 
 export const useContentDataStore = defineStore('app-content-data', {
 export const useContentDataStore = defineStore('app-content-data', {
@@ -36,6 +38,7 @@ export const useContentDataStore = defineStore('app-content-data', {
     diveceDetailMap: {},
     diveceDetailMap: {},
     hasDesignAuth: true,
     hasDesignAuth: true,
     hasPerviewAuth: true,
     hasPerviewAuth: true,
+    isTemplateLink: true,
   }),
   }),
   actions: {
   actions: {
 
 
@@ -61,6 +64,10 @@ export const useContentDataStore = defineStore('app-content-data', {
       this.isTemplate = string
       this.isTemplate = string
     },
     },
 
 
+    setIsTemplateLink(string?: string) {
+      this.isTemplateLink = !!string
+    },
+
     setProductAndDevice(list: ProductAndDevice[]) {
     setProductAndDevice(list: ProductAndDevice[]) {
       this.productAndDevice = list
       this.productAndDevice = list
       this.doBuildDeviceMap()
       this.doBuildDeviceMap()
@@ -103,6 +110,9 @@ export const useContentDataStore = defineStore('app-content-data', {
     getIsTemplate(): number | null | string | undefined {
     getIsTemplate(): number | null | string | undefined {
       return this.isTemplate
       return this.isTemplate
     },
     },
+    getIsTemplateLink(): boolean {
+      return !!this.isTemplateLink
+    },
   },
   },
 })
 })