From 2be08dff9e7d6afc4f2730261673022c520334cf Mon Sep 17 00:00:00 2001
From: RB <getrebuild@sina.com>
Date: Thu, 23 Jan 2025 16:49:19 +0800
Subject: [PATCH] data-updir

---
 .../com/rebuild/core/metadata/impl/EasyFieldConfigProps.java | 5 ++++-
 src/main/resources/web/admin/metadata/field-edit.html        | 4 ++--
 src/main/resources/web/assets/js/general/rb-forms.js         | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/rebuild/core/metadata/impl/EasyFieldConfigProps.java b/src/main/java/com/rebuild/core/metadata/impl/EasyFieldConfigProps.java
index dee5cc809..9405f6afa 100644
--- a/src/main/java/com/rebuild/core/metadata/impl/EasyFieldConfigProps.java
+++ b/src/main/java/com/rebuild/core/metadata/impl/EasyFieldConfigProps.java
@@ -111,7 +111,6 @@ public class EasyFieldConfigProps {
      * 允许上传数量
      */
     public static final String IMAGE_UPLOADNUMBER = FILE_UPLOADNUMBER;
-
     /**
      * 图片获取方式（兼容附件）
      */
@@ -120,6 +119,10 @@ public class EasyFieldConfigProps {
      * 图片获取方式（兼容附件）
      */
     public static final String IMAGE_CAPTURE_DEF = "imageCaptureDef";
+    /**
+     * 指定上传路径
+     */
+    public static final String IMAGE_UPDIR = FILE_UPDIR;
 
     /**
      * 自动编号规则
diff --git a/src/main/resources/web/admin/metadata/field-edit.html b/src/main/resources/web/admin/metadata/field-edit.html
index 8dbe1b55b..f309a7573 100644
--- a/src/main/resources/web/admin/metadata/field-edit.html
+++ b/src/main/resources/web/admin/metadata/field-edit.html
@@ -171,8 +171,8 @@ <h5>[[${bundle.L('常用')}]]</h5>
                     </label>
                   </div>
                 </div>
-                <div th:if="${fieldType == 'FILE'}" class="form-group row J_for-FILE bosskey-show">
-                  <label class="col-md-12 col-xl-3 col-lg-4 col-form-label text-lg-right">[[${bundle.L('上传目录')}]]</label>
+                <div th:if="${fieldType == 'IMAGE' || fieldType == 'FILE'}" class="form-group row J_for-IMAGE J_for-FILE bosskey-show">
+                  <label class="col-md-12 col-xl-3 col-lg-4 col-form-label text-lg-right">[[${bundle.L('上传目录')}]] (LAB)</label>
                   <div class="col-md-12 col-xl-6 col-lg-8">
                     <input type="text" class="form-control form-control-sm" id="fileUpdir" th:placeholder="${bundle.L('默认')}" />
                   </div>
diff --git a/src/main/resources/web/assets/js/general/rb-forms.js b/src/main/resources/web/assets/js/general/rb-forms.js
index 4ea9fa29e..a990d31c3 100644
--- a/src/main/resources/web/assets/js/general/rb-forms.js
+++ b/src/main/resources/web/assets/js/general/rb-forms.js
@@ -1692,7 +1692,7 @@ class RbFormImage extends RbFormElement {
           )
         })}
         <span title={$L('拖动或点击选择图片。需要 %s 个', `${this.__minUpload}~${this.__maxUpload}`)} className={`position-relative ${!showUpload && 'hide'}`}>
-          <input ref={(c) => (this._fieldValue__input = c)} type="file" className="inputfile" id={this._htmlid} accept="image/*" multiple />
+          <input ref={(c) => (this._fieldValue__input = c)} type="file" className="inputfile" id={this._htmlid} accept="image/*" multiple data-updir={this.props.fileUpdir || null} />
           <label htmlFor={this._htmlid} className="img-thumbnail img-upload" onClick={(e) => this._fileClick(e)}>
             {this._captureType === 2 ? <span className="mdi mdi-camera down-2" /> : <span className="zmdi zmdi-image-alt down-2" />}
           </label>