@luomus/laji-form-builder 1.1.1 → 1.1.3

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.
@@ -43,7 +43,7 @@ const hierarchyNmpsc = utils_1.nmspc("hierarchy");
43
43
  const getLabel = (form, idToUri) => {
44
44
  const y = LABEL_HEIGHT + LABEL_PADDING;
45
45
  const { name = "" } = form;
46
- let ellipsedName = name.substring(0, 30);
46
+ let ellipsedName = name.substring(0, 21);
47
47
  if (ellipsedName.length < name.length) {
48
48
  ellipsedName += "...";
49
49
  }
@@ -54,20 +54,25 @@ const getLabel = (form, idToUri) => {
54
54
  return idToUri
55
55
  ? (React.createElement("a", { href: idToUri(form.id), target: "_blank", rel: "noreferrer noopener" }, text)) : text;
56
56
  };
57
- const createNode = (form, idToUri) => ({ name: form.id, label: getLabel(form, idToUri), children: [] });
57
+ const createNode = (form, idToUri, isBase) => ({
58
+ name: form.id,
59
+ label: getLabel(form, idToUri),
60
+ children: [],
61
+ gProps: { className: hierarchyNmpsc(isBase ? "base-node" : "node") }
62
+ });
58
63
  const formsToHierarchy = (forms, id, idToUri) => {
59
64
  const formsById = utils_2.dictionarifyByKey(forms, "id");
60
65
  let base;
61
66
  const idToNode = {};
62
67
  forms.forEach(form => {
63
- const node = idToNode[form.id] || createNode(form, idToUri);
68
+ const node = idToNode[form.id] || createNode(form, idToUri, form.id === id);
64
69
  if (node.name === id) {
65
- node.gProps = { className: "base" };
70
+ node.gProps = { className: hierarchyNmpsc("base-node") };
66
71
  base = node;
67
72
  }
68
73
  const parentId = form.baseFormID || form.fieldsFormID;
69
74
  if (parentId) {
70
- const parentNode = idToNode[parentId] || createNode(formsById[parentId], idToUri);
75
+ const parentNode = idToNode[parentId] || createNode(formsById[parentId], idToUri, parentId === id);
71
76
  !parentNode.children.includes(node) && parentNode.children.push(node);
72
77
  node.parent = parentNode;
73
78
  idToNode[parentId] = parentNode;
@@ -132,6 +137,7 @@ const useComputeMaxWidth = (ref) => {
132
137
  }, [ref]);
133
138
  return maxWidth;
134
139
  };
140
+ const pathProps = { className: hierarchyNmpsc("link") };
135
141
  const HierarchyModal = ({ hierarchy, onHide }) => {
136
142
  const { translations } = React.useContext(Context_1.Context);
137
143
  const ref = React.useRef(null);
@@ -139,8 +145,8 @@ const HierarchyModal = ({ hierarchy, onHide }) => {
139
145
  const depth = getDepth(hierarchy);
140
146
  const maxChildren = getMaxChildren(hierarchy);
141
147
  const height = maxChildren * (LABEL_HEIGHT * 2 + LABEL_PADDING + NODES_PADDING);
142
- return (React.createElement(components_1.GenericModal, { onHide: onHide, className: hierarchyNmpsc("modal"), bodyRef: ref, header: translations["editor.hierarchy.title"] },
143
- React.createElement(react_tree_graph_1.Tree, { data: hierarchy, labelProp: "label", height: height, width: Math.min(depth * 200, maxWidth) })));
148
+ return (React.createElement(components_1.GenericModal, { onHide: onHide, className: hierarchyNmpsc(), bodyRef: ref, header: translations["editor.hierarchy.title"] },
149
+ React.createElement(react_tree_graph_1.Tree, { data: hierarchy, labelProp: "label", pathProps: pathProps, height: height, width: Math.min(depth * 200, maxWidth) })));
144
150
  };
145
151
  const getDepth = (node) => {
146
152
  return 1 + Math.max(...node.children.map(getDepth), 0);
@@ -1 +1 @@
1
- {"version":3,"file":"Hierarchy.js","sourceRoot":"","sources":["../../../../src/client/components/Editor/Hierarchy.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAA+B;AAE/B,wCAAkD;AAClD,8CAAyE;AACzE,wCAAqC;AACrC,uCAAoG;AACpG,uDAAiE;AACjE,0CAAmD;AAQnD,MAAM,YAAY,GAAG,EAAE,CAAC,CAAC,yCAAyC;AAClE,MAAM,aAAa,GAAG,CAAC,CAAC;AACxB,MAAM,aAAa,GAAG,EAAE,CAAC;AAEzB,MAAM,cAAc,GAAG,aAAK,CAAC,WAAW,CAAC,CAAC;AAE1C,MAAM,QAAQ,GAAG,CAAC,IAAiB,EAAE,OAAiC,EAAE,EAAE;IACzE,MAAM,CAAC,GAAG,YAAY,GAAG,aAAa,CAAC;IACvC,MAAM,EAAE,IAAI,GAAG,EAAE,EAAE,GAAG,IAAI,CAAC;IAC3B,IAAI,YAAY,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IACzC,IAAI,YAAY,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,EAAE;QACtC,YAAY,IAAI,KAAK,CAAC;KACtB;IACD,MAAM,IAAI,GAAG,CACZ,2BAAG,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,SAAS,EAAE,cAAc,CAAC,OAAO,CAAC;QACjD,kCAAO,IAAI,CAAC,EAAE,CAAQ;QACtB,8BAAM,CAAC,EAAE,CAAC,IAAG,YAAY,CAAQ;QACjC,mCAAQ,IAAI,CAAS,CAClB,CACJ,CAAC;IACF,OAAO,OAAO;QACb,CAAC,CAAC,CACD,2BAAG,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,MAAM,EAAC,QAAQ,EAAC,GAAG,EAAC,qBAAqB,IAClE,IAAI,CACF,CACJ,CAAC,CAAC,CAAC,IAAI,CAAC;AACX,CAAC,CAAC;AAEF,MAAM,UAAU,GAAG,CAAC,IAAiB,EAAE,OAAiC,EAAa,EAAE,CACtF,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE,KAAK,EAAE,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC;AAEnE,MAAM,gBAAgB,GAAG,CACxB,KAAoB,EACpB,EAAU,EACV,OAAiC,EAChC,EAAE;IACH,MAAM,SAAS,GAAG,yBAAiB,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IACjD,IAAI,IAA2B,CAAC;IAEhC,MAAM,QAAQ,GAA8B,EAAE,CAAC;IAE/C,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QACpB,MAAM,IAAI,GAAc,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,UAAU,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACvE,IAAI,IAAI,CAAC,IAAI,KAAK,EAAE,EAAE;YACrB,IAAI,CAAC,MAAM,GAAG,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC;YACpC,IAAI,GAAG,IAAI,CAAC;SACZ;QACD,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,YAAY,CAAC;QACtD,IAAI,QAAQ,EAAE;YACb,MAAM,UAAU,GAAG,QAAQ,CAAC,QAAQ,CAAC,IAAI,UAAU,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC,CAAC;YAClF,CAAC,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACtE,IAAI,CAAC,MAAM,GAAG,UAAU,CAAC;YACzB,QAAQ,CAAC,QAAQ,CAAC,GAAG,UAAU,CAAC;SAChC;IACF,CAAC,CAAC,CAAC;IAEH,IAAI,QAAQ,GAAG,IAAI,CAAC;IACpB,OAAO,QAAQ,EAAE;QAChB,IAAI,QAAQ,CAAC,MAAM,EAAE;YACpB,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC;SAC3B;aAAM;YACN,OAAO,QAAQ,CAAC;SAChB;KACD;IACD,OAAO,SAAS,CAAC;AAClB,CAAC,CAAC;AAEK,MAAM,eAAe,GAAG,CAAC,EAAE,MAAM,EAAE,SAAS,EAA+C,EAAE,EAAE;IACrG,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAwB,SAAS,CAAC,CAAC;IACnF,MAAM,CAAC,SAAS,EAAE,SAAS,EAAE,UAAU,CAAC,GAAG,wBAAgB,CAAC,KAAK,CAAC,CAAC;IAEnE,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,YAAY,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC,UAAU,CAAC,iBAAO,CAAC,CAAC;IACtF,MAAM,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC;IAE5B,MAAM,QAAQ,GAAG,KAAK,CAAC,MAAM,EAAmB,CAAC;IAEjD,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACpB,MAAM,YAAY,GAAG,GAAS,EAAE;YAC/B,IAAI,CAAC,MAAM,IAAI,CAAC,iBAAO,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE;gBAC9C,OAAO;aACP;YAED,MAAM,KAAK,GAAG,MAAM,oBAAY,CAAC,MAAM,CAAC,EAAE,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,QAAQ,CAAC,CAAC;YACzF,IAAI,0BAAkB,CAAC,KAAK,CAAC,EAAE;gBAC9B,OAAO;aACP;YACD,MAAM,SAAS,GAAG,gBAAgB,CAAC,KAAK,EAAE,MAAM,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;YAC9D,YAAY,CAAC,SAAS,CAAC,CAAC;QACzB,CAAC,CAAA,CAAC;QACF,YAAY,EAAE,CAAC;IAChB,CAAC,EAAE,CAAC,WAAW,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;IAEzC,IAAI,CAAC,SAAS,IAAI,CAAC,MAAM,IAAI,CAAC,iBAAO,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE;QAC5D,OAAO,IAAI,CAAC;KACZ;IAED,MAAM,YAAY,GAAG,kBAAU,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE,SAAS,CAAC,CAAC;IACrE,OAAO;QACN,oBAAC,oBAAO,IAAC,OAAO,EAAE,YAAY,CAAC,uBAAuB,CAAC,EAAE,EAAE,EAAC,gBAAgB;YAC3E,oBAAC,mBAAM,IAAC,KAAK,QAAC,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,YAAY,EAAE,QAAQ,EAAE,SAAS,KAAK,SAAS;gBAC3F,oBAAC,SAAS,IAAC,KAAK,EAAC,UAAU,GAAG,CACtB,CACA;QACR,SAAS,IAAI,oBAAC,cAAc,IAAC,SAAS,EAAE,SAAU,EAAE,MAAM,EAAE,UAAU,GAAI,CAC1E,CAAC;AACL,CAAC,CAAC;AAtCW,QAAA,eAAe,mBAsC1B;AAEF,MAAM,kBAAkB,GAAG,CAAC,GAAiC,EAAE,EAAE;IAChE,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;IACpD,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACpB,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE;YACjB,OAAO;SACP;QACD,IAAI,cAAc,CAAC,GAAG,EAAE;;YACvB,MAAM,MAAM,GAAG,MAAA,GAAG,CAAC,OAAO,0CAAE,qBAAqB,EAAE,CAAC;YACpD,IAAI,CAAC,MAAM,EAAE;gBACZ,OAAO;aACP;YACD,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC3B,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACzB,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IACV,OAAO,QAAQ,CAAC;AACjB,CAAC,CAAC;AAEF,MAAM,cAAc,GAAG,CAAC,EAAE,SAAS,EAAE,MAAM,EAAgD,EAAE,EAAE;IAC9F,MAAM,EAAE,YAAY,EAAE,GAAG,KAAK,CAAC,UAAU,CAAC,iBAAO,CAAC,CAAC;IACnD,MAAM,GAAG,GAAG,KAAK,CAAC,MAAM,CAAiB,IAAI,CAAC,CAAC;IAC/C,MAAM,QAAQ,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAC;IACzC,MAAM,KAAK,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC;IAClC,MAAM,WAAW,GAAG,cAAc,CAAC,SAAS,CAAC,CAAC;IAC9C,MAAM,MAAM,GAAG,WAAW,GAAG,CAAC,YAAY,GAAG,CAAC,GAAG,aAAa,GAAG,aAAa,CAAC,CAAC;IAChF,OAAO,CACN,oBAAC,yBAAY,IAAC,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,cAAc,CAAC,OAAO,CAAC,EAClC,OAAO,EAAE,GAAG,EACZ,MAAM,EAAE,YAAY,CAAC,wBAAwB,CAAC;QAC3D,oBAAC,uBAAI,IAAC,IAAI,EAAE,SAAS,EAAE,SAAS,EAAC,OAAO,EAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,KAAK,GAAG,GAAG,EAAE,QAAQ,CAAC,GAAI,CACrF,CACf,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,QAAQ,GAAG,CAAC,IAAe,EAAU,EAAE;IAC5C,OAAO,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC;AACxD,CAAC,CAAC;AAEF,MAAM,cAAc,GAAG,CAAC,IAAqB,EAAU,EAAE;IACxD,OAAO,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,GAAG,GAAG,cAAc,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AAClF,CAAC,CAAC"}
1
+ {"version":3,"file":"Hierarchy.js","sourceRoot":"","sources":["../../../../src/client/components/Editor/Hierarchy.tsx"],"names":[],"mappings":"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"}
@@ -310,21 +310,24 @@
310
310
  .ljb-mb-5 {
311
311
  margin-bottom: 10px;
312
312
  }
313
- .ljb-hierarchy-modal svg {
313
+ .ljb-hierarchy svg {
314
314
  display: flex;
315
315
  margin: auto;
316
316
  }
317
- .ljb-hierarchy-modal path.link {
318
- stroke: #aaaaaa;
317
+ .ljb-hierarchy-node circle {
318
+ fill: white;
319
+ stroke: #787b83;
319
320
  }
320
- .ljb-hierarchy-modal text {
321
- text-decoration: underline;
321
+ .ljb-hierarchy-base-node circle {
322
+ fill: #47494e;
323
+ stroke: black;
322
324
  }
323
- .ljb-hierarchy-modal .base text {
324
- stroke: #555555;
325
- }
326
- .ljb-hierarchy-modal .ljb-hierarchy-label {
325
+ .ljb-hierarchy-label {
327
326
  display: flex;
328
327
  }
328
+ .ljb-hierarchy-link {
329
+ fill: none;
330
+ stroke: #adafb4;
331
+ }
329
332
 
330
333
  /*# sourceMappingURL=styles.css.map */
@@ -1 +1 @@
1
- {"version":3,"sourceRoot":"","sources":["../../src/client/styles.scss"],"names":[],"mappings":";AAoFA;EACC,SALS;;;AAoBV;EAIC;;AAEA;EAEC,cA5BQ;;AA8BR;EACC,OAvGS;EAwGT;EACA;;AAGD;EACC,OApHS;;AAsHV;EACC;;AAED;EACC,OAnHS;EAoHT;;AAED;EACC,OA9HS;;AAgIV;EACC;;AAED;EACC;;AAED;EACC;;AAEA;EACC;EACA;EACA,OA/HO;;AAiIR;EACC,OArIK;;AAwIP;EACC;;AAEA;EACC;EACA;EACA,OArHQ;;AAuHT;EACC,OA3HM;;AA8HR;EACC;;AAEA;EACC,OA1GO;EA2GP;;AAGF;EACC;EACA;EACA;;AAIF;EACC;;AAGD;EACC;EA1FD,kBAzFS;;AA0FT;EACC;;AA4FA;EACC;EACA;EACA;;AAED;EACC,kBAjLQ;EAkLR,cA7KQ;EA8KR,OA9KQ;;AAgLT;EACC,kBA3KS;EA4KT,cAtKS;EAuKT,OAvKS;;AA0KX;EACC,SAxHQ;EAyHR,kBA7JK;;AA+JN;EACC,OApJO;;AAuJR;EACC;;AAGD;EACC,SApIQ;;AAsIR;EACC,cAvIO;;AA4IT;EACC;;AAGD;EACC,kBA3NU;EA4NV;EACA;;AAEA;EACC;;AACA;EACC;EACA;;AAGF;EACC;;AAGD;EACC,OArMI;;AAyMN;EACE,OA1MI;;AA4MN;EACC;;AAEA;EACC;EACA;EACA,OAzMM;;AA4MP;EACC;;AAKD;EACC;EACA;EACA;EACA;;AACA;EACC;EACA;;AAKH;EACC;;AAID;EAxLA;EACA;;AA0LC;EACC,kBA/QQ;;AAmRV;EACC;EACA;EACA;EACA;;AAEA;EACC;EACA,OAhPM;;AAqPP;EACC,OAlQI;EAmQJ,kBAzSS;EA0ST;;AAGD;EACC;;AAGD;EACC;;AAED;EACC,SA3OO;;AAiPR;EACC;EACA;EACA,eAnPO;EAoPP,OA1TM;EA2TN;EACA;EACA;EACA;;AACA;EACC;EACA;;AAKH;EACC,YA1RO;EA2RP;;AAGD;EACE,eAvQO;;AA2QR;EACC;EACA;;AAGC;EACC,OAtVI;EAuVJ;EACA;EACA;EACA;;AAEA;EACC;;AAGD;EACC,OA1VK;EA2VL,YAjWK;;AAqWP;EACC;EACA;EACA;;AAMJ;EAjSA,kBAzFS;;AA0FT;EACC;;AAmSD;EACC;;AAGD;EAlSA;EACA;;AAoSC;EACC,kBA1XQ;;AA4XT;EACC,kBAhVQ;;AAkVT;EACC,kBA1WS;;AA8WX;EACC;EACA;;AAID;EACC;;AACA;EACC;EACA;EACA;;AAKD;EACC;;AAED;EACC;;AAED;EACC;;AAPD;EACC;;AAED;EACC;;AAED;EACC;;AAPD;EACC;;AAED;EACC;;AAED;EACC;;AAPD;EACC;;AAED;EACC;;AAED;EACC;;AAPD;EACC;;AAED;EACC;;AAED;EACC;;AAKD;EACC;EACA;;AAED;EACC;;AAED;EACI;;AAEJ;EACC;;AAED;EACI","file":"styles.css"}
1
+ {"version":3,"sourceRoot":"","sources":["../../src/client/styles.scss"],"names":[],"mappings":";AAoFA;EACC,SALS;;;AAoBV;EAIC;;AAEA;EAEC,cA5BQ;;AA8BR;EACC,OAvGS;EAwGT;EACA;;AAGD;EACC,OApHS;;AAsHV;EACC;;AAED;EACC,OAnHS;EAoHT;;AAED;EACC,OA9HS;;AAgIV;EACC;;AAED;EACC;;AAED;EACC;;AAEA;EACC;EACA;EACA,OA/HO;;AAiIR;EACC,OArIK;;AAwIP;EACC;;AAEA;EACC;EACA;EACA,OArHQ;;AAuHT;EACC,OA3HM;;AA8HR;EACC;;AAEA;EACC,OA1GO;EA2GP;;AAGF;EACC;EACA;EACA;;AAIF;EACC;;AAGD;EACC;EA1FD,kBAzFS;;AA0FT;EACC;;AA4FA;EACC;EACA;EACA;;AAED;EACC,kBAjLQ;EAkLR,cA7KQ;EA8KR,OA9KQ;;AAgLT;EACC,kBA3KS;EA4KT,cAtKS;EAuKT,OAvKS;;AA0KX;EACC,SAxHQ;EAyHR,kBA7JK;;AA+JN;EACC,OApJO;;AAuJR;EACC;;AAGD;EACC,SApIQ;;AAsIR;EACC,cAvIO;;AA4IT;EACC;;AAGD;EACC,kBA3NU;EA4NV;EACA;;AAEA;EACC;;AACA;EACC;EACA;;AAGF;EACC;;AAGD;EACC,OArMI;;AAyMN;EACE,OA1MI;;AA4MN;EACC;;AAEA;EACC;EACA;EACA,OAzMM;;AA4MP;EACC;;AAKD;EACC;EACA;EACA;EACA;;AACA;EACC;EACA;;AAKH;EACC;;AAID;EAxLA;EACA;;AA0LC;EACC,kBA/QQ;;AAmRV;EACC;EACA;EACA;EACA;;AAEA;EACC;EACA,OAhPM;;AAqPP;EACC,OAlQI;EAmQJ,kBAzSS;EA0ST;;AAGD;EACC;;AAGD;EACC;;AAED;EACC,SA3OO;;AAiPR;EACC;EACA;EACA,eAnPO;EAoPP,OA1TM;EA2TN;EACA;EACA;EACA;;AACA;EACC;EACA;;AAKH;EACC,YA1RO;EA2RP;;AAGD;EACE,eAvQO;;AA2QR;EACC;EACA;;AAGC;EACC,OAtVI;EAuVJ;EACA;EACA;EACA;;AAEA;EACC;;AAGD;EACC,OA1VK;EA2VL,YAjWK;;AAqWP;EACC;EACA;EACA;;AAMJ;EAjSA,kBAzFS;;AA0FT;EACC;;AAmSD;EACC;;AAGD;EAlSA;EACA;;AAoSC;EACC,kBA1XQ;;AA4XT;EACC,kBAhVQ;;AAkVT;EACC,kBA1WS;;AA8WX;EACC;EACA;;AAID;EACC;;AACA;EACC;EACA;EACA;;AAKD;EACC;;AAED;EACC;;AAED;EACC;;AAPD;EACC;;AAED;EACC;;AAED;EACC;;AAPD;EACC;;AAED;EACC;;AAED;EACC;;AAPD;EACC;;AAED;EACC;;AAED;EACC;;AAPD;EACC;;AAED;EACC;;AAED;EACC;;AAKD;EACC;EACA;;AAED;EACI;EACH,QAnYM;;AAqYP;EACI,MAzYC;EA0YJ;;AAED;EACI;;AAEF;EACE;EACH,QAhZM","file":"styles.css"}
@@ -225,9 +225,9 @@
225
225
  "en": "Copy the form heriting, only it's fields"
226
226
  },
227
227
  "wizard.option.extend.extendFields.help": {
228
- "fi": "Lomakkeen ominaisuudet eivät kopioidu. Ainoastaan kentät (validaattoreineen), uiSchema ja käännökset kopioituvat.\nPerittävä lomake määräytyy 'fieldsFromID' kentällä",
229
- "sv": "Formuläralternativen kommer inte att kopieras. Endast fälten (inklusive deras validerare), uiSchema och transalationer kommer att kopieras.\nDet utökade formuläret bestäms av alternativet 'fieldsFromID'.",
230
- "en": "The form options wont be copied. Only the fields (including their validators), uiSchema and transalations will be copied.\nThe extended form is determined by the 'fieldsFromID' option."
228
+ "fi": "Lomakkeen ominaisuudet eivät kopioidu. Ainoastaan kentät (validaattoreineen), uiSchema ja käännökset kopioituvat.\nPerittävä lomake määräytyy 'fieldsFormID' kentällä",
229
+ "sv": "Formuläralternativen kommer inte att kopieras. Endast fälten (inklusive deras validerare), uiSchema och transalationer kommer att kopieras.\nDet utökade formuläret bestäms av alternativet 'fieldsFormID'.",
230
+ "en": "The form options wont be copied. Only the fields (including their validators), uiSchema and transalations will be copied.\nThe extended form is determined by the 'fieldsFormID' option."
231
231
  },
232
232
  "wizard.option.extend.saveOrPreview": {
233
233
  "fi": "Haluatko tallentaa uuden lomakkeen vai vain esikatsella sitä?",
@@ -275,7 +275,7 @@
275
275
  "en": "Open the form inheritance tree"
276
276
  },
277
277
  "editor.hierarchy.title": {
278
- "fi": "Lomake perii toisen lomakkeen kentällä 'baseFormID' tai 'fieldsFromID'",
278
+ "fi": "Lomake perii toisen lomakkeen kentällä 'baseFormID' tai 'fieldsFormID'",
279
279
  "sv": "Näytä lomakkeiden perintäpuu",
280
280
  "en": "Open the form inheritance tree"
281
281
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@luomus/laji-form-builder",
3
- "version": "1.1.1",
3
+ "version": "1.1.3",
4
4
  "description": "UI for building laji.fi forms",
5
5
  "main": "lib/client/app.js",
6
6
  "scripts": {