From 46f79b491173d284a4900d19e7aecf7509481438 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 21 一月 2022 17:21:25 +0800
Subject: [PATCH] 2022-01-21

---
 src/menu/components/card/cardcellcomponent/formconfig.jsx |   53 +++++++++++++++++++++++++++++++----------------------
 1 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/src/menu/components/card/cardcellcomponent/formconfig.jsx b/src/menu/components/card/cardcellcomponent/formconfig.jsx
index ac90789..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澶╁墠锛�' },
       ]
     },
     {
@@ -190,7 +198,8 @@
     {
       type: 'color',
       key: 'color',
-      label: '杩涘害鏉¢鑹�',
+      label: '棰滆壊',
+      tooltip: '杩涘害鏉″畬鎴愬尯鍩熴�佸垎鍓茬嚎鎴栦簩缁寸爜鐨勯鑹层��',
       initVal: card.color || '#1890ff',
       required: true
     },
@@ -394,7 +403,7 @@
       initVal: card.link || '',
       tooltip: '鍔ㄦ�佸湴鍧�涓虹粦瀹氬瓧娈靛�笺��',
       required: false,
-      forbid: isApp,
+      // forbid: isApp,
       options: [
         { value: '', text: '鏃�' },
         { value: 'dynamic', text: '鍔ㄦ��' },
@@ -403,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: '鍏朵粬' }
       ]
     },
     {
@@ -434,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