fix: merge next

src/components/ProTableCard/CardItems/Scene/index.tsx

@@ -126,7 +126,7 @@ const actionFilter = (terms: any, isLast: boolean, index: number) => {
         str += `${handleOptionsLabel(iItem, _isLast ? item.terms[iIndex + 1]?.[3] : undefined)}`;
       });
     }
-    str += iindex < terms.length - 1 ? item.termType : '';
+    str += iindex < terms.length - 1 ? terms[iindex + 1].termType : '';
   });
 
   return str;
@@ -154,7 +154,7 @@ const conditionsRender = (when: any[], index: number) => {
               })
               .join('')
           : '';
-        whenStr += !tLast ? tSer : tSer + termsItem.termType;
+        whenStr += !tLast ? tSer : tSer + terms[tIndex + 1].termType;
       }
     });
     return whenStr;

src/pages/rule-engine/Scene/Save/action/ListItem/FilterGroup.tsx

@@ -204,7 +204,7 @@ export default observer((props: TermsProps) => {
             </div>
           </Popconfirm>
         </div>
-        {!props.isLast && (
+        {props.isLast && (
           <div className="terms-group-add" onClick={props.onAddGroup}>
             <div className="terms-content">
               <PlusOutlined style={{ fontSize: 12, paddingRight: 4 }} />

src/pages/rule-engine/Scene/Save/action/ListItem/Item.tsx

@@ -402,6 +402,7 @@ export default (props: ItemProps) => {
                   data={termsItem}
                   columns={optionsColumns}
                   isLast={index === thenTerms.length - 1}
+                  isFirst={index === 0}
                   paramsOptions={paramsOptions}
                   label={props.options?.terms?.[index]}
                   actionColumns={props.options?.otherColumns}

src/pages/rule-engine/Scene/Save/action/ListItem/index.less

@@ -263,6 +263,7 @@
       }
 
       .ant-form-item {
+        margin-bottom: 8px;
         &:not(:first-child) {
           .ant-form-item-explain-error {
             padding-left: 80px !important;

src/pages/rule-engine/Scene/Save/device/device.tsx

@@ -34,8 +34,6 @@ export default observer(() => {
 
   useEffect(() => {
     if (form) {
-      console.log('TriggerDeviceModel.selector', TriggerDeviceModel.selector);
-
       form.setFieldsValue({ selector: TriggerDeviceModel.selector });
     }
   }, []);

src/pages/rule-engine/Scene/Save/device/deviceList.tsx

@@ -10,16 +10,16 @@ import { useIntl } from 'umi';
 import { SceneDeviceCard } from '@/components/ProTableCard/CardItems/device';
 import { TriggerDeviceModel } from './addModel';
 import { observer, Observer } from '@formily/reactive-react';
+import { isArray } from 'lodash';
 
 export default observer(() => {
   const actionRef = useRef<ActionType>();
   const intl = useIntl();
-  const [searchParam, setSearchParam] = useState<any>({
-    pageIndex: TriggerDeviceModel.devicePage,
-    pageSize: TriggerDeviceModel.devicePageSize,
-  });
+  const [searchParam, setSearchParam] = useState<any>({});
 
-  const [loading, setLoading] = useState(true);
+  const [oldRowKey] = useState(TriggerDeviceModel.deviceKeys);
+
+  // const [loading, setLoading] = useState(true);
 
   const columns: ProColumns<DeviceInstance>[] = [
     {
@@ -184,17 +184,14 @@ export default observer(() => {
         enableSave={false}
         bodyStyle={{ padding: 0, paddingBottom: 16 }}
         onSearch={async (data) => {
-          if (loading) {
-            setSearchParam({
-              pageIndex: TriggerDeviceModel.devicePage,
-              pageSize: TriggerDeviceModel.devicePageSize,
-              ...data,
-            });
-            setLoading(true);
-          } else {
-            actionRef.current?.reset?.();
-            setSearchParam(data);
-          }
+          // if (loading) {
+          //   setSearchParam(data);
+          //   setLoading(true);
+          // } else {
+          //
+          // }
+          actionRef.current?.reset?.();
+          setSearchParam(data);
         }}
         target="scene-trugger-device"
         defaultParam={[
@@ -224,7 +221,6 @@ export default observer(() => {
             rowSelection={{
               selectedRowKeys: [...TriggerDeviceModel.deviceKeys],
               onSelect: (record, selected) => {
-                console.log(record);
                 if (selected) {
                   TriggerDeviceModel.deviceKeys.push(record.id);
                   if (TriggerDeviceModel.selectorValues) {
@@ -253,12 +249,21 @@ export default observer(() => {
               TriggerDeviceModel.devicePage = page;
               TriggerDeviceModel.devicePageSize = size;
             }}
-            request={(params) =>
-              service.query({
+            request={(params) => {
+              const sorts: any[] = [{ name: 'createTime', order: 'desc' }];
+              if (oldRowKey && isArray(oldRowKey)) {
+                oldRowKey.forEach((v) => {
+                  sorts.push({
+                    name: 'id',
+                    value: v,
+                  });
+                });
+              }
+              return service.query({
                 ...params,
-                sorts: [{ name: 'createTime', order: 'desc' }],
-              })
-            }
+                sorts: sorts,
+              });
+            }}
             params={searchParam}
             cardRender={(record) => (
               <SceneDeviceCard showBindBtn={false} showTool={false} {...record} />

src/pages/rule-engine/Scene/Save/device/index.tsx

@@ -48,14 +48,21 @@ export default observer((props: Props) => {
 
     const _label = [
       <div style={{ display: 'flex', alignItems: 'center' }}>
-        {options.selectorIcon ? <AIcon type={options.selectorIcon} /> : null}
+        {options.selectorIcon ? (
+          <AIcon type={options.selectorIcon} style={{ paddingRight: 4 }} />
+        ) : null}
         <span className="trigger-options-name">{options.name}</span>
         {options.extraName ? <span>{options.extraName}</span> : null}
       </div>,
     ];
     if (!options.onlyName) {
       if (options.productName) {
-        _label.push(<span className="trigger-options-type">{options.productName}</span>);
+        _label.push(
+          <div style={{ display: 'flex', alignItems: 'center' }}>
+            <AIcon type={'icon-chanpin1'} style={{ paddingRight: 4 }} />
+            <span className="trigger-options-type">{options.productName}</span>
+          </div>,
+        );
       }
       if (options.when) {
         _label.push(<span className="trigger-options-when">{options.when}</span>);
@@ -70,7 +77,12 @@ export default observer((props: Props) => {
         _label.push(<span className="trigger-options-action">{options.action}</span>);
       }
       if (options.type) {
-        _label.push(<span className="trigger-options-type">{options.type}</span>);
+        _label.push(
+          <div style={{ display: 'flex', alignItems: 'center' }}>
+            <AIcon type={options.typeIcon} style={{ paddingRight: 4 }} />
+            <span className="trigger-options-type">{options.type}</span>
+          </div>,
+        );
       }
     }
     return _label;

src/pages/rule-engine/Scene/Save/device/product.tsx

@@ -23,12 +23,10 @@ export const handleMetadata = (metadata?: string) => {
 export default observer(() => {
   const actionRef = useRef<ActionType>();
   const intl = useIntl();
-  const [searchParam, setSearchParam] = useState<any>({
-    pageIndex: TriggerDeviceModel.productPage,
-    pageSize: TriggerDeviceModel.productPageSize,
-  });
+  const [searchParam, setSearchParam] = useState<any>({});
+  const [oldRowKey] = useState(TriggerDeviceModel.productId);
 
-  const [loading, setLoading] = useState(true);
+  // const [loading, setLoading] = useState(true);
 
   const columns: ProColumns<ProductItem>[] = [
     {
@@ -210,17 +208,19 @@ export default observer(() => {
         enableSave={false}
         bodyStyle={{ padding: 0, paddingBottom: 16 }}
         onSearch={async (data) => {
-          if (loading) {
-            setSearchParam({
-              pageIndex: TriggerDeviceModel.devicePage,
-              pageSize: TriggerDeviceModel.devicePageSize,
-              ...data,
-            });
-            setLoading(true);
-          } else {
-            actionRef.current?.reset?.();
-            setSearchParam(data);
-          }
+          // if (loading) {
+          //   setSearchParam({
+          //     pageIndex: TriggerDeviceModel.devicePage,
+          //     pageSize: TriggerDeviceModel.devicePageSize,
+          //     ...data,
+          //   });
+          //   setLoading(true);
+          // } else {
+          //   actionRef.current?.reset?.();
+          //   setSearchParam(data);
+          // }
+          actionRef.current?.reset?.();
+          setSearchParam(data);
         }}
         target="department-assets-product"
       />
@@ -239,7 +239,6 @@ export default observer(() => {
           type: 'radio',
           selectedRowKeys: [TriggerDeviceModel.productId],
           onChange: (_, selectedRows) => {
-            console.log('onChange', selectedRows);
             TriggerDeviceModel.productId = selectedRows.map((item) => item.id)[0];
             TriggerDeviceModel.productDetail = selectedRows?.[0];
             handleMetadata(TriggerDeviceModel.productDetail.metadata);
@@ -257,12 +256,21 @@ export default observer(() => {
           TriggerDeviceModel.productPage = page;
           TriggerDeviceModel.productPageSize = size;
         }}
-        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} />

src/pages/rule-engine/Scene/Save/device/type.tsx

@@ -92,12 +92,31 @@ export default forwardRef((props: Props, ref) => {
     OperatorType.invokeFunction,
   ];
 
+  const handleFunction = (fcItem: any) => {
+    if (fcItem) {
+      const _properties = fcItem.valueType ? fcItem.valueType.properties : fcItem.inputs;
+      const array = [];
+      for (const datum of _properties) {
+        array.push({
+          id: datum.id,
+          name: datum.name,
+          type: datum.valueType ? datum.valueType.type : '-',
+          format: datum.valueType ? datum.valueType.format : undefined,
+          options: datum.valueType ? datum.valueType.elements : undefined,
+          value: undefined,
+        });
+      }
+      setFunctionItem(array);
+    }
+  };
+
   const handleInit = (data: DeviceModelProps) => {
     form.setFieldsValue({
       ...data.operation,
     });
 
     const newTypeList = [...TypeList];
+    console.log('handleInit', data);
 
     if (data.metadata.events?.length) {
       newTypeList.push(TypeEnum.reportEvent);
@@ -129,12 +148,18 @@ export default forwardRef((props: Props, ref) => {
       if (_reportProperty.length) {
         newTypeList.push(TypeEnum.reportProperty);
       }
-      console.log('data.metadata.properties', data.metadata.properties);
     }
 
     if (data.metadata.functions?.length) {
       newTypeList.push(TypeEnum.invokeFunction);
       setFunctions(data.metadata.functions);
+
+      if (data.operation?.functionId) {
+        const fcItem = data.metadata.functions.find(
+          (item) => item.id === data.operation!.functionId,
+        );
+        handleFunction(fcItem);
+      }
     }
 
     setTypeList(newTypeList);
@@ -191,7 +216,6 @@ export default forwardRef((props: Props, ref) => {
                   style={{ width: '100%' }}
                   fieldNames={{ label: 'name', value: 'id' }}
                   onSelect={(v: any, propertyItem: any) => {
-                    console.log(v);
                     TriggerDeviceModel.options.action = '读取' + propertyItem.name;
                   }}
                 />
@@ -207,7 +231,6 @@ export default forwardRef((props: Props, ref) => {
             <Operation
               propertiesList={writeProperty}
               onSelect={(a, item) => {
-                console.log(a);
                 TriggerDeviceModel.options.action = '修改' + item.name;
               }}
             />
@@ -221,7 +244,6 @@ export default forwardRef((props: Props, ref) => {
               style={{ width: '100%' }}
               fieldNames={{ label: 'name', value: 'id' }}
               onSelect={(v: any, evenItem: any) => {
-                console.log(v);
                 TriggerDeviceModel.options.action = evenItem.name + '上报';
               }}
             />
@@ -245,25 +267,8 @@ export default forwardRef((props: Props, ref) => {
                     option.name.toLowerCase().indexOf(input.toLowerCase()) >= 0
                   }
                   onSelect={(v: any, fcItem: any) => {
-                    console.log(v);
                     TriggerDeviceModel.options.action = '执行' + fcItem.name;
-                    if (fcItem) {
-                      const _properties = fcItem.valueType
-                        ? fcItem.valueType.properties
-                        : fcItem.inputs;
-                      const array = [];
-                      for (const datum of _properties) {
-                        array.push({
-                          id: datum.id,
-                          name: datum.name,
-                          type: datum.valueType ? datum.valueType.type : '-',
-                          format: datum.valueType ? datum.valueType.format : undefined,
-                          options: datum.valueType ? datum.valueType.elements : undefined,
-                          value: undefined,
-                        });
-                      }
-                      setFunctionItem(array);
-                    }
+                    handleFunction(fcItem);
                   }}
                 />
               </Form.Item>

src/pages/rule-engine/Scene/Save/terms/index.less

@@ -135,6 +135,7 @@
     }
 
     .ant-form-item {
+      margin-bottom: 8px;
       &:not(:first-child) {
         .ant-form-item-explain-error {
           padding-left: 80px !important;