fix: #9028、9039、8946

Next wzy

src/pages/rule-engine/Scene/Save/action/DeviceOutput/actions/TypeModel.tsx

@@ -107,6 +107,8 @@ export default (props: Props) => {
         return (
           <InputNumber
             value={value}
+            min={0}
+            precision={type === 'double' || type === 'float' ? 2 : 0}
             onChange={(e: any) => {
               onChange(e);
             }}
@@ -123,7 +125,7 @@ export default (props: Props) => {
             fieldNames={{ label: 'text', value: 'value' }}
             placeholder={'请选择'}
             onChange={(e, options: any) => {
-              console.log(options);
+              // console.log(options);
               setValue(e);
               setLabelValue(options?.text);
               if (props.onChange) {

src/pages/rule-engine/Scene/Save/action/DeviceOutput/actions/WriteProperty.tsx

@@ -13,6 +13,7 @@ interface Props {
   onColumns?: (col: any) => void;
   thenName: number;
   branchGroup?: number;
+  onRest?: (value: any) => void;
 }
 
 export default (props: Props) => {
@@ -95,6 +96,9 @@ export default (props: Props) => {
             setEnumList(option.valueType?.elements);
             textRef.current = option.name;
             setPropertiesValue(undefined);
+            if (props.onRest) {
+              props?.onRest(e);
+            }
           }}
         ></Select>
       </Col>

src/pages/rule-engine/Scene/Save/action/DeviceOutput/actions/index.tsx

@@ -169,7 +169,20 @@ export default observer((props: Props) => {
           <Form.Item
             name={['message', 'properties']}
             label="设置属性"
-            rules={[{ required: true, message: '请选择属性' }]}
+            rules={[
+              // { required: true, message: '请选择属性' },
+              () => ({
+                validator(_, value) {
+                  console.log('---------', value);
+                  const isValue = Object.values(value)?.[0];
+                  console.log(isValue);
+                  if (isValue) {
+                    return Promise.resolve();
+                  }
+                  return Promise.reject(new Error('请选择属性'));
+                },
+              }),
+            ]}
           >
             <WriteProperty
               properties={properties}
@@ -185,6 +198,12 @@ export default observer((props: Props) => {
                 DeviceModel.propertiesName = text;
                 DeviceModel.propertiesValue = item;
               }}
+              onRest={(value: any) => {
+                console.log(1111111);
+                form.setFieldValue(['message', 'properties'], {
+                  [value]: undefined,
+                });
+              }}
             />
           </Form.Item>
         )}

src/pages/rule-engine/Scene/Save/action/DeviceOutput/index.tsx

@@ -86,6 +86,7 @@ export default observer((props: Props) => {
 
   const save = async () => {
     const value = await formRef.current?.validateFields();
+
     const item = {
       selector: DeviceModel.selector,
       source: DeviceModel.source,
@@ -133,7 +134,7 @@ export default observer((props: Props) => {
       }));
       // console.log(_options.taglist, 'taglist')
     }
-    console.log(item);
+    // console.log(item);
     props.save(item, _options);
     init();
   };

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

@@ -236,6 +236,7 @@ export default observer((props: Props) => {
               DeviceModel.productId = selectedRows.map((item) => item.id)?.[0];
               DeviceModel.productDetail = selectedRows?.[0];
               DeviceModel.message = {};
+              DeviceModel.deviceId = '';
             },
           }}
           request={(params) =>