From 8d66ff34fae5b048a6b7923cc75d34f13a08be9d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 02 八月 2022 11:42:43 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/components/card/data-card/options.jsx | 27 +++++++++++++++++++++------
1 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/src/menu/components/card/data-card/options.jsx b/src/menu/components/card/data-card/options.jsx
index 913aba8..64bbde6 100644
--- a/src/menu/components/card/data-card/options.jsx
+++ b/src/menu/components/card/data-card/options.jsx
@@ -4,10 +4,11 @@
/**
* @description Wrap琛ㄥ崟閰嶇疆淇℃伅
*/
-export default function (wrap, subtype, columns = [], id = '', supNodes = []) {
+export default function (wrap, subtype, columns = [], id = '', supNodes = [], setting) {
let appType = sessionStorage.getItem('appType')
let MenuType = ''
let menu = fromJS(window.GLOB.customMenu).toJS()
+ let laypage = setting && setting.laypage !== 'false'
if (menu.parentId === 'BillPrintTemp') {
MenuType = 'billPrint'
@@ -115,10 +116,14 @@
initval: wrap.pagestyle || 'page',
tooltip: '鏁版嵁婧愰�夋嫨鍒嗛〉鏃舵湁鏁堛�傛敞锛氭粦鍔ㄥ姞杞藉彧鏈夌涓�涓湁鏁�',
required: false,
+ disabled: !laypage,
options: [
{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'))
},
@@ -168,7 +173,8 @@
{value: 'false', label: '鏃�'},
{value: 'init', label: '鍒濆鍖�'},
{value: 'always', label: '鏁版嵁鍔犺浇'},
- ]
+ ],
+ forbid: subtype === 'tablecard'
},
{
type: 'select',
@@ -183,8 +189,8 @@
{value: 'backFont', label: '鑳屾櫙+鏂囧瓧'},
{value: 'font', label: '鏂囧瓧'},
...(subtype === 'datacard' && appType === 'mob' ? [{value: 'check', label: '鍕鹃��'}] : [])
- ]
- // forbid: subtype !== 'propcard'
+ ],
+ forbid: subtype === 'tablecard'
},
// {
// type: 'radio',
@@ -387,9 +393,9 @@
{
type: 'text',
field: 'controlVal',
- label: '鎺у埗鍊�',
+ label: '绂佺敤鍊�',
initval: wrap.controlVal || '',
- tooltip: '褰撳瓧娈靛�间笌鎺у埗鍊肩浉绛夋椂锛岃鏁版嵁浼氱鐢紝澶氫釜鍊肩敤閫楀彿鍒嗛殧銆�',
+ tooltip: '褰撳瓧娈靛�间笌绂佺敤鍊肩浉绛夋椂锛岃鏁版嵁浼氱鐢紝澶氫釜鍊肩敤閫楀彿鍒嗛殧銆�',
required: false,
forbid: subtype !== 'datacard'
},
@@ -431,6 +437,15 @@
forbid: !!appType
},
{
+ type: 'text',
+ field: 'slidetip',
+ label: '搴曢儴鎻愮ず',
+ initval: wrap.slidetip || wrap.slidetip === '' ? wrap.slidetip : '娌℃湁鏇村浜�',
+ tooltip: '婊戝姩鍔犺浇鑷冲簳閮ㄦ椂鐨勬彁绀轰俊鎭��',
+ required: false,
+ forbid: !laypage || appType !== 'mob' || subtype === 'propcard'
+ },
+ {
type: 'table',
field: 'supNodes',
label: '涓婄骇缁勪欢',
--
Gitblit v1.8.0