From ed1cc4adc145f8685d04763e19fbd6b0bd80c136 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 09 六月 2022 16:22:44 +0800
Subject: [PATCH] 2022-06-09

---
 src/menu/components/card/data-card/options.jsx |   37 ++++++++++++++++++++++++++++++++-----
 1 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/src/menu/components/card/data-card/options.jsx b/src/menu/components/card/data-card/options.jsx
index 01a1f13..18c7a2c 100644
--- a/src/menu/components/card/data-card/options.jsx
+++ b/src/menu/components/card/data-card/options.jsx
@@ -104,7 +104,8 @@
       ],
       controlFields: subtype !== 'propcard' ? [
         {field: 'printHeight', values: ['flex']},
-      ] : [],
+        {field: 'cardFloat', values: ['grid']},
+      ] : [{field: 'cardFloat', values: ['grid']}],
       forbid: subtype === 'tablecard'
     },
     {
@@ -118,6 +119,9 @@
         {value: 'page', label: '椤电爜'},
         {value: 'switch', label: '宸﹀彸鍒囨崲', forbid: appType === 'mob'},
         {value: 'slide', label: '婊戝姩鍔犺浇', forbid: appType !== 'mob'},
+      ],
+      controlFields: [
+        {field: 'slidetip', values: ['slide']},
       ],
       forbid: !(subtype === 'datacard' || (subtype === 'tablecard' && appType === 'mob'))
     },
@@ -161,12 +165,14 @@
       field: 'selected',
       label: '棣栬閫変腑',
       initval: wrap.selected || 'false',
+      tooltip: '褰撴寜閽墽琛屽畬鎴愬苟杩斿洖涓婚敭鍊兼椂锛岄粯璁ら�変腑涓婚敭鍊煎搴旇銆�',
       required: false,
       options: [
         {value: 'false', label: '鏃�'},
         {value: 'init', label: '鍒濆鍖�'},
         {value: 'always', label: '鏁版嵁鍔犺浇'},
-      ]
+      ],
+      forbid: subtype === 'tablecard'
     },
     {
       type: 'select',
@@ -181,8 +187,8 @@
         {value: 'backFont', label: '鑳屾櫙+鏂囧瓧'},
         {value: 'font', label: '鏂囧瓧'},
         ...(subtype === 'datacard' && appType === 'mob' ? [{value: 'check', label: '鍕鹃��'}] : [])
-      ]
-      // forbid: subtype !== 'propcard'
+      ],
+      forbid: subtype === 'tablecard'
     },
     // {
     //   type: 'radio',
@@ -201,7 +207,7 @@
       field: 'cardFloat',
       label: '瀵归綈鏂瑰紡',
       initval: wrap.cardFloat || 'left',
-      tooltip: '璁剧疆涓哄眳涓榻愭垨鍙冲榻愶紝鍙湪鍗＄墖涓�1琛屾椂鏈夋晥銆�',
+      tooltip: '璁剧疆鍗＄墖鐨勫榻愭柟寮忋��',
       required: false,
       options: [
         {value: 'left', label: '宸﹀榻�'},
@@ -408,6 +414,18 @@
       ]
     },
     {
+      type: 'radio',
+      field: 'permission',
+      label: '鏉冮檺楠岃瘉',
+      initval: wrap.permission || 'false',
+      required: false,
+      options: [
+        {value: 'true', label: '鍚敤'},
+        {value: 'false', label: '绂佺敤'},
+      ],
+      forbid: !appType
+    },
+    {
       type: 'multiselect',
       field: 'blacklist',
       label: '榛戝悕鍗�',
@@ -417,6 +435,15 @@
       forbid: !!appType
     },
     {
+      type: 'text',
+      field: 'slidetip',
+      label: '搴曢儴鎻愮ず',
+      initval: wrap.slidetip || wrap.slidetip === '' ? wrap.slidetip : '娌℃湁鏇村浜�',
+      tooltip: '婊戝姩鍔犺浇鑷冲簳閮ㄦ椂鐨勬彁绀轰俊鎭��',
+      required: false,
+      forbid: appType !== 'mob' || subtype === 'propcard'
+    },
+    {
       type: 'table',
       field: 'supNodes',
       label: '涓婄骇缁勪欢',

--
Gitblit v1.8.0