From 788b1d57f63216c3194c4f0e8dd89c37a32dc7f6 Mon Sep 17 00:00:00 2001
From: Karson <karsonzhang@163.com>
Date: Sat, 12 Sep 2020 11:31:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=90=8E=E5=8F=B0=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E7=A9=BA=E6=A0=BC=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/assets/js/addons.js             | 37 +++++++++++++++++++++++++-
 public/assets/js/backend/auth/group.js |  2 +-
 public/assets/js/backend/auth/rule.js  |  2 +-
 public/assets/js/backend/category.js   |  2 +-
 public/assets/js/backend/user/rule.js  |  2 +-
 5 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/public/assets/js/addons.js b/public/assets/js/addons.js
index d2c1d20a..4b23c52a 100644
--- a/public/assets/js/addons.js
+++ b/public/assets/js/addons.js
@@ -1,3 +1,38 @@
 define([], function () {
-    
+    require.config({
+    paths: {
+        'jquery-colorpicker': '../addons/cms/js/jquery.colorpicker.min',
+        'jquery-autocomplete': '../addons/cms/js/jquery.autocomplete',
+        'jquery-tagsinput': '../addons/cms/js/jquery.tagsinput',
+        'clipboard': '../addons/cms/js/clipboard.min',
+    },
+    shim: {
+        'jquery-colorpicker': {
+            deps: ['jquery'],
+            exports: '$.fn.extend'
+        },
+        'jquery-autocomplete': {
+            deps: ['jquery'],
+            exports: '$.fn.extend'
+        },
+        'jquery-tagsinput': {
+            deps: ['jquery', 'jquery-autocomplete', 'css!../addons/cms/css/jquery.tagsinput.min.css'],
+            exports: '$.fn.extend'
+        }
+    }
+});
+
+require.config({
+    paths: {
+        'async': '../addons/example/js/async',
+        'BMap': ['//api.map.baidu.com/api?v=2.0&ak=mXijumfojHnAaN2VxpBGoqHM'],
+    },
+    shim: {
+        'BMap': {
+            deps: ['jquery'],
+            exports: 'BMap'
+        }
+    }
+});
+
 });
\ No newline at end of file
diff --git a/public/assets/js/backend/auth/group.js b/public/assets/js/backend/auth/group.js
index 1687288a..57afb62b 100755
--- a/public/assets/js/backend/auth/group.js
+++ b/public/assets/js/backend/auth/group.js
@@ -48,7 +48,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'jstree'], function (
                         {field: 'id', title: 'ID'},
                         {field: 'pid', title: __('Parent')},
                         {field: 'name', title: __('Name'), align: 'left', formatter:function (value, row, index) {
-                                return value.toString().replace(/(&|&amp;)nbsp;/g, '');
+                                return value.toString().replace(/(&|&amp;)nbsp;/g, '&nbsp;');
                             }
                         },
                         {field: 'status', title: __('Status'), formatter: Table.api.formatter.status},
diff --git a/public/assets/js/backend/auth/rule.js b/public/assets/js/backend/auth/rule.js
index 5e942782..94dadce8 100755
--- a/public/assets/js/backend/auth/rule.js
+++ b/public/assets/js/backend/auth/rule.js
@@ -121,7 +121,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'template'], function
         api: {
             formatter: {
                 title: function (value, row, index) {
-                    value = value.toString().replace(/(&|&amp;)nbsp;/g, '');
+                    value = value.toString().replace(/(&|&amp;)nbsp;/g, '&nbsp;');
                     return !row.ismenu || row.status == 'hidden' ? "<span class='text-muted'>" + value + "</span>" : value;
                 },
                 name: function (value, row, index) {
diff --git a/public/assets/js/backend/category.js b/public/assets/js/backend/category.js
index 7ab58f36..0299bf33 100644
--- a/public/assets/js/backend/category.js
+++ b/public/assets/js/backend/category.js
@@ -29,7 +29,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'id', title: __('Id')},
                         {field: 'type', title: __('Type'), operate: false, searchList: Config.searchList, formatter: Table.api.formatter.label},
                         {field: 'name', title: __('Name'), align: 'left', formatter:function (value, row, index) {
-                                return value.toString().replace(/(&|&amp;)nbsp;/g, '');
+                                return value.toString().replace(/(&|&amp;)nbsp;/g, '&nbsp;');
                             }
                         },
                         {field: 'nickname', title: __('Nickname')},
diff --git a/public/assets/js/backend/user/rule.js b/public/assets/js/backend/user/rule.js
index 7d873090..c485c311 100644
--- a/public/assets/js/backend/user/rule.js
+++ b/public/assets/js/backend/user/rule.js
@@ -27,7 +27,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'id', title: __('Id')},
                         {field: 'pid', title: __('Pid'), visible: false},
                         {field: 'title', title: __('Title'), align: 'left', formatter:function (value, row, index) {
-                                return value.toString().replace(/(&|&amp;)nbsp;/g, '');
+                                return value.toString().replace(/(&|&amp;)nbsp;/g, '&nbsp;');
                             }
                         },
                         {field: 'name', title: __('Name'), align: 'left'},