Merge remote-tracking branch 'origin/dev' into dev

2023-06-06 20:53:08 +08:00
parent e962ca6559 4bdc256311
commit e7065ab89e
11 changed files with 17036 additions and 3371 deletions
--- a/web/src/views/system/role/crud.tsx
+++ b/web/src/views/system/role/crud.tsx
@@ -177,7 +177,7 @@ export const createCrudOptions = function ({ crudExpose, rolePermission }: { cru
 							name: 'fs-dict-switch',
 							activeText: '',
 							inactiveText: '',
-							style: '--el-switch-on-color: #409eff; --el-switch-off-color: #dcdfe6',
+							style: '--el-switch-on-color: var(--el-color-primary); --el-switch-off-color: #dcdfe6',
 							onChange: compute((context) => {
 								return () => {
 									api.UpdateObj(context.row).then((res: APIResponseData) => {