Commit e9015aa168c9bd18d504f192a94601ab884f6200

Authored by fengtao
1 parent a162783f

fix: 任务中编辑时有缓存,先新增任务中心,选择的组织后,再去编辑已有的任务中心,则编辑的任务中心所选组织是新增时所选组织的缓存

@@ -115,6 +115,7 @@ export const formSchemas: FormSchema[] = [ @@ -115,6 +115,7 @@ export const formSchemas: FormSchema[] = [
115 setFieldsValue({ 115 setFieldsValue({
116 [FormFieldsEnum.EXECUTE_TARGET_DATA]: { 116 [FormFieldsEnum.EXECUTE_TARGET_DATA]: {
117 paramsOrg: key, //传递组织id到DevicePicker组件里进行组织过滤 117 paramsOrg: key, //传递组织id到DevicePicker组件里进行组织过滤
  118 + change: true,
118 }, 119 },
119 }); 120 });
120 }, 121 },
1 <script lang="ts" setup> 1 <script lang="ts" setup>
2 import { BasicForm, useForm } from '/@/components/Form'; 2 import { BasicForm, useForm } from '/@/components/Form';
3 import { BasicModal, useModalInner } from '/@/components/Modal'; 3 import { BasicModal, useModalInner } from '/@/components/Modal';
4 - import { formSchemas } from './config'; 4 + import { FormFieldsEnum, formSchemas } from './config';
5 import { nextTick, ref } from 'vue'; 5 import { nextTick, ref } from 'vue';
6 import { composeData, parseData } from './util'; 6 import { composeData, parseData } from './util';
7 import { createTask, updateTask } from '/@/api/task'; 7 import { createTask, updateTask } from '/@/api/task';
@@ -40,6 +40,13 @@ @@ -40,6 +40,13 @@
40 if (record && mode === DataActionModeEnum.UPDATE) { 40 if (record && mode === DataActionModeEnum.UPDATE) {
41 const res = parseData(record); 41 const res = parseData(record);
42 setFieldsValue({ ...res }); 42 setFieldsValue({ ...res });
  43 + setFieldsValue({
  44 + [FormFieldsEnum.EXECUTE_TARGET_DATA]: {
  45 + ...res.executeTargetData,
  46 + paramsOrg: res.organizationId, //传递组织id到DevicePicker组件里进行组织过滤
  47 + change: false,
  48 + },
  49 + });
43 } 50 }
44 } 51 }
45 ); 52 );
@@ -208,8 +208,8 @@ @@ -208,8 +208,8 @@
208 () => props.value, 208 () => props.value,
209 () => { 209 () => {
210 if (Reflect.has(props.value, 'paramsOrg')) { 210 if (Reflect.has(props.value, 'paramsOrg')) {
211 - const { paramsOrg } = props.value;  
212 - updateOrgSchema(paramsOrg); 211 + const { paramsOrg, change } = props.value;
  212 + updateOrgSchema(paramsOrg, change);
213 } 213 }
214 setValue(); 214 setValue();
215 }, 215 },
@@ -225,12 +225,14 @@ @@ -225,12 +225,14 @@
225 return data; 225 return data;
226 }; 226 };
227 227
228 - const updateOrgSchema = async (organizationId: string) => { 228 + const updateOrgSchema = async (organizationId: string, change?: boolean) => {
229 const data = await getOrganizationLevelList(organizationId); 229 const data = await getOrganizationLevelList(organizationId);
230 - setFieldsValue({  
231 - [FormFieldsEnum.ORGANIZATION]: null,  
232 - [FormFieldsEnum.DEVICE]: [],  
233 - }); 230 + if (change) {
  231 + setFieldsValue({
  232 + [FormFieldsEnum.ORGANIZATION]: null,
  233 + [FormFieldsEnum.DEVICE]: [],
  234 + });
  235 + }
234 updateSchema({ 236 updateSchema({
235 field: FormFieldsEnum.ORGANIZATION, 237 field: FormFieldsEnum.ORGANIZATION,
236 componentProps: { 238 componentProps: {