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