From b5039c3d76008c07fff380d4b7e663d4911dfb14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E4=B8=9C=E4=BA=91?= Date: Tue, 6 Sep 2022 19:53:34 +0800 Subject: [PATCH] =?UTF-8?q?feat(studio):=20=E5=8E=86=E5=8F=B2=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E4=B8=AD=E5=A2=9E=E5=8A=A0=E4=BA=86=E9=A2=84=E7=BD=AE?= =?UTF-8?q?=E7=81=B0=E5=BA=A6=E5=9B=BE=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Workspace/Tasks/Item/GradientLattice.php | 46 ++++++++++--------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/src/Studio/Resource/Workspace/Tasks/Item/GradientLattice.php b/src/Studio/Resource/Workspace/Tasks/Item/GradientLattice.php index 8c7da47..983b862 100644 --- a/src/Studio/Resource/Workspace/Tasks/Item/GradientLattice.php +++ b/src/Studio/Resource/Workspace/Tasks/Item/GradientLattice.php @@ -14,8 +14,8 @@ namespace Singularity\HDK\Studio\Resource\Workspace\Tasks\Item; use Singularity\HDK\Studio\Resource\Field; use Singularity\HDK\Studio\Resource\File; use Singularity\HDK\Studio\Resource\FileCollection; -use Singularity\HDK\Studio\Resource\Workspace\Tasks\OrderItem; use Singularity\HDK\Studio\Resource\Lattice as LatticeResource; +use Singularity\HDK\Studio\Resource\Workspace\Tasks\OrderItem; /** * 用于历史记录列表的渐变晶格任务 @@ -29,27 +29,28 @@ use Singularity\HDK\Studio\Resource\Lattice as LatticeResource; * * @inheritDoc * - * @property string $fileId 要处理的模型文件 ID - * @property string $fileUrl 要处理的模型文件完整路径 - * @property string $latticeId 晶格 - * @property float $scalingRatio 密度比，两位小数 - * @property float $size 晶格尺寸 - * @property float $wideDarkest 杆径粗细-极黑 - * @property float $wideLightest 杆径粗细-极白 - * @property string $projection 投影方向 - * @property string $grayscaleUrl 灰度图链接 - * @property string|null $modelName - * @property int $fieldId - * @property Field $field - * @property LatticeResource $lattice - * @property File $source - * @property File $output - * @property File $outputSmall - * @property \Hyperf\Database\Model\Collection $showPicIds - * @property string $completeFileId - * @property string $completeFileUrl - * @property string $frameFileId - * @property string $frameFileUrl + * @property string $fileId 要处理的模型文件 ID + * @property string $fileUrl 要处理的模型文件完整路径 + * @property string $latticeId 晶格 + * @property float $scalingRatio 密度比，两位小数 + * @property float $size 晶格尺寸 + * @property float $wideDarkest 杆径粗细-极黑 + * @property float $wideLightest 杆径粗细-极白 + * @property string $projection 投影方向 + * @property \Singularity\HDK\Studio\Resource\Grayscale $grayscale 选择的预置灰度图信息 + * @property string $grayscaleUrl 灰度图链接 + * @property string|null $modelName + * @property int $fieldId + * @property Field $field + * @property LatticeResource $lattice + * @property File $source + * @property File $output + * @property File $outputSmall + * @property \Hyperf\Database\Model\Collection $showPicIds + * @property string $completeFileId + * @property string $completeFileUrl + * @property string $frameFileId + * @property string $frameFileUrl */ class GradientLattice extends OrderItem { @@ -68,6 +69,7 @@ class GradientLattice extends OrderItem 'wideDarkest' => $this->when(isset($this->wideDarkest), $this->wideDarkest), 'wideLightest' => $this->when(isset($this->wideLightest), $this->wideLightest), 'projection' => $this->projection, + 'grayscale' => $this->when(isset($this->grayscale), $this->grayscale), 'grayscaleUrl' => $this->grayscaleUrl, $this->mergeWhen(!empty($this->frameFileId), [ 'frameFileId' => $this->frameFileId,