优化：后台管理中的图标选择增加提示信息

Author: weishakeji

Sourcecode/Song.ViewData/Methods/Platform.cs

@@ -250,20 +250,29 @@ public string[] IconFonts()
         /// </summary>
         /// <returns>iconfont图标库的编码,带说明</returns>
         [HttpGet]
-        //[Cache(Expires = 60 * 24 * 30)]
-        public string[] IconJson()
+        [Cache(Expires = 60 * 24 * 30)]
+        public JArray IconJson()
         {
             string file = "/Utilities/Fonts/index.html";
             file = WeiSha.Core.Server.MapPath(file);
             string html = System.IO.File.ReadAllText(file, Encoding.UTF8);
             //
-            List<string> list = new List<string>();
-            string pattern = @"<div.*?>\\(.*?)<\/div>";
-            foreach (Match match in Regex.Matches(html, pattern))
+            JArray arr = new JArray();
+            string pattern = @"<li>(.*?)<\/li>";
+            foreach (Match match in Regex.Matches(html, pattern,RegexOptions.Singleline))
             {
-                list.Add(match.Groups[1].Value);
+                string li = match.Groups[1].Value;
+                Match code = Regex.Match(li, @"<div.*?>\\(.*?)<\/div>", RegexOptions.Singleline);
+                Match name = Regex.Match(li, @"<div class=""name"">(.*?)<\/div>", RegexOptions.Singleline);
+                JObject jo = new JObject();
+                if (code.Success)
+                {
+                    jo.Add(code.Groups[1].Value,
+                        name.Success ? name.Groups[1].Value : "");
+                }
+                arr.Add(jo);               
             }
-            return list.ToArray();
+            return arr;
         }
         /// <summary>
         /// 获取地址的gps坐标

Sourcecode/Song.WebSite/Song.WebSite.csproj

@@ -1225,6 +1225,7 @@
     <Content Include="Utilities\Components\Styles\upload-excel.css" />
     <Content Include="Utilities\Components\upload-chunked.js" />
     <Content Include="Utilities\Components\upload-excel.js" />
+    <Content Include="Utilities\ElementUi\version.txt" />
     <Content Include="Utilities\Images\alpha.png" />
     <Content Include="Utilities\Images\def_logo.jpg" />
     <Content Include="Utilities\Images\head\head1.jpg" />

Sourcecode/Song.WebSite/Utilities/Components/icons.js

@@ -9,7 +9,7 @@ Vue.component('icons', {
         }
     },
     watch: {
-        'selected': function (val, old) {          
+        'selected': function (val, old) {
             this.$emit('change', val);
         }
     },
@@ -20,7 +20,7 @@ Vue.component('icons', {
         var th = this;
         th.loading = true;
         //加载图标
-        $api.cache('Platform/IconFonts').then(function (req) {
+        $api.cache('Platform/IconJson').then(function (req) {
             th.loading = false;
             if (req.data.success) {
                 th.data = req.data.result;
@@ -36,7 +36,9 @@ Vue.component('icons', {
     },
     template: `<div class="icons_select_panel">
     <div v-if="loading">loading...</div>
-    <span v-for="ico in data" v-html="'&#x'+ico+';'" @click="selected=ico;show=false;"
-    :selected="ico==selected"></span>
+        <template v-for="ico in data">
+            <span v-for="(value, key)  in ico" v-html="'&#x'+key+';'" @click="selected=key;show=false;"
+            :title="value"  :selected="ico==selected"></span>
+        </template>   
     </div>`
 });