From b6c698c8833836971184a0a9c2645a15f8174d37 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 08 五月 2025 16:31:18 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/components/search/main-search/index.jsx | 204 ++++++++++++++++++++++++--------------------------
1 files changed, 97 insertions(+), 107 deletions(-)
diff --git a/src/menu/components/search/main-search/index.jsx b/src/menu/components/search/main-search/index.jsx
index eb8265b..281ea26 100644
--- a/src/menu/components/search/main-search/index.jsx
+++ b/src/menu/components/search/main-search/index.jsx
@@ -1,15 +1,14 @@
import React, { Component } from 'react'
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
-import { Modal, notification, Popover, Icon, Switch } from 'antd'
-import moment from 'moment'
+import { Modal, notification, Popover, Switch, message } from 'antd'
+import { PlusOutlined, EditOutlined, ToolOutlined, DeleteOutlined, FontColorsOutlined } from '@ant-design/icons'
import Api from '@/api'
import Utils from '@/utils/utils.js'
-import zhCN from '@/locales/zh-CN/model.js'
-import enUS from '@/locales/en-US/model.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'
@@ -33,7 +32,6 @@
}
state = {
- dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
appType: sessionStorage.getItem('appType'),
searchlist: null, // 鎼滅储鏉′欢闆�
sqlVerifing: false, // sql楠岃瘉涓�
@@ -52,9 +50,6 @@
let _card = {
uuid: card.uuid,
type: card.type,
- floor: card.floor,
- tabId: card.tabId || '',
- parentId: card.parentId || '',
width: 24,
name: card.name,
subtype: card.subtype,
@@ -76,7 +71,6 @@
}
componentDidMount () {
- MKEmitter.addListener('submitStyle', this.getStyle)
MKEmitter.addListener('plusSearch', this.plusSearch)
}
@@ -87,7 +81,6 @@
this.setState = () => {
return
}
- MKEmitter.removeListener('submitStyle', this.getStyle)
MKEmitter.removeListener('plusSearch', this.plusSearch)
}
@@ -95,53 +88,51 @@
return !is(fromJS(this.state), fromJS(nextState))
}
- getStyle = (comIds, style) => {
- const { card } = this.state
-
- if (comIds.length !== 1 || comIds[0] !== card.uuid) return
-
- let _card = {...card, style}
+ getStyle = (style) => {
+ let _card = {...this.state.card, style}
this.setState({
card: _card
})
- this.props.updateConfig(_card)
+ this.updateComponent(_card)
}
changeStyle = () => {
const { card } = this.state
- MKEmitter.emit('changeStyle', [card.uuid], ['background', 'border', 'padding', 'margin', 'shadow'], card.style)
+ 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)
}
- checkComponent = (component) => {
- this.updateComponent(component)
+ // checkComponent = (component) => {
+ // this.updateComponent(component)
- let _item = null
- component.search.forEach(item => {
- if (!_item && item.focus) {
- _item = item
- }
- })
- if (_item) {
- this.handleSearch(_item)
- }
- }
+ // let _item = null
+ // component.search.forEach(item => {
+ // if (!_item && item.focus) {
+ // _item = item
+ // }
+ // })
+ // if (_item) {
+ // this.handleSearch(_item)
+ // }
+ // }
/**
* @description 鎼滅储鏉′欢椤哄簭璋冩暣锛屾垨鎷栨嫿娣诲姞
@@ -154,9 +145,7 @@
this.setState({card: _card})
this.handleSearch(newcell)
} else {
- this.setState({card: _card}, ()=> {
- this.props.updateConfig(_card)
- })
+ this.updateComponent(_card)
}
}
@@ -168,12 +157,14 @@
let linkableFields = []
card.search.forEach(item => {
- if (item.uuid !== cell.uuid && (item.type === 'select' || item.type === 'link')) {
- linkableFields.push({
- value: item.field,
- text: item.label
- })
- }
+ if (item.uuid === cell.uuid) return
+ if (!['select', 'link', 'checkcard'].includes(item.type)) return
+ if (item.type === 'checkcard' && item.multiple === 'true') return
+
+ linkableFields.push({
+ value: item.field,
+ text: item.label
+ })
})
this.setState({
@@ -215,7 +206,6 @@
this.searchFormRef.handleConfirm().then(res => {
let fieldrepet = false // 瀛楁閲嶅
- let labelrepet = false // 鎻愮ず鏂囧瓧閲嶅
card.search = card.search.map(item => { // 鏁版嵁鏇存柊鍙婇噸澶嶆娴�
if (item.uuid !== res.uuid && res.field && item.field) {
@@ -241,8 +231,6 @@
if (setFields.length < itemFields.length + resFields.length && (res.type !== 'date' || item.type !== 'date')) {
fieldrepet = true
- } else if (item.label === res.label) {
- labelrepet = true
}
}
@@ -260,44 +248,24 @@
duration: 5
})
return
- } else if (labelrepet) {
- notification.warning({
- top: 92,
- message: '鍚嶇О宸插瓨鍦�!',
- duration: 5
- })
- return
}
- if (['select', 'multiselect', 'link', 'checkcard'].includes(res.type) && res.resourceType === '1' && /\s/.test(res.dataSource)) {
+ if (['select', 'multiselect', 'link', 'checkcard'].includes(res.type) && res.resourceType === '1' && res.database !== 'sso' && /\s/.test(res.dataSource)) {
this.setState({
sqlVerifing: true
})
- let param = {
- func: 's_debug_sql',
- exec_type: 'y',
- LText: res.dataSource
- }
-
- param.LText = param.LText.replace(/@\$|\$@/ig, '')
+ let sql = `declare @mk_departmentcode nvarchar(512),@mk_organization nvarchar(512),@mk_user_type nvarchar(20)
+ ${res.dataSource}`
+ sql = sql.replace(/@\$|\$@/ig, '')
- param.LText = Utils.formatOptions(param.LText)
- param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- param.secretkey = Utils.encrypt('', param.timestamp)
-
- if (window.GLOB.mainSystemApi && res.database === 'sso') {
- param.rduri = window.GLOB.mainSystemApi
- }
-
- Api.getLocalConfig(param).then(result => {
- if (result.status) {
+ Api.sDebug(sql).then(result => {
+ if (result.status || result.ErrCode === '-2') {
this.setState({
- card: card,
sqlVerifing: false,
visible: false
}, ()=> {
- this.props.updateConfig(card)
+ this.updateComponent(card)
})
} else {
this.setState({sqlVerifing: false})
@@ -309,10 +277,9 @@
})
} else {
this.setState({
- card: card,
visible: false
}, ()=> {
- this.props.updateConfig(card)
+ this.updateComponent(card)
})
}
})
@@ -322,20 +289,15 @@
* @description 鎼滅储鏉′欢鍒犻櫎
*/
deleteElement = (cell) => {
- const { dict } = this.state
- let _this = this
+ let that = this
confirm({
- content: dict['model.confirm'] + dict['model.delete'] + ` - ${cell.label} 锛焋,
+ content: `纭畾鍒犻櫎 - ${cell.label} 锛焋,
onOk() {
- let _card = fromJS(_this.state.card).toJS()
+ let _card = fromJS(that.state.card).toJS()
_card.search = _card.search.filter(item => item.uuid !== cell.uuid)
- _this.setState({
- card: _card
- }, () => {
- _this.props.updateConfig(_card)
- })
+ that.updateComponent(_card)
},
onCancel() {}
})
@@ -353,6 +315,11 @@
match: 'like',
focus: true
}
+
+ if (card.search.length) {
+ item.ratio = card.search[card.search.length - 1].ratio
+ }
+
card.search.push(item)
this.setState({card}, () => {
@@ -377,25 +344,31 @@
if (type === 'simple') {
_card.search.push(item)
- this.setState({
- card: _card,
- }, () => {
- this.props.updateConfig(_card)
+
+ this.updateComponent(_card)
+ this.handleSearch(item)
+ } else if (type === 'replace') {
+ delete item.focus
+ _card.search = _card.search.map(cell => {
+ if (cell.field && cell.field.toLowerCase() === item.field.toLowerCase()) {
+ return item
+ }
+ return cell
})
+
+ this.updateComponent(_card)
+ this.handleSearch(item)
} else if (type === 'multil') {
_card.search.push(...item)
- this.setState({
- card: _card,
- }, () => {
- this.props.updateConfig(_card)
- })
+
+ this.updateComponent(_card)
}
}
getWrapForms = () => {
- const { wrap, action } = this.state.card
+ const { card } = this.state
- return getWrapForm(wrap, action)
+ return getWrapForm(card.wrap, card.uuid)
}
updateWrap = (res) => {
@@ -405,44 +378,62 @@
clickComponent = (e) => {
if (sessionStorage.getItem('style-control') === 'true' || sessionStorage.getItem('style-control') === 'component') {
e.stopPropagation()
- MKEmitter.emit('clickComponent', this.state.card)
+ MKEmitter.emit('clickComponent', this.state.card.uuid, null, (style) => {
+ let _card = {...this.state.card}
+ _card.style = {..._card.style, ...style}
+
+ this.updateComponent(_card)
+ })
}
}
render() {
- const { dict, card, visible, sqlVerifing, showField } = this.state
+ const { card, visible, sqlVerifing, showField } = this.state
let _style = resetStyle(card.style)
return (
- <div className={`main-search-edit-list ${card.wrap.float} ${card.wrap.show || ''}`} onClick={this.clickComponent} id={card.uuid} style={_style}>
+ <div className={`main-search-edit-list ${card.wrap.float} ${showField ? 'show-field' : ''} mk-order-${card.wrap.searchSize || ''}`} onClick={this.clickComponent} id={card.uuid} style={_style}>
<FieldsComponent config={card} type="search" />
- <Switch checkedChildren={dict['model.switch.open']} size="small" unCheckedChildren={dict['model.switch.close']} defaultChecked={showField} onChange={this.onFieldChange} />
+ <Switch checkedChildren="寮�" size="small" unCheckedChildren="鍏�" defaultChecked={showField} onChange={this.onFieldChange} />
<DragElement
list={card.search}
- showField={showField}
+ setting={card.wrap}
handleList={this.handleList}
handleMenu={this.handleSearch}
deleteMenu={this.deleteElement}
/>
<Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
<div className="mk-popover-control">
- <Icon className="plus" title="娣诲姞" onClick={this.addSearch} type="plus" />
+ <PlusOutlined className="plus" title="娣诲姞" onClick={this.addSearch}/>
<NormalForm title="鎼滅储璁剧疆" width={800} update={this.updateWrap} getForms={this.getWrapForms}>
- <Icon type="edit" style={{color: '#1890ff'}} title="缂栬緫"/>
+ <EditOutlined style={{color: '#1890ff'}} title="缂栬緫"/>
</NormalForm>
<CopyComponent type="mainsearch" card={card}/>
- <PasteComponent config={card} options={['search', 'form']} updateConfig={this.checkComponent} />
- <Icon className="style" title="璋冩暣鏍峰紡" onClick={this.changeStyle} type="font-colors" />
- <Icon className="close" title="delete" type="delete" onClick={() => this.props.deletecomponent(card.uuid)} />
+ {/* <PasteComponent config={card} options={['search', 'form']} updateConfig={this.checkComponent} /> */}
+ <PasteComponent config={card} options={['search', 'form']} />
+ <FontColorsOutlined className="style" title="璋冩暣鏍峰紡" onClick={this.changeStyle}/>
+ <DeleteOutlined className="close" onClick={() => this.props.deletecomponent(card.uuid)} />
</div>
} trigger="hover">
- <Icon type="tool" />
+ <ToolOutlined />
</Popover>
+ <div className="component-name">
+ <div className="center" onDoubleClick={() => {
+ let oInput = document.createElement('input')
+ oInput.value = 'anchor' + card.uuid
+ document.body.appendChild(oInput)
+ oInput.select()
+ document.execCommand('Copy')
+ document.body.removeChild(oInput)
+ message.success('澶嶅埗鎴愬姛銆�')
+ }}>{card.name}</div>
+ </div>
{/* 缂栬緫鎼滅储鏉′欢 */}
<Modal
title="鎼滅储鏉′欢-缂栬緫"
+ wrapClassName="mk-scroll-modal"
visible={visible}
- width={850}
+ width={950}
maskClosable={false}
onOk={this.handleSubmit}
confirmLoading={sqlVerifing}
@@ -450,7 +441,6 @@
destroyOnClose
>
<SearchForm
- dict={dict}
card={this.state.editcard}
formlist={this.state.formlist}
inputSubmit={this.handleSubmit}
--
Gitblit v1.8.0