Merge branch 'ft' into 'main_dev'

ix: DEFECT-1682 设备导入时，网关子设备选择支持查询功能

See merge request yunteng/thingskit-front!949

@@ -187,6 +187,7 @@ export interface AlarmLogItem {
   originatorType: number;
   originatorType: number;
   deviceId: string;
   deviceId: string;
   deviceName: string;
   deviceName: string;
+  deviceAlias: string;
   type: string;
   type: string;
   severity: string;
   severity: string;
   status: string;
   status: string;

@@ -67,7 +67,7 @@ export function useAlarmNotify(params: UseAlarmNotifyParams = {}) {
 
 
       if (items.length) {
       if (items.length) {
         const first = items.at(0)!;
         const first = items.at(0)!;
-        const { deviceName, id, severity, type } = first;
+        const { deviceAlias, deviceName, id, severity, type } = first;
 
 
         let key: Nullable<string> = `open-notify-${id}`;
         let key: Nullable<string> = `open-notify-${id}`;
 
 
@@ -80,7 +80,7 @@ export function useAlarmNotify(params: UseAlarmNotifyParams = {}) {
           description: h('div', {}, [
           description: h('div', {}, [
             h('div', { style: { marginRight: '5px' } }, [
             h('div', { style: { marginRight: '5px' } }, [
               h('span', { style: { marginRight: '5px' } }, '设备:'),
               h('span', { style: { marginRight: '5px' } }, '设备:'),
-              h('span', {}, `[${deviceName}]`),
+              h('span', {}, `[${deviceAlias ?? deviceName}]`),
             ]),
             ]),
             h('div', { style: { marginRight: '5px' } }, [
             h('div', { style: { marginRight: '5px' } }, [
               h('span', { style: { marginRight: '5px' } }, '告警场景:'),
               h('span', { style: { marginRight: '5px' } }, '告警场景:'),

@@ -41,6 +41,7 @@
               "
               "
               v-else-if="item.key === TableDefaultTypeEnum.ENTITYID"
               v-else-if="item.key === TableDefaultTypeEnum.ENTITYID"
               v-model:value="item.value"
               v-model:value="item.value"
+              v-bind="createPickerSearch()"
               placeholder="请选择"
               placeholder="请选择"
               :options="entityOptions"
               :options="entityOptions"
               allowClear
               allowClear
@@ -53,6 +54,7 @@
               "
               "
               v-else-if="item.key === TableDefaultTypeEnum.KEYS"
               v-else-if="item.key === TableDefaultTypeEnum.KEYS"
               v-model:value="item.value"
               v-model:value="item.value"
+              v-bind="createPickerSearch()"
               placeholder="请选择"
               placeholder="请选择"
               :options="attributeOptions"
               :options="attributeOptions"
               mode="multiple"
               mode="multiple"
@@ -102,6 +104,7 @@
               "
               "
               v-else
               v-else
               v-model:value="item.value"
               v-model:value="item.value"
+              v-bind="createPickerSearch()"
               placeholder="请选择"
               placeholder="请选择"
               :options="valueOptions"
               :options="valueOptions"
               allowClear
               allowClear
@@ -157,6 +160,7 @@
   import { getPacketIntervalByRange } from '/@/views/device/localtion/cpns/TimePeriodForm/helper';
   import { getPacketIntervalByRange } from '/@/views/device/localtion/cpns/TimePeriodForm/helper';
   import { uniqBy } from 'lodash';
   import { uniqBy } from 'lodash';
   import { TableDefaultTypeEnum } from '../../../config/enum';
   import { TableDefaultTypeEnum } from '../../../config/enum';
+  import { createPickerSearch } from '/@/utils/pickerSearch';
 
 
   const props = defineProps({
   const props = defineProps({
     method: {
     method: {

@@ -212,6 +212,10 @@ export const basicInfoForm: FormSchema[] = [
         labelField: 'name',
         labelField: 'name',
         valueField: 'tbDeviceId',
         valueField: 'tbDeviceId',
         getPopupContainer: () => document.body,
         getPopupContainer: () => document.body,
+        showSearch: true,
+        filterOption: (inputValue: string, options: Record<'label', string>) => {
+          return options.label.includes(inputValue);
+        },
       };
       };
     },
     },
   },
   },

@@ -2,7 +2,8 @@ import type { BasicColumn } from '/@/components/Table';
 import type { FormSchema } from '/@/components/Table';
 import type { FormSchema } from '/@/components/Table';
 import { getOrganizationList } from '/@/api/system/system';
 import { getOrganizationList } from '/@/api/system/system';
 import { copyTransFun } from '/@/utils/fnUtils';
 import { copyTransFun } from '/@/utils/fnUtils';
-import { getDeviceDataKeys, getDeviceProfile } from '/@/api/alarm/position';
+import { getDeviceDataKeys } from '/@/api/alarm/position';
+import { deviceProfile } from '/@/api/device/deviceManager';
 import { EChartsOption } from 'echarts';
 import { EChartsOption } from 'echarts';
 
 
 export enum AggregateDataEnum {
 export enum AggregateDataEnum {
@@ -31,11 +32,17 @@ export const formSchema: FormSchema[] = [
     field: 'deviceProfileId',
     field: 'deviceProfileId',
     label: '',
     label: '',
     component: 'ApiSelect',
     component: 'ApiSelect',
-    componentProps: {
-      api: getDeviceProfile,
-      placeholder: '请选择产品',
-      labelField: 'name',
-      valueField: 'tbProfileId',
+    componentProps: () => {
+      return {
+        showSearch: true,
+        labelField: 'name',
+        valueField: 'tbProfileId',
+        resultField: 'data',
+        placeholder: '请选择产品',
+        api: deviceProfile,
+        filterOption: (inputValue: string, option: Record<'label' | 'value', string>) =>
+          option.label.includes(inputValue),
+      };
     },
     },
   },
   },
   {
   {