Merge branch 'fix/data-flow-transfer-table' into 'main_dev'

Fix/data flow transfer table

See merge request yunteng/thingskit-front!931

@@ -91,6 +91,7 @@
       pendingTotalList.value = list;
       pendingTotalList.value = list;
       return unref(pendingTotalList);
       return unref(pendingTotalList);
     },
     },
+    pagination: { hideOnSinglePage: false },
     rowSelection: {
     rowSelection: {
       type: 'checkbox',
       type: 'checkbox',
       getCheckboxProps: (record: DeviceModel) => {
       getCheckboxProps: (record: DeviceModel) => {
@@ -132,7 +133,8 @@
       const { name = '', deviceType = '' } = params || {};
       const { name = '', deviceType = '' } = params || {};
       const items = unref(selectedTotalList).filter((item) => {
       const items = unref(selectedTotalList).filter((item) => {
         return (
         return (
-          item.name.toUpperCase().includes(name.toUpperCase()) &&
+          (item.name.toUpperCase().includes(name.toUpperCase()) ||
+            item.alias?.toUpperCase().includes(name.toUpperCase())) &&
           item.deviceType.toUpperCase().includes(deviceType.toUpperCase())
           item.deviceType.toUpperCase().includes(deviceType.toUpperCase())
         );
         );
       });
       });
@@ -186,7 +188,13 @@
   const handleRemoveSelected = () => {
   const handleRemoveSelected = () => {
     const { primaryKey } = props;
     const { primaryKey } = props;
     const selectedIds = unref(selectedConfirmQueue).map((selected) => selected[primaryKey]);
     const selectedIds = unref(selectedConfirmQueue).map((selected) => selected[primaryKey]);
-    remove(unref(selectedTotalList), (item) => selectedIds.includes(item[primaryKey]));
+    remove(unref(selectedTotalList), (item) => {
+      const flag = selectedIds.includes(item[primaryKey]);
+      if (flag) {
+        pendingTableActionType.deleteSelectRowByKey(item[primaryKey]);
+      }
+      return flag;
+    });
 
 
     handleTriggerUpdateValue();
     handleTriggerUpdateValue();
 
 
@@ -195,9 +203,15 @@
     selectedTableActionType.reload();
     selectedTableActionType.reload();
   };
   };
 
 
-  const handleCheckoutPanel = async () => {
-    await nextTick();
-    selectedTableActionType.reload();
+  const handleCheckoutPanel = async (key: Active) => {
+    if (key === Active.PENDING) {
+      pendingTableActionType.setTableData([]);
+      await nextTick();
+      pendingTableActionType.setTableData(unref(pendingTotalList));
+    } else {
+      await nextTick();
+      selectedTableActionType.reload();
+    }
   };
   };
 
 
   const handleOpenModal = async () => {
   const handleOpenModal = async () => {
@@ -327,15 +341,8 @@
       background-color: #fff;
       background-color: #fff;
     }
     }
 
 
-    .transfer-table-disabled-row {
-      :deep(.ant-checkbox) {
-        cursor: not-allowed;
-
-        .ant-checkbox-inner {
-          background-color: #f5f5f5;
-          border-color: #d9d9d9 !important;
-        }
-      }
+    .ant-table-placeholder {
+      height: auto !important;
     }
     }
   }
   }
 </style>
 </style>

@@ -3,6 +3,7 @@ import { findDictItemByCode } from '/@/api/system/dict';
 import { getDeviceProfile } from '/@/api/alarm/position';
 import { getDeviceProfile } from '/@/api/alarm/position';
 import { BasicInfoFormField, DataSourceType } from '../enum';
 import { BasicInfoFormField, DataSourceType } from '../enum';
 import { DeviceRecord } from '/@/api/device/model/deviceModel';
 import { DeviceRecord } from '/@/api/device/model/deviceModel';
+import { useMessage } from '/@/hooks/web/useMessage';
 
 
 export const stepConfig = ['选择流转方式', '完善配置参数'];
 export const stepConfig = ['选择流转方式', '完善配置参数'];
 
 
@@ -33,6 +34,7 @@ export const modelFormPublicConfig = {
   showSubmitButton: false,
   showSubmitButton: false,
 };
 };
 
 
+const { createMessage } = useMessage();
 export const modeForm = (disabled: boolean): FormSchema[] => {
 export const modeForm = (disabled: boolean): FormSchema[] => {
   return [
   return [
     {
     {
@@ -113,6 +115,14 @@ export const modeForm = (disabled: boolean): FormSchema[] => {
             return { convertConfigId, deviceProfileIds };
             return { convertConfigId, deviceProfileIds };
           },
           },
           transformValue: handleGroupDevice,
           transformValue: handleGroupDevice,
+          openModalValidate: () => {
+            const values = getFieldsValue();
+            const deviceProfileIds = Reflect.get(values, BasicInfoFormField.DATA_SOURCE_PRODUCT);
+            if (!deviceProfileIds || !deviceProfileIds?.length) {
+              createMessage.warning('请选择数据源设备');
+            }
+            return deviceProfileIds && deviceProfileIds?.length;
+          },
         };
         };
       },
       },
     },
     },