From 59db6fab9c1ed1fa5559d423d439e14ea33b1598 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 27 四月 2023 11:18:24 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/tabviews/custom/components/share/normalTable/index.jsx | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/src/tabviews/custom/components/share/normalTable/index.jsx b/src/tabviews/custom/components/share/normalTable/index.jsx
index 1926c23..993c4db 100644
--- a/src/tabviews/custom/components/share/normalTable/index.jsx
+++ b/src/tabviews/custom/components/share/normalTable/index.jsx
@@ -504,6 +504,8 @@
width: item.Width || 120
})
})
+
+ orderfields = null
}
if (rowspans.length === 0) {
@@ -816,7 +818,9 @@
pickup: false
})
- sorter.field = orderfields[sorter.field] || ''
+ if (orderfields) {
+ sorter.field = orderfields[sorter.field] || ''
+ }
this.props.refreshdata(pagination, filters, sorter)
}
@@ -991,8 +995,18 @@
loading = false
}
+ let fixed = ''
+ if (setting.colfixed && setting.colfixed.length) {
+ if (setting.colfixed.includes('first')) {
+ fixed = 'mk-fixed-first-col'
+ }
+ if (setting.colfixed.includes('last')) {
+ fixed += ' mk-fixed-last-col'
+ }
+ }
+
return (
- <div className={`normal-custom-table ${setting.tableHeader || ''} ${height ? 'fixed-height' : ''} ${setting.mode || ''} table-vertical-${setting.vertical || 'middle'} table-col-${columns.length}`} id={tableId}>
+ <div className={`normal-custom-table ${setting.tableHeader || ''} ${height ? 'fixed-height' : ''} ${setting.mode || ''} table-vertical-${setting.vertical || 'middle'} table-col-${columns.length} ${fixed}`} id={tableId}>
{(setting.tableType === 'radio' || setting.tableType === 'checkbox') && data && data.length > 0 ?
<Switch title="鏀惰捣" className="main-pickup" checkedChildren="寮�" unCheckedChildren="鍏�" checked={pickup} onChange={this.pickupChange} /> : null
}
--
Gitblit v1.8.0