From 3f66b9062ba847ebc58ec57d14d1be822fbac120 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= <zoujingli@qq.com>
Date: Tue, 11 Oct 2022 11:10:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=96=87=E4=BB=B6=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/static/admin.js | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/public/static/admin.js b/public/static/admin.js
index 2c93d7907..63af51346 100644
--- a/public/static/admin.js
+++ b/public/static/admin.js
@@ -572,7 +572,7 @@ $(function () {
             if (elem.dataset.inited) return false; else elem.dataset.inited = 'true';
             elem.dataset.multiple = '|one|btn|'.indexOf(elem.dataset.file || 'one') > -1 ? '0' : '1';
             require(['upload'], function (apply) {
-                apply(elem, callable), setTimeout(function () {
+                apply(elem, callable) && setTimeout(function () {
                     typeof initialize === 'function' && initialize.call(elem, elem);
                 }, 100);
             });
@@ -890,12 +890,17 @@ $(function () {
         this.id = this.dataset.id = this.id || (function (date) {
             return (date + Math.random()).replace('0.', '');
         })(layui.util.toDateString(Date.now(), 'yyyyMMddHHmmss-'));
-        // 上传图片，支持单图或多图选择，分别是 image|images
+        /*! 查找表单元素, 如果没有找到将不会自动写值 */
+        if (!(this.$elem = $(this)).data('input') && this.$elem.data('field')) {
+            var $input = $('input[name="' + this.$elem.data('field') + '"]:not([type=file])');
+            this.$elem.data('input', $input.size() > 0 ? $input.get(0) : null);
+        }
+        // 单图或多图选择器 ( image|images )
         if (typeof this.dataset.file === 'string' && /^images?$/.test(this.dataset.file)) {
             return $.form.modal(tapiRoot + '/api.upload/image', this.dataset, '图片选择器')
         }
-        // 其他文件上传
-        if (!this.dataset.inited) $(this).uploadFile(undefined, function () {
+        // 其他文件上传处理
+        this.dataset.inited || $(this).uploadFile(undefined, function () {
             $(this).trigger('upload.start');
         });
     });