From 15762e4a3658e6afe5221d79d9ce4525300bfe8d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 24 八月 2023 17:54:11 +0800
Subject: [PATCH] 2023-08-24

---
 src/menu/components/card/double-data-card/options.jsx |  122 +++++++++++++++++++++++++---------------
 1 files changed, 76 insertions(+), 46 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..778fe4c 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,16 +199,59 @@
       required: false
     },
     {
+      type: 'number',
+      field: 'minWidth',
+      label: '鏈�灏忓搴�',
+      min: 0,
+      max: 5000,
+      precision: 0,
+      initval: wrap.minWidth,
+      tooltip: '璁剧疆鍗$墖鍖哄煙鐨勬渶灏忓搴︼紝鏄剧ず鍖哄煙灏忎簬姝ゅ�煎皢鍑虹幇妯悜婊氬姩銆�',
+      required: false
+    },
+    {
+      type: 'number',
+      field: 'zHeight',
+      label: '楂樺害',
+      min: 10,
+      max: 5000,
+      precision: 0,
+      initval: wrap.zHeight,
+      tooltip: '鍗$墖鍖哄煙楂樺害锛屽唴瀹硅秴鍑烘椂绾靛悜婊氬姩銆傛敞锛氬皬浜庣瓑浜�100鏃朵负楂樺害鐨勭櫨鍒嗘瘮锛岀涓�涓墿灞曞睘鎬у崱灏嗗畾浣嶅湪椤堕儴銆�',
+      required: false,
+      forbid: appType === 'mob'
+    },
+    {
+      type: 'color',
+      field: 'zBColor',
+      label: '杈规棰滆壊',
+      initval: wrap.zBColor || 'transparent',
+      tooltip: '鍗$墖鍖哄煙璁剧疆楂樺害鎴栨渶灏忓搴︽椂锛屾粴鍔ㄥ尯鍩熻竟妗嗙殑棰滆壊銆�',
+      required: false
+    },
+    {
       type: 'radio',
       field: 'permission',
       label: '鏉冮檺楠岃瘉',
-      initval: wrap.permission || 'false',
+      initval: wrap.permission || (!appType ? 'true' : 'false'),
       required: false,
       options: [
-        {value: 'true', label: '鍚敤'},
+        {value: 'true', label: !appType ? '缁ф壙鑿滃崟' : '鍚敤'},
         {value: 'false', label: '绂佺敤'},
       ],
-      forbid: !appType || sessionStorage.getItem('editMenuType') === 'popview'
+      forbid: sessionStorage.getItem('editMenuType') === 'popview'
+    },
+    {
+      type: 'radio',
+      field: 'cacheLocal',
+      label: '鏈湴缂撳瓨',
+      initval: wrap.cacheLocal || 'true',
+      required: false,
+      options: [
+        {value: 'true', label: '缁ф壙鑿滃崟'},
+        {value: 'false', label: '绂佺敤'},
+      ],
+      forbid: sessionStorage.getItem('editMenuType') === 'popview'
     },
     {
       type: 'multiselect',

--
Gitblit v1.8.0