新增defaultValue特性；

public/static/admin/js/system/admin.js

@@ -12,9 +12,9 @@ define(["jquery", "easy-admin"], function ($, ea) {
         password_url: 'system.admin/password',
     };
 
-    var authList = ea.getDataBrage('auth_list',[]);
+    var authList = ea.getDataBrage('auth_list', []);
-    var count = ea.getDataBrage('count',0);
+    var count = ea.getDataBrage('count', 0);
-    var tips = ea.getDataBrage('tips','');
+    var tips = ea.getDataBrage('tips', '');
 
     console.log(authList);
     console.log(count);
@@ -27,20 +27,20 @@ define(["jquery", "easy-admin"], function ($, ea) {
             ea.table.render({
                 init: init,
                 cols: [[
-                    {type: "checkbox"},
+                    { type: "checkbox" },
-                    {field: 'id', width: 80, title: 'ID'},
+                    { field: 'id', width: 80, title: 'ID' },
-                    {field: 'sort', width: 80, title: '排序', edit: 'text'},
+                    { field: 'sort', width: 80, title: '排序', edit: 'text' },
-                    {field: 'username', minWidth: 80, title: '登录账户'},
+                    { field: 'username', minWidth: 80, title: '登录账户' },
-                    {field: 'head_img', minWidth: 80, title: '头像', search: false, templet: ea.table.image},
+                    { field: 'head_img', minWidth: 80, title: '头像', search: false, templet: ea.table.image },
-                    {field: 'phone', minWidth: 80, title: '手机'},
+                    { field: 'phone', minWidth: 80, title: '手机' },
-                    {field: 'login_num', minWidth: 80, title: '登录次数'},
+                    { field: 'login_num', minWidth: 80, title: '登录次数' },
-                    {field: 'remark', minWidth: 80, title: '备注信息'},
+                    { field: 'remark', minWidth: 80, title: '备注信息', defaultValue: '无' },
-                    {field: 'status', title: '状态', width: 85, search: 'select', selectList: {0: '禁用', 1: '启用'}, templet: ea.table.switch},
+                    { field: 'status', title: '状态', width: 85, search: 'select', selectList: { 0: '禁用', 1: '启用' }, templet: ea.table.switch },
-                    {field: 'create_time', minWidth: 80, title: '创建时间', search: 'range'},
+                    { field: 'create_time', minWidth: 80, title: '创建时间', search: 'range' },
                     {
                         width: 250,
                         title: '操作',
-                        fixed:'right',
+                        fixed: 'right',
                         templet: ea.table.tool,
                         operat: [
                             'edit',

public/static/plugs/easy-admin/easy-admin.js

@@ -66,16 +66,7 @@ define(["jquery", "tableSelect", "ckeditor"], function ($, tableSelect, undefine
         headers: function () {
             return { 'X-CSRF-TOKEN': window.CONFIG.CSRF_TOKEN };
         },
-        //js版empty，判断变量是否为空
+
-        empty: function (r) {
-            var n, t, e, f = [void 0, null, !1, 0, "", "0"];
-            for (t = 0, e = f.length; t < e; t++) if (r === f[t]) return !0;
-            if ("object" == typeof r) {
-                for (n in r) if (r.hasOwnProperty(n)) return !1;
-                return !0
-            }
-            return !1
-        },
         checkAuth: function (node, elem) {
             if (CONFIG.IS_SUPER_ADMIN) {
                 return true;
@@ -730,6 +721,11 @@ define(["jquery", "tableSelect", "ckeditor"], function ($, tableSelect, undefine
                             }
                         }
 
+                        // 如果未定义则默认使用value
+                        if (val.templet === undefined) {
+                            cols[i][index]['templet'] = admin.table.value;
+                        }
+
                         if (val.fieldFormat == undefined) {
 
                             switch (val.templet) {
@@ -840,12 +836,8 @@ define(["jquery", "tableSelect", "ckeditor"], function ($, tableSelect, undefine
             list: function (data) {
                 var option = data.LAY_COL;
                 option.selectList = option.selectList || {};
-                var field = option.field;
+
-                try {
+                var value = admin.table.returnColumnValue(data);
-                    var value = eval("data." + field);
-                } catch (e) {
-                    var value = undefined;
-                }
                 if (option.selectList[value] === undefined || option.selectList[value] === '' || option.selectList[value] === null) {
                     return value;
                 } else {
@@ -853,19 +845,13 @@ define(["jquery", "tableSelect", "ckeditor"], function ($, tableSelect, undefine
                 }
             },
             filePreview: function (data) {
-                var option = data.LAY_COL;
                 var mimeName = data.mime_type.split('/')[0];
-                var field = option.field;
 
                 if (mimeName == 'image') {
                     return admin.table.image(data);
                 } else {
 
-                    try {
+                    var value = admin.table.returnColumnValue(data);
-                        var value = eval("data." + field);
-                    } catch (e) {
-                        var value = undefined;
-                    }
 
                     var groupName = admin.getExtGroupName(data.file_ext);
 
@@ -880,13 +866,8 @@ define(["jquery", "tableSelect", "ckeditor"], function ($, tableSelect, undefine
                 option.imageSplit = option.imageSplit || '|';
                 option.imageJoin = option.imageJoin || '<br>';
                 option.title = option.title || option.field;
-                var field = option.field,
+                var title = data[option.title];
-                    title = data[option.title];
+                var value = admin.table.returnColumnValue(data);
-                try {
-                    var value = eval("data." + field);
-                } catch (e) {
-                    var value = undefined;
-                }
                 if (value === undefined || value === null) {
                     return '<img style="max-width: ' + option.imageWidth + 'px; height: ' + option.imageHeight + 'px;" src="' + value + '" data-image="' + title + '">';
                 } else {
@@ -900,15 +881,10 @@ define(["jquery", "tableSelect", "ckeditor"], function ($, tableSelect, undefine
             },
             url: function (data) {
                 var option = data.LAY_COL;
-                var field = option.field;
+
                 var urlNameField = option.urlNameField || '';
 
-                try {
+                var value = admin.table.returnColumnValue(data);
-                    var value = eval("data." + field);
-                } catch (e) {
-                    var value = undefined;
-                }
-
                 var urlName = value;
 
                 if (urlNameField != '') {
@@ -930,80 +906,62 @@ define(["jquery", "tableSelect", "ckeditor"], function ($, tableSelect, undefine
             },
             switch: function (data) {
                 var option = data.LAY_COL;
-                var field = option.field;
                 option.filter = option.filter || option.field || null;
                 option.checked = option.checked || 1;
                 option.tips = option.tips || '开|关';
-                try {
+                var value = admin.table.returnColumnValue(data);
-                    var value = eval("data." + field);
-                } catch (e) {
-                    var value = undefined;
-                }
                 var checked = value === option.checked ? 'checked' : '';
                 return laytpl('<input type="checkbox" name="' + option.field + '" value="' + data.id + '" lay-skin="switch" lay-text="' + option.tips + '" lay-filter="' + option.filter + '" ' + checked + ' >').render(data);
             },
             price: function (data) {
-                var option = data.LAY_COL;
+                var value = admin.table.returnColumnValue(data);
-                var field = option.field;
-                try {
-                    var value = eval("data." + field);
-                } catch (e) {
-                    var value = undefined;
-                }
                 return '<span>￥' + value + '</span>';
             },
             percent: function (data) {
-                var option = data.LAY_COL;
+                var value = admin.table.returnColumnValue(data);
-                var field = option.field;
-                try {
-                    var value = eval("data." + field);
-                } catch (e) {
-                    var value = undefined;
-                }
                 return '<span>' + value + '%</span>';
             },
             icon: function (data) {
-                var option = data.LAY_COL;
+                var value = admin.table.returnColumnValue(data);
-                var field = option.field;
-                try {
-                    var value = eval("data." + field);
-                } catch (e) {
-                    var value = undefined;
-                }
                 return '<i class="' + value + '"></i>';
             },
             text: function (data) {
-                var option = data.LAY_COL;
+                var value = admin.table.returnColumnValue(data);
-                var field = option.field;
-                try {
-                    var value = eval("data." + field);
-                } catch (e) {
-                    var value = undefined;
-                }
                 return '<span class="line-limit-length">' + value + '</span>';
             },
             value: function (data) {
-                var option = data.LAY_COL;
+                var value = admin.table.returnColumnValue(data);
-                var field = option.field;
-                try {
-                    var value = eval("data." + field);
-                } catch (e) {
-                    var value = undefined;
-                }
                 return '<span>' + value + '</span>';
             },
             //时间戳转日期
             date: function (data) {
                 var option = data.LAY_COL;
-                var field = option.field, value = '';
+
-                try {
+                value = admin.table.returnColumnValue(data);
-                    value = eval("data." + field);
-                } catch (e) { }
                 if (!admin.empty(value)) {
                     value = util.toDateString(value * 1000, option.format || 'yyyy-MM-dd HH:mm:ss');
                 }
                 return '<span>' + value + '</span>';
             },
+
+            // 统一列返回数据处理
+            returnColumnValue(data) {
+                var option = data.LAY_COL;
+                var field = option.field;
+                var defaultValue = option.defaultValue;
+                var value = defaultValue;
+                try {
+                    value = eval("data." + field);
+                } catch (e) {
+                    value = undefined;
+                }
+                
+                if (defaultValue != undefined && admin.empty(value)) {
+                    value = defaultValue;
+                }
+
+                return value;
+            },
             listenTableSearch: function (tableId) {
                 form.on('submit(' + tableId + '_filter)', function (data) {
                     var dataField = data.field;
@@ -1957,7 +1915,17 @@ define(["jquery", "tableSelect", "ckeditor"], function ($, tableSelect, undefine
             }
 
             return groupName;
-        }
+        },
+        //js版empty，判断变量是否为空
+        empty: function (r) {
+            var n, t, e, f = [void 0, null, !1, 0, "", "0"];
+            for (t = 0, e = f.length; t < e; t++) if (r === f[t]) return !0;
+            if ("object" == typeof r) {
+                for (n in r) if (r.hasOwnProperty(n)) return !1;
+                return !0
+            }
+            return !1
+        },
 
     };
     return admin;