style(系统): 设计走查样式修改

This commit is contained in:
xinxin.wu 2023-09-19 14:13:45 +08:00 committed by rubylliu
parent 252d203328
commit adb76aa41a
9 changed files with 46 additions and 7 deletions

View File

@ -574,6 +574,9 @@
.arco-switch-checked:not(.arco-switch-disabled) {
background: rgb(var(--primary-6)) !important;
}
.arco-switch[disabled] {
background: var(--color-text-n8);
}
/** 分页 **/
.ms-pagination {
@ -718,7 +721,7 @@
}
.arco-checkbox-label {
overflow: hidden;
width: 214px;
width: 207px;
text-overflow: ellipsis;
white-space: nowrap;
}

View File

@ -1,5 +1,5 @@
export default {
'msBatchModal.batchModalSubTitle': '已选 {count} 个用户)',
'msBatchModal.batchModalSubTitle': '已选 {count} 个用户)',
'msBatchModal.batchModalTip': '默认为成员添加项目成员用户组',
'msBatchModal.batchOptional': '可选',
'msBatchModal.batchChosen': '已选',

View File

@ -9,9 +9,19 @@
@cancel="handleCancel"
>
<div class="ms-table-column-seletor">
<div class="mb-2">
<div class="mb-2 flex items-center">
<span class="text-[var(--color-text-4)]">{{ t('msTable.columnSetting.mode') }}</span>
<icon-question-circle class="ml-1 text-[var(--color-text-brand)]" />
<a-tooltip :content="t('msTable.columnSetting.tooltipContent')">
<template #content>
<span>{{ t('msTable.columnSetting.tooltipContentDrawer') }}</span
><br />
<span>{{ t('msTable.columnSetting.tooltipContentWindow') }}</span>
</template>
<span class="inline-block align-middle"
><icon-question-circle
class="ml-[4px] mt-[3px] text-[var(--color-text-brand)] hover:text-[rgb(var(--primary-5))]"
/></span>
</a-tooltip>
</div>
<a-radio-group :model-value="currentMode" type="button" @change="handleModeChange">
<a-radio value="drawer">
@ -35,7 +45,11 @@
<div class="flex-col">
<div v-for="item in nonSortColumn" :key="item.dataIndex" class="column-item">
<div>{{ t(item.title as string) }}</div>
<a-switch v-model="item.showInTable" size="small" />
<a-switch
v-model="item.showInTable"
size="small"
:disabled="item.dataIndex === 'name' || item.dataIndex === 'operation'"
/>
</div>
</div>
<a-divider orientation="center" class="non-sort"

View File

@ -25,6 +25,8 @@ export default {
header: 'Header Settings',
resetDefault: 'Reset default',
nonSort: 'The above properties cannot be sorted',
tooltipContentDrawer: 'Drawer: open a new page as a drawer',
tooltipContentWindow: 'New Window: open a new page with a new page',
},
cancel: 'Cancel',
confirm: 'Confirm',

View File

@ -25,6 +25,8 @@ export default {
header: '表头设置',
resetDefault: '恢复默认',
nonSort: '以上属性不可排序',
tooltipContentDrawer: '抽屉:以抽屉形式打开新页面',
tooltipContentWindow: '新窗口:以新开网页打开新页面',
},
cancel: '取消',
confirm: '确定',

View File

@ -1,5 +1,6 @@
import JSEncrypt from 'jsencrypt';
import { isObject } from './is';
import dayjs from 'dayjs';
type TargetContext = '_self' | '_parent' | '_blank' | '_top';
@ -274,3 +275,10 @@ export const downloadUrlFile = (url: string, fileName: string) => {
link.style.display = 'none';
link.click();
};
/**
*
* @param time
*/
export const getTime = (time: string): string => {
return dayjs(time).format('YYYY-MM-DD HH:mm:ss');
};

View File

@ -146,6 +146,7 @@
showTooltip: true,
ellipsis: true,
sortIndex: 0,
showDrag: true,
},
{
title: 'organization.member.tableColunmName',
@ -153,6 +154,7 @@
showInTable: true,
showTooltip: true,
ellipsis: true,
showDrag: false,
},
{
title: 'organization.member.tableColunmPhone',
@ -161,6 +163,7 @@
width: 200,
showTooltip: true,
ellipsis: true,
showDrag: true,
},
{
title: 'organization.member.tableColunmPro',
@ -168,6 +171,7 @@
dataIndex: 'projectIdNameMap',
showInTable: true,
isTag: true,
showDrag: true,
},
{
title: 'organization.member.tableColunmUsergroup',
@ -175,6 +179,7 @@
dataIndex: 'userRoleIdNameMap',
showInTable: true,
isTag: true,
showDrag: true,
},
{
title: 'organization.member.tableColunmStatus',
@ -182,6 +187,7 @@
dataIndex: 'enable',
showInTable: true,
width: 200,
showDrag: true,
},
{
title: 'organization.member.tableColunmActions',
@ -190,6 +196,7 @@
fixed: 'right',
width: 140,
showInTable: true,
showDrag: false,
},
];
tableStore.initColumn(TableKeyEnum.ORGANIZATION_MEMBER, columns, 'drawer');

View File

@ -133,9 +133,9 @@
@apply flex items-center rounded-md;
}
.ms-item-0 {
background: url('@/assets/images/ms_plugindownload.jpg') no-repeat center / cover;
background: url('@/assets/images/ms_plugindownload.jpg') no-repeat center / auto;
}
.ms-item-1 {
background: url('@/assets/images/ms_configplugin.jpg') no-repeat center / cover;
background: url('@/assets/images/ms_configplugin.jpg') no-repeat center / auto;
}
</style>

View File

@ -444,4 +444,7 @@
}
}
}
:deep(.arco-table-th) {
color: var(--color-text-3);
}
</style>