Kaynağa Gözat

fix: 设备输出弹框勾选提前

Wzyyy98 3 yıl önce
ebeveyn
işleme
52fa9bdaeb

+ 15 - 5
src/pages/rule-engine/Scene/Save/action/DeviceOutput/device/index.tsx

@@ -39,6 +39,7 @@ export default observer((props: Props) => {
   const [tagList, setTagList] = useState([]);
   const [list, setList] = useState<any>([]);
   const [isFirst, setIsFirst] = useState(true);
+  const [oldRowKey] = useState(DeviceModel.deviceId);
 
   const TypeList = [
     {
@@ -387,12 +388,21 @@ export default observer((props: Props) => {
                     }
                   },
                 }}
-                request={(params) =>
-                  service.query({
+                request={(params) => {
+                  const sorts: any = [{ name: 'createTime', order: 'desc' }];
+
+                  if (oldRowKey) {
+                    sorts.push({
+                      name: 'id',
+                      value: oldRowKey,
+                    });
+                  }
+
+                  return service.query({
                     ...params,
-                    sorts: [{ name: 'createTime', order: 'desc' }],
-                  })
-                }
+                    sorts: sorts,
+                  });
+                }}
                 params={searchParam}
                 cardRender={(record) => (
                   <SceneDeviceCard showBindBtn={false} showTool={false} {...record} />

+ 15 - 5
src/pages/rule-engine/Scene/Save/action/DeviceOutput/product/index.tsx

@@ -20,6 +20,7 @@ export default observer((props: Props) => {
   const actionRef = useRef<ActionType>();
   const intl = useIntl();
   const [searchParam, setSearchParam] = useState({});
+  const [oldRowKey] = useState(props.productId);
 
   const columns: ProColumns<ProductItem>[] = [
     {
@@ -239,12 +240,21 @@ export default observer((props: Props) => {
               DeviceModel.deviceId = '';
             },
           }}
-          request={(params) =>
-            service.query({
+          request={(params) => {
+            const sorts: any = [{ name: 'createTime', order: 'desc' }];
+
+            if (oldRowKey) {
+              sorts.push({
+                name: 'id',
+                value: oldRowKey,
+              });
+            }
+
+            return service.query({
               ...params,
-              sorts: [{ name: 'createTime', order: 'desc' }],
-            })
-          }
+              sorts: sorts,
+            });
+          }}
           params={searchParam}
           cardRender={(record) => (
             <SceneProductCard showBindBtn={false} showTool={false} {...record} />