From bbcb3f45ad0ef4c808bf5a68ec10c0464c094e2f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 27 十月 2021 11:51:40 +0800
Subject: [PATCH] Merge branch 'master' into bms
---
src/menu/components/table/normal-table/index.jsx | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/menu/components/table/normal-table/index.jsx b/src/menu/components/table/normal-table/index.jsx
index 075ebfa..fe363e0 100644
--- a/src/menu/components/table/normal-table/index.jsx
+++ b/src/menu/components/table/normal-table/index.jsx
@@ -55,8 +55,8 @@
dataName: card.dataName || '',
width: card.width || 24,
search: [
- { origin: true, uuid: Utils.getuuid(), label: 'label', type: 'text', match: 'like' },
- { origin: true, uuid: Utils.getuuid(), label: 'label', type: 'select', match: 'equal' }
+ { origin: true, uuid: Utils.getuuid(), label: 'label', field: '', type: 'text', match: 'like' },
+ { origin: true, uuid: Utils.getuuid(), label: 'label', field: '', type: 'select', match: 'equal' }
],
action: [
{ origin: true, uuid: Utils.getuuid(), label: '娣诲姞', intertype: 'system', OpenType: 'pop', execSuccess: 'grid', icon: 'plus', class: 'green', style: {color: 'rgb(255, 255, 255)', background: 'rgb(38, 194, 129)', marginRight: '15px'} },
@@ -66,7 +66,7 @@
name: card.name,
subtype: card.subtype,
setting: { interType: 'system' },
- wrap: { name: card.name, width: card.width || 24, bordered: 'true', tableType: 'checkbox' },
+ wrap: { name: card.name, width: card.width || 24, bordered: 'true', tableType: 'checkbox', show: 'true' },
style: { marginLeft: '8px', marginRight: '8px', marginTop: '8px', marginBottom: '8px' },
headerStyle: { fontSize: '16px', borderBottomWidth: '1px', borderBottomColor: '#e8e8e8' },
columns: [],
--
Gitblit v1.8.0