Merge branch 'dev-fix-ww' into 'main_dev'

fix: 修复teambition bug

See merge request yunteng/thingskit-front!559

@@ -50,6 +50,7 @@ export interface DeviceModel {
   deviceType: DeviceTypeEnum;
   deviceType: DeviceTypeEnum;
   organizationId: string;
   organizationId: string;
   customerId?: string;
   customerId?: string;
+  alias?: string;
 }
 }
 
 
 export interface DeviceProfileModel {
 export interface DeviceProfileModel {

@@ -76,20 +76,25 @@ export const formSchemas: FormSchema[] = [
           try {
           try {
             if (isDevices) {
             if (isDevices) {
               const result = await getDevicesByDeviceIds(data!);
               const result = await getDevicesByDeviceIds(data!);
-              return result.data;
+              return result.data.map((item) => ({
+                label: item.alias || item.name,
+                value: 'tbDeviceId',
+              }));
             } else {
             } else {
-              return await getMeetTheConditionsDevice({
+              const result = await getMeetTheConditionsDevice({
                 organizationId,
                 organizationId,
                 deviceProfileId: data![0],
                 deviceProfileId: data![0],
               });
               });
+              return result.map((item) => ({
+                label: item.alias || item.name,
+                value: 'tbDeviceId',
+              }));
             }
             }
           } catch (error) {
           } catch (error) {
             return [];
             return [];
           }
           }
         },
         },
         mode: 'multiple',
         mode: 'multiple',
-        labelField: 'name',
-        valueField: 'tbDeviceId',
         ...createPickerSearch(),
         ...createPickerSearch(),
         placeholder: '请选择设备',
         placeholder: '请选择设备',
         getPopupContainer: () => document.body,
         getPopupContainer: () => document.body,

@@ -33,6 +33,9 @@
     submitFunc: async () => {
     submitFunc: async () => {
       getDataSource();
       getDataSource();
     },
     },
+    resetFunc: async () => {
+      getDataSource({});
+    },
   });
   });
 
 
   const paginationChange = (page: number, pageSize: number) => {
   const paginationChange = (page: number, pageSize: number) => {
@@ -54,10 +57,10 @@
 
 
   const dataSource = ref<TaskRecordType[]>([]);
   const dataSource = ref<TaskRecordType[]>([]);
   const loading = ref(false);
   const loading = ref(false);
-  const getDataSource = async () => {
+  const getDataSource = async (params?: Recordable) => {
     try {
     try {
       loading.value = true;
       loading.value = true;
-      const params = getFieldsValue();
+      params = params || getFieldsValue();
       const { items, total } = await getTaskCenterList({
       const { items, total } = await getTaskCenterList({
         page: pagination.current,
         page: pagination.current,
         pageSize: pagination.pageSize,
         pageSize: pagination.pageSize,