From 71c9a33a74eba93449193027c007df4404b91a4e Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 30 五月 2024 15:22:47 +0800
Subject: [PATCH] 2024-05-30
---
src/menu/components/share/actioncomponent/actionform/index.jsx | 7 +++
src/menu/stylecontroller/index.scss | 28 --------------
src/menu/stylecombcontroller/index.scss | 28 --------------
3 files changed, 7 insertions(+), 56 deletions(-)
diff --git a/src/menu/components/share/actioncomponent/actionform/index.jsx b/src/menu/components/share/actioncomponent/actionform/index.jsx
index c00ec97..3f88b64 100644
--- a/src/menu/components/share/actioncomponent/actionform/index.jsx
+++ b/src/menu/components/share/actioncomponent/actionform/index.jsx
@@ -723,6 +723,10 @@
} else if (value === 'custom') {
_fieldval.Ot = 'required'
}
+ if (_fieldval.Ot === 'required' && this.record.execError === 'never') {
+ this.record.execError = 'grid'
+ _fieldval.execError = 'grid'
+ }
if (this.props.type === 'card' && _fieldval.Ot === 'required') { // 鍗＄墖涓棤澶氳閫夐」
_fieldval.Ot = 'requiredSgl'
@@ -741,6 +745,9 @@
if (appType !== 'mob' && value === 'notRequired') {
this.record.control = ''
_fieldval.control = ''
+ } else if (value === 'required' && this.record.execError === 'never') {
+ this.record.execError = 'grid'
+ _fieldval.execError = 'grid'
}
} else if (key === 'pageTemplate') {
if (value === 'pay') {
diff --git a/src/menu/stylecombcontroller/index.scss b/src/menu/stylecombcontroller/index.scss
index 7c91c4a..bc8fabd 100644
--- a/src/menu/stylecombcontroller/index.scss
+++ b/src/menu/stylecombcontroller/index.scss
@@ -115,34 +115,6 @@
}
}
-.margin-popover {
- padding-top: 0px;
- .ant-popover-inner-content {
- width: 90px;
- padding: 0px 5px;
- .ant-menu-root.ant-menu-vertical {
- border: 0;
- .ant-menu-item {
- height: 30px;
- cursor: pointer;
- line-height: 30px;
- }
- .ant-menu-item:not(:last-child) {
- margin-bottom: 0px;
- }
- .ant-menu-item:first-child {
- margin-top: 10px;
- }
- .ant-menu-item:last-child {
- margin-bottom: 10px;
- }
- }
- }
- .ant-popover-arrow {
- display: none;
- }
-}
-
.menu-style-drawer {
.ant-drawer-body {
height: calc(100vh - 50px);
diff --git a/src/menu/stylecontroller/index.scss b/src/menu/stylecontroller/index.scss
index df5ab73..8280649 100644
--- a/src/menu/stylecontroller/index.scss
+++ b/src/menu/stylecontroller/index.scss
@@ -156,34 +156,6 @@
}
}
-.margin-popover {
- padding-top: 0px;
- .ant-popover-inner-content {
- width: 90px;
- padding: 0px 5px;
- .ant-menu-root.ant-menu-vertical {
- border: 0;
- .ant-menu-item {
- height: 30px;
- cursor: pointer;
- line-height: 30px;
- }
- .ant-menu-item:not(:last-child) {
- margin-bottom: 0px;
- }
- .ant-menu-item:first-child {
- margin-top: 10px;
- }
- .ant-menu-item:last-child {
- margin-bottom: 10px;
- }
- }
- }
- .ant-popover-arrow {
- display: none;
- }
-}
-
.menu-style-drawer {
.ant-drawer-body {
height: calc(100vh - 50px);
--
Gitblit v1.8.0