From 0a98c5dab4f2783ff5250cb69715340b40d801bb Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 05 四月 2023 18:23:08 +0800
Subject: [PATCH] 2023-04-05

---
 src/menu/components/card/double-data-card/options.jsx |   84 ++++++++++++++++++++---------------------
 1 files changed, 41 insertions(+), 43 deletions(-)

diff --git a/src/menu/components/card/double-data-card/options.jsx b/src/menu/components/card/double-data-card/options.jsx
index 2a7fabe..235adfa 100644
--- a/src/menu/components/card/double-data-card/options.jsx
+++ b/src/menu/components/card/double-data-card/options.jsx
@@ -3,13 +3,13 @@
  */
 export default function (wrap, columns = [], setting) {
   let appType = sessionStorage.getItem('appType')
-  let MenuType = ''
-  let menu = window.GLOB.customMenu
+  // let MenuType = ''
+  // let menu = window.GLOB.customMenu
   let laypage = setting && setting.laypage !== 'false'
 
-  if (menu.parentId === 'BillPrintTemp') {
-    MenuType = 'billPrint'
-  }
+  // if (menu.parentId === 'BillPrintTemp') {
+  //   MenuType = 'billPrint'
+  // }
 
   let roleList = sessionStorage.getItem('sysRoles')
 
@@ -65,22 +65,22 @@
       precision: 0,
       required: true
     },
-    {
-      type: 'radio',
-      field: 'layout',
-      label: '鍗＄墖甯冨眬',
-      initval: wrap.layout || 'grid',
-      tooltip: appType === 'mob' ? '寮规�у竷灞�鏃讹紝婊戝姩鍔犺浇鏃犳晥' : '',
-      required: false,
-      options: [
-        {value: 'grid', label: '鏍呮牸甯冨眬'},
-        {value: 'flex', label: '寮规�у竷灞�'},
-      ],
-      controlFields: [
-        {field: 'printHeight', values: ['flex']},
-        {field: 'cardFloat', values: ['grid']},
-      ]
-    },
+    // {
+    //   type: 'radio',
+    //   field: 'layout',
+    //   label: '鍗＄墖甯冨眬',
+    //   initval: wrap.layout || 'grid',
+    //   tooltip: appType === 'mob' ? '寮规�у竷灞�鏃讹紝婊戝姩鍔犺浇鏃犳晥' : '',
+    //   required: false,
+    //   options: [
+    //     {value: 'grid', label: '鏍呮牸甯冨眬'},
+    //     {value: 'flex', label: '寮规�у竷灞�'},
+    //   ],
+    //   controlFields: [
+    //     {field: 'printHeight', values: ['flex']},
+    //     {field: 'cardFloat', values: ['grid']},
+    //   ]
+    // },
     {
       type: 'radio',
       field: 'pagestyle',
@@ -146,19 +146,6 @@
     },
     {
       type: 'radio',
-      field: 'cardFloat',
-      label: '瀵归綈鏂瑰紡',
-      initval: wrap.cardFloat || 'left',
-      tooltip: '璁剧疆鍗＄墖鐨勫榻愭柟寮忋��',
-      required: false,
-      options: [
-        {value: 'left', label: '宸﹀榻�'},
-        {value: 'center', label: '灞呬腑'},
-        {value: 'right', label: '鍙冲榻�'},
-      ],
-    },
-    {
-      type: 'radio',
       field: 'parity',
       label: '濂囧伓鑳屾櫙',
       initval: wrap.parity || 'false',
@@ -169,15 +156,15 @@
         {value: 'true', label: '鏈�'},
       ],
     },
-    {
-      type: 'number',
-      field: 'printHeight',
-      label: '鎹㈢畻楂樺害',
-      initval: wrap.printHeight || '',
-      tooltip: '褰撳墠鏁版嵁鍗￠珮搴︾浉褰撲簬鍑犳潯鏁版嵁銆�',
-      required: false,
-      forbid: MenuType !== 'billPrint'
-    },
+    // {
+    //   type: 'number',
+    //   field: 'printHeight',
+    //   label: '鎹㈢畻楂樺害',
+    //   initval: wrap.printHeight || '',
+    //   tooltip: '褰撳墠鏁版嵁鍗￠珮搴︾浉褰撲簬鍑犳潯鏁版嵁銆�',
+    //   required: false,
+    //   forbid: MenuType !== 'billPrint'
+    // },
     {
       type: 'radio',
       field: 'empty',
@@ -212,6 +199,17 @@
       required: false
     },
     {
+      type: 'number',
+      field: 'minWidth',
+      label: '鏈�灏忓搴�',
+      min: 0,
+      max: 5000,
+      precision: 0,
+      initval: wrap.minWidth,
+      tooltip: '璁剧疆鍗＄墖鍖哄煙鐨勬渶灏忓搴︼紝鏄剧ず鍖哄煙灏忎簬姝ゅ�煎皢鍑虹幇妯悜婊氬姩銆�',
+      required: false
+    },
+    {
       type: 'radio',
       field: 'permission',
       label: '鏉冮檺楠岃瘉',

--
Gitblit v1.8.0