From 31060c20e8d232f2bdb426fed620b7c15018b8df Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 23 二月 2023 00:13:00 +0800
Subject: [PATCH] 2023-02-23
---
src/tabviews/custom/components/card/double-data-card/index.scss | 7 ++++++-
src/tabviews/subtable/index.jsx | 1 +
src/tabviews/subtabtable/index.jsx | 1 +
src/tabviews/commontable/index.jsx | 1 +
src/tabviews/zshare/actionList/normalbutton/index.jsx | 7 +++++++
src/menu/components/card/cardcellcomponent/elementform/index.jsx | 7 ++++---
src/tabviews/zshare/actionList/printbutton/index.jsx | 7 +++++++
7 files changed, 27 insertions(+), 4 deletions(-)
diff --git a/src/menu/components/card/cardcellcomponent/elementform/index.jsx b/src/menu/components/card/cardcellcomponent/elementform/index.jsx
index 2289193..009826c 100644
--- a/src/menu/components/card/cardcellcomponent/elementform/index.jsx
+++ b/src/menu/components/card/cardcellcomponent/elementform/index.jsx
@@ -64,7 +64,7 @@
if (item.key === 'field' || item.key === 'linkurl' || item.key === 'bgImage' || item.key === 'posterField') {
item.options = []
-
+
if (side === 'sub') {
config.subColumns.forEach(col => {
let label = `${col.field}锛�${col.label}锛塦
@@ -188,15 +188,16 @@
if (item.key === 'field') {
item.options = []
+
if (side === 'sub') {
config.subColumns.forEach(col => {
let label = `${col.field}锛�${col.label}锛塦
- if (/^(Int|Decimal)/ig.test(col.datatype) && (card.eleType === 'number' || card.eleType === 'slider')) {
+ if (/^(Int|Decimal)/ig.test(col.datatype) && (value === 'number' || value === 'slider')) {
item.options.push({
value: col.field,
text: label
})
- } else if (/^(Nvarchar|date)/ig.test(col.datatype) && card.eleType !== 'number' && card.eleType !== 'slider') {
+ } else if (/^(Nvarchar|date)/ig.test(col.datatype) && value !== 'number' && value !== 'slider') {
item.options.push({
value: col.field,
text: label
diff --git a/src/tabviews/commontable/index.jsx b/src/tabviews/commontable/index.jsx
index f224e98..1133667 100644
--- a/src/tabviews/commontable/index.jsx
+++ b/src/tabviews/commontable/index.jsx
@@ -319,6 +319,7 @@
config.action.forEach(item => {
item.logLabel = MenuName + '-' + item.label // 鐢ㄤ簬sPC_TableData_InUpDe璁板綍鎿嶄綔鎸夐挳
item.$menuId = this.props.MenuID
+ item.$old = true
item.ContainerId = this.state.ContainerId
if (item.OpenType === 'funcbutton' && item.funcType === 'print' && item.verify) { // 鎵撳嵃鏈鸿缃�
diff --git a/src/tabviews/custom/components/card/double-data-card/index.scss b/src/tabviews/custom/components/card/double-data-card/index.scss
index 8f41eeb..4969ee5 100644
--- a/src/tabviews/custom/components/card/double-data-card/index.scss
+++ b/src/tabviews/custom/components/card/double-data-card/index.scss
@@ -284,6 +284,11 @@
overflow: hidden;
transition: height 0.3s;
}
+ .sub-card-wrap {
+ .card-item-box:hover {
+ background-color: var(--mk-sys-color2);
+ }
+ }
}
.card-item-wrap.flex-card {
>.card-item-box:first-child {
@@ -299,7 +304,7 @@
.sub-card-wrap.mk-parity-bg {
.ant-col:nth-child(even){
- .card-item-box {
+ .card-item-box:not(:hover) {
background-color: var(--mk-sys-color1);
}
}
diff --git a/src/tabviews/subtable/index.jsx b/src/tabviews/subtable/index.jsx
index b261601..150533f 100644
--- a/src/tabviews/subtable/index.jsx
+++ b/src/tabviews/subtable/index.jsx
@@ -241,6 +241,7 @@
config.action.forEach(item => {
item.logLabel = Tab.label + '-' + item.label // 鐢ㄤ簬sPC_TableData_InUpDe璁板綍鎿嶄綔鎸夐挳
item.$menuId = this.props.MenuID
+ item.$old = true
if (item.OpenType === 'funcbutton' && item.funcType === 'print' && item.verify) { // 鎵撳嵃鏈鸿缃�
let _item = window.GLOB.UserCacheMap.get(Tab.uuid + item.uuid)
diff --git a/src/tabviews/subtabtable/index.jsx b/src/tabviews/subtabtable/index.jsx
index 154233c..c46137c 100644
--- a/src/tabviews/subtabtable/index.jsx
+++ b/src/tabviews/subtabtable/index.jsx
@@ -211,6 +211,7 @@
config.action.forEach(item => {
item.logLabel = Tab.label + '-' + item.label // 鐢ㄤ簬sPC_TableData_InUpDe璁板綍鎿嶄綔鎸夐挳
item.$menuId = this.props.MenuID
+ item.$old = true
if (item.position === 'toolbar') {
item.$toolbtn = true
diff --git a/src/tabviews/zshare/actionList/normalbutton/index.jsx b/src/tabviews/zshare/actionList/normalbutton/index.jsx
index 55028c5..2271803 100644
--- a/src/tabviews/zshare/actionList/normalbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/normalbutton/index.jsx
@@ -2431,6 +2431,13 @@
}, 100)
}
}
+ } else if (!btn.$old) {
+ notification.warning({
+ top: 92,
+ message: '鏈幏鍙栧埌鎸夐挳閰嶇疆淇℃伅锛�',
+ duration: 5
+ })
+ this.setState({ loading: false })
} else {
Api.getCacheConfig({
func: 'sPC_Get_LongParam',
diff --git a/src/tabviews/zshare/actionList/printbutton/index.jsx b/src/tabviews/zshare/actionList/printbutton/index.jsx
index e98c0f6..d868d58 100644
--- a/src/tabviews/zshare/actionList/printbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/printbutton/index.jsx
@@ -2020,6 +2020,13 @@
}, 100)
}
}
+ } else if (!btn.$old) {
+ notification.warning({
+ top: 92,
+ message: '鏈幏鍙栧埌鎸夐挳閰嶇疆淇℃伅锛�',
+ duration: 5
+ })
+ this.setState({ loading: false })
} else {
Api.getCacheConfig({
func: 'sPC_Get_LongParam',
--
Gitblit v1.8.0