|
|
@ -70,6 +70,7 @@ |
|
|
|
import { buildUUID } from '/@/utils/uuid'; |
|
|
|
import { buildUUID } from '/@/utils/uuid'; |
|
|
|
import { MapTask } from '/@/api/platform/common/entity/mapTask'; |
|
|
|
import { MapTask } from '/@/api/platform/common/entity/mapTask'; |
|
|
|
import { useI18n } from '/@/hooks/web/useI18n'; |
|
|
|
import { useI18n } from '/@/hooks/web/useI18n'; |
|
|
|
|
|
|
|
import {MapTaskPreset} from "/@/api/platform/common/entity/mapTaskPreset"; |
|
|
|
|
|
|
|
|
|
|
|
/** 类型规范统一声明定义区域 */ |
|
|
|
/** 类型规范统一声明定义区域 */ |
|
|
|
type OptionsType = { |
|
|
|
type OptionsType = { |
|
|
@ -404,9 +405,15 @@ |
|
|
|
message: '表格行校验未通过,请检查!', |
|
|
|
message: '表格行校验未通过,请检查!', |
|
|
|
duration: 2 |
|
|
|
duration: 2 |
|
|
|
}); |
|
|
|
}); |
|
|
|
taskOrdinaryData.forEach((item, index)=> item.sort = add(index, 1)); |
|
|
|
const taskOrdinaryDataResult : MapTask[] = taskOrdinaryData.map((item, index)=> { |
|
|
|
taskPresetData.forEach((item, index)=> item.sort = add(index, 1)); |
|
|
|
item.sort = add(index, 1); |
|
|
|
state.mapData.mapTask = [...taskOrdinaryData, ...taskPresetData] as MapTask[]; |
|
|
|
return omit(item, ['onEdit','onValid','editable','onCancel','onSubmit','submitCbs','cancelCbs','validCbs','editValueRefs']) as MapTask; |
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
const taskPresetDataResult : MapTask[] = taskPresetData.map((item, index)=> { |
|
|
|
|
|
|
|
item.sort = add(index, 1); |
|
|
|
|
|
|
|
return omit(item, ['onEdit','onValid','editable','onCancel','onSubmit','submitCbs','cancelCbs','validCbs','editValueRefs']) as MapTask; |
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
state.mapData.mapTask = [...taskOrdinaryDataResult, ...taskPresetDataResult]; |
|
|
|
// 处理提交完成之后逻辑 |
|
|
|
// 处理提交完成之后逻辑 |
|
|
|
closeModal(); |
|
|
|
closeModal(); |
|
|
|
emit('success'); |
|
|
|
emit('success'); |
|
|
|