diff --git a/src/styles/components/ant-input.scss b/src/styles/components/ant-input.scss index 945df33..5e81ba8 100644 --- a/src/styles/components/ant-input.scss +++ b/src/styles/components/ant-input.scss @@ -27,7 +27,7 @@ &:focus-within, &.ant-input-focus, &.ant-textarea-focus { - background-color: var(--color-bg-2) !important; + background-color: #fff !important; border-color: $color-primary !important; box-shadow: 0 0 0 0 var(--color-primary-light-2) !important; } diff --git a/src/styles/components/ant-modal.scss b/src/styles/components/ant-modal.scss index c968195..7ac72de 100644 --- a/src/styles/components/ant-modal.scss +++ b/src/styles/components/ant-modal.scss @@ -41,6 +41,12 @@ .ant-modal-confirm-body-wrapper { .ant-modal-confirm-title { + font-family: $font-family-medium; + font-weight: 500; + color: #211F24; + font-size: 16px; + font-style: normal; + line-height: 24px; .anticon { font-size: 24px; } diff --git a/src/styles/components/ant-select.scss b/src/styles/components/ant-select.scss index 708f987..f5794f4 100644 --- a/src/styles/components/ant-select.scss +++ b/src/styles/components/ant-select.scss @@ -27,13 +27,28 @@ .ant-select-arrow { color: #737478; - //font-size: 14px; + + .anticon { + &.anticon-down { + color: #737478; + background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='14' height='14' viewBox='0 0 14 14' fill='none'%3E%3Cpath fill-rule='evenodd' clip-rule='evenodd' d='M11.9629 5.5L11.1379 4.67504L7.01314 8.79983L2.88835 4.67504L2.0634 5.5L6.60063 10.0372C6.60063 10.0372 6.60066 10.0373 7.01314 9.62479L6.60063 10.0372L7.01314 10.4497L11.9629 5.5Z' fill='%23737478'/%3E%3C/svg%3E"); + background-size: 14px; + width: 14px; + height: 14px; + background-repeat: no-repeat; + background-position: center right; + + > svg { + display: none; + } + } + } } &:focus, &-focused { .ant-select-selector { - background-color: var(--color-bg-2) !important; - border-color: rgb(var(--primary-6)) !important; + background-color: #fff !important; + border-color: $color-primary !important; box-shadow: 0 0 0 0 var(--color-primary-light-2) !important; } } @@ -44,7 +59,7 @@ &:not(.ant-select-disabled) { &:hover { .ant-select-selector { - border-color: rgb(var(--primary-6)) !important; + border-color: $color-primary !important; } } } @@ -55,6 +70,16 @@ } } + &.ant-select-open { + .ant-select-arrow { + .anticon { + &.anticon-down { + transform: rotate(180deg); + } + } + } + } + } .ant-select { diff --git a/src/styles/components/ant-table.scss b/src/styles/components/ant-table.scss index a53d7a6..3198601 100644 --- a/src/styles/components/ant-table.scss +++ b/src/styles/components/ant-table.scss @@ -56,20 +56,40 @@ } .ant-table-bordered { .ant-table-container { - .ant-table-thead { - .ant-table-cell { - border-inline-end: none !important ; - border-bottom: 1px solid var(--Border-1, #d7d7d9); - } - } - .ant-table-tbody { - .ant-table-row { - .ant-table-cell { - border-inline-end: none !important; - border-bottom: 1px solid var(--Border-1, #e6e6e8); + .ant-table-content { + > table { + border-top: none !important; + + .ant-table-thead { + .ant-table-cell { + border-inline-end: none !important; + border-bottom: 1px solid var(--Border-1, #d7d7d9); + } + + .ant-table-cell-fix-right-first { + &::after { + border-inline-end: none !important; + } + } + } + + .ant-table-tbody { + .ant-table-row { + .ant-table-cell { + border-inline-end: none !important; + border-bottom: 1px solid var(--Border-1, #e6e6e8); + } + + .ant-table-cell-fix-right-first { + &::after { + border-inline-end: none !important; + } + } + } } } } + } } } diff --git a/src/styles/components/ant-textarea.scss b/src/styles/components/ant-textarea.scss index 595c3fc..1f909fd 100644 --- a/src/styles/components/ant-textarea.scss +++ b/src/styles/components/ant-textarea.scss @@ -6,7 +6,7 @@ &:not(.ant-input-textarea-disabled) { &:hover { .ant-input { - border-color: rgb(var(--primary-6)) !important; + border-color: $color-primary !important; } } } diff --git a/src/utils/tools.ts b/src/utils/tools.ts index c0f2580..ecb1196 100644 --- a/src/utils/tools.ts +++ b/src/utils/tools.ts @@ -120,7 +120,7 @@ export function formatFileSize(bytes: number): string { if (bytes === 0) return '0 Bytes'; const k = 1024; - const sizes = ['Bytes', 'kb', 'mb', 'gb', 'tb']; + const sizes = ['Bytes', 'KB', 'MB', 'GB', 'TB']; const i = Math.floor(Math.log(bytes) / Math.log(k)); return parseFloat((bytes / Math.pow(k, i)).toFixed(2)) + ' ' + sizes[i]; diff --git a/src/views/material-center/components/raw-material/components/add-raw-material-drawer/index.vue b/src/views/material-center/components/raw-material/components/add-raw-material-drawer/index.vue index 985b59b..26a803c 100644 --- a/src/views/material-center/components/raw-material/components/add-raw-material-drawer/index.vue +++ b/src/views/material-center/components/raw-material/components/add-raw-material-drawer/index.vue @@ -19,7 +19,7 @@ import { documentExtensions, } from '@/views/material-center/components/raw-material/constants'; -import icon1 from '@/assets/img/media-account/icon-delete.png'; +// import icon1 from '@/assets/img/media-account/icon-delete.png'; import icon2 from '../../img/icon-no-text.png'; enum EnumUploadStatus { @@ -186,7 +186,7 @@ export default defineComponent({ const currentData = { uid, - name, + name: name.slice(0, 20), // type, type: fileType, uploadStatus: statusText ? EnumUploadStatus.error : EnumUploadStatus.uploading, @@ -263,7 +263,7 @@ export default defineComponent({ if (hasUploading) { modalRef.value = Modal.warning({ title: '上传未完成', - content:

当前原料正在上传中,关闭弹窗将导致上传失败,请等待上传完成后再点击“确定”

, + content:

当前原料正在上传中,关闭弹窗将导致上传失败,请等待上传完成后再点击“确定”

, okText: '我知道了', centered: true, }); @@ -312,7 +312,7 @@ export default defineComponent({ const renderUploadStatus = (record) => { if (record.uploadStatus === EnumUploadStatus.error) { return ( -
+

上传失败

{record.statusText}

@@ -320,9 +320,7 @@ export default defineComponent({ } return (
- - {record.uploadStatus === EnumUploadStatus.done ? '上传成功' : '上传中'} - +

{record.uploadStatus === EnumUploadStatus.done ? '上传成功' : '上传中'}

); @@ -340,7 +338,7 @@ export default defineComponent({ ref="tableRef" dataSource={uploadData.value} pagination={false} - class="w-100% flex-1" + class="w-100% flex-1 overflow-hidden" scroll={{ y: '100%' }} > { return (
- +