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/edit-table/columns/editColumn/formconfig.jsx | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/menu/components/table/edit-table/columns/editColumn/formconfig.jsx b/src/menu/components/table/edit-table/columns/editColumn/formconfig.jsx
index adbb88b..06fefad 100644
--- a/src/menu/components/table/edit-table/columns/editColumn/formconfig.jsx
+++ b/src/menu/components/table/edit-table/columns/editColumn/formconfig.jsx
@@ -384,7 +384,7 @@
precision: 0,
label: Formdict['header.form.decimal'],
initVal: card.decimal || 0,
- required: true
+ required: false
},
{
type: 'number',
@@ -409,7 +409,7 @@
initVal: card.format || 'none',
options: [{
value: 'none',
- text: Formdict['model.empty']
+ text: '鏃�'
}, {
value: 'thdSeparator',
text: '鍗冨垎浣�'
@@ -429,7 +429,10 @@
initVal: card.textFormat || 'none',
options: [{
value: 'none',
- text: Formdict['model.empty']
+ text: '鏃�'
+ }, {
+ value: 'encryption',
+ text: '鍔犲瘑'
}, {
value: 'YYYY-MM-DD',
text: 'YYYY-MM-DD'
--
Gitblit v1.8.0