From 91e232bb0b910f3670bdbccd65cc218d55e1eda9 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 06 十二月 2022 16:08:20 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/components/table/base-table/columns/editColumn/formconfig.jsx | 45 +++++++++++++++++++++++++++++++++++++++++----
1 files changed, 41 insertions(+), 4 deletions(-)
diff --git a/src/menu/components/table/base-table/columns/editColumn/formconfig.jsx b/src/menu/components/table/base-table/columns/editColumn/formconfig.jsx
index 6897370..29bf27a 100644
--- a/src/menu/components/table/base-table/columns/editColumn/formconfig.jsx
+++ b/src/menu/components/table/base-table/columns/editColumn/formconfig.jsx
@@ -36,6 +36,9 @@
value: 'picture',
text: '鍥剧墖'
}, {
+ value: 'video',
+ text: '瑙嗛'
+ }, {
value: 'link',
text: '閾炬帴'
}, {
@@ -163,6 +166,26 @@
}]
},
{
+ type: 'number',
+ key: 'startTime',
+ precision: 0,
+ label: '寮�濮嬫椂闂�',
+ initVal: card.startTime || 0,
+ tooltip: '瑙嗛寮�濮嬫挱鏀剧殑鏃堕棿锛岀敤浜庤皟鏁磋棰戝垵濮嬪寲灞曠ず鐨勭晫闈€��',
+ required: false
+ },
+ {
+ type: 'select',
+ key: 'aspectRatio',
+ label: '闀垮姣�',
+ initVal: card.aspectRatio || '16:9',
+ required: true,
+ options: [
+ { value: '4:3', text: '4:3' },
+ { value: '16:9', text: '16:9' }
+ ]
+ },
+ {
type: 'radio',
key: 'rowspan',
label: '琛屽悎骞�',
@@ -190,14 +213,16 @@
}, {
value: 'false',
text: '鍚�'
- }]
+ }],
+ forbid: card.isSub
},
{
type: 'number',
key: 'fieldlength',
label: '瀛楁闀垮害',
initVal: card.fieldlength || 50,
- required: true
+ required: true,
+ forbid: card.isSub
},
{
type: 'number',
@@ -206,8 +231,8 @@
max: 18,
decimal: 0,
label: '灏忔暟浣�',
- initVal: card.decimal || 0,
- required: true
+ initVal: card.decimal === undefined ? 0 : card.decimal,
+ required: !card.isSub
},
{
type: 'select',
@@ -303,6 +328,18 @@
},
{
type: 'radio',
+ key: 'backgroundSize',
+ label: '鍥惧儚澶у皬',
+ initVal: card.backgroundSize || 'cover',
+ required: false,
+ options: [
+ { value: 'cover', text: '瑕嗙洊' },
+ { value: 'contain', text: '鍖呭惈' },
+ { value: 'auto', text: '鑷�傚簲' },
+ ]
+ },
+ {
+ type: 'radio',
key: 'scale',
label: '鐐瑰嚮缂╂斁',
initVal: card.scale || 'true',
--
Gitblit v1.8.0