From ada4722b4f0b458305e1f754c62f9df829dfcb24 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 18 十一月 2021 15:22:12 +0800
Subject: [PATCH] Merge branch 'master' into bms
---
src/menu/components/share/actioncomponent/actionform/index.jsx | 2 ++
src/menu/components/table/normal-table/columns/editColumn/index.jsx | 9 +++++----
src/menu/components/share/actioncomponent/formconfig.jsx | 8 ++++----
src/menu/components/table/edit-table/columns/editColumn/index.jsx | 9 +++++----
src/assets/css/main.scss | 6 ------
5 files changed, 16 insertions(+), 18 deletions(-)
diff --git a/src/assets/css/main.scss b/src/assets/css/main.scss
index 60cb6df..a137096 100644
--- a/src/assets/css/main.scss
+++ b/src/assets/css/main.scss
@@ -412,12 +412,6 @@
transition: margin-left 0s cubic-bezier(0.645, 0.045, 0.355, 1)!important;
}
-.ant-progress-status-success .ant-progress-text {
- color: rgba(0, 0, 0, 0.45)!important;
-}
-.ant-progress-circle.ant-progress-status-success .ant-progress-text {
- color: rgba(0, 0, 0, 0.65)!important;
-}
.ant-progress-line.square {
.ant-progress-inner {
border-radius: 0;
diff --git a/src/menu/components/share/actioncomponent/actionform/index.jsx b/src/menu/components/share/actioncomponent/actionform/index.jsx
index c7ce951..8bc29d8 100644
--- a/src/menu/components/share/actioncomponent/actionform/index.jsx
+++ b/src/menu/components/share/actioncomponent/actionform/index.jsx
@@ -272,6 +272,8 @@
if (item.key === 'intertype') {
_fieldval.intertype = 'system'
+ } else if (item.key === 'popClose' && value === 'popview') {
+ _fieldval.popClose = 'grid'
} else if (item.key === 'Ot') {
if (type === 'card') {
item.options = this.state.requireOptions.filter(op => ['notRequired', 'requiredSgl'].includes(op.value))
diff --git a/src/menu/components/share/actioncomponent/formconfig.jsx b/src/menu/components/share/actioncomponent/formconfig.jsx
index c33334e..388b4f9 100644
--- a/src/menu/components/share/actioncomponent/formconfig.jsx
+++ b/src/menu/components/share/actioncomponent/formconfig.jsx
@@ -137,7 +137,7 @@
opentypes = opentypes.filter(item => item.value !== 'popview' && item.value !== 'funcbutton')
refresh.push({
value: 'popclose',
- text: '鏍囩鍒锋柊'
+ text: '鍒锋柊婧愮粍浠�'
})
}
@@ -379,7 +379,7 @@
key: 'execSuccess',
label: Formdict['model.form.afterSuccess'],
initVal: card.execSuccess || 'never',
- tooltip: refresh.length ? '鎵ц鏍囩鍒锋柊鏃讹紝浼氬悓姝ュ埛鏂板綋鍓嶇粍浠跺拰涓婄骇缁勪欢-琛屻��' : '鍒锋柊涓婄骇缁勪欢-琛屾椂锛屼細鍚屾鍒锋柊褰撳墠缁勪欢锛屾敞锛氫笂绾х粍浠跺湪鏁版嵁婧愪腑娣诲姞銆�',
+ tooltip: refresh.length ? '鎵ц鍒锋柊婧愮粍浠舵椂锛岃鍦ㄦ簮鎸夐挳涓缃叧闂悗鍒锋柊閭ｄ竴椤癸紝娉細姝ゆ椂浼氬悓姝ュ埛鏂板綋鍓嶇粍浠跺拰涓婄骇缁勪欢-琛屻��' : '鍒锋柊涓婄骇缁勪欢-琛屾椂锛屼細鍚屾鍒锋柊褰撳墠缁勪欢锛屾敞锛氫笂绾х粍浠跺湪鏁版嵁婧愪腑娣诲姞銆�',
required: true,
options: [{
value: 'never',
@@ -395,7 +395,7 @@
text: '鍒锋柊涓婄骇缁勪欢 - 琛�'
}, {
value: !appType ? 'closetab' : 'goback',
- text: !appType ? '鍏抽棴鏍囩' : '杩斿洖锛堜笂涓�涓〉闈級'
+ text: !appType ? '鍏抽棴寮圭獥' : '杩斿洖锛堜笂涓�涓〉闈級'
},
...refresh]
},
@@ -404,7 +404,7 @@
key: 'execError',
label: Formdict['model.form.afterError'],
initVal: card.execError || 'never',
- tooltip: refresh.length ? '鎵ц鏍囩鍏抽棴鍒锋柊鏃讹紝浼氬悓姝ュ埛鏂板綋鍓嶇粍浠跺拰涓婄骇缁勪欢-琛屻��' : '鍒锋柊涓婄骇缁勪欢-琛屾椂锛屼細鍚屾鍒锋柊褰撳墠缁勪欢锛屾敞锛氫笂绾х粍浠跺湪鏁版嵁婧愪腑娣诲姞銆�',
+ tooltip: refresh.length ? '鎵ц鍒锋柊婧愮粍浠舵椂锛岃鍦ㄦ簮鎸夐挳涓缃叧闂悗鍒锋柊閭ｄ竴椤癸紝娉細姝ゆ椂浼氬悓姝ュ埛鏂板綋鍓嶇粍浠跺拰涓婄骇缁勪欢-琛屻��' : '鍒锋柊涓婄骇缁勪欢-琛屾椂锛屼細鍚屾鍒锋柊褰撳墠缁勪欢锛屾敞锛氫笂绾х粍浠跺湪鏁版嵁婧愪腑娣诲姞銆�',
required: true,
options: [{
value: 'never',
diff --git a/src/menu/components/table/edit-table/columns/editColumn/index.jsx b/src/menu/components/table/edit-table/columns/editColumn/index.jsx
index b8e9de9..d664236 100644
--- a/src/menu/components/table/edit-table/columns/editColumn/index.jsx
+++ b/src/menu/components/table/edit-table/columns/editColumn/index.jsx
@@ -62,16 +62,17 @@
return item
})
- }, () => {
- if (column.focus) {
+ })
+ if (column.focus) {
+ setTimeout(() => {
try {
let _form = document.getElementById('label')
_form && _form.select()
} catch (e) {
console.warn('琛ㄥ崟focus澶辫触锛�')
}
- }
- })
+ }, 200)
+ }
}
typeChange = (key, value, option) => {
diff --git a/src/menu/components/table/normal-table/columns/editColumn/index.jsx b/src/menu/components/table/normal-table/columns/editColumn/index.jsx
index b360aaa..6222466 100644
--- a/src/menu/components/table/normal-table/columns/editColumn/index.jsx
+++ b/src/menu/components/table/normal-table/columns/editColumn/index.jsx
@@ -62,16 +62,17 @@
return item
})
- }, () => {
- if (column.focus) {
+ })
+ if (column.focus) {
+ setTimeout(() => {
try {
let _form = document.getElementById('label')
_form && _form.select()
} catch (e) {
console.warn('琛ㄥ崟focus澶辫触锛�')
}
- }
- })
+ }, 200)
+ }
}
typeChange = (key, value, option) => {
--
Gitblit v1.8.0