From fa381753ef2a2b25b1c0722549ac17e333da79be Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 06 九月 2022 22:50:54 +0800
Subject: [PATCH] 2022-09-06

---
 src/menu/components/card/cardcellcomponent/formconfig.jsx |   95 ++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 72 insertions(+), 23 deletions(-)

diff --git a/src/menu/components/card/cardcellcomponent/formconfig.jsx b/src/menu/components/card/cardcellcomponent/formconfig.jsx
index 863b7e1..1529d90 100644
--- a/src/menu/components/card/cardcellcomponent/formconfig.jsx
+++ b/src/menu/components/card/cardcellcomponent/formconfig.jsx
@@ -43,16 +43,8 @@
     }
   }
 
-  let dataTypes = [
-    { value: 'dynamic', text: '鍔ㄦ��' },
-    { value: 'static', text: '闈欐��' }
-  ]
   let tooltip = ''
   if (cardCell.$cardType === 'extendCard') {
-    // card.datatype = 'static'
-    // dataTypes = [
-    //   { value: 'static', text: '闈欐��' }
-    // ]
     tooltip = '鍦ㄦ墿灞曞崱鐗囦腑锛屽姩鎬佹暟鎹樉绀哄�间负鑾峰彇鍒扮殑绗竴琛屾暟鎹��'
   }
 
@@ -79,7 +71,10 @@
       initVal: card.datatype || 'static',
       tooltip,
       required: true,
-      options: dataTypes
+      options: [
+        { value: 'dynamic', text: '鍔ㄦ��' },
+        { value: 'static', text: '闈欐��' }
+      ]
     },
     {
       type: 'select',
@@ -95,13 +90,14 @@
       min: 0,
       label: '鍐呭',
       initVal: card.value || '',
-      tooltip: '鏂囨湰绫诲瀷锛屼細鏇挎崲鍐呭涓殑@username@銆丂fullName@銆丂login_city@銆�',
+      tooltip: '鏂囨湰绫诲瀷锛屼細鏇挎崲鍐呭涓殑@username@銆丂fullName@銆丂mk_city@銆丂appname@銆丂bid@銆�',
       required: true
     },
     {
       type: 'file',
       key: 'url',
       label: '鍥剧墖/鏂囦欢',
+      tooltip: '浣跨敤闈欐�佸浘鐗囨椂锛孈icon@浠h〃澶村儚銆�',
       initVal: card.url || '',
       maxfile: 1,
       required: true
@@ -129,6 +125,52 @@
       ]
     },
     {
+      type: 'number',
+      key: 'startTime',
+      precision: 0,
+      label: '寮�濮嬫椂闂�',
+      initVal: card.startTime || 0,
+      tooltip: '瑙嗛寮�濮嬫挱鏀剧殑鏃堕棿锛岀敤浜庤皟鏁磋棰戝垵濮嬪寲灞曠ず鐨勭晫闈€��',
+      required: false
+    },
+    {
+      type: 'radio',
+      key: 'posterType',
+      label: '棰勮鍥�',
+      initVal: card.posterType || '',
+      required: false,
+      options: [
+        { value: '', text: '鏃�' },
+        { value: 'dynamic', text: '鍔ㄦ��' },
+        { value: 'static', text: '闈欐��' }
+      ]
+    },
+    {
+      type: 'file',
+      key: 'posterUrl',
+      label: '棰勮鍦板潃',
+      initVal: card.posterUrl || '',
+      maxfile: 1,
+      required: true
+    },
+    {
+      type: 'select',
+      key: 'posterField',
+      label: '棰勮鍦板潃',
+      initVal: card.posterField || '',
+      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: '鏍煎紡鍖�',
@@ -140,7 +182,10 @@
         { 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' },
         { value: 'MM鏈圖D鏃�', text: 'MM鏈圖D鏃�' },
         { value: 'YYYY骞碝M鏈圖D鏃�', text: 'YYYY骞碝M鏈圖D鏃�' },
         { value: 'HH:mm', text: '鏃跺垎锛堜緥锛�16:57锛�' },
@@ -163,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',
@@ -311,8 +346,8 @@
       min: 1,
       max: 10,
       label: '楂樺害(琛�)',
-      initVal: card.height,
-      tooltip: '鍐呭鏄剧ず琛屾暟锛屽�间负绌烘椂楂樺害鑷�傚簲锛屾敞锛氳嚜閫傚簲楂樺害浠呭湪璁剧疆鍗$墖楂樺害鍚庢湁鏁堛��',
+      initVal: card.height !== undefined ? card.height : 1,
+      tooltip: '鍐呭鏄剧ず琛屾暟锛屽�间负绌烘椂楂樺害鑷�傚簲銆�',
       required: false
     },
     {
@@ -330,6 +365,7 @@
       key: 'anchors',
       label: '璺宠浆閿氱偣',
       initVal: card.anchors || [],
+      tooltip: sessionStorage.getItem('appType') === 'mob' ? '娉細灏忕▼搴忎腑鏃犳晥' : '',
       required: false,
       options: anchors
     },
@@ -378,7 +414,8 @@
       min: 0,
       max: 50,
       label: '绾垮',
-      initVal: card.borderWidth || 1,
+      initVal: card.borderWidth === undefined ? 1 : card.borderWidth,
+      tooltip: '绾垮涓�0鏃讹紝涓烘柟渚垮湪寮�鍙戞椂閫変腑榛樿楂樺害涓�10px锛岃娉ㄦ剰璋冩暣鍐呭杈硅窛銆�',
       required: true
     },
     {
@@ -556,6 +593,18 @@
       ]
     },
     {
+      type: 'radio',
+      key: 'copyable',
+      label: '鍙鍒�',
+      initVal: card.copyable || 'false',
+      tooltip: '鍏冪礌鏄惁鍙鍒讹紝澶嶅埗鍐呭涓嶅寘鎷墠缂�涓庡悗缂�銆�',
+      required: false,
+      options: [
+        { value: 'true', text: '鏄�' },
+        { value: 'false', text: '鍚�' }
+      ]
+    },
+    {
       type: 'number',
       key: 'fixSize',
       min: 10,

--
Gitblit v1.8.0