From f2d444b877bee2c7e8115ca0fef25a2d535a0efd Mon Sep 17 00:00:00 2001
From: mkg <1650473152@qq.com>
Date: Fri, 8 Oct 2021 22:58:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E8=A1=A5iconPicker=20->=20icon=20?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 applications/templates/admin/index.html      |   2 +-
 applications/templates/admin/power/add.html  | 137 +++++++-------
 applications/templates/admin/power/edit.html | 180 +++++++++----------
 3 files changed, 157 insertions(+), 162 deletions(-)

diff --git a/applications/templates/admin/index.html b/applications/templates/admin/index.html
index 6fd29d2..330044c 100644
--- a/applications/templates/admin/index.html
+++ b/applications/templates/admin/index.html
@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
     <title> Pear Admin Flask </title>
     <link rel="stylesheet" href="{{ url_for('static', filename='admin/component/pear/css/pear.css') }}">
-    <link rel="stylesheet" href="{{ url_for('static', filename='admin/admin/css/load.css') }}"/>
+    <link rel="stylesheet" href="{{ url_for('static', filename='admin/admin/css/loader.css') }}"/>
     <link rel="stylesheet" href="{{ url_for('static', filename='admin/admin/css/admin.css') }}"/>
     <!-- 主 题 更 换 -->
     <style id="pearadmin-bg-color"></style>
diff --git a/applications/templates/admin/power/add.html b/applications/templates/admin/power/add.html
index d1a9642..30c0ce0 100644
--- a/applications/templates/admin/power/add.html
+++ b/applications/templates/admin/power/add.html
@@ -85,83 +85,78 @@
 </form>
 {% include 'admin/common/footer.html' %}
 <script>
-  layui.use(['form', 'jquery', 'iconPicker', 'dtree'], function () {
-    let form = layui.form
-    let $ = layui.jquery
-    let iconPicker = layui.iconPicker
-    let dtree = layui.dtree
+    layui.use(['form', 'jquery', 'icon', 'dtree'], function () {
+        let form = layui.form
+        let $ = layui.jquery
+        let icon = layui.icon
+        let dtree = layui.dtree
 
-    dtree.renderSelect({
-      elem: '#selectParent',
-      url: '/admin/power/selectParent',
-      method: 'get',
-      selectInputName: { nodeId: 'parentId', context: 'powerName' },
-      skin: 'layui',
-      dataFormat: 'list',
-      response: { treeId: 'powerId', parentId: 'parentId', title: 'powerName' },  //修改response中返回数据的定义
-      selectInitVal: '0'
-    })
+        dtree.renderSelect({
+            elem: '#selectParent',
+            url: '/admin/power/selectParent',
+            method: 'get',
+            selectInputName: {nodeId: 'parentId', context: 'powerName'},
+            skin: 'layui',
+            dataFormat: 'list',
+            response: {treeId: 'powerId', parentId: 'parentId', title: 'powerName'},  //修改response中返回数据的定义
+            selectInitVal: '0'
+        })
 
-    form.on('radio(powerType)', function () {
-      if (this.value == '0') {
-        $('#powerUrlItem').hide()
-        $('#powerCodeItem').hide()
-        $('#openTypeItem').hide()
-        $('#powerUrl').val('')
-        $('#powerCode').val('')
-        $('#openType').val('')
-      } else if (this.value == '1') {
-        $('#powerUrlItem').show()
-        $('#powerCodeItem').show()
-        $('#openTypeItem').show()
-      } else if (this.value == '2') {
-        $('#powerUrlItem').hide()
-        $('#openTypeItem').hide()
-        $('#powerCodeItem').show()
-        $('#powerUrl').val('')
-        $('#openType').val('')
-      }
-    })
+        form.on('radio(powerType)', function () {
+            if (this.value == '0') {
+                $('#powerUrlItem').hide()
+                $('#powerCodeItem').hide()
+                $('#openTypeItem').hide()
+                $('#powerUrl').val('')
+                $('#powerCode').val('')
+                $('#openType').val('')
+            } else if (this.value == '1') {
+                $('#powerUrlItem').show()
+                $('#powerCodeItem').show()
+                $('#openTypeItem').show()
+            } else if (this.value == '2') {
+                $('#powerUrlItem').hide()
+                $('#openTypeItem').hide()
+                $('#powerCodeItem').show()
+                $('#powerUrl').val('')
+                $('#openType').val('')
+            }
+        })
 
-    form.on('submit(power-save)', function (data) {
-      data.field.icon = 'layui-icon ' + data.field.icon
-      $.ajax({
-        url: '/admin/power/save',
-        data: JSON.stringify(data.field),
-        dataType: 'json',
-        contentType: 'application/json',
-        type: 'post',
-        success: function (result) {
-          if (result.success) {
-            layer.msg(result.msg, { icon: 1, time: 1000 }, function () {
-              parent.layer.close(parent.layer.getFrameIndex(window.name))//关闭当前页
-              parent.render()
+        form.on('submit(power-save)', function (data) {
+            data.field.icon = 'layui-icon ' + data.field.icon
+            $.ajax({
+                url: '/admin/power/save',
+                data: JSON.stringify(data.field),
+                dataType: 'json',
+                contentType: 'application/json',
+                type: 'post',
+                success: function (result) {
+                    if (result.success) {
+                        layer.msg(result.msg, {icon: 1, time: 1000}, function () {
+                            parent.layer.close(parent.layer.getFrameIndex(window.name))//关闭当前页
+                            parent.render()
+                        })
+                    } else {
+                        layer.msg(result.msg, {icon: 2, time: 1000})
+                    }
+                }
             })
-          } else {
-            layer.msg(result.msg, { icon: 2, time: 1000 })
-          }
-        }
-      })
-      return false
-    })
+            return false
+        })
 
-    iconPicker.render({
-      // 选择器，推荐使用input
-      elem: '#icon',
-      // 数据类型：fontClass/unicode，推荐使用fontClass
-      type: 'fontClass',
-      // 是否开启搜索：true/false
-      search: true,
-      // 是否开启分页
-      page: true,
-      // 每页显示数量，默认12
-      limit: 12,
-      // 点击回调
-      click: function (data) {
-        console.log(data)
-      }
+        icon.render({
+            elem: '#icon',
+            style: 'color: #5FB878;',
+            placeholder: '',
+            isSplit: true,
+            page: false,
+            search: false,
+            click: function (data) {
+                console.log(data)
+            }
+        })
     })
-  })
 </script>
 <script>
 </script>
diff --git a/applications/templates/admin/power/edit.html b/applications/templates/admin/power/edit.html
index 44d5283..e963ab3 100644
--- a/applications/templates/admin/power/edit.html
+++ b/applications/templates/admin/power/edit.html
@@ -97,102 +97,102 @@
 </form>
 {% include 'admin/common/footer.html' %}
 <script>
-  layui.use(['form', 'jquery', 'iconPicker', 'dtree'], function () {
-    let form = layui.form
-    let $ = layui.jquery
-    let iconPicker = layui.iconPicker
-    let dtree = layui.dtree
+    layui.use(['form', 'jquery', 'icon', 'dtree'], function () {
+        let form = layui.form
+        let $ = layui.jquery
+        let icon = layui.icon
+        let dtree = layui.dtree
 
-    dtree.renderSelect({
-      elem: '#selectParent',
-      url: '/admin/power/selectParent',
-      method: 'get',
-      selectInputName: { nodeId: 'parentId', context: 'powerName' },
-      skin: 'layui',
-      dataFormat: 'list',
-      response: { treeId: 'powerId', parentId: 'parentId', title: 'powerName' },
-      selectInitVal: "{{ power.parent_id }}"
-    })
+        dtree.renderSelect({
+            elem: '#selectParent',
+            url: '/admin/power/selectParent',
+            method: 'get',
+            selectInputName: {nodeId: 'parentId', context: 'powerName'},
+            skin: 'layui',
+            dataFormat: 'list',
+            response: {treeId: 'powerId', parentId: 'parentId', title: 'powerName'},
+            selectInitVal: "{{ power.parent_id }}"
+        })
 
-    form.on('radio(powerType)', function (data) {
-      if (this.value == '0') {
-        $('#powerUrlItem').hide()
-        $('#powerCodeItem').hide()
-        $('#openTypeItem').hide()
-        $('#powerUrl').val('')
-        $('#powerCode').val('')
-        $('#openType').val('')
-      } else if (this.value == '1') {
-        $('#powerUrlItem').show()
-        $('#powerCodeItem').show()
-        $('#openTypeItem').show()
-      } else if (this.value == '2') {
-        $('#powerUrlItem').hide()
-        $('#openTypeItem').hide()
-        $('#powerCodeItem').show()
-        $('#powerUrl').val('')
-        $('#openType').val('')
-      }
-    })
+        form.on('radio(powerType)', function (data) {
+            if (this.value == '0') {
+                $('#powerUrlItem').hide()
+                $('#powerCodeItem').hide()
+                $('#openTypeItem').hide()
+                $('#powerUrl').val('')
+                $('#powerCode').val('')
+                $('#openType').val('')
+            } else if (this.value == '1') {
+                $('#powerUrlItem').show()
+                $('#powerCodeItem').show()
+                $('#openTypeItem').show()
+            } else if (this.value == '2') {
+                $('#powerUrlItem').hide()
+                $('#openTypeItem').hide()
+                $('#powerCodeItem').show()
+                $('#powerUrl').val('')
+                $('#openType').val('')
+            }
+        })
 
-    form.on('submit(power-save)', function (data) {
-      data.field.icon = 'layui-icon ' + data.field.icon
-      $.ajax({
-        url: '/admin/power/update',
-        data: JSON.stringify(data.field),
-        dataType: 'json',
-        contentType: 'application/json',
-        type: 'put',
-        success: function (result) {
-          if (result.success) {
-            layer.msg(result.msg, { icon: 1, time: 1000 }, function () {
-              parent.layer.close(parent.layer.getFrameIndex(window.name))//关闭当前页
-              parent.render()
+        form.on('submit(power-save)', function (data) {
+            data.field.icon = 'layui-icon ' + data.field.icon
+            $.ajax({
+                url: '/admin/power/update',
+                data: JSON.stringify(data.field),
+                dataType: 'json',
+                contentType: 'application/json',
+                type: 'put',
+                success: function (result) {
+                    if (result.success) {
+                        layer.msg(result.msg, {icon: 1, time: 1000}, function () {
+                            parent.layer.close(parent.layer.getFrameIndex(window.name))//关闭当前页
+                            parent.render()
+                        })
+                    } else {
+                        layer.msg(result.msg, {icon: 2, time: 1000})
+                    }
+                }
             })
-          } else {
-            layer.msg(result.msg, { icon: 2, time: 1000 })
-          }
+            return false
+        })
+
+        icon.render({
+            elem: '#icon',
+            style: 'color: #5FB878;',
+            placeholder: '',
+            isSplit: true,
+            page: false,
+            search: false,
+            click: function (data) {
+                console.log(data)
+            }
+        })
+
+
+        window.init = function (type) {
+            if (type == '0') {
+                $('#powerUrlItem').hide()
+                $('#powerCodeItem').hide()
+                $('#openTypeItem').hide()
+                $('#powerUrl').val('')
+                $('#powerCode').val('')
+                $('#openType').val('')
+            } else if (type == '1') {
+                $('#powerUrlItem').show()
+                $('#powerCodeItem').show()
+                $('#openTypeItem').show()
+            } else if (type == '2') {
+                $('#powerUrlItem').hide()
+                $('#openTypeItem').hide()
+                $('#powerCodeItem').show()
+                $('#powerUrl').val('')
+                $('#openType').val('')
+            }
         }
-      })
-      return false
+
+        window.init("{{ power.type}}")
     })
-
-    iconPicker.render({
-      elem: '#icon',
-      type: 'fontClass',
-      search: true,
-      page: true,
-      limit: 12,
-      click: function (data) {
-        console.log(data)
-      }
-    })
-
-    iconPicker.checkIcon('icon', "{{ icon }}")
-
-    window.init = function (type) {
-      if (type == '0') {
-        $('#powerUrlItem').hide()
-        $('#powerCodeItem').hide()
-        $('#openTypeItem').hide()
-        $('#powerUrl').val('')
-        $('#powerCode').val('')
-        $('#openType').val('')
-      } else if (type == '1') {
-        $('#powerUrlItem').show()
-        $('#powerCodeItem').show()
-        $('#openTypeItem').show()
-      } else if (type == '2') {
-        $('#powerUrlItem').hide()
-        $('#openTypeItem').hide()
-        $('#powerCodeItem').show()
-        $('#powerUrl').val('')
-        $('#openType').val('')
-      }
-    }
-
-    window.init("{{ power.type}}")
-  })
 </script>
 <script>
 </script>