From 0fe7659a978cbedd95715bbba93b9edf65176640 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 24 十二月 2021 21:35:21 +0800
Subject: [PATCH] 2021-12-24
---
src/tabviews/zshare/actionList/exceloutbutton/index.jsx | 4 ++--
src/tabviews/zshare/actionList/tabbutton/index.jsx | 4 ++--
src/tabviews/zshare/actionList/newpagebutton/index.jsx | 4 ++--
src/tabviews/zshare/actionList/popupbutton/index.jsx | 4 ++--
src/tabviews/zshare/actionList/normalbutton/index.jsx | 4 ++--
src/tabviews/zshare/actionList/changeuserbutton/index.jsx | 4 ++--
src/tabviews/zshare/actionList/excelInbutton/index.jsx | 4 ++--
src/tabviews/zshare/actionList/printbutton/index.jsx | 4 ++--
8 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/tabviews/zshare/actionList/changeuserbutton/index.jsx b/src/tabviews/zshare/actionList/changeuserbutton/index.jsx
index 55fbf4a..21c1835 100644
--- a/src/tabviews/zshare/actionList/changeuserbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/changeuserbutton/index.jsx
@@ -65,7 +65,7 @@
}
UNSAFE_componentWillReceiveProps (nextProps) {
- const { btn, selectedData } = this.props
+ const { btn, selectedData, BData } = this.props
if (btn.controlField && !is(fromJS(nextProps.selectedData || []), fromJS(selectedData || []))) {
let disabled = false
@@ -79,7 +79,7 @@
})
}
this.setState({disabled, hidden: disabled && btn.control === 'hidden'})
- } else if (btn.control === 'parent') {
+ } else if (btn.control === 'parent' && !is(fromJS(nextProps.BData || {}), fromJS(BData || {}))) {
if (!nextProps.BData || !nextProps.BData.hasOwnProperty(btn.controlField)) {
this.setState({hidden: true})
} else {
diff --git a/src/tabviews/zshare/actionList/excelInbutton/index.jsx b/src/tabviews/zshare/actionList/excelInbutton/index.jsx
index 617357d..c146924 100644
--- a/src/tabviews/zshare/actionList/excelInbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/excelInbutton/index.jsx
@@ -70,7 +70,7 @@
}
UNSAFE_componentWillReceiveProps (nextProps) {
- const { btn, selectedData } = this.props
+ const { btn, selectedData, BData } = this.props
if (btn.controlField && !is(fromJS(nextProps.selectedData || []), fromJS(selectedData || []))) {
let disabled = false
@@ -84,7 +84,7 @@
})
}
this.setState({disabled, hidden: disabled && btn.control === 'hidden'})
- } else if (btn.control === 'parent') {
+ } else if (btn.control === 'parent' && !is(fromJS(nextProps.BData || {}), fromJS(BData || {}))) {
if (!nextProps.BData || !nextProps.BData.hasOwnProperty(btn.controlField)) {
this.setState({hidden: true})
} else {
diff --git a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
index 79ef835..b8be25b 100644
--- a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
@@ -61,9 +61,9 @@
}
UNSAFE_componentWillReceiveProps (nextProps) {
- const { btn } = this.props
+ const { btn, BData } = this.props
- if (btn.control === 'parent') {
+ if (btn.control === 'parent' && !is(fromJS(nextProps.BData || {}), fromJS(BData || {}))) {
if (!nextProps.BData || !nextProps.BData.hasOwnProperty(btn.controlField)) {
this.setState({hidden: true})
} else {
diff --git a/src/tabviews/zshare/actionList/newpagebutton/index.jsx b/src/tabviews/zshare/actionList/newpagebutton/index.jsx
index dade94c..3038569 100644
--- a/src/tabviews/zshare/actionList/newpagebutton/index.jsx
+++ b/src/tabviews/zshare/actionList/newpagebutton/index.jsx
@@ -62,7 +62,7 @@
}
UNSAFE_componentWillReceiveProps (nextProps) {
- const { btn, selectedData } = this.props
+ const { btn, selectedData, BData } = this.props
if (btn.controlField && !is(fromJS(nextProps.selectedData || []), fromJS(selectedData || []))) {
let disabled = false
@@ -76,7 +76,7 @@
})
}
this.setState({disabled, hidden: disabled && btn.control === 'hidden'})
- } else if (btn.control === 'parent') {
+ } else if (btn.control === 'parent' && !is(fromJS(nextProps.BData || {}), fromJS(BData || {}))) {
if (!nextProps.BData || !nextProps.BData.hasOwnProperty(btn.controlField)) {
this.setState({hidden: true})
} else {
diff --git a/src/tabviews/zshare/actionList/normalbutton/index.jsx b/src/tabviews/zshare/actionList/normalbutton/index.jsx
index 5d0b6c5..c29c578 100644
--- a/src/tabviews/zshare/actionList/normalbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/normalbutton/index.jsx
@@ -96,7 +96,7 @@
}
UNSAFE_componentWillReceiveProps (nextProps) {
- const { btn, selectedData } = this.props
+ const { btn, selectedData, BData } = this.props
if (btn.controlField && !is(fromJS(nextProps.selectedData || []), fromJS(selectedData || []))) {
let disabled = false
@@ -110,7 +110,7 @@
})
}
this.setState({disabled, hidden: disabled && btn.control === 'hidden'})
- } else if (btn.control === 'parent') {
+ } else if (btn.control === 'parent' && !is(fromJS(nextProps.BData || {}), fromJS(BData || {}))) {
if (!nextProps.BData || !nextProps.BData.hasOwnProperty(btn.controlField)) {
this.setState({hidden: true})
} else {
diff --git a/src/tabviews/zshare/actionList/popupbutton/index.jsx b/src/tabviews/zshare/actionList/popupbutton/index.jsx
index d390060..bf0e1e3 100644
--- a/src/tabviews/zshare/actionList/popupbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/popupbutton/index.jsx
@@ -73,7 +73,7 @@
}
UNSAFE_componentWillReceiveProps (nextProps) {
- const { btn, selectedData } = this.props
+ const { btn, selectedData, BData } = this.props
if (btn.controlField && !is(fromJS(nextProps.selectedData || []), fromJS(selectedData || []))) {
let disabled = false
@@ -87,7 +87,7 @@
})
}
this.setState({disabled, hidden: disabled && btn.control === 'hidden'})
- } else if (btn.control === 'parent') {
+ } else if (btn.control === 'parent' && !is(fromJS(nextProps.BData || {}), fromJS(BData || {}))) {
if (!nextProps.BData || !nextProps.BData.hasOwnProperty(btn.controlField)) {
this.setState({hidden: true})
} else {
diff --git a/src/tabviews/zshare/actionList/printbutton/index.jsx b/src/tabviews/zshare/actionList/printbutton/index.jsx
index 26e90e8..bdd11c0 100644
--- a/src/tabviews/zshare/actionList/printbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/printbutton/index.jsx
@@ -87,7 +87,7 @@
}
UNSAFE_componentWillReceiveProps (nextProps) {
- const { btn, selectedData } = this.props
+ const { btn, selectedData, BData } = this.props
if (btn.controlField && !is(fromJS(nextProps.selectedData || []), fromJS(selectedData || []))) {
let disabled = false
@@ -101,7 +101,7 @@
})
}
this.setState({disabled, hidden: disabled && btn.control === 'hidden'})
- } else if (btn.control === 'parent') {
+ } else if (btn.control === 'parent' && !is(fromJS(nextProps.BData || {}), fromJS(BData || {}))) {
if (!nextProps.BData || !nextProps.BData.hasOwnProperty(btn.controlField)) {
this.setState({hidden: true})
} else {
diff --git a/src/tabviews/zshare/actionList/tabbutton/index.jsx b/src/tabviews/zshare/actionList/tabbutton/index.jsx
index d134b84..ae74881 100644
--- a/src/tabviews/zshare/actionList/tabbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/tabbutton/index.jsx
@@ -62,7 +62,7 @@
}
UNSAFE_componentWillReceiveProps (nextProps) {
- const { btn, selectedData } = this.props
+ const { btn, selectedData, BData } = this.props
if (btn.controlField && !is(fromJS(nextProps.selectedData || []), fromJS(selectedData || []))) {
let disabled = false
@@ -76,7 +76,7 @@
})
}
this.setState({disabled, hidden: disabled && btn.control === 'hidden'})
- } else if (btn.control === 'parent') {
+ } else if (btn.control === 'parent' && !is(fromJS(nextProps.BData || {}), fromJS(BData || {}))) {
if (!nextProps.BData || !nextProps.BData.hasOwnProperty(btn.controlField)) {
this.setState({hidden: true})
} else {
--
Gitblit v1.8.0