wzyyy 3 лет назад
Родитель
Сommit
f02a20b5d2

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

@@ -85,6 +85,7 @@ export default (props: Props) => {
 
 
   useEffect(() => {
   useEffect(() => {
     setValue(props.value);
     setValue(props.value);
+    console.log('typemodel', props.value);
   }, [props.value]);
   }, [props.value]);
 
 
   const renderNode = (type: string) => {
   const renderNode = (type: string) => {

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

@@ -29,7 +29,7 @@ export default (props: Props) => {
   const [enumList, setEnumList] = useState<any>([]);
   const [enumList, setEnumList] = useState<any>([]);
 
 
   useEffect(() => {
   useEffect(() => {
-    // console.log(props.value);
+    console.log(props.value);
     if (props.value) {
     if (props.value) {
       if (props.properties && props.properties.length) {
       if (props.properties && props.properties.length) {
         if (0 in props.value) {
         if (0 in props.value) {

+ 1 - 1
src/pages/rule-engine/Scene/Save/action/DeviceOutput/index.less

@@ -25,7 +25,7 @@
     width: 237px;
     width: 237px;
     //width: 100%;
     //width: 100%;
     padding: 12px 16px;
     padding: 12px 16px;
-    border: 1px solid rgba(#e0e4e8, 0.6);
+    border: 1px solid #e0e4e8;
     border-radius: 2px;
     border-radius: 2px;
     cursor: pointer;
     cursor: pointer;
     transition: all 0.3s;
     transition: all 0.3s;

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

@@ -186,7 +186,24 @@ export default observer((props: Props) => {
       }
       }
     >
     >
       <div className="steps-steps">
       <div className="steps-steps">
-        <Steps current={DeviceModel.current} items={DeviceModel.steps} />
+        <Steps
+          current={DeviceModel.current}
+          items={DeviceModel.steps}
+          onChange={(value) => {
+            console.log(value);
+            if (value === 1) {
+              return DeviceModel.productId
+                ? (DeviceModel.current = 1)
+                : onlyMessage('请选择产品', 'error');
+            } else if (value === 2) {
+              return DeviceModel.deviceId
+                ? (DeviceModel.current = 2)
+                : onlyMessage('请选择设备', 'error');
+            } else {
+              return (DeviceModel.current = 0);
+            }
+          }}
+        />
       </div>
       </div>
       <div className="steps-content">{DeviceModel.steps[DeviceModel.current]?.content}</div>
       <div className="steps-content">{DeviceModel.steps[DeviceModel.current]?.content}</div>
     </Modal>
     </Modal>

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

@@ -154,11 +154,8 @@ export default (props: ItemProps) => {
         return (
         return (
           <div>
           <div>
             {`${data?.options?.type} ${data?.options?.name} ${data?.options?.properties} ${
             {`${data?.options?.type} ${data?.options?.name} ${data?.options?.properties} ${
-              data?.options?.propertiesValue || ''
+              data?.options?.propertiesValue ? `为 ${data?.options?.propertiesValue}` : ''
             }`}
             }`}
-            {/* {data?.options?.type}
-            <span>{data?.options?.name}</span>
-            {data?.options?.properties} */}
           </div>
           </div>
         );
         );
       case 'tag':
       case 'tag':

+ 3 - 1
src/pages/rule-engine/Scene/Save/components/ParamsSelect/index.tsx

@@ -42,7 +42,9 @@ export default (props: Props) => {
   }, [props.value]);
   }, [props.value]);
 
 
   useEffect(() => {
   useEffect(() => {
-    setValue(props.labelValue);
+    if (props.labelValue) {
+      setValue(props.labelValue);
+    }
   }, [props.labelValue]);
   }, [props.labelValue]);
 
 
   useEffect(() => {
   useEffect(() => {