From 89f85223ff7b1b5ee3931ae01efa3dd17d5524fc Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 21 十一月 2022 16:03:27 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/components/search/main-search/index.jsx | 47 ++++++++++++++++++-----------------------------
1 files changed, 18 insertions(+), 29 deletions(-)
diff --git a/src/menu/components/search/main-search/index.jsx b/src/menu/components/search/main-search/index.jsx
index 3595d12..8741554 100644
--- a/src/menu/components/search/main-search/index.jsx
+++ b/src/menu/components/search/main-search/index.jsx
@@ -9,6 +9,7 @@
import Utils from '@/utils/utils.js'
import { getSearchForm } from '@/templates/zshare/formconfig'
import { resetStyle } from '@/utils/utils-custom.js'
+import { getTables } from '@/utils/utils-custom.js'
import asyncComponent from '@/utils/asyncComponent'
import asyncIconComponent from '@/utils/asyncIconComponent'
import DragElement from './dragsearch'
@@ -95,25 +96,27 @@
card: _card
})
- this.props.updateConfig(_card)
+ this.updateComponent(_card)
}
changeStyle = () => {
const { card } = this.state
- MKEmitter.emit('changeStyle', ['background', 'border', 'padding', 'margin', 'shadow'], card.style, this.getStyle)
+ MKEmitter.emit('changeStyle', ['background', 'border', 'padding', 'margin', 'shadow', 'clear'], card.style, this.getStyle)
}
/**
* @description 鍗＄墖琛屽灞備俊鎭洿鏂帮紙鏁版嵁婧愶紝鏍峰紡绛夛級
*/
updateComponent = (component) => {
- this.setState({
- card: component
- })
+ component.$tables = getTables(component)
component.width = component.wrap.width
component.name = component.wrap.name
+
+ this.setState({
+ card: component
+ })
this.props.updateConfig(component)
}
@@ -143,9 +146,7 @@
this.setState({card: _card})
this.handleSearch(newcell)
} else {
- this.setState({card: _card}, ()=> {
- this.props.updateConfig(_card)
- })
+ this.updateComponent(_card)
}
}
@@ -273,6 +274,7 @@
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
param.LText = param.LText.replace(/@\$|\$@/ig, '').replace(/@(BID|ID|LoginUID|SessionUid|UserID|Appkey|time_id)@/ig, `'${param.timestamp}'`)
+ param.LText = param.LText.replace(/\n/g, ' ')
param.LText = Utils.formatOptions(param.LText)
param.secretkey = Utils.encrypt('', param.timestamp)
@@ -284,11 +286,10 @@
Api.genericInterface(param).then(result => {
if (result.status) {
this.setState({
- card: card,
sqlVerifing: false,
visible: false
}, ()=> {
- this.props.updateConfig(card)
+ this.updateComponent(card)
})
} else {
this.setState({sqlVerifing: false})
@@ -300,10 +301,9 @@
})
} else {
this.setState({
- card: card,
visible: false
}, ()=> {
- this.props.updateConfig(card)
+ this.updateComponent(card)
})
}
})
@@ -321,11 +321,7 @@
let _card = fromJS(_this.state.card).toJS()
_card.search = _card.search.filter(item => item.uuid !== cell.uuid)
- _this.setState({
- card: _card
- }, () => {
- _this.props.updateConfig(_card)
- })
+ _this.updateComponent(_card)
},
onCancel() {}
})
@@ -367,18 +363,12 @@
if (type === 'simple') {
_card.search.push(item)
- this.setState({
- card: _card,
- }, () => {
- this.props.updateConfig(_card)
- })
+
+ this.updateComponent(_card)
} else if (type === 'multil') {
_card.search.push(...item)
- this.setState({
- card: _card,
- }, () => {
- this.props.updateConfig(_card)
- })
+
+ this.updateComponent(_card)
}
}
@@ -399,8 +389,7 @@
let _card = {...this.state.card}
_card.style = {..._card.style, ...style}
- this.setState({ card: _card })
- this.props.updateConfig(_card)
+ this.updateComponent(_card)
})
}
}
--
Gitblit v1.8.0