fix: bug#5838

config/proxy.ts

@@ -12,11 +12,11 @@ export default {
       // target: 'http://192.168.32.28:8844/',
       // ws: 'ws://192.168.32.28:8844/',
       // 开发环境
-      target: 'http://120.79.18.123:8844/',
-      ws: 'ws://120.79.18.123:8844/',
+      // 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.66.5:8844/',
       // ws: 'ws://192.168.66.5:8844/',
       // ws: 'ws://demo.jetlinks.cn/jetlinks',

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

@@ -24,6 +24,7 @@ interface BuiltInProps {
   form: FormInstance;
   name: number;
   isEdit?: boolean;
+  id?: string;
 }
 
 export default (props: BuiltInProps) => {
@@ -110,6 +111,7 @@ export default (props: BuiltInProps) => {
     <ItemGroup compact>
       <Select
         value={source}
+        id={props.id}
         options={[
           { label: '手动输入', value: 'fixed' },
           { label: '内置参数', value: 'upper' },

src/pages/rule-engine/Scene/Save/action/VariableItems/org.tsx

@@ -16,6 +16,7 @@ interface OrgProps {
   notifyType: string;
   configId: string;
   onChange?: (value: ChangeType) => void;
+  id?: string;
 }
 
 export default (props: OrgProps) => {
@@ -47,6 +48,7 @@ export default (props: OrgProps) => {
   return (
     <TreeSelect
       value={keys}
+      id={props.id}
       listHeight={200}
       treeData={departmentTree}
       fieldNames={{

src/pages/rule-engine/Scene/Save/action/VariableItems/tag.tsx

@@ -6,6 +6,7 @@ interface TagSelectProps {
   configId?: string;
   value?: string;
   onChange?: (value: string) => void;
+  id?: string;
 }
 
 export default (props: TagSelectProps) => {
@@ -32,6 +33,7 @@ export default (props: TagSelectProps) => {
 
   return (
     <Select
+      id={props.id}
       value={value}
       placeholder={'请选择标签'}
       options={options}

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

@@ -21,6 +21,7 @@ interface UserProps {
   value?: ChangeType;
   type?: string;
   onChange?: (value: ChangeType) => void;
+  id?: string;
 }
 
 export default (props: UserProps) => {
@@ -308,6 +309,7 @@ export default (props: UserProps) => {
   return (
     <ItemGroup compact>
       <Select
+        id={props.id}
         value={source}
         options={
           props.notifyType && ['dingTalk', 'weixin'].includes(props.notifyType)

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

@@ -18,6 +18,7 @@ interface WritePropertyProps {
   trigger?: any;
   productId: string;
   isEdit?: boolean;
+  id?: string;
 }
 
 export default (props: WritePropertyProps) => {
@@ -249,6 +250,7 @@ export default (props: WritePropertyProps) => {
       <Col span={6}>
         <Select
           value={propertiesKey}
+          id={props.id}
           options={props.properties.filter((item) => {
             if (item.expands && item.expands.type) {
               return item.expands.type.includes('write');

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

@@ -11,6 +11,7 @@ interface DeviceModelProps {
   value?: ChangeValueType[];
   onChange?: (value: ChangeValueType[]) => void;
   productId?: string;
+  id?: string;
 }
 
 type DeviceBadgeProps = {
@@ -200,6 +201,7 @@ export default (props: DeviceModelProps) => {
         </Modal>
       )}
       <Input
+        id={props.id}
         placeholder={'请选择设备'}
         onClick={onClick}
         addonAfter={<AIcon type={'icon-shebei'} onClick={onClick} />}

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

@@ -4,11 +4,13 @@ interface ReadPropertyProps {
   properties: any[];
   value?: any;
   onChange?: (value?: any) => void;
+  id?: string;
 }
 
 export default (props: ReadPropertyProps) => {
   return (
     <Select
+      id={props.id}
       value={props.value ? props.value[0] : undefined}
       options={props.properties.filter((item) => {
         if (item.expands && item.expands.type) {

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

@@ -5,6 +5,7 @@ import { getRelations } from '@/pages/rule-engine/Scene/Save/action/service';
 interface RelationProps {
   value?: any;
   onChange?: (value?: any) => void;
+  id?: string;
 }
 
 export default (props: RelationProps) => {
@@ -28,6 +29,7 @@ export default (props: RelationProps) => {
 
   return (
     <Select
+      id={props.id}
       options={options}
       style={{ width: '100%' }}
       value={props.value ? props.value[0]?.value?.relation : undefined}

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

@@ -7,6 +7,7 @@ interface TagModalProps {
   tagData: any[];
   value?: any[];
   onChange?: (value: any[]) => void;
+  id?: string;
 }
 
 /**
@@ -251,6 +252,7 @@ export default (props: TagModalProps) => {
         </div>
       </Modal>
       <Input
+        id={props.id}
         value={nameList.length ? nameList.toString() : undefined}
         readOnly
         style={{ width: 300 }}

src/pages/rule-engine/Scene/Save/components/InputUpload/index.tsx

@@ -8,6 +8,7 @@ import { LoadingOutlined, PlusOutlined } from '@ant-design/icons';
 interface InputUploadProps {
   value?: string;
   onChange?: (value?: string) => void;
+  id?: string;
 }
 
 export default (props: InputUploadProps) => {
@@ -68,6 +69,7 @@ export default (props: InputUploadProps) => {
   return (
     <Input
       value={url}
+      id={props.id}
       onChange={(e) => {
         if (onChange) {
           onChange(e.target.value);

src/pages/rule-engine/Scene/Save/components/TimeSelect/index.tsx

@@ -15,6 +15,7 @@ interface TimeSelect {
   options?: OptionItemType[];
   className?: string;
   style?: React.CSSProperties;
+  id?: string;
 }
 
 export default (props: TimeSelect) => {
@@ -104,7 +105,7 @@ export default (props: TimeSelect) => {
         }}
         id={'timeSelect'}
       >
-        <div className={'time-select-content ellipsis'}>
+        <div className={'time-select-content ellipsis'} id={props.id}>
           {checkedNames.length ? (
             checkedKeys.includes('null') ? (
               '每天'

src/pages/rule-engine/Scene/Save/components/TimingTrigger/RangePicker.tsx

@@ -9,10 +9,12 @@ type RangePickerValue = {
 interface RangePickerProps {
   value?: RangePickerValue;
   onChange?: (value: RangePickerValue) => void;
+  id?: string;
 }
 export default (props: RangePickerProps) => {
   return (
     <TimePicker.RangePicker
+      id={props.id}
       style={{ width: '100%' }}
       format={'HH:mm:ss'}
       value={[

src/pages/rule-engine/Scene/Save/components/TimingTrigger/TimePicker.tsx

@@ -8,10 +8,12 @@ type TimePickerValue = {
 interface TimePickerProps {
   value?: TimePickerValue;
   onChange?: (value: TimePickerValue) => void;
+  id?: string;
 }
 export default (props: TimePickerProps) => {
   return (
     <TimePicker
+      id={props.id}
       style={{ width: '100%' }}
       format={'HH:mm:ss'}
       value={moment(props.value?.time || new Date(), 'HH:mm:ss')}

src/pages/rule-engine/Scene/Save/trigger/OrgTreeSelect.tsx

@@ -7,6 +7,7 @@ interface OrgTreeSelect extends Omit<TreeSelectProps, 'onChange' | 'value'> {
   onChange?: (value: any[]) => void;
   value?: any;
   productId?: string;
+  id?: string;
 }
 
 export default (props: OrgTreeSelect) => {
@@ -43,6 +44,12 @@ export default (props: OrgTreeSelect) => {
   }, [props.value]);
 
   return (
-    <TreeSelect<string> value={myValue} treeData={orgTree} onChange={onchange} {...extraProps} />
+    <TreeSelect<string>
+      id={props.id}
+      value={myValue}
+      treeData={orgTree}
+      onChange={onchange}
+      {...extraProps}
+    />
   );
 };

src/pages/rule-engine/Scene/Save/trigger/operation.tsx

@@ -7,6 +7,7 @@ interface OperatorProps {
   propertiesList?: any[];
   value?: any;
   onChange?: (value: any) => void;
+  id?: string;
 }
 
 export default (props: OperatorProps) => {
@@ -81,6 +82,7 @@ export default (props: OperatorProps) => {
       <Col span={6}>
         <Select
           mode="multiple"
+          id={props.id}
           options={props.propertiesList || []}
           value={key}
           fieldNames={{