From fe227dd3d6c4ff9fd031033c15ae7b873dbf5535 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 31 三月 2022 22:39:47 +0800
Subject: [PATCH] 2022-03-31

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

diff --git a/src/menu/components/card/data-card/options.jsx b/src/menu/components/card/data-card/options.jsx
index ab2ea6d..9001f8b 100644
--- a/src/menu/components/card/data-card/options.jsx
+++ b/src/menu/components/card/data-card/options.jsx
@@ -86,9 +86,9 @@
         {value: 'grid', label: '鏍呮牸甯冨眬'},
         {value: 'flex', label: '寮规�у竷灞�'},
       ],
-      controlFields: [
-        {field: 'cardFloat', values: ['grid']},
-      ],
+      controlFields: subtype !== 'propcard' ? [
+        {field: 'printHeight', values: ['flex']},
+      ] : [],
       forbid: subtype === 'tablecard'
     },
     {
@@ -218,7 +218,19 @@
         {value: 'content', label: '鍐呭'},
         {value: 'headerOrfooter', label: '椤电湁/椤佃剼'},
       ],
+      controlFields: [
+        {field: 'printHeight', values: ['content']},
+      ],
       forbid: subtype !== 'propcard' || MenuType !== 'billPrint'
+    },
+    {
+      type: 'number',
+      field: 'printHeight',
+      label: '鎹㈢畻楂樺害',
+      initval: wrap.printHeight || '',
+      tooltip: subtype !== 'propcard' ? '褰撳墠鏁版嵁鍗¢珮搴︾浉褰撲簬鍑犳潯鏁版嵁銆�' : '褰撳墠灞炴�у崱楂樺害鐩稿綋浜庡嚑鏉℃暟鎹��',
+      required: false,
+      forbid: subtype === 'tablecard' || MenuType !== 'billPrint'
     },
     {
       type: 'select',
@@ -358,11 +370,11 @@
     }
   ]
 
-  return cardWrapForm.map(item => {
+  return cardWrapForm.filter(item => {
     if (['pagestyle'].includes(item.field)) {
       item.options = item.options.filter(option => !option.forbid)
     }
 
-    return item
+    return !item.forbid
   })
 } 
\ No newline at end of file

--
Gitblit v1.8.0