From 400fee62fb40006a9839f1c3a8244b82566b5057 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 08 五月 2025 16:30:39 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/templates/sharecomponent/searchcomponent/index.jsx | 92 ++++++++++++++++++++-------------------------
1 files changed, 41 insertions(+), 51 deletions(-)
diff --git a/src/templates/sharecomponent/searchcomponent/index.jsx b/src/templates/sharecomponent/searchcomponent/index.jsx
index 2f848fc..5e6ae12 100644
--- a/src/templates/sharecomponent/searchcomponent/index.jsx
+++ b/src/templates/sharecomponent/searchcomponent/index.jsx
@@ -2,12 +2,8 @@
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
import { Modal, notification, Switch } from 'antd'
-import moment from 'moment'
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 asyncComponent from '@/utils/asyncComponent'
import MKEmitter from '@/utils/events.js'
@@ -27,7 +23,6 @@
}
state = {
- dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
searchlist: null,
sqlVerifing: false,
visible: false,
@@ -47,12 +42,12 @@
componentDidMount () {
MKEmitter.addListener('plusSearch', this.plusSearch)
- MKEmitter.addListener('revert', this.revert)
+ // MKEmitter.addListener('revert', this.revert)
}
- revert = () => {
- this.setState({searchlist: fromJS(this.props.config.search).toJS()})
- }
+ // revert = () => {
+ // this.setState({searchlist: fromJS(this.props.config.search).toJS()})
+ // }
plusSearch = (MenuId, item, type) => {
const { config } = this.props
@@ -63,6 +58,18 @@
if (type === 'simple') {
this.setState({
searchlist: [...searchlist, item],
+ }, () => {
+ this.handleSearch(item)
+ })
+ } else if (type === 'replace') {
+ delete item.focus
+ this.setState({
+ searchlist: searchlist.map(cell => {
+ if (cell.field && cell.field.toLowerCase() === item.field.toLowerCase()) {
+ return item
+ }
+ return cell
+ }),
}, () => {
this.handleSearch(item)
})
@@ -98,6 +105,7 @@
* @description 鎼滅储鏉′欢缂栬緫锛岃幏鍙栨悳绱㈡潯浠惰〃鍗曚俊鎭�
*/
handleSearch = (card) => {
+ const { config } = this.props
const { searchlist } = this.state
let linkableFields = []
@@ -113,8 +121,8 @@
})
let columns = null
- if (this.props.config.type === 'table') {
- columns = this.props.config.columns.map(item => {
+ if (config.columns && config.columns.length) {
+ columns = config.columns.map(item => {
return {key: item.uuid, text: item.field, value: item.field, label: item.label}
})
}
@@ -163,7 +171,6 @@
this.searchFormRef.handleConfirm().then(res => {
let fieldrepet = false // 瀛楁閲嶅
- let labelrepet = false // 鎻愮ず鏂囧瓧閲嶅
_searchlist = _searchlist.filter(item => !item.origin || item.uuid === res.uuid) // 鍘婚櫎绯荤粺椤�
@@ -191,8 +198,6 @@
if (setFields.length < itemFields.length + resFields.length && (res.type !== 'date' || item.type !== 'date')) {
fieldrepet = true
- } else if (item.label === res.label) {
- labelrepet = true
}
}
@@ -210,38 +215,19 @@
duration: 5
})
return
- } else if (labelrepet) {
- notification.warning({
- top: 92,
- message: '鍚嶇О宸插瓨鍦�!',
- duration: 5
- })
- return
}
- if (['checkcard', 'select', 'multiselect', 'link'].includes(res.type) && res.resourceType === '1' && /\s/.test(res.dataSource)) {
+ if (['checkcard', 'select', 'multiselect', 'link'].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.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}'`)
+ 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.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({
sqlVerifing: false,
searchlist: _searchlist,
@@ -273,20 +259,19 @@
*/
deleteElement = (card) => {
const { config } = this.props
- const { dict } = this.state
- let _this = this
+ let that = this
confirm({
- content: dict['model.confirm'] + dict['model.delete'] + ` - ${card.label} 锛焋,
+ content: `纭畾鍒犻櫎 - ${card.label} 锛焋,
onOk() {
- let _searchlist = fromJS(_this.state.searchlist).toJS()
+ let _searchlist = fromJS(that.state.searchlist).toJS()
_searchlist = _searchlist.filter(item => item.uuid !== card.uuid)
- _this.setState({
+ that.setState({
searchlist: _searchlist
}, () => {
- _this.props.updatesearch({...config, search: _searchlist})
+ that.props.updatesearch({...config, search: _searchlist})
})
},
onCancel() {}
@@ -334,7 +319,7 @@
this.setState = () => {
return
}
- MKEmitter.removeListener('revert', this.revert)
+ // MKEmitter.removeListener('revert', this.revert)
MKEmitter.removeListener('plusSearch', this.plusSearch)
}
@@ -350,12 +335,17 @@
render() {
const { config } = this.props
- const { dict, searchlist, visible, sqlVerifing, card, showField, setVisible } = this.state
+ const { searchlist, visible, sqlVerifing, card, showField, setVisible } = this.state
+
+ let size = ''
+ if (config.wrap && config.wrap.searchSize) {
+ size = ' mk-order-' + config.wrap.searchSize
+ }
return (
- <div className={'model-table-search-list length' + searchlist.length + (showField ? ' show-field' : '')}>
+ <div className={'model-table-search-list length' + searchlist.length + (showField ? ' show-field' : '') + size}>
<FieldsComponent config={{uuid: config.uuid, search: searchlist}} type="search" />
- <Switch className="switch-field-show" checkedChildren={dict['model.switch.open']} unCheckedChildren={dict['model.switch.close']} defaultChecked={showField} onChange={this.onFieldChange} />
+ <Switch className="switch-field-show" checkedChildren="寮�" unCheckedChildren="鍏�" defaultChecked={showField} onChange={this.onFieldChange} />
<DragElement
list={searchlist}
setting={config.wrap || config.setting}
@@ -367,8 +357,9 @@
{/* 缂栬緫鎼滅储鏉′欢 */}
<Modal
title={card && card.copyType === 'search' ? '鎼滅储鏉′欢-澶嶅埗' : '鎼滅储鏉′欢-缂栬緫'}
+ wrapClassName="mk-scroll-modal"
visible={visible}
- width={850}
+ width={950}
maskClosable={false}
onOk={this.handleSubmit}
confirmLoading={sqlVerifing}
@@ -376,7 +367,6 @@
destroyOnClose
>
<SearchForm
- dict={dict}
card={this.state.card}
formlist={this.state.formlist}
inputSubmit={this.handleSubmit}
--
Gitblit v1.8.0