fix: field domain should have priority over fields

gisce/webclient#1317

src/Form.ts

@@ -240,9 +240,9 @@ class Form {
 
         if (checkIfDomainHasValue(tagAttributes.domain)) {
           domain = tagAttributes.domain;
-        }
-
-        if (checkIfDomainHasValue(this._fields[tagAttributes.name]?.domain)) {
+        } else if (
+          checkIfDomainHasValue(this._fields[tagAttributes.name]?.domain)
+        ) {
           domain = this._fields[tagAttributes.name].domain;
         }
 

src/spec/Form.spec.ts

@@ -5831,4 +5831,25 @@ describe("A Form", () => {
   //     expect(pageAutoconsum).toBeDefined();
   //     expect(pageAutoconsum.invisible).toBeTruthy();
   //   });
+  it("a domain defined in the xml should have priority over the domain defined in the fields", () => {
+    const fields = {
+      field_char: {
+        type: "char",
+        domain: "[('value', '=', 'field')]",
+      },
+    };
+    const xmlViewForm = `<?xml version="1.0"?>
+    <form string="Form1">
+      <field name="field_char" colspan="4" nolabel="1" domain="[('value', '=', 'form')]"/>
+    </form>`;
+    const form = new Form(fields);
+    form.parse(xmlViewForm, {
+      values: {
+        field_char: "test",
+      },
+    });
+
+    const field_char = form.findById("field_char");
+    expect(field_char!.domain!).toBe("[('value', '=', 'form')]");
+  });
 });