From c1f9e05741e64087ebbfa5e1185bfd0beeb4eeb5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 07 一月 2022 17:50:18 +0800
Subject: [PATCH] 2022-01-07
---
src/menu/components/card/cardcellcomponent/formconfig.jsx | 87 +++++++++++++++++++++++++++----------------
1 files changed, 55 insertions(+), 32 deletions(-)
diff --git a/src/menu/components/card/cardcellcomponent/formconfig.jsx b/src/menu/components/card/cardcellcomponent/formconfig.jsx
index 4d4da5e..c101166 100644
--- a/src/menu/components/card/cardcellcomponent/formconfig.jsx
+++ b/src/menu/components/card/cardcellcomponent/formconfig.jsx
@@ -136,7 +136,15 @@
{ value: '', text: '鏃�' },
{ value: 'percent', text: '鐧惧垎鏁�' },
{ value: 'thdSeparator', text: '鍗冨垎浣�' },
- { value: 'YYYY-MM-DD', text: 'YYYY-MM-DD' }
+ { value: 'abs', text: '缁濆鍊�' },
+ { value: 'YYYY-MM-DD', text: 'YYYY-MM-DD' },
+ { value: 'MM鏈圖D鏃�', text: 'MM鏈圖D鏃�' },
+ { value: 'YYYY骞碝M鏈圖D鏃�', text: 'YYYY骞碝M鏈圖D鏃�' },
+ { value: 'HH:mm', text: '鏃跺垎锛堜緥锛�16:57锛�' },
+ { value: 'ahh:mm', text: '鑷畾涔�1锛堜緥锛氫笂鍗�10:57锛�' },
+ { value: 'MM鏈圖D鏃� ahh:mm', text: '鑷畾涔�2锛堜緥锛�12鏈�17鏃� 涓婂崍10:57锛�' },
+ { value: 'calendar1', text: '鑷畾涔�3锛堜緥锛氫粖澶� 涓婂崍10:57锛�' },
+ { value: 'calendar2', text: '鑷畾涔�4锛堜緥锛氬垰鍒氥�佹槰澶┿��5澶╁墠锛�' },
]
},
{
@@ -176,11 +184,31 @@
required: false
},
{
+ type: 'radio',
+ key: 'showType',
+ label: '灞曠幇褰㈠紡',
+ initVal: card.showType || 'line',
+ required: false,
+ options: [
+ { value: 'line', text: '杩涘害鏉�' },
+ { value: 'circle', text: '杩涘害鍦�' },
+ { value: 'dashboard', text: '浠〃鐩�' },
+ ]
+ },
+ {
type: 'color',
key: 'color',
label: '棰滆壊',
- initVal: card.color || 'rgba(0, 0, 0, 0.85)',
+ tooltip: '杩涘害鏉″畬鎴愬尯鍩熴�佸垎鍓茬嚎鎴栦簩缁寸爜鐨勯鑹层��',
+ initVal: card.color || '#1890ff',
required: true
+ },
+ {
+ type: 'color',
+ key: 'trailColor',
+ label: '鏈畬鎴愰鑹�',
+ initVal: card.trailColor || '#f5f5f5',
+ required: false
},
{
type: 'radio',
@@ -194,16 +222,11 @@
]
},
{
- type: 'radio',
- key: 'showType',
- label: '灞曠幇褰㈠紡',
- initVal: card.showType || 'line',
- required: false,
- options: [
- { value: 'line', text: '杩涘害鏉�' },
- { value: 'circle', text: '杩涘害鍦�' },
- { value: 'dashboard', text: '浠〃鐩�' },
- ]
+ type: 'color',
+ key: 'infoColor',
+ label: '杩涘害鍊奸鑹�',
+ initVal: card.infoColor || 'rgba(0, 0, 0, 0.65)',
+ required: false
},
{
type: 'radio',
@@ -380,7 +403,7 @@
initVal: card.link || '',
tooltip: '鍔ㄦ�佸湴鍧�涓虹粦瀹氬瓧娈靛�笺��',
required: false,
- forbid: isApp,
+ // forbid: isApp,
options: [
{ value: '', text: '鏃�' },
{ value: 'dynamic', text: '鍔ㄦ��' },
@@ -389,15 +412,15 @@
},
{
type: 'radio',
- key: 'link',
- label: '閾炬帴',
- initVal: card.link || '',
+ key: 'linkType',
+ label: '閾炬帴绫诲瀷',
+ initVal: card.linkType || 'other',
required: false,
- forbid: !isApp,
+ // forbid: isApp,
options: [
- { value: '', text: '鏃�' },
- { value: 'linkpage', text: '鍏宠仈鑿滃崟' },
- { value: 'custom', text: '閾炬帴' }
+ { value: 'tel', text: '鐢佃瘽' },
+ { value: 'email', text: '閭' },
+ { value: 'other', text: '鍏朵粬' }
]
},
{
@@ -420,18 +443,18 @@
forbid: !isApp,
options: appMenus
},
- {
- type: 'radio',
- key: 'open',
- label: '鎵撳紑鏂瑰紡',
- initVal: card.open || 'blank',
- required: false,
- forbid: !isApp,
- options: [
- { value: 'blank', text: '鏂伴〉闈�' },
- { value: 'self', text: '褰撳墠椤甸潰' }
- ]
- },
+ // {
+ // type: 'radio',
+ // key: 'open',
+ // label: '鎵撳紑鏂瑰紡',
+ // initVal: card.open || 'blank',
+ // required: false,
+ // forbid: !isApp,
+ // options: [
+ // { value: 'blank', text: '鏂伴〉闈�' },
+ // { value: 'self', text: '褰撳墠椤甸潰' }
+ // ]
+ // },
// {
// type: 'select',
// key: 'copyMenuId',
--
Gitblit v1.8.0