From cf62796bdc550a1fd35b15dd7bd39ba58cac82aa Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 01 十一月 2022 18:19:37 +0800
Subject: [PATCH] 2022-11-01

---
 src/menu/components/share/actioncomponent/formconfig.jsx |   19 ++++++++++++++++---
 1 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/menu/components/share/actioncomponent/formconfig.jsx b/src/menu/components/share/actioncomponent/formconfig.jsx
index 22eae11..a371f8a 100644
--- a/src/menu/components/share/actioncomponent/formconfig.jsx
+++ b/src/menu/components/share/actioncomponent/formconfig.jsx
@@ -201,7 +201,7 @@
   }
 
   let closetab = []
-  if (!appType) {
+  if (!appType && viewType !== 'popview') {
     closetab = [{
       value: 'closetab',
       text: '鍏抽棴鏍囩'
@@ -1029,13 +1029,12 @@
  * @param {*} setting        缁勪欢閰嶇疆
  * @param {*} usefulFields   瀛樺偍杩囩▼鍙敤鐨勫紑濮嬪瓧娈�
  */
-export function getBaseTableActionForm (card, functip, config, usefulFields) {
+export function getBaseTableActionForm (card, functip, config, usefulFields, modules) {
   let viewType = sessionStorage.getItem('editMenuType') // 寮圭獥 popview
   let printTemps = sessionStorage.getItem('printTemps')
   printTemps = printTemps ? JSON.parse(printTemps) : []
   let setting = config.setting || {}
   let columns = config.columns || []
-  let modules = []
 
   let opentypes = [
     {
@@ -1069,6 +1068,8 @@
   ]
 
   let pageTemps = [
+    // { value: 'print', text: '鏍囩鎵撳嵃妯℃澘' },
+    // { value: 'billprintTemp', text: '鍗曟嵁鎵撳嵃妯℃澘' },
     { value: 'billprint', text: '鍗曟嵁鎵撳嵃' },
     { value: 'pay', text: '鏀粯' },
     { value: 'custom', text: '鑷畾涔�' }
@@ -1447,6 +1448,18 @@
       }]
     },
     {
+      type: 'number',
+      key: 'width',
+      min: 1,
+      max: 24,
+      precision: 0,
+      label: '瀹藉害',
+      initVal: card.width || 12,
+      tooltip: '鏍呮牸甯冨眬锛屾瘡琛岀瓑鍒嗕负24鍒椼��',
+      forbid: card.eleType !== 'button',
+      required: true
+    },
+    {
       type: 'icon',
       key: 'icon',
       label: '鍥炬爣',

--
Gitblit v1.8.0