From b8e1395f02c929eaa96b949cf6027ee2a43856a6 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 06 九月 2022 19:03:37 +0800
Subject: [PATCH] 2022-09-06
---
src/menu/components/card/cardcellcomponent/formconfig.jsx | 29 ++++++++++++++++-------------
1 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/src/menu/components/card/cardcellcomponent/formconfig.jsx b/src/menu/components/card/cardcellcomponent/formconfig.jsx
index ea3a280..1529d90 100644
--- a/src/menu/components/card/cardcellcomponent/formconfig.jsx
+++ b/src/menu/components/card/cardcellcomponent/formconfig.jsx
@@ -90,13 +90,14 @@
min: 0,
label: '鍐呭',
initVal: card.value || '',
- tooltip: '鏂囨湰绫诲瀷锛屼細鏇挎崲鍐呭涓殑@username@銆丂fullName@銆丂login_city@銆丂appname@銆�',
+ tooltip: '鏂囨湰绫诲瀷锛屼細鏇挎崲鍐呭涓殑@username@銆丂fullName@銆丂mk_city@銆丂appname@銆丂bid@銆�',
required: true
},
{
type: 'file',
key: 'url',
label: '鍥剧墖/鏂囦欢',
+ tooltip: '浣跨敤闈欐�佸浘鐗囨椂锛孈icon@浠ｈ〃澶村儚銆�',
initVal: card.url || '',
maxfile: 1,
required: true
@@ -160,6 +161,16 @@
required: true
},
{
+ type: 'number',
+ key: 'decimal',
+ min: 0,
+ max: 18,
+ decimal: 0,
+ label: '灏忔暟浣�',
+ initVal: card.decimal === undefined ? '' : card.decimal,
+ required: false
+ },
+ {
type: 'select',
key: 'format',
label: '鏍煎紡鍖�',
@@ -171,6 +182,7 @@
{ value: 'percent', text: '鐧惧垎鏁�' },
{ value: 'thdSeparator', text: '鍗冨垎浣�' },
{ value: 'abs', text: '缁濆鍊�' },
+ { value: 'encryption', text: '鍔犲瘑'},
{ value: 'YYYY-MM-DD', text: 'YYYY-MM-DD' },
{ value: 'YYYY-MM-DD HH:mm', text: 'YYYY-MM-DD HH:mm' },
{ value: 'YYYY-MM-DD HH:mm:ss', text: 'YYYY-MM-DD HH:mm:ss' },
@@ -196,16 +208,6 @@
{ value: 'YYYY-MM-DD HH:mm', text: 'YYYY-MM-DD HH:mm' },
{ value: 'YYYY-MM-DD HH:mm:ss', text: 'YYYY-MM-DD HH:mm:ss' },
]
- },
- {
- type: 'number',
- key: 'decimal',
- min: 0,
- max: 18,
- decimal: 0,
- label: '灏忔暟浣�',
- initVal: card.decimal === undefined ? '' : card.decimal,
- required: false
},
{
type: 'text',
@@ -345,7 +347,7 @@
max: 10,
label: '楂樺害(琛�)',
initVal: card.height !== undefined ? card.height : 1,
- tooltip: '鍐呭鏄剧ず琛屾暟锛屽�间负绌烘椂楂樺害鑷�傚簲锛屾敞锛氳嚜閫傚簲楂樺害浠呭湪璁剧疆鍗＄墖楂樺害鍚庢湁鏁堛��',
+ tooltip: '鍐呭鏄剧ず琛屾暟锛屽�间负绌烘椂楂樺害鑷�傚簲銆�',
required: false
},
{
@@ -412,7 +414,8 @@
min: 0,
max: 50,
label: '绾垮',
- initVal: card.borderWidth || 1,
+ initVal: card.borderWidth === undefined ? 1 : card.borderWidth,
+ tooltip: '绾垮涓�0鏃讹紝涓烘柟渚垮湪寮�鍙戞椂閫変腑榛樿楂樺害涓�10px锛岃娉ㄦ剰璋冩暣鍐呭杈硅窛銆�',
required: true
},
{
--
Gitblit v1.8.0