From ed3ec423f27695f8c1cc00c31283f6145b6fc81e Mon Sep 17 00:00:00 2001
From: SunnyQjm <qjm253@pku.edu.cn>
Date: Tue, 18 Feb 2020 17:57:09 +0800
Subject: [PATCH] =?UTF-8?q?add:=20=E6=94=AF=E6=8C=81=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=96=87=E4=BB=B6=E7=9A=84=E6=A0=BC=E5=BC=8F?=
 =?UTF-8?q?=E5=92=8C=E8=B4=A8=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                   |  1 +
 .idea/inspectionProfiles/Project_Default.xml |  2 +-
 @types/taro-cropper.d.ts                     |  2 ++
 src/components/taro-cropper/index.tsx        | 18 +++++++++++++-----
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2cea3ef..c3eedb5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ deploy_versions/
 .rn_temp/
 node_modules/
 .DS_Store
+yarn.lock
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index 38746d6..1a55941 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -3,7 +3,7 @@
     <option name="myName" value="Project Default" />
     <inspection_tool class="DuplicatedCode" enabled="true" level="WEAK WARNING" enabled_by_default="true">
       <Languages>
-        <language minSize="54" name="TypeScript" />
+        <language minSize="65" name="TypeScript" />
       </Languages>
     </inspection_tool>
     <inspection_tool class="Stylelint" enabled="true" level="ERROR" enabled_by_default="true" />
diff --git a/@types/taro-cropper.d.ts b/@types/taro-cropper.d.ts
index 829e319..6467c53 100644
--- a/@types/taro-cropper.d.ts
+++ b/@types/taro-cropper.d.ts
@@ -18,6 +18,8 @@ export interface TaroCropperComponentProps {
   hideCancelText?: boolean,          // 隐藏取消按钮（默认为true）
   finishText?: string,               // 完成按钮文字，默认为 '完成'
   cancelText?: string,               // 取消按钮文字，默认为 '取消'
+  fileType?: 'jpg' | 'png' | string, // 裁剪后导出的图片的格式，只支持 'jpg' 或 'png'。默认为 'jpg'
+  quality?: number,                  // 导出图片的质量，取值为 0 ~ 1，默认为1
 }
 
 declare const TaroCropper: ComponentClass<TaroCropperComponentProps>;
diff --git a/src/components/taro-cropper/index.tsx b/src/components/taro-cropper/index.tsx
index c71ec40..6bc7ce5 100644
--- a/src/components/taro-cropper/index.tsx
+++ b/src/components/taro-cropper/index.tsx
@@ -25,6 +25,8 @@ interface TaroCropperComponentProps {
   hideCancelText: boolean,          // 隐藏取消按钮（默认为true）
   finishText: string,               // 完成按钮文字，默认为 '完成'
   cancelText: string,               // 取消按钮文字，默认为 '取消'
+  fileType: 'jpg' | 'png' | string, // 裁剪后导出的图片的格式，只支持 'jpg' 或 'png'。默认为 'jpg'
+  quality: number,                  // 导出图片的质量，取值为 0 ~ 1，默认为1
 }
 
 interface TaroCropperComponentState {
@@ -48,7 +50,10 @@ class TaroCropperComponent extends Taro.PureComponent<TaroCropperComponentProps,
     hideCancelText: true,
     finishText: '完成',
     cancelText: '取消',
-    onCancel: () => {},
+    fileType: 'jpg',
+    quality: 1,
+    onCancel: () => {
+    },
     onCut: () => {
     },
     onFail: () => {
@@ -432,9 +437,10 @@ class TaroCropperComponent extends Taro.PureComponent<TaroCropperComponentProps,
     filePath: string,
   }> {
     const {
-      cropperCutCanvasId
+      cropperCutCanvasId,
+      fileType,
+      quality
     } = this.props;
-    console.log(this.systemInfo.pixelRatio);
     return new Promise((resolve, reject) => {
       const scope = process.env.TARO_ENV === 'h5' ? this : this.$scope;
       Taro.canvasToTempFilePath({
@@ -445,6 +451,8 @@ class TaroCropperComponent extends Taro.PureComponent<TaroCropperComponentProps,
         height: this.cropperHeight - 2,
         destWidth: this.cropperWidth * this.systemInfo.pixelRatio,
         destHeight: this.cropperHeight * this.systemInfo.pixelRatio,
+        fileType: fileType,
+        quality: quality,
         success: res => {
           switch (process.env.TARO_ENV) {
             case 'alipay':
@@ -552,7 +560,7 @@ class TaroCropperComponent extends Taro.PureComponent<TaroCropperComponentProps,
       // }
     }
 
-    if(!hideCancelText) {
+    if (!hideCancelText) {
       const cancelStyle: CSSProperties = {
         position: 'absolute',
         display: 'inline-block',
@@ -593,7 +601,7 @@ class TaroCropperComponent extends Taro.PureComponent<TaroCropperComponentProps,
         }
         {
           !hideCancelText &&
-            cancel
+          cancel
         }
       </View>