From 5c8860f3cd8921e7eb0da7749628e9dc669b3203 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 17 三月 2020 10:19:16 +0800
Subject: [PATCH] 2020-03-17
---
src/tabviews/tableshare/verifycard/index.jsx | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/src/tabviews/tableshare/verifycard/index.jsx b/src/tabviews/tableshare/verifycard/index.jsx
index 199789e..705a486 100644
--- a/src/tabviews/tableshare/verifycard/index.jsx
+++ b/src/tabviews/tableshare/verifycard/index.jsx
@@ -67,23 +67,23 @@
{
title: '鍚嶇О',
dataIndex: 'label',
- width: '20%'
+ width: '25%'
},
{
title: '蹇嵎閿�',
dataIndex: 'shortcut',
- width: '20%'
- },
- {
- title: '缁勫悎閿�',
- dataIndex: 'shortcutkey',
- width: '20%',
- render: (text, record) => keycode[text] || ''
+ width: '25%',
+ render: (text, record) => {
+ if (!record.shortcut || typeof(record.shortcut) !== 'object') return ''
+ let _text = keycode[record.shortcut[1]]
+
+ return record.shortcut[0] + ' + ' + _text
+ }
},
{
title: '鎵撳嵃鏈�',
dataIndex: 'printer',
- width: '20%'
+ width: '30%'
},
{
title: '鎿嶄綔',
@@ -100,7 +100,7 @@
UNSAFE_componentWillMount() {
const { config } = this.props
-
+
this.setState({
config: JSON.parse(JSON.stringify(config))
})
@@ -144,6 +144,7 @@
_config.action = _config.action.map(cell => {
if (item.uuid === cell.uuid) {
+
cell.printer = cell.printer || data.defaultPrinter
cell.printers = printers.map(print => {
return {
--
Gitblit v1.8.0