From fa80cc6f1fe2b358e0450d0114b8f9f824e4854e Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 25 九月 2023 18:10:48 +0800
Subject: [PATCH] 2023-09-25
---
src/templates/sharecomponent/tablecomponent/index.jsx | 2 +-
src/menu/components/search/main-search/dragsearch/card.jsx | 2 +-
src/menu/components/search/main-search/index.scss | 5 +++++
src/templates/sharecomponent/searchcomponent/dragsearch/card.jsx | 2 +-
src/templates/sharecomponent/searchcomponent/index.scss | 5 +++++
5 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/menu/components/search/main-search/dragsearch/card.jsx b/src/menu/components/search/main-search/dragsearch/card.jsx
index f439493..1b4f6a0 100644
--- a/src/menu/components/search/main-search/dragsearch/card.jsx
+++ b/src/menu/components/search/main-search/dragsearch/card.jsx
@@ -133,7 +133,7 @@
<CloseOutlined className="close" onClick={() => delCard(id)} />
</div>
} trigger="hover">
- <div className={'page-card ' + (card.labelShow === 'false' ? 'label-hide ' : '') + card.type + (card.advanced === 'true' ? ' advanced' : '')} style={{ opacity: opacity}}>
+ <div className={'page-card ' + (card.labelShow === 'false' ? 'label-hide ' : '') + card.type + (card.advanced === 'true' ? ' advanced' : '') + (card.query === 'false' ? ' no-query' : '')} style={{ opacity: opacity}}>
<div ref={node => drag(drop(node))}>
<Form.Item
labelCol={{xs: { span: 24 }, sm: { span: 8 }}}
diff --git a/src/menu/components/search/main-search/index.scss b/src/menu/components/search/main-search/index.scss
index 6aff673..3411db9 100644
--- a/src/menu/components/search/main-search/index.scss
+++ b/src/menu/components/search/main-search/index.scss
@@ -89,6 +89,11 @@
color: orange;
}
}
+ .page-card.no-query {
+ .ant-form-explain {
+ color: #13c2c2;
+ }
+ }
.mk-search-item-wrap.action {
.ant-form-item {
white-space: nowrap;
diff --git a/src/templates/sharecomponent/searchcomponent/dragsearch/card.jsx b/src/templates/sharecomponent/searchcomponent/dragsearch/card.jsx
index 081c790..56ea667 100644
--- a/src/templates/sharecomponent/searchcomponent/dragsearch/card.jsx
+++ b/src/templates/sharecomponent/searchcomponent/dragsearch/card.jsx
@@ -140,7 +140,7 @@
<CloseOutlined className="close" onClick={() => delCard(id)} />
</div>
} trigger="hover">
- <div className={'page-card ' + (card.labelShow === 'false' ? 'label-hide ' : '') + type + (card.advanced === 'true' ? ' advanced' : '')} style={{ opacity: opacity}}>
+ <div className={'page-card ' + (card.labelShow === 'false' ? 'label-hide ' : '') + type + (card.advanced === 'true' ? ' advanced' : '') + (card.query === 'false' ? ' no-query' : '')} style={{ opacity: opacity}}>
<div ref={node => drag(drop(node))} onDoubleClick={() => editCard(id)}>
<Form.Item
labelCol={{style: {width: labelwidth + '%'}}}
diff --git a/src/templates/sharecomponent/searchcomponent/index.scss b/src/templates/sharecomponent/searchcomponent/index.scss
index 3b00b21..52dda6d 100644
--- a/src/templates/sharecomponent/searchcomponent/index.scss
+++ b/src/templates/sharecomponent/searchcomponent/index.scss
@@ -104,6 +104,11 @@
color: orange;
}
}
+ .page-card.no-query {
+ .ant-form-explain {
+ color: #13c2c2;
+ }
+ }
.ant-calendar-picker {
min-width: 100px!important;
width: 100%;
diff --git a/src/templates/sharecomponent/tablecomponent/index.jsx b/src/templates/sharecomponent/tablecomponent/index.jsx
index 0b533e8..98f43d5 100644
--- a/src/templates/sharecomponent/tablecomponent/index.jsx
+++ b/src/templates/sharecomponent/tablecomponent/index.jsx
@@ -104,7 +104,7 @@
let _table = tables.filter(item => item.TbName === value)[0]
- if (selectedTables.findIndex(cell => cell.TbName === value) > -1) return
+ if (!_table || selectedTables.findIndex(cell => cell.TbName === value) > -1) return
let _tables = [...selectedTables, _table]
--
Gitblit v1.8.0