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

# Conflicts:
#	components.d.ts
This commit is contained in:
2026-05-13 12:56:01 +03:30
2 changed files with 26 additions and 16 deletions
@@ -4,12 +4,14 @@
class="w-[96px] h-[96px] overflow-hidden border border-solid border-blue-600 bg-gray-50 rounded-md p-2"
>
<AUpload
accept=".jpg,.jpeg,.png,.webp"
v-model:file-list="fileList"
name="file"
list-type="picture-card"
:showUploadList="true"
:multiple="false"
:action="uploadURL"
:capture="undefined"
:headers="fileHeader"
:before-upload="beforeUpload"
@change="handleChange"
@@ -3,18 +3,20 @@
<div class="border border-solid border-blue-600 bg-gray-50 w-full rounded-md p-2">
<div class="flex">
<AUpload
v-model:file-list="fileList"
name="file"
list-type="picture-card"
:show-upload-list="false"
:action="uploadURL"
:headers="fileHeader"
:showUploadList="true"
:before-upload="beforeUpload"
@change="handleChange"
accept=".jpg,.jpeg,.png,.webp"
v-model:file-list="fileList"
name="file"
list-type="picture-card"
:show-upload-list="false"
:action="uploadURL"
:capture="undefined"
:headers="fileHeader"
:showUploadList="true"
:before-upload="beforeUpload"
@change="handleChange"
>
<div>
<BaseIcon icon="vuesax-linear:add" color="#6B7280" />
<BaseIcon icon="vuesax-linear:add" color="#6B7280"/>
<div class="text-gray-500 text-center text-xs font-normal">بارگذاری فایل</div>
</div>
</AUpload>
@@ -24,13 +26,13 @@
</template>
<script setup lang="ts">
import type { UploadChangeParam, UploadProps } from 'ant-design-vue'
import { uploadURL } from '@root/config'
import { getToken } from '@/utils'
import { usePrefix } from '@core/composable/usePrefix'
import { message } from 'ant-design-vue'
import type {UploadChangeParam, UploadProps} from 'ant-design-vue'
import {uploadURL} from '@root/config'
import {getToken} from '@/utils'
import {usePrefix} from '@core/composable/usePrefix'
import {message} from 'ant-design-vue'
const { prefixCls } = usePrefix('product-image-uploader')
const {prefixCls} = usePrefix('product-image-uploader')
const loading = ref<boolean>(false)
const fileHeader = {
@@ -94,9 +96,11 @@ function handleChange(info: UploadChangeParam) {
margin: 0 !important;
border: none;
}
.ant-upload-picture-card-wrapper {
width: fit-content;
}
.ant-upload {
width: 78px !important;
height: 78px !important;
@@ -104,18 +108,22 @@ function handleChange(info: UploadChangeParam) {
border: dashed 1px #93c5fd;
border-radius: 4px;
}
.ant-upload-list-picture-card-container {
margin: 0;
width: 78px !important;
height: 78px !important;
}
.ant-upload-list-picture-card .ant-upload-list-item {
padding: 0;
border: none;
}
.ant-upload-list-picture-card .ant-upload-list-item-info {
border-radius: 4px;
}
.ant-upload-list {
display: flex !important;
flex-wrap: wrap;