From 0c9b369e2e262548a149038ea16da76db9f50082 Mon Sep 17 00:00:00 2001
From: wolfcode <37436228+wolf-leo@users.noreply.github.com>
Date: Mon, 6 Jan 2025 16:55:24 +0800
Subject: [PATCH] build: integrate xmSelect plugin into admin static files

- Add xmSelect plugin to config-admin.js
- Remove separate script tag for xmSelect in default.html
- Update easy-admin.js to include xmSelect as a dependency
- Modify xm-select.js to support different module systems
---
 app/admin/view/layout/default.html           | 1 -
 public/static/config-admin.js                | 3 ++-
 public/static/plugs/easy-admin/easy-admin.js | 2 +-
 public/static/plugs/xmSelect/xm-select.js    | 5 ++++-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/admin/view/layout/default.html b/app/admin/view/layout/default.html
index 38c4ac4..d6572ab 100644
--- a/app/admin/view/layout/default.html
+++ b/app/admin/view/layout/default.html
@@ -27,7 +27,6 @@
             EDITOR_TYPE: "{$adminEditor|default='wangEditor'}",
         };
     </script>
-    <script src="/static/plugs/xmSelect/xm-select.js" charset="utf-8"></script>
     <script src="/static/plugs/layui-v2.x/layui.js" charset="utf-8"></script>
     <script src="/static/plugs/require-2.3.6/require.js" charset="utf-8"></script>
     <script src="/static/config-admin.js?v={$version}" charset="utf-8"></script>
diff --git a/public/static/config-admin.js b/public/static/config-admin.js
index 44f55df..21e3ab9 100644
--- a/public/static/config-admin.js
+++ b/public/static/config-admin.js
@@ -20,9 +20,10 @@ require.config({
         "tableSelect": ["plugs/lay-module/tableSelect/tableSelect"],
         "iconPickerFa": ["plugs/lay-module/iconPicker/iconPickerFa"],
         "autocomplete": ["plugs/lay-module/autocomplete/autocomplete"],
+        "xmSelect": ["plugs/xmSelect/xm-select"],
         "vue": ["plugs/vue-2.6.10/vue.min"],
         "swiper": ["plugs/swiper/swiper-bundle.min"],
-        "colorMode":["plugs/colorMode/colorMode"],
+        "colorMode": ["plugs/colorMode/colorMode"],
     }
 });
 
diff --git a/public/static/plugs/easy-admin/easy-admin.js b/public/static/plugs/easy-admin/easy-admin.js
index 5f00346..c30079a 100644
--- a/public/static/plugs/easy-admin/easy-admin.js
+++ b/public/static/plugs/easy-admin/easy-admin.js
@@ -1,4 +1,4 @@
-define(["jquery", "tableSelect", "miniTheme"], function ($, tableSelect, miniTheme) {
+define(["jquery", "tableSelect", "miniTheme", "xmSelect"], function ($, tableSelect, miniTheme, xmSelect) {
 
     //切换日夜模式
     window.onInitElemStyle = function () {
diff --git a/public/static/plugs/xmSelect/xm-select.js b/public/static/plugs/xmSelect/xm-select.js
index dbd8d26..71963f3 100644
--- a/public/static/plugs/xmSelect/xm-select.js
+++ b/public/static/plugs/xmSelect/xm-select.js
@@ -212,7 +212,10 @@
                     var n = t.b[e];
                     n && n.calcPosition && n.calcPosition()
                 }))
-            }))), "object" === ("undefined" == typeof exports ? "undefined" : _typeof(exports)) ? e.exports = t.c : "function" == typeof define && n(221) ? define(xmSelect) : window.layui && layui.define && layui.define((function (e) {
+            }))), "object" === ("undefined" == typeof exports ? "undefined" : _typeof(exports)) ? e.exports = t.c : "function" == typeof define && n(221)
+                ? define(function () {
+                    return t.c
+                }) : window.layui && layui.define && layui.define((function (e) {
                 e("xmSelect", t.c)
             })), window.xmSelect = t.c
         }.call(this, n(215)(e))