@gisce/ooui 0.9.0 → 0.9.1
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/Form.js +2 -4
- package/dist/Form.js.map +1 -1
- package/package.json +1 -1
- package/src/Form.ts +3 -5
- package/src/spec/Form.spec.ts +0 -3
package/dist/Form.js
CHANGED
|
@@ -134,6 +134,7 @@ var Form = /** @class */ (function () {
|
|
|
134
134
|
var widgetFactory = new WidgetFactory();
|
|
135
135
|
var nodesParsed = parseNodes(node.childNodes, this._fields);
|
|
136
136
|
nodesParsed.forEach(function (nodeParsed) {
|
|
137
|
+
var _a;
|
|
137
138
|
var tag = nodeParsed.tag, tagAttributes = nodeParsed.tagAttributes, child = nodeParsed.child;
|
|
138
139
|
var evaluatedTagAttributes = evaluateAttributes({
|
|
139
140
|
tagAttributes: tagAttributes,
|
|
@@ -155,13 +156,10 @@ var Form = /** @class */ (function () {
|
|
|
155
156
|
});
|
|
156
157
|
}
|
|
157
158
|
var widgetContext = parseContext({
|
|
158
|
-
context: tagAttributes["context"] || _this._fields["context"],
|
|
159
|
+
context: tagAttributes["context"] || ((_a = _this._fields[tagAttributes.name]) === null || _a === void 0 ? void 0 : _a["context"]),
|
|
159
160
|
values: values,
|
|
160
161
|
fields: _this._fields,
|
|
161
162
|
});
|
|
162
|
-
if (tag !== "button") {
|
|
163
|
-
_this._context = __assign(__assign({}, _this._context), widgetContext);
|
|
164
|
-
}
|
|
165
163
|
if (tagAttributes["on_change"]) {
|
|
166
164
|
_this._onChangeFields[tagAttributes.name] = parseOnChange(tagAttributes["on_change"]);
|
|
167
165
|
}
|
package/dist/Form.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Form.js","sourceRoot":"","sources":["../src/Form.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"Form.js","sourceRoot":"","sources":["../src/Form.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,aAAa,MAAM,iBAAiB,CAAC;AAC5C,OAAO,SAAS,MAAM,aAAa,CAAC;AACpC,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAEhD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAC7E,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAOzD;IA4DE;;;;;;;;;;;;;;MAcE;IAEF,cAAY,MAAc,EAAE,OAAmB;QAAnB,wBAAA,EAAA,WAAmB;QA9D/C,YAAO,GAAkB,IAAI,CAAC;QAK9B;;WAEG;QACH,UAAK,GAAW,MAAM,CAAC;QAKvB;;WAEG;QACH,cAAS,GAAY,KAAK,CAAC;QAQ3B;;WAEG;QACH,aAAQ,GAAQ,EAAE,CAAC;QAQnB;;WAEG;QACH,oBAAe,GAAQ,EAAE,CAAC;QAyBxB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,UAAU,GAAG,IAAI,SAAS,CAAC,OAAO,CAAC,CAAC;IAC3C,CAAC;IA1ED,sBAAI,wBAAM;aAAV;YACE,OAAO,IAAI,CAAC,OAAO,CAAC;QACtB,CAAC;;;OAAA;IAGD,sBAAI,2BAAS;aAAb;YACE,OAAO,IAAI,CAAC,UAAU,CAAC;QACzB,CAAC;;;OAAA;IAGD,sBAAI,wBAAM;aAAV;YACE,OAAO,IAAI,CAAC,OAAO,CAAC;QACtB,CAAC;;;OAAA;IAMD,sBAAI,sBAAI;aAAR;YACE,OAAO,IAAI,CAAC,KAAK,CAAC;QACpB,CAAC;;;OAAA;IAMD,sBAAI,0BAAQ;aAAZ;YACE,OAAO,IAAI,CAAC,SAAS,CAAC;QACxB,CAAC;aACD,UAAa,KAAc;YACzB,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;QACzB,CAAC;;;OAHA;IASD,sBAAI,yBAAO;aAAX;YACE,OAAO,IAAI,CAAC,QAAQ,CAAC;QACvB,CAAC;aACD,UAAY,KAAU;YACpB,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;QACxB,CAAC;;;OAHA;IASD,sBAAI,gCAAc;aAAlB;YACE,OAAO,IAAI,CAAC,eAAe,CAAC;QAC9B,CAAC;aACD,UAAmB,KAAU;YAC3B,IAAI,CAAC,eAAe,GAAG,KAAK,CAAC;QAC/B,CAAC;;;OAHA;IA0BD,oBAAK,GAAL,UAAM,GAAW,EAAE,OAA0B;QACrC,IAAA,KAAoC,OAAO,IAAI,EAAE,EAA/C,cAAW,EAAX,MAAM,mBAAG,EAAE,KAAA,EAAE,gBAAgB,EAAhB,QAAQ,mBAAG,KAAK,KAAkB,CAAC;QAExD,IAAM,MAAM,GAAG,IAAI,SAAS,EAAE,CAAC;QAC/B,IAAM,IAAI,GAAa,MAAM,CAAC,eAAe,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;QAC/D,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;QAC3D,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;QAC1B,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC;YAC1B,CAAC,CAAC,EAAE,SAAS,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE,UAAU,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE;YACzD,CAAC,CAAC,EAAE,CAAC;QAEP,IAAI,CAAC,SAAS,CAAC;YACb,IAAI,EAAE,IAAI,CAAC,eAAe;YAC1B,SAAS,EAAE,IAAI,CAAC,UAAU;YAC1B,MAAM,QAAA;SACP,CAAC,CAAC;IACL,CAAC;IAED,wBAAS,GAAT,UAAU,EAQT;QARD,iBAoFC;YAnFC,IAAI,UAAA,EACJ,SAAS,eAAA,EACT,MAAM,YAAA;QAMN,IAAM,aAAa,GAAG,IAAI,aAAa,EAAE,CAAC;QAE1C,IAAM,WAAW,GAAG,UAAU,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QAE9D,WAAW,CAAC,OAAO,CAAC,UAAC,UAAU;;YACrB,IAAA,GAAG,GAA2B,UAAU,IAArC,EAAE,aAAa,GAAY,UAAU,cAAtB,EAAE,KAAK,GAAK,UAAU,MAAf,CAAgB;YACjD,IAAM,sBAAsB,GAAG,kBAAkB,CAAC;gBAChD,aAAa,eAAA;gBACb,MAAM,QAAA;gBACN,MAAM,EAAE,KAAI,CAAC,OAAO;aACrB,CAAC,CAAC;YAEH,IAAI,wBAAwB,CAAC;YAE7B,IAAI,GAAG,KAAK,QAAQ,IAAI,aAAa,CAAC,MAAM,EAAE;gBAC5C,wBAAwB,GAAG,oBAAoB,CAAC;oBAC9C,MAAM,EAAE,aAAa,CAAC,MAAM;oBAC5B,MAAM,QAAA;iBACP,CAAC,CAAC;aACJ;iBAAM;gBACL,wBAAwB,GAAG,cAAc,CAAC;oBACxC,SAAS,EAAE,aAAa,CAAC,IAAI;oBAC7B,MAAM,QAAA;oBACN,MAAM,EAAE,KAAI,CAAC,OAAO;iBACrB,CAAC,CAAC;aACJ;YAED,IAAM,aAAa,GAAG,YAAY,CAAC;gBACjC,OAAO,EACL,aAAa,CAAC,SAAS,CAAC,WACxB,KAAI,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,0CAAG,SAAS,EAAC;gBAC/C,MAAM,QAAA;gBACN,MAAM,EAAE,KAAI,CAAC,OAAO;aACrB,CAAC,CAAC;YAEH,IAAI,aAAa,CAAC,WAAW,CAAC,EAAE;gBAC9B,KAAI,CAAC,eAAe,CAAC,aAAa,CAAC,IAAI,CAAC,GAAG,aAAa,CACtD,aAAa,CAAC,WAAW,CAAC,CAC3B,CAAC;aACH;YAED,IAAI,MAAM,GAAuB,SAAS,CAAC;YAE3C,IACE,aAAa,CAAC,QAAQ,CAAC;gBACvB,aAAa,CAAC,QAAQ,CAAC,KAAK,EAAE;gBAC9B,aAAa,CAAC,QAAQ,CAAC,KAAK,IAAI,EAChC;gBACA,MAAM,GAAG,aAAa,CAAC,QAAQ,CAAC,CAAC;aAClC;YAED,IACE,KAAI,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC;gBAChC,KAAI,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,MAAM;gBACvC,KAAI,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,MAAM,KAAK,EAAE;gBAC9C,KAAI,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,MAAM,KAAK,IAAI,EAChD;gBACA,MAAM,GAAG,KAAI,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC;aAClD;YAED,IAAM,MAAM,GAAG,aAAa,CAAC,YAAY,CAAC,GAAG,iCACxC,sBAAsB,GACtB,wBAAwB,KAC3B,OAAO,EAAE,aAAa,EACtB,MAAM,QAAA,IACN,CAAC;YAEH,IAAI,MAAM,YAAY,eAAe,EAAE;gBACrC,KAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,CAAC,SAAS,EAAE,MAAM,QAAA,EAAE,CAAC,CAAC;aACtE;YAED,6DAA6D;YAC7D,MAAM,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,IAAI,KAAI,CAAC,QAAQ,CAAC;YACnD,SAAS,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAC9B,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;;OAGG;IACH,uBAAQ,GAAR,UAAS,EAAU;QACjB,OAAO,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IACrC,CAAC;IACH,WAAC;AAAD,CAAC,AAhMD,IAgMC;AAED,eAAe,IAAI,CAAC"}
|
package/package.json
CHANGED
package/src/Form.ts
CHANGED
|
@@ -149,15 +149,13 @@ class Form {
|
|
|
149
149
|
}
|
|
150
150
|
|
|
151
151
|
const widgetContext = parseContext({
|
|
152
|
-
context:
|
|
152
|
+
context:
|
|
153
|
+
tagAttributes["context"] ||
|
|
154
|
+
this._fields[tagAttributes.name]?.["context"],
|
|
153
155
|
values,
|
|
154
156
|
fields: this._fields,
|
|
155
157
|
});
|
|
156
158
|
|
|
157
|
-
if (tag !== "button") {
|
|
158
|
-
this._context = { ...this._context, ...widgetContext };
|
|
159
|
-
}
|
|
160
|
-
|
|
161
159
|
if (tagAttributes["on_change"]) {
|
|
162
160
|
this._onChangeFields[tagAttributes.name] = parseOnChange(
|
|
163
161
|
tagAttributes["on_change"]
|
package/src/spec/Form.spec.ts
CHANGED
|
@@ -881,9 +881,6 @@ describe("A Form", () => {
|
|
|
881
881
|
expect(form.context.active_id).toBe(99);
|
|
882
882
|
expect(Array.isArray(form.context.active_ids)).toBeTruthy();
|
|
883
883
|
expect(form.context.active_ids[0]).toBe(99);
|
|
884
|
-
expect(form.context.cups_id).toBe(99);
|
|
885
|
-
expect(form.context.test_string).toBe("test");
|
|
886
|
-
expect(form.context.power).toBeUndefined();
|
|
887
884
|
|
|
888
885
|
const field = form.findById("button") as Button;
|
|
889
886
|
expect(field.context).toBeDefined();
|