datastake-daf 0.6.516 → 0.6.518

package/dist/components/index.js

@@ -37610,9 +37610,11 @@ const inputTypeComponent = {
   drawTerritory: ({
     formsValue,
     name,
-    addressData
+    addressData,
+    onValuesChange
   }, {
-    setFormValues
+    setFormValues,
+    form
   }) => {
     let search = formsValue.country;
     if (addressData && addressData.address && Object.keys(addressData.address).length > 0) {
@@ -37645,10 +37647,29 @@ const inputTypeComponent = {
     return /*#__PURE__*/jsxRuntime.jsx(PolygonSelector, {
       value: formsValue[name],
       onChange: val => {
-        setFormValues({
-          ...formsValue,
+        // Update form instance first
+        if (form && typeof form.setFieldValue === 'function') {
+          form.setFieldValue(name, val);
+        }
+
+        // Get all current form values
+        const allFormValues = form && typeof form.getFieldsValue === 'function' ? form.getFieldsValue(true) : formsValue;
+
+        // Create the updated values
+        const updatedValues = {
+          ...allFormValues,
           [name]: val
-        });
+        };
+
+        // Call onValuesChange with the change and all values
+        if (typeof onValuesChange === 'function') {
+          onValuesChange({
+            [name]: val
+          }, updatedValues);
+        }
+
+        // Update React state
+        setFormValues(updatedValues);
       },
       searchValue: search
     });

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "datastake-daf",
-	"version": "0.6.516",
+	"version": "0.6.518",
 	"dependencies": {
 		"@ant-design/icons": "^5.2.5",
 		"@antv/g2": "^5.1.1",

package/src/@daf/core/components/DynamicForm/helper.js

@@ -435,7 +435,7 @@ export const inputTypeComponent = {
 			/>
 		);
 	},
-	drawTerritory: ({ formsValue, name, addressData }, { setFormValues }) => {
+	drawTerritory: ({ formsValue, name, addressData, onValuesChange }, { setFormValues, form }) => {
 		let search = formsValue.country;
 		if (addressData && addressData.address && Object.keys(addressData.address).length > 0) {
 			if (addressData.address.country) {
@@ -470,10 +470,29 @@ export const inputTypeComponent = {
 			<PolygonSelector
 				value={formsValue[name]}
 				onChange={(val) => {
-					setFormValues({
-						...formsValue,
+					// Update form instance first
+					if (form && typeof form.setFieldValue === 'function') {
+						form.setFieldValue(name, val);
+					}
+					
+					// Get all current form values
+					const allFormValues = form && typeof form.getFieldsValue === 'function' 
+						? form.getFieldsValue(true) 
+						: formsValue;
+					
+					// Create the updated values
+					const updatedValues = {
+						...allFormValues,
 						[name]: val,
-					});
+					};
+					
+					// Call onValuesChange with the change and all values
+					if (typeof onValuesChange === 'function') {
+						onValuesChange({ [name]: val }, updatedValues);
+					}
+					
+					// Update React state
+					setFormValues(updatedValues);
 				}}
 				searchValue={search}
 			/>