From b91c28df2f734b680198e755b7828666e238cea0 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 21 六月 2024 16:43:44 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/components/search/main-search/index.jsx | 13 ++++---------
1 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/src/menu/components/search/main-search/index.jsx b/src/menu/components/search/main-search/index.jsx
index 270358a..ef3e3c1 100644
--- a/src/menu/components/search/main-search/index.jsx
+++ b/src/menu/components/search/main-search/index.jsx
@@ -250,7 +250,7 @@
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
})
@@ -258,13 +258,8 @@
let sql = `declare @mk_departmentcode nvarchar(512),@mk_organization nvarchar(512),@mk_user_type nvarchar(20)
${res.dataSource}`
sql = sql.replace(/@\$|\$@/ig, '')
-
- let rduri = ''
- if (window.GLOB.mainSystemApi && res.database === 'sso') {
- rduri = window.GLOB.mainSystemApi
- }
- Api.sDebug(sql, rduri).then(result => {
+ Api.sDebug(sql).then(result => {
if (result.status || result.ErrCode === '-2') {
this.setState({
sqlVerifing: false,
@@ -381,7 +376,7 @@
let _style = resetStyle(card.style)
return (
- <div className={`main-search-edit-list ${card.wrap.float} ${showField ? 'show-field' : ''}`} onClick={this.clickComponent} id={card.uuid} style={_style}>
+ <div className={`main-search-edit-list ${card.wrap.float} ${showField ? 'show-field' : ''} mk-size-${card.wrap.searchSize || ''}`} onClick={this.clickComponent} id={card.uuid} style={_style}>
<FieldsComponent config={card} type="search" />
<Switch checkedChildren="寮�" size="small" unCheckedChildren="鍏�" defaultChecked={showField} onChange={this.onFieldChange} />
<DragElement
@@ -422,7 +417,7 @@
title="鎼滅储鏉′欢-缂栬緫"
wrapClassName="mk-scroll-modal"
visible={visible}
- width={850}
+ width={950}
maskClosable={false}
onOk={this.handleSubmit}
confirmLoading={sqlVerifing}
--
Gitblit v1.8.0