From b33d3bdee2e5705937af6ff1f2fed45d778c9a36 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 20 六月 2023 00:10:23 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/templates/zshare/modalform/datatable/index.jsx | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/templates/zshare/modalform/datatable/index.jsx b/src/templates/zshare/modalform/datatable/index.jsx
index 75a9a67..8f3e62b 100644
--- a/src/templates/zshare/modalform/datatable/index.jsx
+++ b/src/templates/zshare/modalform/datatable/index.jsx
@@ -174,6 +174,7 @@
!is(fromJS(this.props.fields), fromJS(nextProps.fields)) ||
!is(fromJS(this.props.linkSubFields), fromJS(nextProps.linkSubFields)) ||
this.props.display !== nextProps.display ||
+ (nextProps.multiple && this.props.multiple !== nextProps.multiple) ||
this.props.type !== nextProps.type
) {
this.setState({editingKey: ''}, () => {
@@ -185,9 +186,9 @@
}
getCloumns = () => {
- const { display, fields, linkSubFields, transfield, type } = this.props
+ const { display, fields, linkSubFields, transfield, type, multiple } = this.props
let columns = []
- let keys = ['ParentID']
+ let keys = ['ParentID', 'pid']
if (display === 'picture') {
columns.push({
@@ -241,6 +242,14 @@
editable: true,
})
+ if (multiple === 'dropdown' && display === 'text') {
+ columns.unshift({
+ title: 'pid',
+ dataIndex: 'pid',
+ editable: true,
+ })
+ }
+
if (type === 'link') {
columns.unshift({
title: 'ParentID',
--
Gitblit v1.8.0