From b11d4d3cb31dcf96d60b6945811cf61e05333ac0 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 06 三月 2025 22:46:26 +0800
Subject: [PATCH] 2025-03-06
---
src/menu/datasource/verifycard/settingform/index.scss | 18 ++++++++++++++++++
src/api/index.js | 10 ++++++----
src/menu/datasource/verifycard/settingform/index.jsx | 4 ++--
src/menu/datasource/verifycard/index.jsx | 5 ++++-
4 files changed, 30 insertions(+), 7 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index da8093a..86a16f4 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -48,10 +48,12 @@
okText: '鐭ラ亾浜�',
onOk: () => {
window.GLOB.$error = false
- sessionStorage.clear()
- if (!!(window.history && window.history.pushState)) {
- window.history.replaceState(null, null, window.location.href.split('#')[0] + '#/login')
- window.location.reload()
+ if (!/#\/login/.test(window.location.href)) {
+ sessionStorage.clear()
+ if (!!(window.history && window.history.pushState)) {
+ window.history.replaceState(null, null, window.location.href.split('#')[0] + '#/login')
+ window.location.reload()
+ }
}
}
})
diff --git a/src/menu/datasource/verifycard/index.jsx b/src/menu/datasource/verifycard/index.jsx
index d10bf53..a6b1d41 100644
--- a/src/menu/datasource/verifycard/index.jsx
+++ b/src/menu/datasource/verifycard/index.jsx
@@ -55,6 +55,7 @@
oriConfig: null,
scriptValue: '',
cols: null,
+ hasMainSearch: false,
colColumns: [
{
title: '鍚嶇О',
@@ -269,6 +270,7 @@
searches: formatSearch(search),
searchKey: '',
debugId: _setting.debugId || '',
+ hasMainSearch: mainSearch && mainSearch.length,
oriConfig: fromJS({
scripts,
columns: columns,
@@ -1243,7 +1245,7 @@
render() {
const { config } = this.props
- const { columns, subColumns, median, skip, setting, scripts, colColumns, scriptsColumns, activeKey, loading, searches, defaultsql, visible, pvisible, reload, script, scriptValue, searchKey, editLineId } = this.state
+ const { columns, subColumns, median, skip, setting, scripts, colColumns, scriptsColumns, activeKey, loading, searches, defaultsql, visible, pvisible, reload, script, scriptValue, searchKey, editLineId, hasMainSearch } = this.state
return (
<div className="model-data-source-wrap">
@@ -1261,6 +1263,7 @@
subColumns={subColumns}
setting={setting}
scripts={scripts}
+ hasMainSearch={hasMainSearch}
updateStatus={this.updateStatus}
updateColumns={this.updateColumns}
addProcess={this.addProcess}
diff --git a/src/menu/datasource/verifycard/settingform/index.jsx b/src/menu/datasource/verifycard/settingform/index.jsx
index 87940cc..147c84a 100644
--- a/src/menu/datasource/verifycard/settingform/index.jsx
+++ b/src/menu/datasource/verifycard/settingform/index.jsx
@@ -192,7 +192,7 @@
}
render() {
- const { columns, config } = this.props
+ const { columns, config, hasMainSearch } = this.props
const { getFieldDecorator } = this.props.form
const { setting, modules, innerRules, innertip, MenuType, visible } = this.state
@@ -562,7 +562,7 @@
initialValue: setting.useMSearch || 'true'
})(
<Radio.Group onChange={(e) => {this.onOptionChange(e.target.value, 'useMSearch')}}>
- <Radio value="true">浣跨敤</Radio>
+ <Radio value="true">浣跨敤{!hasMainSearch ? <Tooltip placement="top" title="鏃犲彲浣跨敤鐨勫閮ㄦ悳绱㈡潯浠�"><span className="mk-dot"></span></Tooltip> : null}</Radio>
<Radio value="false">涓嶄娇鐢�</Radio>
</Radio.Group>
)}
diff --git a/src/menu/datasource/verifycard/settingform/index.scss b/src/menu/datasource/verifycard/settingform/index.scss
index 87630fa..389394d 100644
--- a/src/menu/datasource/verifycard/settingform/index.scss
+++ b/src/menu/datasource/verifycard/settingform/index.scss
@@ -13,6 +13,24 @@
height: 150px;
}
}
+ .mk-dot {
+ display: inline-block;
+ width: 4px;
+ height: 4px;
+ border-radius: 4px;
+ background-color: orange;
+ vertical-align: top;
+ position: relative;
+ }
+ .mk-dot::before {
+ content: ' ';
+ display: block;
+ position: absolute;
+ top: -5px;
+ bottom: -10px;
+ left: -10px;
+ right: -5px;
+ }
}
.ant-radio-group {
white-space: nowrap;
--
Gitblit v1.8.0