From 04a9e254f765ccea77dad02574a8c6fc45ddafb8 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 06 四月 2023 11:31:46 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/templates/comtableconfig/updatetable/index.jsx | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/templates/comtableconfig/updatetable/index.jsx b/src/templates/comtableconfig/updatetable/index.jsx
index 647404a..d56aa9b 100644
--- a/src/templates/comtableconfig/updatetable/index.jsx
+++ b/src/templates/comtableconfig/updatetable/index.jsx
@@ -1052,7 +1052,7 @@
}
let colbtns = []
- let colors = { primary: '#1890ff', yellow: '#c49f47', orange: 'orange', danger: '#ff4d4f', green: '#26C281', dgreen: '#32c5d2', purple: '#8E44AD', cyan: '#13c2c2', gray: '#666666', default: 'rgba(0, 0, 0, 0.65)' }
+ let colors = { primary: '#1890ff', yellow: '#c49f47', orange: 'orange', danger: '#ff4d4f', green: '#26C281', dgreen: '#32c5d2', purple: '#8E44AD', cyan: '#13c2c2', gray: '#E7E7EF', default: 'rgba(0, 0, 0, 0.65)' }
let uuids = {}
config.action.forEach(btn => {
@@ -1161,7 +1161,7 @@
} else if (btn.class.indexOf('border') > -1) {
_btn.style = {color: color, backgroundColor: '#fff', borderColor: color, marginRight: '15px'}
} else {
- _btn.style = {color: '#fff', backgroundColor: color, borderColor: color, marginRight: '15px'}
+ _btn.style = {color: btn.class === 'gray' ? 'rgba(0, 0, 0, 0.65)' : '#fff', backgroundColor: color, borderColor: color, marginRight: '15px'}
}
_card.action.push(_btn)
}
--
Gitblit v1.8.0