Просмотр исходного кода

fix: 修复执行动作-消息通知无法回显问题

xieyonghong 3 лет назад
Родитель
Сommit
1ce481767f

+ 4 - 4
config/proxy.ts

@@ -15,13 +15,13 @@ export default {
       // target: 'http://120.79.18.123:8844/',
       // ws: 'ws://120.79.18.123:8844/',
       // 测试环境
-      target: 'http://120.77.179.54:8844/',
-      ws: 'ws://120.77.179.54:8844/',
+      // target: 'http://120.77.179.54:8844/',
+      // ws: 'ws://120.77.179.54:8844/',
       // target: 'http://192.168.32.65:8850/',
       // ws: 'ws://192.168.32.65:8850/',
       //v2环境
-      // ws: 'ws://47.109.52.230:8844',
-      // target: 'http://47.109.52.230:8844',
+      ws: 'ws://47.109.52.230:8844',
+      target: 'http://47.109.52.230:8844',
       changeOrigin: true,
       pathRewrite: { '^/api': '' },
     },

+ 16 - 1
src/pages/rule-engine/Scene/Save/action/VariableItems/builtIn.tsx

@@ -4,6 +4,7 @@ import type { FormInstance } from 'antd';
 import { queryBuiltInParams } from '@/pages/rule-engine/Scene/Save/action/service';
 import { ItemGroup } from '@/pages/rule-engine/Scene/Save/components';
 import { BuiltInParamsHandleTreeData } from '@/pages/rule-engine/Scene/Save/components/BuiltInParams';
+import { useLocation } from 'umi';
 
 import moment from 'moment';
 
@@ -36,6 +37,7 @@ export default (props: BuiltInProps) => {
   const [builtInList, setBuiltInList] = useState<any[]>([]);
 
   const [isEdit, setIsEdit] = useState(false);
+  const location = useLocation();
 
   const onChange = (_source: string = 'fixed', _value?: any, _upperKey?: string) => {
     const obj: ChangeType = {
@@ -53,7 +55,7 @@ export default (props: BuiltInProps) => {
   };
 
   const sourceChangeEvent = async () => {
-    onChange(source, undefined);
+    // onChange(source, undefined);
     const data = props.form.getFieldsValue();
     // console.log(data)
     const triggerData = await props.triggerRef?.getTriggerData();
@@ -103,7 +105,20 @@ export default (props: BuiltInProps) => {
   }, [props.trigger?.trigger?.device?.productId, source]);
 
   useEffect(() => {
+    if (props.trigger?.trigger?.device?.productId !== undefined) {
+      onChange(source, undefined);
+    }
+  }, [props.trigger?.trigger?.device?.productId]);
+
+  useEffect(() => {
+    if (!location.query?.id) {
+      onChange(source, undefined);
+    }
+  }, [props.trigger]);
+
+  useEffect(() => {
     // console.log(props.value,'value')
+    console.log('builtIn-effect', props.value);
     setSource(props.value?.source);
     setValue(props.value?.value);
     setUpperKey(props.value?.upperKey);

+ 6 - 1
src/pages/rule-engine/Scene/Save/action/VariableItems/user.tsx

@@ -8,6 +8,7 @@ import {
   queryRelationUsers,
   queryWechatUsers,
 } from '@/pages/rule-engine/Scene/Save/action/service';
+import { useLocation } from 'umi';
 
 type ChangeType = {
   source?: string;
@@ -32,6 +33,8 @@ export default (props: UserProps) => {
     { name: '平台用户', id: 'p1', selectable: false, children: [] },
   ]);
 
+  const location = useLocation();
+
   useEffect(() => {
     setSource(props.value?.source);
     if (props.value?.source === 'relation') {
@@ -186,7 +189,9 @@ export default (props: UserProps) => {
         }
       }
 
-      onchange(props.value?.source, '');
+      if (!location.query?.id) {
+        onchange(props.value?.source, '');
+      }
     }
   }, [props.type, source]);