From f4606ea0496e1b71e358f07143f6e5b1866014a0 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 26 六月 2023 20:08:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/FormTempalte.vue b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
similarity index 99%
rename from Source/UBCS-WEB/src/components/FormTemplate/FormTempalte.vue
rename to Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
index 0733ce0..8d0c452 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/FormTempalte.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
@@ -562,7 +562,7 @@
maxlength: formItem.maxlength,
filterable: true,
referConfig:
- formItem.type == "refer"
+ formItem.type == "refer"
? {
title: formItem.text,
showField: formItem.showField || formItem.field,
@@ -571,7 +571,7 @@
options: formItem.referConfig,
}
: {},
- span: formItem.type === "textarea" ? 24 : this.trendsSpan,
+ span: formItem.span ? formItem.span : formItem.type === "textarea" ? 24 : this.trendsSpan,
rules: [
{
required: formItem.required,
--
Gitblit v1.9.3