|
|
@@ -38,7 +38,8 @@ function titleConfig(title) {
|
|
|
function formConfig(model) {
|
|
|
let { type, config, layout } = model;
|
|
|
let { fontSize, header, fieldStyle, valueStyle, columns, data } = config;
|
|
|
- data = data ? data.map((d) => {
|
|
|
+ data = data ? ( ( data instanceof Array ) ? data : [data] ) : [];
|
|
|
+ data = data.map((d) => {
|
|
|
d.field = {
|
|
|
text: d.field.text,
|
|
|
style: parseStyleStr(d.field.style)
|
|
|
@@ -49,7 +50,7 @@ function formConfig(model) {
|
|
|
};
|
|
|
d.render = renderFunction(d.render);
|
|
|
return d;
|
|
|
- }) : [];
|
|
|
+ });
|
|
|
let c = {
|
|
|
type: 'form',
|
|
|
config: {
|
|
|
@@ -69,7 +70,9 @@ function tableConfig(model) {
|
|
|
let { type, config, layout } = model;
|
|
|
let { fontSize, title, cls, render, columns, data, pagesize, interval, headerrowsstyle, rowsstyle } = config;
|
|
|
let allWidth = 0;
|
|
|
+ columns = columns ? ( ( columns instanceof Array ) ? columns : [columns] ) : [];
|
|
|
columns.map((c, i) => allWidth += (c.width || 100));
|
|
|
+ data = data ? ( ( data instanceof Array ) ? data : [data] ) : [];
|
|
|
return {
|
|
|
type: 'table',
|
|
|
config: {
|
|
|
@@ -78,19 +81,19 @@ function tableConfig(model) {
|
|
|
refreshInterval: interval,
|
|
|
title: renderFunction(title),
|
|
|
render: renderFunction(render),
|
|
|
- columns: columns ? columns.map((v, i) => {
|
|
|
+ columns: columns.map( (v, i) => {
|
|
|
v.key = i;
|
|
|
v.width ? v.width = getScreenSize().width * (layout.w/100) * (v.width/ allWidth) : '';
|
|
|
v.render = renderFunction(v.render);
|
|
|
v.rowStyle = parseStyleStr(v.rowstyle);
|
|
|
return v;
|
|
|
- }) : [],
|
|
|
- data: data ? data.map((v, i) => {
|
|
|
+ }),
|
|
|
+ data: data.map( (v, i) => {
|
|
|
if(v){
|
|
|
v.key = i;
|
|
|
}
|
|
|
return v || {};
|
|
|
- }) : [],
|
|
|
+ } ),
|
|
|
headerRowsStyle: parseStyleStr(headerrowsstyle),
|
|
|
rowsStyle: parseStyleStr(rowsstyle),
|
|
|
},
|