Browse Source

feat: 修正前端的formDialog修改造成的多个bug

WANGKANG 8 months ago
parent
commit
4cc425c32f
1 changed files with 15 additions and 6 deletions
  1. 15 6
      src/components/FormDialog/index.vue

+ 15 - 6
src/components/FormDialog/index.vue

@@ -10,7 +10,7 @@
   >
     <ProFrom ref="proFormRef" :items-options="parameter.itemsOptions" :form-options="_options" :model="parameter.model">
       <template #modelAddress="{}">
-        <FileUpload :file-size="4096" :file-type="['pt']" @update:model-value="setModelAddr" />
+        <FileUpload :file-size="4096" :file-type="['pt']" @update:model-value="setModelAddr"/>
       </template>
     </ProFrom>
     <template #footer>
@@ -23,15 +23,17 @@
 </template>
 
 <script setup lang="ts" name="FormDialog">
-import { ref, ComputedRef, computed, reactive } from 'vue'
+import {ref, ComputedRef, computed, reactive} from 'vue'
 import ProFrom from '@/components/ProForm/index.vue'
-import { ElMessage } from 'element-plus'
+import {ElMessage} from 'element-plus'
 import FileUpload from '@/components/Upload/File.vue'
+
 // import mittBus from '@/utils/mittBus'
 
 interface EmitEvent {
   (e: 'update'): void
 }
+
 const emits = defineEmits<EmitEvent>()
 
 const videoUploadRef = ref<InstanceType<typeof FileUpload> | null>(null)
@@ -70,7 +72,7 @@ const _options: ComputedRef<ProForm.FormOptions> = computed(() => {
   return Object.assign(form, parameter.value.formOptions)
 })
 
-const modelAddr = ref('')
+const modelAddr = ref(null)
 const setModelAddr = res => {
   console.log('modelAddr', res)
   modelAddr.value = res
@@ -88,7 +90,13 @@ const handleSubmit = () => {
   if (!formEl) return
   formEl.validate(valid => {
     if (valid) {
-      parameter.value.api!({ ...formModel, ...parameter.value.model, algorithmId: algorithmModelId.value }).then(res => {
+      let data = {}
+      if (algorithmModelId.value) {
+        data = {...formModel, ...parameter.value.model, algorithmId: algorithmModelId.value}
+      } else {
+        data = {...formModel, ...parameter.value.model}
+      }
+      parameter.value.api!(data).then(res => {
         if (res.code == 200) {
           proFormRef.value?.resetForm(formEl)
           ElMessage.success('操作成功')
@@ -131,7 +139,7 @@ let algorithmModelId = ref(0)
 // 接收父组件参数
 const openDialog = (params: FormParameterProps, algoModelId = null) => {
   algorithmModelId.value = algoModelId
-  parameter.value = { ...parameter.value, ...params }
+  parameter.value = {...parameter.value, ...params}
   _options.value.disabled = !parameter.value.isEdit
   butLoading.value = false
   dialogVisible.value = true
@@ -151,6 +159,7 @@ defineExpose({
   height: 200px;
   margin-top: 20px;
   border: 1px dashed #cccccc;
+
   :deep(.upload-file-uploader) {
     display: flex;
     align-items: center;