From 4587b07918b19e9724439d773b0ba28f388057df Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 15 五月 2023 21:05:40 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/tabviews/zshare/actionList/index.jsx | 84 +++++++++++++----------------------------
1 files changed, 27 insertions(+), 57 deletions(-)
diff --git a/src/tabviews/zshare/actionList/index.jsx b/src/tabviews/zshare/actionList/index.jsx
index df5de33..8723fa0 100644
--- a/src/tabviews/zshare/actionList/index.jsx
+++ b/src/tabviews/zshare/actionList/index.jsx
@@ -17,11 +17,11 @@
const PrintButton = asyncComponent(() => import('./printbutton'))
const FuncMegvii = asyncComponent(() => import('./funcMegvii'))
const FuncZip = asyncComponent(() => import('./funczip'))
+const EditLine = asyncComponent(() => import('./editLine'))
class ActionList extends Component {
static propTpyes = {
BID: PropTypes.any, // 涓昏〃ID
- lock: PropTypes.any, // 鍙紪杈戣〃涓寜閽攣瀹�
BData: PropTypes.any, // 涓昏〃鏁版嵁
selectedData: PropTypes.any, // 瀛愯〃涓�夋嫨鏁版嵁
MenuID: PropTypes.string, // 鑿滃崟ID
@@ -32,60 +32,21 @@
state = {
actions: [],
- mores: null,
- listId: ''
+ mores: null
}
UNSAFE_componentWillMount() {
const { setting, actions } = this.props
- let listId = (() => {
- let uuid = []
- let options = '0123456789abcdefghigklmnopqrstuv'
- for (let i = 0; i < 32; i++) {
- uuid.push(options.substr(Math.floor(Math.random() * 0x20), 1))
- }
- return uuid.join('')
- })()
-
if (!setting.btnlimit || setting.btnlimit >= actions.length) {
- this.setState({actions: actions, listId})
+ this.setState({actions: actions})
} else {
let mores = fromJS(actions).toJS()
this.setState({
actions: mores.splice(0, setting.btnlimit),
- mores,
- listId
+ mores
})
- }
- }
-
- componentDidMount() {
- const { actions, listId } = this.state
-
- if (actions.length > 9) {
- let node = document.getElementById(listId)
-
- // const resizeObserver = new ResizeObserver((entries) => {
-
- // })
- // resizeObserver.observe(node)
-
- let limit = 10
- let index = 1
- let check = () => {
- if (node.offsetHeight > 65) {
- node.classList.add('double-line')
- } else if (index < limit) {
- index++
- setTimeout(() => {
- check()
- }, 100)
- }
- }
-
- node && check()
}
}
@@ -94,14 +55,14 @@
}
getButtonList = (actions) => {
- const { BID, BData, MenuID, columns, setting, selectedData, lock } = this.props
+ const { BID, BData, MenuID, columns, setting, selectedData } = this.props
return actions.map(item => {
if (['exec', 'prompt', 'pop'].includes(item.OpenType)) {
return (
<NormalButton
key={item.uuid}
show={item.show || 'actionList'}
- disabled={lock || false}
+ disabled={false}
BID={BID}
btn={item}
BData={BData}
@@ -115,7 +76,7 @@
<ExcelInButton
key={item.uuid}
show={item.show || 'actionList'}
- disabled={lock || false}
+ disabled={false}
BID={BID}
btn={item}
BData={BData}
@@ -128,7 +89,7 @@
<ExcelOutButton
key={item.uuid}
show={item.show || 'actionList'}
- disabled={lock || false}
+ disabled={false}
BID={BID}
btn={item}
BData={BData}
@@ -141,7 +102,7 @@
<PopupButton
key={item.uuid}
show={item.show || 'actionList'}
- disabled={lock || false}
+ disabled={false}
BID={BID}
btn={item}
BData={BData}
@@ -154,7 +115,7 @@
<TabButton
key={item.uuid}
show={item.show || 'actionList'}
- disabled={lock || false}
+ disabled={false}
btn={item}
BID={BID}
BData={BData}
@@ -167,7 +128,7 @@
<NewPageButton
key={item.uuid}
show={item.show || 'actionList'}
- disabled={lock || false}
+ disabled={false}
btn={item}
BData={BData}
selectedData={selectedData}
@@ -179,7 +140,7 @@
<ChangeUserButton
key={item.uuid}
show={item.show || 'actionList'}
- disabled={lock || false}
+ disabled={false}
BID={BID}
btn={item}
BData={BData}
@@ -193,7 +154,7 @@
<PrintButton
key={item.uuid}
show={item.show || 'actionList'}
- disabled={lock || false}
+ disabled={false}
BID={BID}
btn={item}
BData={BData}
@@ -207,7 +168,7 @@
<FuncMegvii
key={item.uuid}
show={item.show || 'actionList'}
- disabled={lock || false}
+ disabled={false}
BID={BID}
btn={item}
setting={setting}
@@ -219,10 +180,19 @@
<FuncZip
key={item.uuid}
show={item.show || 'actionList'}
- disabled={lock || false}
+ disabled={false}
BID={BID}
btn={item}
setting={setting}
+ selectedData={selectedData}
+ />
+ )
+ } else if (item.funcType === 'addline' || item.funcType === 'delline') {
+ return (
+ <EditLine
+ key={item.uuid}
+ disabled={false}
+ btn={item}
selectedData={selectedData}
/>
)
@@ -234,12 +204,12 @@
render() {
const { setting } = this.props
- const { actions, mores, listId } = this.state
+ const { actions, mores } = this.state
if (setting.actionfixed === 'true') {
return (
<Affix offsetTop={48}>
- <div className="button-list toolbar-button" id={listId}>
+ <div className="button-list toolbar-button">
{this.getButtonList(actions)}
{mores ? <Dropdown overlay={<div className="mk-button-dropdown-wrap">{this.getButtonList(mores)}</div>} trigger={['hover']}>
<div className="mk-button-more">鏇村<DownOutlined/></div>
@@ -249,7 +219,7 @@
)
} else {
return (
- <div className="button-list toolbar-button" id={listId}>
+ <div className="button-list toolbar-button">
{this.getButtonList(actions)}
{mores ? <Dropdown overlay={<div className="mk-button-dropdown-wrap">{this.getButtonList(mores)}</div>} trigger={['hover']}>
<div className="mk-button-more">鏇村<DownOutlined/></div>
--
Gitblit v1.8.0