From af6486b3629d23e426ce85b87dbc20dfa15b1afe Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 07 十一月 2022 18:50:27 +0800
Subject: [PATCH] 2022-11-07
---
src/tabviews/zshare/settingcomponent/index.jsx | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/src/tabviews/zshare/settingcomponent/index.jsx b/src/tabviews/zshare/settingcomponent/index.jsx
index 54dba0b..2f137ee 100644
--- a/src/tabviews/zshare/settingcomponent/index.jsx
+++ b/src/tabviews/zshare/settingcomponent/index.jsx
@@ -41,7 +41,7 @@
if (config.Template === 'CommonTable' || config.Template === 'TreePage') {
this.getPageConfig()
- } else if (config.Template === 'CustomPage') {
+ } else if (config.Template === 'CustomPage' || config.Template === 'BaseTable') {
this.getCustomPageConfig()
} else {
notification.warning({
@@ -82,7 +82,7 @@
if (cell.OpenType === 'funcbutton' && cell.funcType === 'print') {
cell.$port = cell.verify ? cell.verify.linkUrl : ''
- if (cell.verify && cell.verify.printerTypeList) {
+ if (cell.verify && cell.verify.printerTypeList && cell.verify.printerTypeList.length > 0) {
cell.verify.printerTypeList = cell.verify.printerTypeList.map(_cell => {
_cell.uuid = _cell.uuid || _cell.key
_cell.parentId = cell.uuid
@@ -106,7 +106,7 @@
if (cell.OpenType === 'funcbutton' && cell.funcType === 'print') {
cell.$port = cell.verify ? cell.verify.linkUrl : ''
- if (cell.verify && cell.verify.printerTypeList) {
+ if (cell.verify && cell.verify.printerTypeList && cell.verify.printerTypeList.length > 0) {
cell.verify.printerTypeList = cell.verify.printerTypeList.map(_cell => {
_cell.uuid = _cell.uuid || _cell.key
_cell.parentId = cell.uuid
@@ -119,7 +119,7 @@
printbtns.push(cell)
}
- _comp.action.push({...cell, ...(userConfig[cell.uuid] || {})})
+ _comp.action.push({...cell, $line: true, ...(userConfig[cell.uuid] || {})})
})
card.backElements && card.backElements.forEach(cell => {
if (cell.eleType !== 'button') return
@@ -127,7 +127,7 @@
if (cell.OpenType === 'funcbutton' && cell.funcType === 'print') {
cell.$port = cell.verify ? cell.verify.linkUrl : ''
- if (cell.verify && cell.verify.printerTypeList) {
+ if (cell.verify && cell.verify.printerTypeList && cell.verify.printerTypeList.length > 0) {
cell.verify.printerTypeList = cell.verify.printerTypeList.map(_cell => {
_cell.uuid = _cell.uuid || _cell.key
_cell.parentId = cell.uuid
@@ -140,7 +140,7 @@
printbtns.push(cell)
}
- _comp.action.push({...cell, ...(userConfig[cell.uuid] || {})})
+ _comp.action.push({...cell, $line: true, ...(userConfig[cell.uuid] || {})})
})
})
} else if (item.type === 'table') {
@@ -151,7 +151,7 @@
if (cell.OpenType === 'funcbutton' && cell.funcType === 'print') {
cell.$port = cell.verify ? cell.verify.linkUrl : ''
- if (cell.verify && cell.verify.printerTypeList) {
+ if (cell.verify && cell.verify.printerTypeList && cell.verify.printerTypeList.length > 0) {
cell.verify.printerTypeList = cell.verify.printerTypeList.map(_cell => {
_cell.uuid = _cell.uuid || _cell.key
_cell.parentId = cell.uuid
@@ -164,7 +164,7 @@
printbtns.push(cell)
}
- _comp.action.push({...cell, ...(userConfig[cell.uuid] || {})})
+ _comp.action.push({...cell, $line: true, ...(userConfig[cell.uuid] || {})})
})
})
}
@@ -269,7 +269,7 @@
item.printer = _item ? (_item.printer || '') : ''
item.$port = item.verify ? item.verify.linkUrl : ''
- if (item.verify && item.verify.printerTypeList) {
+ if (item.verify && item.verify.printerTypeList && item.verify.printerTypeList.length > 0) {
item.verify.printerTypeList = item.verify.printerTypeList.map(cell => {
cell.uuid = cell.uuid || cell.key
cell.parentId = item.uuid
@@ -424,7 +424,7 @@
components.forEach(com => {
com.action.forEach(item => {
- if (item.shortcut && item.shortcut.length > 0) {
+ if (item.shortcut && item.shortcut.length > 0 && !item.$line) {
_LongParam.action.push({uuid: item.uuid, parentId: com.uuid, shortcut: item.shortcut, $shortcut: item.shortcut.join('+')})
}
if (item.funcType === 'print' && (item.printer || item.verify.printerTypeList)) {
@@ -531,6 +531,7 @@
]}
destroyOnClose
>
+ <div className="tip">娉細琛岀骇鎸夐挳蹇嵎閿缃棤鏁堛��</div>
{components && components.length > 0 ? components.map(item => (
<div key={item.uuid}>
<p className="component-title">{item.title}</p>
--
Gitblit v1.8.0