-
Notifications
You must be signed in to change notification settings - Fork 7.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
19 changed files
with
550 additions
and
121 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,10 @@ | ||
| ## Wip | ||
|
|
||
| ### ✨ Features | ||
|
|
||
| - `Cropper` 头像裁剪新增圆形裁剪功能 | ||
| - 新增头像上传组件 | ||
|
|
||
| ## 2.4.2(2021-06-10) | ||
|
|
||
| ### ✨ Refactor | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,7 @@ | ||
| import type Cropper from 'cropperjs'; | ||
| import { withInstall } from '/@/utils'; | ||
| import cropperImage from './src/Cropper.vue'; | ||
| import avatarCropper from './src/CropperAvatar.vue'; | ||
|
|
||
| export type { Cropper }; | ||
| export { default as CropperImage } from './src/Cropper.vue'; | ||
| export * from './src/typing'; | ||
| export const CropperImage = withInstall(cropperImage); | ||
| export const CropperAvatar = withInstall(avatarCropper); |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,258 @@ | ||
| <template> | ||
| <BasicModal | ||
| v-bind="$attrs" | ||
| @register="register" | ||
| :title="t('component.cropper.modalTitle')" | ||
| width="800px" | ||
| :canFullscreen="false" | ||
| @ok="handleOk" | ||
| :okText="t('component.cropper.okText')" | ||
| > | ||
| <div :class="prefixCls"> | ||
| <div :class="`${prefixCls}-left`"> | ||
| <div :class="`${prefixCls}-cropper`"> | ||
| <CropperImage | ||
| v-if="src" | ||
| :src="src" | ||
| height="300px" | ||
| :circled="circled" | ||
| @cropend="handleCropend" | ||
| @ready="handleReady" | ||
| /> | ||
| </div> | ||
|
|
||
| <div :class="`${prefixCls}-toolbar`"> | ||
| <Upload :fileList="[]" accept="image/*" :beforeUpload="handleBeforeUpload"> | ||
| <a-button size="small" preIcon="ant-design:upload-outlined" type="primary" /> | ||
| </Upload> | ||
| <Space> | ||
| <a-button | ||
| type="primary" | ||
| preIcon="ant-design:reload-outlined" | ||
| size="small" | ||
| @click="handlerToolbar('reset')" | ||
| /> | ||
| <a-button | ||
| type="primary" | ||
| preIcon="ant-design:rotate-left-outlined" | ||
| size="small" | ||
| @click="handlerToolbar('rotate', -45)" | ||
| /> | ||
| <a-button | ||
| type="primary" | ||
| preIcon="ant-design:rotate-right-outlined" | ||
| size="small" | ||
| @click="handlerToolbar('rotate', 45)" | ||
| /> | ||
| <a-button | ||
| type="primary" | ||
| preIcon="vaadin:arrows-long-h" | ||
| size="small" | ||
| @click="handlerToolbar('scaleX')" | ||
| /> | ||
| <a-button | ||
| type="primary" | ||
| preIcon="vaadin:arrows-long-v" | ||
| size="small" | ||
| @click="handlerToolbar('scaleY')" | ||
| /> | ||
| <a-button | ||
| type="primary" | ||
| preIcon="ant-design:zoom-in-outlined" | ||
| size="small" | ||
| @click="handlerToolbar('zoom', 0.1)" | ||
| /> | ||
| <a-button | ||
| type="primary" | ||
| preIcon="ant-design:zoom-out-outlined" | ||
| size="small" | ||
| @click="handlerToolbar('zoom', -0.1)" | ||
| /> | ||
| </Space> | ||
| </div> | ||
| </div> | ||
| <div :class="`${prefixCls}-right`"> | ||
| <div :class="`${prefixCls}-preview`"> | ||
| <img :src="previewSource" v-if="previewSource" /> | ||
| </div> | ||
| <template v-if="previewSource"> | ||
| <div :class="`${prefixCls}-group`"> | ||
| <Avatar :src="previewSource" size="large" /> | ||
| <Avatar :src="previewSource" :size="48" /> | ||
| <Avatar :src="previewSource" :size="64" /> | ||
| <Avatar :src="previewSource" :size="80" /> | ||
| </div> | ||
| </template> | ||
| </div> | ||
| </div> | ||
| </BasicModal> | ||
| </template> | ||
| <script lang="ts"> | ||
| import type { CropendResult, Cropper } from './typing'; | ||
| import { defineComponent, ref } from 'vue'; | ||
| import CropperImage from './Cropper.vue'; | ||
| import { Space, Upload, Avatar } from 'ant-design-vue'; | ||
| import { useDesign } from '/@/hooks/web/useDesign'; | ||
| import { BasicModal, useModalInner } from '/@/components/Modal'; | ||
| import { dataURLtoBlob } from '/@/utils/file/base64Conver'; | ||
| import { isFunction } from '/@/utils/is'; | ||
| import { useI18n } from '/@/hooks/web/useI18n'; | ||
| const props = { | ||
| circled: { type: Boolean, default: true }, | ||
| uploadApi: { | ||
| type: Function as PropType<({ file: Blob, name: stirng, filename: string }) => Promise<any>>, | ||
| }, | ||
| }; | ||
| export default defineComponent({ | ||
| name: 'CropperAvatar', | ||
| components: { BasicModal, Space, CropperImage, Upload, Avatar }, | ||
| props, | ||
| emits: ['uploadSuccess', 'register'], | ||
| setup(props, { emit }) { | ||
| let filename = ''; | ||
| const src = ref(''); | ||
| const previewSource = ref(''); | ||
| const cropper = ref<Cropper>(); | ||
| let scaleX = 1; | ||
| let scaleY = 1; | ||
| const { prefixCls } = useDesign('cropper-am'); | ||
| const [register, { closeModal, setModalProps }] = useModalInner(); | ||
| const { t } = useI18n(); | ||
| // Block upload | ||
| function handleBeforeUpload(file: File) { | ||
| const reader = new FileReader(); | ||
| reader.readAsDataURL(file); | ||
| src.value = ''; | ||
| previewSource.value = ''; | ||
| reader.onload = function (e) { | ||
| src.value = (e.target?.result as string) ?? ''; | ||
| filename = file.name; | ||
| }; | ||
| return false; | ||
| } | ||
| function handleCropend({ imgBase64 }: CropendResult) { | ||
| previewSource.value = imgBase64; | ||
| } | ||
| function handleReady(cropperInstance: Cropper) { | ||
| cropper.value = cropperInstance; | ||
| } | ||
| function handlerToolbar(event: string, arg?: number) { | ||
| if (event === 'scaleX') { | ||
| scaleX = arg = scaleX === -1 ? 1 : -1; | ||
| } | ||
| if (event === 'scaleY') { | ||
| scaleY = arg = scaleY === -1 ? 1 : -1; | ||
| } | ||
| cropper?.value?.[event]?.(arg); | ||
| } | ||
| async function handleOk() { | ||
| const uploadApi = props.uploadApi; | ||
| if (uploadApi && isFunction(uploadApi)) { | ||
| const blob = dataURLtoBlob(previewSource.value); | ||
| try { | ||
| setModalProps({ confirmLoading: true }); | ||
| const result = await uploadApi({ name: 'file', file: blob, filename }); | ||
| emit('uploadSuccess', { source: previewSource.value, data: result.data }); | ||
| closeModal(); | ||
| } finally { | ||
| setModalProps({ confirmLoading: false }); | ||
| } | ||
| } | ||
| } | ||
| return { | ||
| t, | ||
| prefixCls, | ||
| src, | ||
| register, | ||
| previewSource, | ||
| handleBeforeUpload, | ||
| handleCropend, | ||
| handleReady, | ||
| handlerToolbar, | ||
| handleOk, | ||
| }; | ||
| }, | ||
| }); | ||
| </script> | ||
|
|
||
| <style lang="less"> | ||
| @prefix-cls: ~'@{namespace}-cropper-am'; | ||
| .@{prefix-cls} { | ||
| display: flex; | ||
| &-left, | ||
| &-right { | ||
| height: 340px; | ||
| } | ||
| &-left { | ||
| width: 55%; | ||
| } | ||
| &-right { | ||
| width: 45%; | ||
| } | ||
| &-cropper { | ||
| height: 300px; | ||
| background: #eee; | ||
| background-image: linear-gradient( | ||
| 45deg, | ||
| rgba(0, 0, 0, 0.25) 25%, | ||
| transparent 0, | ||
| transparent 75%, | ||
| rgba(0, 0, 0, 0.25) 0 | ||
| ), | ||
| linear-gradient( | ||
| 45deg, | ||
| rgba(0, 0, 0, 0.25) 25%, | ||
| transparent 0, | ||
| transparent 75%, | ||
| rgba(0, 0, 0, 0.25) 0 | ||
| ); | ||
| background-position: 0 0, 12px 12px; | ||
| background-size: 24px 24px; | ||
| } | ||
| &-toolbar { | ||
| display: flex; | ||
| justify-content: space-between; | ||
| align-items: center; | ||
| margin-top: 10px; | ||
| } | ||
| &-preview { | ||
| width: 220px; | ||
| height: 220px; | ||
| margin: 0 auto; | ||
| overflow: hidden; | ||
| border: 1px solid @border-color-base; | ||
| border-radius: 50%; | ||
| img { | ||
| width: 100%; | ||
| height: 100%; | ||
| } | ||
| } | ||
| &-group { | ||
| display: flex; | ||
| padding-top: 8px; | ||
| margin-top: 8px; | ||
| border-top: 1px solid @border-color-base; | ||
| justify-content: space-around; | ||
| align-items: center; | ||
| } | ||
| } | ||
| </style> |
Oops, something went wrong.