From bdfec44c9f3a37dbbe05bf14a252ffec04132a86 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 06 九月 2022 21:24:28 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/components/table/normal-table/columns/editColumn/formconfig.jsx | 41 +++++++++++++++++------------------------
1 files changed, 17 insertions(+), 24 deletions(-)
diff --git a/src/menu/components/table/normal-table/columns/editColumn/formconfig.jsx b/src/menu/components/table/normal-table/columns/editColumn/formconfig.jsx
index 0c76b5f..937165d 100644
--- a/src/menu/components/table/normal-table/columns/editColumn/formconfig.jsx
+++ b/src/menu/components/table/normal-table/columns/editColumn/formconfig.jsx
@@ -217,7 +217,7 @@
decimal: 0,
label: Formdict['header.form.decimal'],
initVal: card.decimal || 0,
- required: true
+ required: false
},
{
type: 'select',
@@ -226,7 +226,7 @@
initVal: card.format || 'none',
options: [{
value: 'none',
- text: Formdict['model.empty']
+ text: '鏃�'
}, {
value: 'thdSeparator',
text: '鍗冨垎浣�'
@@ -246,7 +246,10 @@
initVal: card.textFormat || 'none',
options: [{
value: 'none',
- text: Formdict['model.empty']
+ text: '鏃�'
+ }, {
+ value: 'encryption',
+ text: '鍔犲瘑'
}, {
value: 'YYYY-MM-DD',
text: 'YYYY-MM-DD'
@@ -273,6 +276,17 @@
readonly: false
},
{
+ type: 'number',
+ key: 'span',
+ min: 1,
+ max: 24,
+ precision: 0,
+ label: '鍥剧墖瀹藉害',
+ initVal: card.span || 24,
+ tooltip: '鏍呮牸甯冨眬锛岀瓑鍒嗕负24浠姐��',
+ required: true
+ },
+ {
type: 'select',
key: 'lenWidRadio',
label: '闀垮姣�',
@@ -296,27 +310,6 @@
{ value: '2:3', text: '2:3' },
{ value: '9:16', text: '9:16' },
]
- },
- {
- type: 'radio',
- key: 'picSort',
- label: '鍥剧墖鎺掑垪',
- initVal: card.picSort || '1',
- tooltip: '鍚屼竴鍗曞厓鏍煎唴锛屽惈鏈夊寮犲浘鐗囨椂鐨勫垪鏁般��',
- required: false,
- options: [{
- value: '1',
- text: '1'
- }, {
- value: '2',
- text: '2'
- }, {
- value: '3',
- text: '3'
- }, {
- value: '4',
- text: '4'
- }]
},
{
type: 'radio',
--
Gitblit v1.8.0