qinyan 1 year ago
parent
commit
85aaa5642c
3 changed files with 9 additions and 6 deletions
  1. 1 1
      package.json
  2. 4 1
      src/modules/editor/components/CompUI/basicUI/Image2/component.tsx
  3. 4 4
      yarn.lock

+ 1 - 1
package.json

@@ -31,7 +31,7 @@
     "@queenjs-modules/queentree": "^0.0.10",
     "@queenjs-modules/queentree-explorer": "^0.0.6",
     "@queenjs-modules/queentree-explorer-viewer": "^0.0.3",
-    "@queenjs/components": "^0.0.19",
+    "@queenjs/components": "^0.0.20",
     "@queenjs/controllers": "^0.0.6",
     "@queenjs/icons": "^0.0.20",
     "@queenjs/theme": "^0.0.8",

+ 4 - 1
src/modules/editor/components/CompUI/basicUI/Image2/component.tsx

@@ -20,7 +20,10 @@ export const Component = defineComponent({
       temImg.src = url;
 
       temImg.onload = function () {
-        comp.setH(comp.getW() / (temImg.width / temImg.height));
+        const ratio = temImg.width / temImg.height;
+        const W = temImg.width > comp.getW() ? comp.getW() : temImg.width;
+        comp.setW(W);
+        comp.setH(W / ratio);
         actions.onCompLayoutUpdated(comp);
         helper.extendStreamCard(store.currStreamCardId);
       };

+ 4 - 4
yarn.lock

@@ -1763,10 +1763,10 @@
   resolved "http://124.70.149.18:4873/@queenjs-modules%2fqueentree/-/queentree-0.0.10.tgz#f6344ab32ba0163a3b8cf4f4b9fe6641aef2bea7"
   integrity sha512-P4cIjXKgcvd8h3vVs4f1rGLNf3/Kd5G+qGiZN+idkLjiu22HU6SNmOVLUwV6PuKg+9sTPRn7FKamSHuFxXWX5g==
 
-"@queenjs/components@^0.0.19":
-  version "0.0.19"
-  resolved "http://124.70.149.18:4873/@queenjs%2fcomponents/-/components-0.0.19.tgz#b3a0a91cf24fd2b46610c338ab1f0d68e0e6af60"
-  integrity sha512-XEuCLkyy9o2CFZu1nPf+9ND/m+1D+ib6zn8oSfKtwcB1rvz/lL6e/iqSqdZnUZ6ia2GAI0gRKcA0/3FRYJDL6g==
+"@queenjs/components@^0.0.20":
+  version "0.0.20"
+  resolved "http://124.70.149.18:4873/@queenjs%2fcomponents/-/components-0.0.20.tgz#26e863f9e91d9b16804244c13b081b1e7c6496ff"
+  integrity sha512-iFMI2Q3OVemrkxIuIACWsip8MH8NhjoBusDKGtjeWf7J4eVe2gh1fUE8zdpFz4m4upgtlk6KDAfcNGRxbi1U/Q==
   dependencies:
     "@queenjs/utils" "^0.0.1"