Skip to content

Commit 80beb8d

Browse files
committed
9.8.0
1 parent c6860e0 commit 80beb8d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+209
-9126
lines changed

app/Constant/AppConstant.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ class AppConstant
66
{
77
const APP = 'blog';
88
const APP_NAME = 'ModStartBlog';
9-
const VERSION = '9.7.0';
9+
const VERSION = '9.8.0';
1010
}
1111

module/Banner/Asset/style/banner.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

module/Vendor/Docs/release.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
- 新增:EntryProcessor 功能逻辑
44
- 优化:图片可视化设计增加图片占位符显示
5+
- 优化:图片可视化设计库尺寸缩放问题优化
56

67
---
78

module/Vendor/QuickRun/ImageDesign/ImageDesignUtil.php

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,14 @@ public static function textLineCount($text)
5858
return count($pcs);
5959
}
6060

61+
public static function configSaveCheck($imageConfig)
62+
{
63+
BizException::throwsIfEmpty('imageConfig 为空', $imageConfig);
64+
BizException::throwsIfEmpty('宽度为空', $imageConfig['width']);
65+
BizException::throwsIfEmpty('高度为空', $imageConfig['height']);
66+
BizException::throwsIfEmpty('背景图和背景色同时为空', empty($imageConfig['backgroundImage']) && empty($imageConfig['backgroundColor']));
67+
}
68+
6169
public static function render($imageConfig, $variables = [])
6270
{
6371
BizException::throwsIfEmpty('imageConfig 为空', $imageConfig);
@@ -163,12 +171,12 @@ public static function render($imageConfig, $variables = [])
163171
case 'image':
164172
$itemImagePath = FileUtil::savePathToLocalTemp($item['data']['image']);
165173
$itemImage = Image::make($itemImagePath);
166-
if (!empty($item['data']['opacity']) && $item['data']['opacity'] < 100 && $item['data']['opacity'] > 0) {
167-
$itemImage->opacity($item['data']['opacity']);
168-
}
169174
if (isset($item['data']['width']) && isset($item['data']['height'])) {
170175
$itemImage->resize($item['data']['width'], $item['data']['height']);
171176
}
177+
if (!empty($item['data']['opacity']) && $item['data']['opacity'] < 100 && $item['data']['opacity'] > 0) {
178+
$itemImage->opacity($item['data']['opacity']);
179+
}
172180
$image->insert($itemImage, 'top-left', $item['x'], $item['y']);
173181
break;
174182
case 'qrcode':

0 commit comments

Comments
 (0)