fixed crop out of outline

Author: JackPu

src/lib/resize.js

@@ -32,12 +32,12 @@ export default function resize(e, el, container, coor, ratio) {
     CSSObj.width = (coor.w + resetX - coor.x);
     CSSObj.height = elOffsetWidth * ratioRemainder;
     if (dotBoxW > dotBoxH) {
-      if (elOffsetWidth >= dotBoxH) {
+      if (elOffsetWidth > dotBoxH) {
         CSSObj.height = dotBoxH;
         CSSObj.width = dotBoxH * ratio;
       }
     } else if (dotBoxW < dotBoxH) {
-      if (elOffsetWidth >= dotBoxW) {
+      if (elOffsetWidth > dotBoxW) {
         CSSObj.width = dotBoxW;
         CSSObj.height = dotBoxW * ratioRemainder;
       }
@@ -50,16 +50,16 @@ export default function resize(e, el, container, coor, ratio) {
     CSSObj.width = parseInt(el.style.height) * ratio;
     // 限制拖拉的范围在图片内
     if (dotBoxW > dotBoxH) {
-      if (elOffsetHeight >= dotBoxH) {
+      if (elOffsetHeight > dotBoxH) {
         CSSObj.height = dotBoxH;
         CSSObj.width = dotBoxH * ratio;
       }
     } else if (dotBoxW < dotBoxH) {
-      if (elOffsetWidth >= dotBoxW) {
+      if (elOffsetWidth > dotBoxW) {
         CSSObj.width = dotBoxW;
         CSSObj.height = dotBoxW * ratioRemainder;
       }
-    } else if (elOffsetWidth >= dotBoxW) {
+    } else if (elOffsetWidth > dotBoxW) {
       CSSObj.width = dotBoxW;
       CSSObj.height = dotBoxW * ratioRemainder;
     }
@@ -71,16 +71,16 @@ export default function resize(e, el, container, coor, ratio) {
     CSSObj.height = el.style.width;
     // limit the crop box area
     if (dotBoxW > dotBoxH) {
-      if (elOffsetHeight >= dotBoxH) {
+      if (elOffsetHeight > dotBoxH) {
         CSSObj.height = dotBoxH;
         CSSObj.width = dotBoxH;
       }
     } else if (dotBoxW < dotBoxH) {
-      if (elOffsetWidth >= dotBoxW) {
+      if (elOffsetWidth > dotBoxW) {
         CSSObj.width = dotBoxW;
         CSSObj.height = dotBoxW;
       }
-    } else if (elOffsetWidth >= dotBoxW) {
+    } else if (elOffsetWidth > dotBoxW) {
       CSSObj.width = el.style.height = dotBoxW;
     }
   }

src/vue-core-image-upload.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="g-core-image-upload-btn">
-    {{text}}
+    <slot>{{text}}</slot>
     <form class="g-core-image-upload-form" v-show="!hasImage" method="post" enctype="multipart/form-data" action="/api2/common_user/cropHeadUrl" style="display: block; cursor: pointer; position: absolute; left: 0px; top: 0px; width: 1242px; height: 61px; opacity: 0; margin: 0px; padding: 0px; overflow: hidden;">
       <input v-bind:disabled="uploading" v-bind:id="'g-core-upload-input-' + formID" v-bind:name="name" v-bind:multiple="multiple" type="file" v-bind:accept="inputAccept" v-on:change="change" style="width: 100%; height: 100%;">
     </form>
@@ -14,11 +14,11 @@
         <resize-bar v-if="resize" :min-progress="image.minProgress" ref="resizeBar" @resize="resizeImage"></resize-bar>
         <p class="btn-groups" v-if="crop">
           <button type="button" v-on:click="doCrop" class="btn btn-upload">{{cropBtn.ok}}</button>
-          <button type="button" v-on:click="cancel()" class="btn btn-cancel">{{cropBtn.cancel}}</button>
+          <button type="button" v-on:click="cancel" class="btn btn-cancel">{{cropBtn.cancel}}</button>
         </p>
         <p class="btn-groups" v-if="resize">
           <button type="button" v-on:click="doResize" class="btn btn-upload">{{ResizeBtn.ok}}</button>
-          <button type="button" v-on:click="cancel()" class="btn btn-cancel">{{ResizeBtn.cancel}}</button>
+          <button type="button" v-on:click="cancel" class="btn btn-cancel">{{ResizeBtn.cancel}}</button>
         </p>
       </div>
   </div>