Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions public/static/admin/js/mall/goods.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@ define(["jquery", "easy-admin"], function ($, ea) {
icon: 'fa fa-plus ',
extend: 'data-full="true"',
}],
'delete', 'export'],
'delete'],
cols: [[
{type: "checkbox"},
{field: 'id', width: 80, title: 'ID'},
{field: 'sort', width: 80, title: '排序', edit: 'text'},
{field: 'cate.title', minWidth: 80, title: '商品分类'},
{field: 'cate.title', minWidth: 80, title: '商品分类',search: 'select',selectList: '/'+CONFIG.ADMIN+'/mall.cate/index|title,title'},
{field: 'title', minWidth: 80, title: '商品名称'},
{field: 'logo', minWidth: 80, title: '分类图片', search: false, templet: ea.table.image},
{field: 'cate.image', minWidth: 80, title: '分类图片', search: false, templet: ea.table.image},
{field: 'market_price', width: 100, title: '市场价', templet: ea.table.price},
{field: 'discount_price', width: 100, title: '折扣价', templet: ea.table.price},
{field: 'total_stock', width: 100, title: '库存统计'},
Expand Down
29 changes: 21 additions & 8 deletions public/static/plugs/easy-admin/easy-admin.js
Original file line number Diff line number Diff line change
Expand Up @@ -297,17 +297,28 @@ define(["jquery", "tableSelect", "ckeditor"], function ($, tableSelect, undefine
case 'select':
d.searchOp = '=';
var selectHtml = '';
$.each(d.selectList, function (sI, sV) {
var selected = '';
if (sI === d.searchValue) {
selected = 'selected=""';
var data_select = '';
var data_fields = '';
if(typeof d.selectList === 'string'){
var url = d.selectList.split('|');
if(url.length === 2){
data_select=url[0];
data_fields=url[1];
}
selectHtml += '<option value="' + sI + '" ' + selected + '>' + sV + '</option>/n';
});
}else{
$.each(d.selectList, function (sI, sV) {
var selected = '';
if (sI === d.searchValue) {
selected = 'selected=""';
}
selectHtml += '<option value="' + sI + '" ' + selected + '>' + sV + '</option>/n';
});
}

formHtml += '\t<div class="layui-form-item layui-inline">\n' +
'<label class="layui-form-label">' + d.title + '</label>\n' +
'<div class="layui-input-inline">\n' +
'<select class="layui-select" id="c-' + d.fieldAlias + '" name="' + d.fieldAlias + '" data-search-op="' + d.searchOp + '" >\n' +
'<select class="layui-select" id="c-' + d.fieldAlias + '" name="' + d.fieldAlias + '" data-search-op="' + d.searchOp +'"'+ (data_select ? ' data-select="'+data_select+'"':'""') + (data_fields?' data-fields="'+data_fields+'"':'""') + ' data-value="'+d.searchValue+ '" >\n' +
'<option value="">- 全部 -</option> \n' +
selectHtml +
'</select>\n' +
Expand Down Expand Up @@ -1190,7 +1201,9 @@ define(["jquery", "tableSelect", "ckeditor"], function ($, tableSelect, undefine
if (typeof preposeCallback === 'function') {
dataField = preposeCallback(dataField);
}
admin.api.form(url, dataField, ok, no, ex, refresh);
if(dataField!==false){
admin.api.form(url, dataField, ok, no, ex, refresh);
}

return false;
});
Expand Down