@gisce/react-ooui 0.9.4 → 0.9.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.js +1 -1
- package/dist/widgets/containers/Container.d.ts.map +1 -1
- package/dist/widgets/containers/Container.js +4 -3
- package/dist/widgets/containers/Container.js.map +1 -1
- package/package.json +1 -1
- package/src/stories/mocks/models/cups.ts +1 -1
- package/src/widgets/containers/Container.tsx +28 -27
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Container.d.ts","sourceRoot":"","sources":["../../../src/widgets/containers/Container.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,SAAS,IAAI,aAAa,EAAiB,MAAM,aAAa,CAAC;AAYxE,aAAK,KAAK,GAAG;IACX,SAAS,EAAE,aAAa,CAAC;IACzB,mBAAmB,EAAE,OAAO,CAAC;CAC9B,CAAC;AAEF,QAAA,MAAM,SAAS,UAAW,KAAK,KAAG,MAAM,
|
|
1
|
+
{"version":3,"file":"Container.d.ts","sourceRoot":"","sources":["../../../src/widgets/containers/Container.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,SAAS,IAAI,aAAa,EAAiB,MAAM,aAAa,CAAC;AAYxE,aAAK,KAAK,GAAG;IACX,SAAS,EAAE,aAAa,CAAC;IACzB,mBAAmB,EAAE,OAAO,CAAC;CAC9B,CAAC;AAEF,QAAA,MAAM,SAAS,UAAW,KAAK,KAAG,MAAM,YAgFvC,CAAC;AAEF,eAAe,SAAS,CAAC"}
|
|
@@ -39,8 +39,9 @@ var Container = function (props) {
|
|
|
39
39
|
row: rowWithoutInvisibleFields,
|
|
40
40
|
numberOfColumns: columns,
|
|
41
41
|
});
|
|
42
|
-
var rowWithEmptiesToFit;
|
|
43
|
-
if (i === 0
|
|
42
|
+
var rowWithEmptiesToFit = rowWithExpandedItems;
|
|
43
|
+
if (i === 0 ||
|
|
44
|
+
!(row.length === 1 && row.some(function (widget) { return widget.type === "group"; }))) {
|
|
44
45
|
rowWithEmptiesToFit = containerHelper_1.fillRowWithEmptiesToFit({
|
|
45
46
|
row: rowWithExpandedItems,
|
|
46
47
|
numberOfColumns: columns,
|
|
@@ -48,7 +49,7 @@ var Container = function (props) {
|
|
|
48
49
|
});
|
|
49
50
|
firstRow = firstRow.concat(rowWithEmptiesToFit);
|
|
50
51
|
}
|
|
51
|
-
return
|
|
52
|
+
return rowWithEmptiesToFit.map(function (item, j) {
|
|
52
53
|
// We check if we have any label+field inside the container.
|
|
53
54
|
// In this scenario, we must format the grid accordingly
|
|
54
55
|
// Otherwise, the grid will divide uniformly
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Container.js","sourceRoot":"","sources":["../../../src/widgets/containers/Container.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,gDAA0B;AAC1B,oCAAwE;AACxE,yDAA4D;AAE5D,6DAOmC;AAOnC,IAAM,SAAS,GAAG,UAAC,KAAY;IACrB,IAAA,SAAS,GAA0B,KAAK,UAA/B,EAAE,mBAAmB,GAAK,KAAK,oBAAV,CAAW;IACzC,IAAA,IAAI,GAAK,SAAS,KAAd,CAAe;IACrB,IAAA,OAAO,GAAK,SAAS,QAAd,CAAe;IAE5B,gDAAgD;IAChD,qDAAqD;IACrD,8BAA8B;IAC9B,IAAM,iBAAiB,GAAG,sCAAoB,CAAC,IAAI,CAAC,CAAC;IACrD,IAAI,iBAAiB,GAAG,OAAO,EAAE;QAC/B,OAAO,GAAG,iBAAiB,CAAC;KAC7B;IAED,IAAI,WAAW,GAAG,KAAK,CAAC;IACxB,IAAI,QAAQ,GAAa,EAAE,CAAC;IAE5B,IAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,UAAC,GAAa,EAAE,CAAC;QACxC,IAAM,yBAAyB,GAAG,GAAG,CAAC,MAAM,CAAC,UAAC,MAAM;YAClD,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC;QAC3B,CAAC,CAAC,CAAC;QAEH,IAAM,oBAAoB,GAAG,uCAAqB,CAAC;YACjD,GAAG,EAAE,yBAAyB;YAC9B,eAAe,EAAE,OAAO;SACzB,CAAC,CAAC;QAEH,IAAI,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"Container.js","sourceRoot":"","sources":["../../../src/widgets/containers/Container.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -50,7 +50,7 @@ export default {
|
|
|
50
50
|
},
|
|
51
51
|
form: {
|
|
52
52
|
arch:
|
|
53
|
-
'<form string="CUPS">\n <notebook colspan="4">\n <page string="General">\n <field name="name" select="1" size="25"/>\n <field name="active" select="1"/>\n <field name="distribuidora_id" domain="[(\'supplier\',\'=\',True)]" context="{\'task\': \'test\'}" required="1" select="1"/>\n <field name="id_municipi" select="1"/>\n <field name="id_provincia"/>\n <field name="id_poblacio" select="1" domain="[(\'municipi_id.id\', \'=\', id_municipi)]"/>\n <field name="dp"/>\n <field name="direccio" select="1" colspan="4"/>\n <field name="polissa_polissa" select="1"/>\n <field name="polissa_comptador" select="1"/>\n <field name="polissa_potencia"/>\n <field name="potencia_adscrita" attrs="{\'readonly\':[(\'force_potencia_adscrita\',\'=\',0)]}"/>\n <field name="force_potencia_adscrita"/>\n <group colspan="4" string="Adreces">\n <notebook colspan="4">\n <page string="Principal">\n <separator string="Zona urbana" colspan="4"/>\n <field name="tv"/>\n <field name="nv" select="1"/>\n <field name="pnp" select="1"/>\n <field name="bq" select="1"/>\n <field name="es" select="1"/>\n <field name="pt" select="1"/>\n <field name="pu" select="1"/>\n <field name="aclarador" colspan="4" select="1"/>\n <separator string="Zona industrial" colspan="4"/>\n <field name="cpo" select="1"/>\n <field name="cpa" select="1"/>\n </page>\n <page string="Cadastre">\n <separator string="Zona urbana" colspan="4"/>\n <field name="catas_np"/>\n <field name="catas_nm"/>\n <field name="ref_catastral" select="1"/>\n <button type="object" name="update_dir_from_ref" string="Obtenir del Cadastre"/>\n <button type="object" name="delete_dir_ref" string="Eliminar dades del Cadastre" confirm="Està segur que vol eliminar les dades que s\'han obtingut del cadastre?"/>\n <field name="catas_ldt" colspan="4"/>\n <field name="catas_tv"/>\n <field name="catas_nv"/>\n <field name="catas_pnp"/>\n <field name="catas_bq"/>\n <field name="catas_es"/>\n <field name="catas_pt"/>\n <field name="catas_pu"/>\n <field name="catas_dp"/>\n <separator string="Zona industrial" colspan="4"/>\n <field name="catas_cpo"/>\n <field name="catas_cpa"/>\n <separator string="Sincronització amb el cadastre" colspan="4"/>\n <label colspan="2" string="Si disposa de la referencia cadastral pot copiar les dades del cadastre a l\'adreça principal mitjançant aquest botó"/>\n <button type="object" name="copy_to_alternative" string="Copiar a la principal"/>\n </page>\n <page string="Notes">\n <field name="notes" colspan="4" nolabel="1"/>\n </page>\n </notebook>\n </group>\n </page>\n <page string="Autoconsum">\n <field name="autoconsum_id" readonly="1" colspan="4"/>\n <field name="coef_repartiment" readonly="1" colspan="4"/>\n </page>\n <page string="Butlletins">\n <field name="butlletins" colspan="4" nolabel="1" context="{\'cups_id\': active_id}"/>\n </page>\n <page string="Històric d\'autoconsums">\n <field name="hist_autoconsum" nolabel="1" context="{\'default_cups_id\': active_id}" readonly="1"/>\n </page>\n <page string="Històric de pòlisses">\n <field name="polisses" nolabel="1" colspan="4">\n </field>\n </page>\n </notebook>\n </form>',
|
|
53
|
+
'<form string="CUPS">\n <notebook colspan="4">\n <page string="Corbes"> <group colspan="4"> <group string="Validada" colspan="2"> <field name="bq" string="Última corba"/> <field name="bq" string="Format"/> </group> <group string="Facturada" colspan="2"> <field name="bq" string="Última corba"/> <field name="bq" string="Format"/> </group> <group string="Autoconsumida" colspan="2"> <field name="bq" string="Última corba"/> <field name="bq" string="Format"/> </group> <group string="Generada Neta" colspan="2"> <field name="bq" string="Última corba"/> <field name="bq" string="Format"/> </group> <group string="Quart-Horària" colspan="2"> <field name="bq" string="Última corba"/> <field name="bq" string="Format"/> </group> </group> </page> <page string="General">\n <field name="name" select="1" size="25"/>\n <field name="active" select="1"/>\n <field name="distribuidora_id" domain="[(\'supplier\',\'=\',True)]" context="{\'task\': \'test\'}" required="1" select="1"/>\n <field name="id_municipi" select="1"/>\n <field name="id_provincia"/>\n <field name="id_poblacio" select="1" domain="[(\'municipi_id.id\', \'=\', id_municipi)]"/>\n <field name="dp"/>\n <field name="direccio" select="1" colspan="4"/>\n <field name="polissa_polissa" select="1"/>\n <field name="polissa_comptador" select="1"/>\n <field name="polissa_potencia"/>\n <field name="potencia_adscrita" attrs="{\'readonly\':[(\'force_potencia_adscrita\',\'=\',0)]}"/>\n <field name="force_potencia_adscrita"/>\n <group colspan="4" string="Adreces">\n <notebook colspan="4">\n <page string="Principal">\n <separator string="Zona urbana" colspan="4"/>\n <field name="tv"/>\n <field name="nv" select="1"/>\n <field name="pnp" select="1"/>\n <field name="bq" select="1"/>\n <field name="es" select="1"/>\n <field name="pt" select="1"/>\n <field name="pu" select="1"/>\n <field name="aclarador" colspan="4" select="1"/>\n <separator string="Zona industrial" colspan="4"/>\n <field name="cpo" select="1"/>\n <field name="cpa" select="1"/>\n </page>\n <page string="Cadastre">\n <separator string="Zona urbana" colspan="4"/>\n <field name="catas_np"/>\n <field name="catas_nm"/>\n <field name="ref_catastral" select="1"/>\n <button type="object" name="update_dir_from_ref" string="Obtenir del Cadastre"/>\n <button type="object" name="delete_dir_ref" string="Eliminar dades del Cadastre" confirm="Està segur que vol eliminar les dades que s\'han obtingut del cadastre?"/>\n <field name="catas_ldt" colspan="4"/>\n <field name="catas_tv"/>\n <field name="catas_nv"/>\n <field name="catas_pnp"/>\n <field name="catas_bq"/>\n <field name="catas_es"/>\n <field name="catas_pt"/>\n <field name="catas_pu"/>\n <field name="catas_dp"/>\n <separator string="Zona industrial" colspan="4"/>\n <field name="catas_cpo"/>\n <field name="catas_cpa"/>\n <separator string="Sincronització amb el cadastre" colspan="4"/>\n <label colspan="2" string="Si disposa de la referencia cadastral pot copiar les dades del cadastre a l\'adreça principal mitjançant aquest botó"/>\n <button type="object" name="copy_to_alternative" string="Copiar a la principal"/>\n </page>\n <page string="Notes">\n <field name="notes" colspan="4" nolabel="1"/>\n </page>\n </notebook>\n </group>\n </page>\n <page string="Autoconsum">\n <field name="autoconsum_id" readonly="1" colspan="4"/>\n <field name="coef_repartiment" readonly="1" colspan="4"/>\n </page>\n <page string="Butlletins">\n <field name="butlletins" colspan="4" nolabel="1" context="{\'cups_id\': active_id}"/>\n </page>\n <page string="Històric d\'autoconsums">\n <field name="hist_autoconsum" nolabel="1" context="{\'default_cups_id\': active_id}" readonly="1"/>\n </page>\n <page string="Històric de pòlisses">\n <field name="polisses" nolabel="1" colspan="4">\n </field>\n </page>\n </notebook>\n </form>',
|
|
54
54
|
field_parent: false,
|
|
55
55
|
fields: {
|
|
56
56
|
aclarador: {
|
|
@@ -42,8 +42,11 @@ const Container = (props: Props): React.ReactElement => {
|
|
|
42
42
|
numberOfColumns: columns,
|
|
43
43
|
});
|
|
44
44
|
|
|
45
|
-
let rowWithEmptiesToFit;
|
|
46
|
-
if (
|
|
45
|
+
let rowWithEmptiesToFit = rowWithExpandedItems;
|
|
46
|
+
if (
|
|
47
|
+
i === 0 ||
|
|
48
|
+
!(row.length === 1 && row.some((widget) => widget.type === "group"))
|
|
49
|
+
) {
|
|
47
50
|
rowWithEmptiesToFit = fillRowWithEmptiesToFit({
|
|
48
51
|
row: rowWithExpandedItems,
|
|
49
52
|
numberOfColumns: columns,
|
|
@@ -53,33 +56,31 @@ const Container = (props: Props): React.ReactElement => {
|
|
|
53
56
|
firstRow = firstRow.concat(rowWithEmptiesToFit);
|
|
54
57
|
}
|
|
55
58
|
|
|
56
|
-
return (
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
}
|
|
59
|
+
return rowWithEmptiesToFit.map((item: Widget, j: number) => {
|
|
60
|
+
// We check if we have any label+field inside the container.
|
|
61
|
+
// In this scenario, we must format the grid accordingly
|
|
62
|
+
// Otherwise, the grid will divide uniformly
|
|
63
|
+
if (item instanceof Label && (item as Label).fieldForLabel) {
|
|
64
|
+
fieldInRows = true;
|
|
65
|
+
}
|
|
64
66
|
|
|
65
|
-
|
|
67
|
+
const itemRowIndex = row.indexOf(item);
|
|
66
68
|
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
);
|
|
69
|
+
return (
|
|
70
|
+
<div
|
|
71
|
+
key={`${i.toString()}-${itemRowIndex.toString()}`}
|
|
72
|
+
style={{
|
|
73
|
+
...getSpanStyleForItem({ item, responsiveBehaviour }),
|
|
74
|
+
minWidth: 0,
|
|
75
|
+
}}
|
|
76
|
+
>
|
|
77
|
+
{createReactWidget({
|
|
78
|
+
ooui: item,
|
|
79
|
+
responsiveBehaviour,
|
|
80
|
+
})}
|
|
81
|
+
</div>
|
|
82
|
+
);
|
|
83
|
+
});
|
|
83
84
|
});
|
|
84
85
|
|
|
85
86
|
const templateColumns =
|