Commit 97a9628fa69f1129112d47991a96b97c7276ef62

Authored by xp.Huang
2 parents 4666799a 2138e6bc

Merge branch 'fix/DEFECT-1390' into 'main_dev'

fix: 修改数据流转编辑界面数据未暂存

See merge request yunteng/thingskit-front!747
@@ -151,7 +151,7 @@ @@ -151,7 +151,7 @@
151 ...record, 151 ...record,
152 ...record?.configuration, 152 ...record?.configuration,
153 name: record?.name, 153 name: record?.name,
154 - description: record?.additionalInfo?.description, 154 + description: record?.configuration.description || record?.additionalInfo?.description,
155 }); 155 });
156 }; 156 };
157 157
@@ -178,10 +178,11 @@ @@ -178,10 +178,11 @@
178 }; 178 };
179 179
180 //上一步 180 //上一步
181 - const handlePrevDataFlowMethod = (value) => {  
182 - currentStep.value = value; 181 + const handlePrevDataFlowMethod = (oldData: { currentStep: number; values: Object }) => {
  182 + currentStep.value = oldData.currentStep;
183 setModalProps({ showOkBtn: false }); 183 setModalProps({ showOkBtn: false });
184 if (hasEditOrView(businessText.value)) { 184 if (hasEditOrView(businessText.value)) {
  185 + restData.data = { ...restData.data, configuration: oldData.values };
185 setValue(restData.data); 186 setValue(restData.data);
186 } 187 }
187 }; 188 };
@@ -52,8 +52,9 @@ @@ -52,8 +52,9 @@
52 52
53 const dataFlowMethodIsRabbitMqRef = ref<InstanceType<typeof DataFlowMethodIsRabbitMq>>(); 53 const dataFlowMethodIsRabbitMqRef = ref<InstanceType<typeof DataFlowMethodIsRabbitMq>>();
54 54
55 - const currentDataFlowParamsHanlePrevStep = () => {  
56 - emit('currentDataFlowParamsEmitPrevStep', 0); 55 + const currentDataFlowParamsHanlePrevStep = async () => {
  56 + const values = await getValue();
  57 + emit('currentDataFlowParamsEmitPrevStep', { currentStep: 0, values });
57 }; 58 };
58 59
59 //表单配置项(kafka、mqtt、rabbitmq、restapi) 60 //表单配置项(kafka、mqtt、rabbitmq、restapi)