From 4253da96a80b36aa66a1322b0379ec624e01101c Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期二, 26 十二月 2023 17:38:36 +0800
Subject: [PATCH] 修复表单FYForm不传入初始数据时报错问题
---
src/components/bg-task/FYBgTaskCard.vue | 57 ++++++++++++++++++----------
src/composables/formConfirm.js | 18 ++++----
src/components/form/FYForm.vue | 11 ++++-
3 files changed, 53 insertions(+), 33 deletions(-)
diff --git a/src/components/bg-task/FYBgTaskCard.vue b/src/components/bg-task/FYBgTaskCard.vue
index 877c4b7..7a00510 100644
--- a/src/components/bg-task/FYBgTaskCard.vue
+++ b/src/components/bg-task/FYBgTaskCard.vue
@@ -1,31 +1,46 @@
<template>
<el-card class="bg-task-card" shadow="hover" :body-style="{ padding: '8px' }">
<!-- <template #header> -->
- <el-row>
- <el-space>
- <el-tag>{{ nameToLabel(model.type) }}</el-tag>
- <el-text tag="b" size="large" truncated>{{ model.name }}鍟婂疄鎵撳疄澶ц嫃鎵撳晩瀹炴墦瀹炲ぇ鑻忔墦闃垮ぇ鎾掑ぇ鎾�</el-text>
- </el-space>
+ <el-row style="background-color: aliceblue">
+ <!-- <el-space> -->
+ <el-tag>{{ nameToLabel(model.type) }}</el-tag>
+ <el-text style="width: 80%" tag="b" size="large" truncated>{{ model.name }}</el-text>
+ <!-- <div>{{ model.name }}asdasdasdasdasdasdaasdasdasdasdasdasdaasdasdasdasdasdasdaasdasdasdasdasdasda</div> -->
+ <!-- </el-space> -->
</el-row>
+ <!-- <div>
+ <el-text truncated>{{ model.name }}asdasdasdasdasdasdaasdasdasdasdasdasdaasdasdasdasdasdasdaasdasdasdasdasdasda</el-text>
+ </div> -->
<!-- </template> -->
- <el-text type="info" size="small">鐘舵�侊細{{ nameToLabel(model.status) }}</el-text>
- <el-text type="info" size="small">寮�濮嬶細{{ model.startTime }}</el-text>
- <el-text type="info" size="small">缁撴潫锛歿{ model.endTime }}</el-text>
+ <div>
+ <el-text type="info" size="small">ID锛歿{ model.id }}</el-text>
+ </div>
+
+ <div>
+ <el-text type="info" size="small">鐘舵�侊細{{ nameToLabel(model.status) }}</el-text>
+ </div>
+ <div>
+ <el-text type="info" size="small">寮�濮嬶細{{ model.startTime }}</el-text>
+ </div>
+ <div>
+ <el-text type="info" size="small">缁撴潫锛歿{ model.endTime }}</el-text>
+ </div>
<!-- <template #footer> -->
- <el-button type="primary" size="small" :loading="false" @click="$emit('start', model)"
- >寮�濮嬩换鍔�</el-button
- >
- <el-button type="danger" size="small" :loading="false" @click="$emit('shutDown', model)"
- >寮哄埗缁撴潫</el-button
- >
- <el-button type="danger" size="small" :loading="false" @click="$emit('remove', model)"
- >绉婚櫎浠诲姟</el-button
- >
- <el-button type="danger" size="small" :loading="false" @click="$emit('gotoResult', model)"
- >鏌ョ湅缁撴灉</el-button
- >
- <el-text type="info" size="small">ID锛歿{ model.id }}</el-text>
+ <el-row justify="end">
+ <el-button type="primary" size="small" :loading="false" @click="$emit('start', model)"
+ >寮�濮嬩换鍔�</el-button
+ >
+ <el-button type="danger" size="small" :loading="false" @click="$emit('shutDown', model)"
+ >寮哄埗缁撴潫</el-button
+ >
+ <el-button type="danger" size="small" :loading="false" @click="$emit('remove', model)"
+ >绉婚櫎浠诲姟</el-button
+ >
+ <el-button type="danger" size="small" :loading="false" @click="$emit('gotoResult', model)"
+ >鏌ョ湅缁撴灉</el-button
+ >
+ </el-row>
<!-- </template> -->
</el-card>
</template>
diff --git a/src/components/form/FYForm.vue b/src/components/form/FYForm.vue
index f9f8297..07fde84 100644
--- a/src/components/form/FYForm.vue
+++ b/src/components/form/FYForm.vue
@@ -31,7 +31,12 @@
const props = defineProps({
//琛ㄥ崟鍩烘湰淇℃伅
- formInfo: Object,
+ formInfo: {
+ type: Object,
+ default: () => {
+ return {};
+ }
+ },
//琛ㄥ崟妫�楠岃鍒�
rules: Object,
showButtons: {
@@ -63,7 +68,7 @@
{
required: true,
message: '琛屾斂鍖哄垝涓嶈兘涓虹┖',
- trigger: 'change',
+ trigger: 'change'
// validator: (rule, value, callback) => {
// if (!value) {
// callback(new Error('Please input the age'));
@@ -77,7 +82,7 @@
{
required: true,
message: '鍦烘櫙绫诲瀷涓嶈兘涓虹┖',
- trigger: 'change',
+ trigger: 'change'
// validator: (rule, value, callback) => {
// if (!value) {
// callback(new Error('Please input the age'));
diff --git a/src/composables/formConfirm.js b/src/composables/formConfirm.js
index 0bb274c..92d114c 100644
--- a/src/composables/formConfirm.js
+++ b/src/composables/formConfirm.js
@@ -96,15 +96,15 @@
formRef.value.validate(async (valid) => {
if (valid) {
if (messageBox) {
- useMessageBoxTip({
- confirmMsg: submit.msg,
- confirmTitle: submit.title,
- onConfirm: async () => {
- const res = await submit.do();
- submited();
- return res;
- }
- });
+ useMessageBoxTip({
+ confirmMsg: submit.msg,
+ confirmTitle: submit.title,
+ onConfirm: async () => {
+ const res = await submit.do();
+ submited();
+ return res;
+ }
+ });
} else {
await submit.do();
submited();
--
Gitblit v1.9.3