一些优化

README.md

@@ -51,21 +51,22 @@
         ->accept('mime types');
         
     $form->vMutipleFile('files') // 关联文件系统配置-直传
-        ->accept('mime types');
+        ->mimeTypes('video/*');
         
     $form->vImage('image') // 关联文件系统配置-直传-裁剪
         ->ratio(16 / 9) // 固定裁剪比例
         ->large() // 放大裁剪框
         ->resolution(1920, 1080) // 重置图片分辨率
         ->jpeg(0.8) // 裁剪为jpeg格式, 参数为图片质量0-1
-        ->accept('mime types');
+        ->disableCropper() // 关闭裁剪弹窗
+        ->mimeTypes('image/*');
         
     $form->vMultipleImage('images') // 关联文件系统配置-直传-裁剪
         ->ratio(16 / 9) // 固定裁剪比例
         ->large() // 放大裁剪框
         ->resolution(1920, 1080) // 重置图片分辨率
         ->jpeg(0.8) // 裁剪为jpeg格式, 参数为图片质量0-1
-        ->accept('mime types');
+        ->mimeTypes('image/*');
         
     $form->vTags('tags'); // 标签
     

resources/assets/css/index.css

@@ -1 +1 @@
-.file-list-wrap[data-v-25c6ecfc]{margin-top:2px!important}.cropper-container{direction:ltr;font-size:0;line-height:0;position:relative;touch-action:none;user-select:none}.cropper-container img{backface-visibility:hidden;display:block;height:100%;image-orientation:0deg;max-height:none!important;max-width:none!important;min-height:0!important;min-width:0!important;width:100%}.cropper-wrap-box,.cropper-canvas,.cropper-drag-box,.cropper-crop-box,.cropper-modal{bottom:0;left:0;position:absolute;right:0;top:0}.cropper-wrap-box,.cropper-canvas{overflow:hidden}.cropper-drag-box{background-color:#fff;opacity:0}.cropper-modal{background-color:#000;opacity:.5}.cropper-view-box{display:block;height:100%;outline:1px solid #39f;outline-color:#3399ffbf;overflow:hidden;width:100%}.cropper-dashed{border:0 dashed #eee;display:block;opacity:.5;position:absolute}.cropper-dashed.dashed-h{border-bottom-width:1px;border-top-width:1px;height:33.3333333333%;left:0;top:33.3333333333%;width:100%}.cropper-dashed.dashed-v{border-left-width:1px;border-right-width:1px;height:100%;left:33.3333333333%;top:0;width:33.3333333333%}.cropper-center{display:block;height:0;left:50%;opacity:.75;position:absolute;top:50%;width:0}.cropper-center:before,.cropper-center:after{background-color:#eee;content:" ";display:block;position:absolute}.cropper-center:before{height:1px;left:-3px;top:0;width:7px}.cropper-center:after{height:7px;left:0;top:-3px;width:1px}.cropper-face,.cropper-line,.cropper-point{display:block;height:100%;opacity:.1;position:absolute;width:100%}.cropper-face{background-color:#fff;left:0;top:0}.cropper-line{background-color:#39f}.cropper-line.line-e{cursor:ew-resize;right:-3px;top:0;width:5px}.cropper-line.line-n{cursor:ns-resize;height:5px;left:0;top:-3px}.cropper-line.line-w{cursor:ew-resize;left:-3px;top:0;width:5px}.cropper-line.line-s{bottom:-3px;cursor:ns-resize;height:5px;left:0}.cropper-point{background-color:#39f;height:5px;opacity:.75;width:5px}.cropper-point.point-e{cursor:ew-resize;margin-top:-3px;right:-3px;top:50%}.cropper-point.point-n{cursor:ns-resize;left:50%;margin-left:-3px;top:-3px}.cropper-point.point-w{cursor:ew-resize;left:-3px;margin-top:-3px;top:50%}.cropper-point.point-s{bottom:-3px;cursor:s-resize;left:50%;margin-left:-3px}.cropper-point.point-ne{cursor:nesw-resize;right:-3px;top:-3px}.cropper-point.point-nw{cursor:nwse-resize;left:-3px;top:-3px}.cropper-point.point-sw{bottom:-3px;cursor:nesw-resize;left:-3px}.cropper-point.point-se{bottom:-3px;cursor:nwse-resize;height:20px;opacity:1;right:-3px;width:20px}@media (min-width: 768px){.cropper-point.point-se{height:15px;width:15px}}@media (min-width: 992px){.cropper-point.point-se{height:10px;width:10px}}@media (min-width: 1200px){.cropper-point.point-se{height:5px;opacity:.75;width:5px}}.cropper-point.point-se:before{background-color:#39f;bottom:-50%;content:" ";display:block;height:200%;opacity:0;position:absolute;right:-50%;width:200%}.cropper-invisible{opacity:0}.cropper-bg{background-image:url(../images/bg.png)}.cropper-hide{display:block;height:0;position:absolute;width:0}.cropper-hidden{display:none!important}.cropper-move{cursor:move}.cropper-crop{cursor:crosshair}.cropper-disabled .cropper-drag-box,.cropper-disabled .cropper-face,.cropper-disabled .cropper-line,.cropper-disabled .cropper-point{cursor:not-allowed}.n-modal-container{z-index:99999999!important}.modal-container[data-v-7a8a7584]{display:flex;flex-direction:column}.modal-container .cropper-container[data-v-7a8a7584]{width:480px;height:270px}.modal-container .cropper-container img[data-v-7a8a7584]{max-width:100%;display:block}.modal-container .large[data-v-7a8a7584]{width:960px!important;height:540px!important}.modal-container .cropper-controls[data-v-7a8a7584]{height:50px;display:flex;align-items:center}.modal-container .cropper-controls .controls-first[data-v-7a8a7584]{margin-left:12px}.file-list-wrap[data-v-4917ac86]{margin-top:2px!important}.preview[data-v-4917ac86]{width:138px;height:138px;border:1px solid #dae1e7;border-radius:10px;background-color:#f1f1f1;display:flex;justify-content:center;align-items:center}.preview img[data-v-4917ac86]{max-width:100%;max-height:100%;border-radius:4px;padding:1px}.preview[data-v-4917ac86]:hover{border:1px dashed #2dd3c4}.custom-upload-dragger[data-v-4917ac86]{width:138px;height:138px;display:flex;justify-content:center;align-items:center;border-radius:10px}.custom-upload-dragger .btn-plus[data-v-4917ac86]{font-size:88px;color:#b0b0b0}.add[data-v-f1fb3bdc]{font-size:20px}.map-container{margin-top:18px;height:var(--aa3e063e)}.map-container canvas{border-radius:10px;box-shadow:1px 1px 6px #aaa}
+.file-list-wrap[data-v-4317a8d6]{margin-top:6px!important}.cropper-container{direction:ltr;font-size:0;line-height:0;position:relative;touch-action:none;user-select:none}.cropper-container img{backface-visibility:hidden;display:block;height:100%;image-orientation:0deg;max-height:none!important;max-width:none!important;min-height:0!important;min-width:0!important;width:100%}.cropper-wrap-box,.cropper-canvas,.cropper-drag-box,.cropper-crop-box,.cropper-modal{bottom:0;left:0;position:absolute;right:0;top:0}.cropper-wrap-box,.cropper-canvas{overflow:hidden}.cropper-drag-box{background-color:#fff;opacity:0}.cropper-modal{background-color:#000;opacity:.5}.cropper-view-box{display:block;height:100%;outline:1px solid #39f;outline-color:#3399ffbf;overflow:hidden;width:100%}.cropper-dashed{border:0 dashed #eee;display:block;opacity:.5;position:absolute}.cropper-dashed.dashed-h{border-bottom-width:1px;border-top-width:1px;height:33.3333333333%;left:0;top:33.3333333333%;width:100%}.cropper-dashed.dashed-v{border-left-width:1px;border-right-width:1px;height:100%;left:33.3333333333%;top:0;width:33.3333333333%}.cropper-center{display:block;height:0;left:50%;opacity:.75;position:absolute;top:50%;width:0}.cropper-center:before,.cropper-center:after{background-color:#eee;content:" ";display:block;position:absolute}.cropper-center:before{height:1px;left:-3px;top:0;width:7px}.cropper-center:after{height:7px;left:0;top:-3px;width:1px}.cropper-face,.cropper-line,.cropper-point{display:block;height:100%;opacity:.1;position:absolute;width:100%}.cropper-face{background-color:#fff;left:0;top:0}.cropper-line{background-color:#39f}.cropper-line.line-e{cursor:ew-resize;right:-3px;top:0;width:5px}.cropper-line.line-n{cursor:ns-resize;height:5px;left:0;top:-3px}.cropper-line.line-w{cursor:ew-resize;left:-3px;top:0;width:5px}.cropper-line.line-s{bottom:-3px;cursor:ns-resize;height:5px;left:0}.cropper-point{background-color:#39f;height:5px;opacity:.75;width:5px}.cropper-point.point-e{cursor:ew-resize;margin-top:-3px;right:-3px;top:50%}.cropper-point.point-n{cursor:ns-resize;left:50%;margin-left:-3px;top:-3px}.cropper-point.point-w{cursor:ew-resize;left:-3px;margin-top:-3px;top:50%}.cropper-point.point-s{bottom:-3px;cursor:s-resize;left:50%;margin-left:-3px}.cropper-point.point-ne{cursor:nesw-resize;right:-3px;top:-3px}.cropper-point.point-nw{cursor:nwse-resize;left:-3px;top:-3px}.cropper-point.point-sw{bottom:-3px;cursor:nesw-resize;left:-3px}.cropper-point.point-se{bottom:-3px;cursor:nwse-resize;height:20px;opacity:1;right:-3px;width:20px}@media (min-width: 768px){.cropper-point.point-se{height:15px;width:15px}}@media (min-width: 992px){.cropper-point.point-se{height:10px;width:10px}}@media (min-width: 1200px){.cropper-point.point-se{height:5px;opacity:.75;width:5px}}.cropper-point.point-se:before{background-color:#39f;bottom:-50%;content:" ";display:block;height:200%;opacity:0;position:absolute;right:-50%;width:200%}.cropper-invisible{opacity:0}.cropper-bg{background-image:url(../images/bg.png)}.cropper-hide{display:block;height:0;position:absolute;width:0}.cropper-hidden{display:none!important}.cropper-move{cursor:move}.cropper-crop{cursor:crosshair}.cropper-disabled .cropper-drag-box,.cropper-disabled .cropper-face,.cropper-disabled .cropper-line,.cropper-disabled .cropper-point{cursor:not-allowed}.n-modal-container{z-index:99999999!important}.modal-container[data-v-14b01bbd]{border-radius:10px}.modal-container .cropper-container[data-v-14b01bbd]{width:480px;height:270px}.modal-container .cropper-container img[data-v-14b01bbd]{max-width:100%;display:block}.modal-container .large[data-v-14b01bbd]{width:960px!important;height:540px!important}.modal-container .cropper-controls[data-v-14b01bbd]{padding:11px 0 11px 11px;background-color:#c9c9c9;border-radius:0 0 6px 6px}.file-list-wrap[data-v-8ad40512]{margin-top:2px!important}.preview[data-v-8ad40512]{width:138px;height:138px;border:1px solid #dae1e7;border-radius:10px;background-color:#f1f1f1;display:flex;justify-content:center;align-items:center}.preview img[data-v-8ad40512]{max-width:100%;max-height:100%;border-radius:4px;padding:1px}.preview[data-v-8ad40512]:hover{border:1px dashed #2dd3c4}.custom-upload-dragger[data-v-8ad40512]{width:138px;height:138px;display:flex;justify-content:center;align-items:center;border-radius:10px}.custom-upload-dragger .btn-plus[data-v-8ad40512]{font-size:88px;color:#b0b0b0}.add[data-v-9ae53601]{font-size:20px}.map-container{margin-top:18px;height:var(--3ba32538)}.map-container canvas{border-radius:10px;box-shadow:1px 1px 6px #aaa}

src/Field/Image.php

@@ -11,6 +11,7 @@ class Image extends Field\Image
 {
     protected $view = 'weiwait.dcat-vue::common';
     protected string $disk;
+    protected bool $disableCropper = false;
 
     protected function prepareInputValue($file)
     {
@@ -61,6 +62,7 @@ class Image extends Field\Image
             'dir' => $this->getDirectory(),
             'uploaded_url' => route('dcat.admin.weiwait.file.uploaded'),
             'obs_config_url' => route('dcat.admin.weiwait.file.obs-config'),
+            'disableCropper' => $this->disableCropper,
        ]);
     }
 
@@ -139,4 +141,11 @@ class Image extends Field\Image
 
         return $previews;
     }
+
+    public function disableCropper(bool $disable = true): static
+    {
+        $this->disableCropper = $disable;
+
+        return $this;
+    }
 }

version.php

@@ -83,4 +83,7 @@ return [
     '2.6.0' => [
         '合并验证码到此',
     ],
+    '2.6.1' => [
+        '一些优化',
+    ],
 ];