From 3ee684875fa52ca9f4165d26bfbc364dac8cfd87 Mon Sep 17 00:00:00 2001
From: Karson <karsonzhang@163.com>
Date: Thu, 25 Jul 2024 15:25:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=80=89=E6=8B=A9=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=90=8E=E5=9B=9E=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

优化选择文件回调参数
---
 public/assets/js/backend/general/attachment.js | 2 +-
 public/assets/js/require-form.js               | 3 +++
 public/assets/js/require-table.js              | 6 +++---
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/public/assets/js/backend/general/attachment.js b/public/assets/js/backend/general/attachment.js
index 23202114..53c8680a 100644
--- a/public/assets/js/backend/general/attachment.js
+++ b/public/assets/js/backend/general/attachment.js
@@ -167,7 +167,7 @@ define(['jquery', 'bootstrap', 'backend', 'form', 'table'], function ($, undefin
                         {
                             field: 'operate', title: __('Operate'), width: 85, events: {
                                 'click .btn-chooseone': function (e, value, row, index) {
-                                    Fast.api.close({url: row.url, multiple: multiple});
+                                    Fast.api.close($.extend({multiple: multiple}, row));
                                 },
                             }, formatter: function () {
                                 return '<a href="javascript:;" class="btn btn-danger btn-chooseone btn-xs"><i class="fa fa-check"></i> ' + __('Choose') + '</a>';
diff --git a/public/assets/js/require-form.js b/public/assets/js/require-form.js
index bd20b8dd..79e29250 100755
--- a/public/assets/js/require-form.js
+++ b/public/assets/js/require-form.js
@@ -295,6 +295,9 @@ define(['jquery', 'bootstrap', 'upload', 'validator', 'validator-lang'], functio
                                     var url = Config.upload.fullmode ? Fast.api.cdnurl(data.url) : data.url;
                                     $("#" + input_id).val(url).trigger("change").trigger("validate");
                                 }
+
+                                // 触发选择文件自定义事件
+                                button.trigger("fa.event.selectedfile", data);
                             }
                         });
                         return false;
diff --git a/public/assets/js/require-table.js b/public/assets/js/require-table.js
index 3df6305f..5da5368a 100755
--- a/public/assets/js/require-table.js
+++ b/public/assets/js/require-table.js
@@ -929,15 +929,15 @@ define(['jquery', 'bootstrap', 'moment', 'moment/locale/zh-cn', 'bootstrap-table
                                     buttons.push(tempButton[item.name]);
                                 }
                                 existBtn.push(item.name);
-                    }
+                            }
                         } else {
                             buttons.push(item);
-                    }
+                        }
                     });
                     defaultBtn.forEach(function (value, index) {
                         if (existBtn.indexOf(value) === -1) {
                             buttons.push(tempButton[value]);
-                    }
+                        }
                     });
                     return Table.api.buttonlink(this, buttons, value, row, index, 'operate');
                 }