Skip to content

Commit 7fab3ac

Browse files
evoluteurevoluteur
committed
New field type "json" (partially implemented).
1 parent ec4af00 commit 7fab3ac

5 files changed

Lines changed: 31 additions & 7 deletions

File tree

‎doc/ui-model.html‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ <h1>field</h1>
235235
<tr>
236236
<td>label<span class="evol-required">*</span>
237237
</td>
238-
<td>Field title in all views. (Can be overridden for specific views with labellist, labelexport...).
238+
<td>Field title in all views. (Can be overridden for specific views with labelList, labelExport...).
239239
</td>
240240
</tr>
241241
<tr>
@@ -265,17 +265,18 @@ <h1>field</h1>
265265
<li><span data-id="#datetime"><img src="../dico/pix/ft-datehm.gif" class="Icon">datetime</span><span class="evol-asterix">*</span></li>
266266
<li><span data-id="#decimal"><img src="../dico/pix/ft-dec.gif" class="Icon">decimal</span></li>
267267
<li><span data-id="#document"><img src="../dico/pix/ft-doc.gif" class="Icon">document</span><span class="evol-asterix">*</span></li>
268+
<li><span data-id="#email"><img src="../dico/pix/ft-email.gif" class="Icon">email</span></li>
268269
</ul>
269270
<ul class="indent list-unstyled" style="float:left;width:160px">
270-
<li><span data-id="#email"><img src="../dico/pix/ft-email.gif" class="Icon">email</span></li>
271271
<li><span data-id="#hidden"><img class="Icon" src="../dico/pix/ft-hidden.png">hidden</span></li>
272272
<li><span data-id="#html"><img class="Icon" src="../dico/pix/ft-htm.gif">html</span><span class="evol-asterix">*</span></li>
273273
<li><span data-id="#image"><img src="../dico/pix/ft-img.gif" class="Icon">image</span><span class="evol-asterix">*</span></li>
274+
<li><span data-id="#json"><img class="Icon" src="../dico/pix/ft-json.png">json</span><span class="evol-asterix">*</span></li>
274275
<li><span data-id="#url"><img src="../dico/pix/ft-url.gif" class="Icon">url</span></li>
275276
<li><span data-id="#lov"><img src="../dico/pix/ft-lov.gif" class="Icon">lov (single value)</span></li>
277+
<li><span data-id="#list"><img src="../dico/pix/ft-list.png" class="Icon">list (multiple values)</span></li>
276278
</ul>
277279
<ul class="indent list-unstyled" style="float:left;width:160px">
278-
<li><span data-id="#list"><img src="../dico/pix/ft-list.png" class="Icon">list (multiple values)</span></li>
279280
<li><span data-id="#money"><img src="../dico/pix/ft-money.gif" class="Icon">money</span></li>
280281
<li><span data-id="#text"><img src="../dico/pix/ft-txt.gif" class="Icon">text</span></li>
281282
<li><span data-id="#textmultiline"><img src="../dico/pix/ft-txtml.gif" class="Icon">textmultiline</span></li>

‎js/dico/def.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ var fts = {
3333
//doc:'document',
3434
url: 'url',
3535
color: 'color',
36-
hidden: 'hidden'
37-
//json: 'json',
36+
hidden: 'hidden',
37+
json: 'json'
3838
//rating: 'rating',
3939
//widget: 'widget'
4040
};
@@ -48,7 +48,7 @@ return {
4848
return viewName==='new' || viewName==='edit' || viewName==='browse' || viewName==='json';
4949
},*/
5050
isViewMany: function(viewName){
51-
return viewName==='list' || viewName==='cards' || viewName==='charts' || viewName==='bubbles';
51+
return viewName==='list' || viewName==='cards' || viewName==='charts' || viewName==='bubbles'|| viewName==='sunburst';
5252
},
5353

5454
isViewCollection: function(viewName){

‎js/dico/dico.js‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,10 @@ return {
8282
return uiInput.text(fid, fv, f);
8383
//fv!==''?EvoUI.link(fid,'',fv):''
8484
},
85+
json: function(f, fid, fv){
86+
// TODO
87+
return uiInput.textM(fid, fv, f.maxlength, f.height);
88+
},
8589
//doc: function(f, fid, fv, iconsPath){
8690
//},
8791
image: function(f, fid, fv, iconsPath){

‎js/ui-models/apps/test.js‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ function fieldTypePanel(id, label, labelPanel, label2Panel, css){
4949
},
5050
{
5151
id: id+'3',
52-
attribute: id,
52+
attribute: id+'3',
5353
type: id,
5454
label: label+' 3',
5555
width: 100
@@ -324,6 +324,13 @@ uiModels.test = {
324324
]
325325
}
326326
]
327+
},
328+
{
329+
type: 'tab',
330+
label: 'JSON',
331+
elements: [
332+
fieldTypePanel('json', 'JSON', 'JSON', '', 'panel-success')
333+
]
327334
}
328335
]
329336
};

‎js/view-one/one.js‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,9 @@ return Backbone.View.extend({
190190
case fts.color:
191191
$f.html(uiInput.colorBox(f.id, fv, fv));
192192
break;
193+
case fts.json:
194+
$f.html(Evol.Format.cr2br(fv));
195+
break;
193196
default:
194197
$f.text(eDico.fieldHTML_RO(f, _.isUndefined(fv)?'':fv, Evol.hashLov, iconsPath) + ' ');
195198
}
@@ -843,6 +846,15 @@ return Backbone.View.extend({
843846
return formatMsg(f.label, i18nVal[f.type]);
844847
}
845848
break;
849+
case fts.json:
850+
var obj;
851+
try{
852+
obj=$.parseJSON(v);
853+
}catch(err){}
854+
if(_.isUndefined(obj)){
855+
return formatMsg(f.label, i18nVal[f.type]);
856+
}
857+
break;
846858
}
847859
}
848860
}

0 commit comments

Comments
 (0)