From 10c86c1fab41f01c7bf7fcb9d2f8b624142f6a54 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 13 九月 2022 14:42:33 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/components/form/simple-form/index.jsx | 28 ++++------------------------
1 files changed, 4 insertions(+), 24 deletions(-)
diff --git a/src/menu/components/form/simple-form/index.jsx b/src/menu/components/form/simple-form/index.jsx
index f09614f..7aa4c24 100644
--- a/src/menu/components/form/simple-form/index.jsx
+++ b/src/menu/components/form/simple-form/index.jsx
@@ -112,7 +112,6 @@
}
componentDidMount () {
- MKEmitter.addListener('submitStyle', this.getStyle)
MKEmitter.addListener('submitComponentStyle', this.updateComponentStyle)
}
@@ -127,7 +126,6 @@
this.setState = () => {
return
}
- MKEmitter.removeListener('submitStyle', this.getStyle)
MKEmitter.removeListener('submitComponentStyle', this.updateComponentStyle)
}
@@ -221,29 +219,11 @@
changeStyle = () => {
const { card } = this.state
- MKEmitter.emit('changeStyle', [card.uuid], ['height', 'background', 'border', 'padding', 'margin', 'shadow'], card.style)
+ MKEmitter.emit('changeStyle', ['height', 'background', 'border', 'padding', 'margin', 'shadow'], card.style, this.getStyle)
}
- getStyle = (comIds, style) => {
- const { card } = this.state
-
- if (comIds[0] === 'form') {
- let Index = card.subcards[0].fields.findIndex(n => n.uuid === comIds[1])
-
- if (Index === -1) return
-
- let _card = fromJS(card).toJS()
-
- _card.subcards[0].fields[Index].style = style
-
- this.updateComponent(_card)
-
- return
- }
-
- if (comIds.length !== 1 || comIds[0] !== card.uuid) return
-
- let _card = {...card, style}
+ getStyle = (style) => {
+ let _card = {...this.state.card, style}
this.updateComponent(_card)
}
@@ -534,7 +514,7 @@
param.rduri = window.GLOB.mainSystemApi
}
- Api.getLocalConfig(param).then(result => {
+ Api.genericInterface(param).then(result => {
if (result.status) {
this.setState({
sqlVerifing: false,
--
Gitblit v1.8.0