|
@@ -59,6 +59,7 @@ export default () => {
|
|
|
|
|
|
|
|
const [requestParams, setRequestParams] = useState<any>(undefined);
|
|
const [requestParams, setRequestParams] = useState<any>(undefined);
|
|
|
const [triggerValue, setTriggerValue] = useState<any>([]);
|
|
const [triggerValue, setTriggerValue] = useState<any>([]);
|
|
|
|
|
+ const [actionParams, setActionParams] = useState<any>(undefined);
|
|
|
|
|
|
|
|
const [actionsData, setActionsData] = useState<any[]>([]);
|
|
const [actionsData, setActionsData] = useState<any[]>([]);
|
|
|
const [isEdit, setIsEdit] = useState(false);
|
|
const [isEdit, setIsEdit] = useState(false);
|
|
@@ -88,8 +89,6 @@ export default () => {
|
|
|
[triggerRef],
|
|
[triggerRef],
|
|
|
);
|
|
);
|
|
|
|
|
|
|
|
- console.log(shakeLimit);
|
|
|
|
|
-
|
|
|
|
|
useEffect(() => {
|
|
useEffect(() => {
|
|
|
const params = new URLSearchParams(location.search);
|
|
const params = new URLSearchParams(location.search);
|
|
|
const id = params.get('id');
|
|
const id = params.get('id');
|
|
@@ -209,16 +208,21 @@ export default () => {
|
|
|
preserve={false}
|
|
preserve={false}
|
|
|
className={'scene-save'}
|
|
className={'scene-save'}
|
|
|
onValuesChange={(changeValue, allValues) => {
|
|
onValuesChange={(changeValue, allValues) => {
|
|
|
- if (changeValue.trigger && changeValue.trigger.device) {
|
|
|
|
|
- if (
|
|
|
|
|
- changeValue.trigger.device.selectorValues ||
|
|
|
|
|
- (changeValue.trigger.device.operation &&
|
|
|
|
|
- changeValue.trigger.device.operation.operator)
|
|
|
|
|
- ) {
|
|
|
|
|
- setTriggerValue([]);
|
|
|
|
|
- setRequestParams({ trigger: allValues.trigger });
|
|
|
|
|
|
|
+ if (changeValue.trigger) {
|
|
|
|
|
+ if (changeValue.trigger.type === 'device' && changeValue.trigger.device) {
|
|
|
|
|
+ if (
|
|
|
|
|
+ changeValue.trigger.device.selectorValues ||
|
|
|
|
|
+ (changeValue.trigger.device.operation &&
|
|
|
|
|
+ changeValue.trigger.device.operation.operator)
|
|
|
|
|
+ ) {
|
|
|
|
|
+ setTriggerValue([]);
|
|
|
|
|
+ setRequestParams({ trigger: allValues.trigger });
|
|
|
|
|
+ }
|
|
|
|
|
+ } else if (['timer', 'manual'].includes(changeValue.trigger.type)) {
|
|
|
|
|
+ setActionParams({ trigger: allValues.trigger });
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
if (allValues.actions) {
|
|
if (allValues.actions) {
|
|
|
setActionsData(allValues.actions);
|
|
setActionsData(allValues.actions);
|
|
|
}
|
|
}
|
|
@@ -390,7 +394,7 @@ export default () => {
|
|
|
form={form}
|
|
form={form}
|
|
|
restField={restField}
|
|
restField={restField}
|
|
|
name={name}
|
|
name={name}
|
|
|
- trigger={requestParams}
|
|
|
|
|
|
|
+ trigger={actionParams}
|
|
|
triggerType={triggerType}
|
|
triggerType={triggerType}
|
|
|
onRemove={() => remove(name)}
|
|
onRemove={() => remove(name)}
|
|
|
actionItemData={actionsData.length && actionsData[name]}
|
|
actionItemData={actionsData.length && actionsData[name]}
|