From 91e232bb0b910f3670bdbccd65cc218d55e1eda9 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 06 十二月 2022 16:08:20 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/components/table/normal-table/index.jsx | 24 +-----------------------
1 files changed, 1 insertions(+), 23 deletions(-)
diff --git a/src/menu/components/table/normal-table/index.jsx b/src/menu/components/table/normal-table/index.jsx
index 8f8f6a3..cd6df52 100644
--- a/src/menu/components/table/normal-table/index.jsx
+++ b/src/menu/components/table/normal-table/index.jsx
@@ -138,7 +138,6 @@
}
componentDidMount () {
- MKEmitter.addListener('submitModal', this.handleSave)
MKEmitter.addListener('completeSave', this.completeSave)
}
@@ -153,7 +152,6 @@
this.setState = () => {
return
}
- MKEmitter.removeListener('submitModal', this.handleSave)
MKEmitter.removeListener('completeSave', this.completeSave)
}
@@ -282,7 +280,7 @@
style.fontSize = card.wrap.fontSize || 14
style.fontWeight = card.wrap.fontWeight || 'normal'
- MKEmitter.emit('changeStyle', ['font1', 'background', 'border', 'padding', 'margin', 'shadow'], style, this.getStyle)
+ MKEmitter.emit('changeStyle', ['font1', 'background', 'border', 'padding', 'margin', 'shadow', 'clear'], style, this.getStyle)
}
getStyle = (style) => {
@@ -366,26 +364,6 @@
} else if (btn.OpenType === 'popview') {
MKEmitter.emit('changePopview', card, btn)
}
- }
-
- handleSave = (_cards, btn, modal) => {
- let card = fromJS(this.state.card).toJS()
-
- if (card.uuid !== _cards.uuid) return
-
- let _index = card.action.findIndex(cell => cell.uuid === btn.uuid)
-
- if (_index === -1) return
-
- card.action = card.action.map(cell => {
- if (cell.uuid === btn.uuid) {
- cell.modal = modal
- }
-
- return cell
- })
-
- this.updateComponent(card)
}
getWrapForms = () => {
--
Gitblit v1.8.0