From f5b58d03235e3633b736df352d268f381359be46 Mon Sep 17 00:00:00 2001 From: zoeeer Date: Tue, 21 Nov 2017 17:47:57 +0800 Subject: [PATCH 1/2] add helper to display image in listview --- lib/data/list.js | 1 + views/listview.html | 12 ++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/lib/data/list.js b/lib/data/list.js index 93ef01ad..c4d8ebb5 100644 --- a/lib/data/list.js +++ b/lib/data/list.js @@ -32,6 +32,7 @@ exports.get = function (args, done) { var value = rows[i][columns[j].name]; value = format.list.value(columns[j], value); if (columns[j].manyToMany && value) value = {mtm: value.split(',')} + if (columns[j].control.image && value) value = {file: {img: value}}; values.push(value); } records.push({pk: pk, values: values}); diff --git a/views/listview.html b/views/listview.html index 40017e8a..b9166c60 100644 --- a/views/listview.html +++ b/views/listview.html @@ -42,8 +42,16 @@

{{/pk}} {{#values}} - {{^mtm}}{{.}}{{/mtm}} - {{#mtm}}{{.}}{{/mtm}} + {{^file}} + {{^mtm}}{{.}}{{/mtm}} + {{#mtm}}{{.}}{{/mtm}} + {{/file}} + {{#file}} + {{#img}} + {{^mtm}}{{img}}{{/mtm}} + {{#mtm}}{{.}}{{/mtm}} + {{/img}} + {{/file}} {{/values}} From bac252960cb60c1ae9257e0bcdbdb9580c0ed419 Mon Sep 17 00:00:00 2001 From: zoeeer Date: Tue, 21 Nov 2017 17:51:28 +0800 Subject: [PATCH 2/2] revise Chinese translation --- config/lang/cn.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/lang/cn.json b/config/lang/cn.json index b5d388ce..0ecc3225 100644 --- a/config/lang/cn.json +++ b/config/lang/cn.json @@ -23,7 +23,7 @@ "views" : "Views", "others" : "其它", - "select" : "对", + "select" : "选择", "to-change" : "进行修改", "filter" : "按条件过滤", "clear" : "清除", @@ -33,14 +33,14 @@ "or" : "或", "today" : "今天", - "add-another" : "载追加", + "add-another" : "添加", "remove" : "移除", "add" : "增加", "change" : "修改", "delete" : "删除", "save" : "保存", - "save-continue" : "保存然后继续修改", - "save-add" : "保存然后增加", + "save-continue" : "保存并继续编辑本条", + "save-add" : "保存并添加下一条", "success" : "成功", "error" : "错误",