From 457425bbe73ea270fe7ebd8b76b443efa8eab949 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 13 十二月 2024 13:05:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-table-form.vue | 12 ++++--------
1 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-table-form.vue b/Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-table-form.vue
index 1fe34cf..79fd34d 100644
--- a/Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-table-form.vue
+++ b/Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-table-form.vue
@@ -95,19 +95,15 @@
const typeValue = item.type === 'text' ? 'input' : item.type === 'combox' ? 'select' : item.type;
return {
+ ...item,
label: item.text,
- prop: item.field,
+ prop: item.prop || item.field,
type: typeValue,
value: item.defaultValue,
dicData: item.type === 'combox' ? item.dicData : item.dicUrl,
- readonly: item.readOnly,
- disabled: item.disabled,
- labelSuffix: item.suffix,
- suffixIcon: item.prefix,
- placeholder:item.placeholder,
- clearable:item.clearable,
+ suffixIcon: item.suffixIcon || item.prefix,
+ labelSuffix: item.labelSuffix || item.suffix,
tip: item.tooltips,
- keyAttr: item.keyAttr,
rules: [{
required: item.required,
message: `璇疯緭鍏�${item.text}!`,
--
Gitblit v1.9.3