From b6ae55ef1e932bd84118e382db0211feda15b97d Mon Sep 17 00:00:00 2001
From: Karson <karsonzhang@163.com>
Date: Thu, 25 Jul 2024 14:53:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8F=92=E4=BB=B6=E5=AE=89?=
 =?UTF-8?q?=E8=A3=85=E6=97=B6=E5=8F=91=E7=8E=B0=E5=86=B2=E7=AA=81=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E6=97=B6=E6=97=A0=E6=B3=95=E6=8F=90=E7=A4=BA=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/assets/js/backend/addon.js | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/public/assets/js/backend/addon.js b/public/assets/js/backend/addon.js
index 1eb51287..defe5b52 100644
--- a/public/assets/js/backend/addon.js
+++ b/public/assets/js/backend/addon.js
@@ -241,6 +241,27 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'template', 'cookie']
                             Layer.close(index);
                         });
                         return false;
+                    } else if (ret && ret.code === -3) {
+                        //插件目录发现影响全局的文件
+                        Layer.open({
+                            content: Template("conflicttpl", ret.data),
+                            shade: 0.8,
+                            area: area,
+                            title: __('Warning'),
+                            btn: [__('Continue install'), __('Cancel')],
+                            end: function () {
+
+                            },
+                            yes: function (index) {
+                                up.removeFile(file);
+                                file.force = true;
+                                up.uploadFile(file);
+                                Layer.close(index);
+                            }
+                        });
+
+                    } else {
+                        Layer.alert(ret.msg, {title: __('Warning'), icon: 0});
                     }
                 });