datastake-daf 0.6.592 → 0.6.594

package/dist/components/index.js

@@ -7345,7 +7345,7 @@ const Style$J = dt.div`
     }
 
     &.ant-btn-primary {
-      background: var(--mmt-primary-70);
+      background: var(--color-primary-70);
 
       &[disabled] {
         opacity: 0.6;
@@ -7359,8 +7359,8 @@ const Style$J = dt.div`
     }
 
     &.ant-btn-default {
-      color: var(--mmt-primary-70);
-      border: 1.5px solid var(--mmt-primary-70);
+      color: var(--color-primary-70);
+      border: 1.5px solid var(--color-primary-70);
 
       &.default {
         color: #1F2A37;
@@ -7375,8 +7375,8 @@ const Style$J = dt.div`
     }
 
     &.blue-color {
-      color: var(--mmt-primary-70);
-      border-color: var(--mmt-primary-70);
+      color: var(--color-primary-70);
+      border-color: var(--color-primary-70);
     }
   }
 `;
@@ -40497,6 +40497,12 @@ const Navigation = _ref => {
   }) : null;
 };
 
+const SelectStyle = dt.div`
+  .ant-select-arrow {
+    margin-top: 1px !important;
+  }
+`;
+
 function AuthForm(_ref) {
   var _steps$currentStep;
   let {
@@ -40508,19 +40514,20 @@ function AuthForm(_ref) {
     form,
     errors,
     t = key => key,
-    executeRecaptcha = () => {}
+    executeRecaptcha = () => {},
+    getCurrentStep = () => {}
   } = _ref;
   const [formInstance] = antd.Form.useForm(form);
   const [currentStep, setCurrentStep] = React.useState(0);
   const [allFormValues, setAllFormValues] = React.useState(initialValues);
   const [formErrors, setFormErrors] = React.useState(null);
-  console.log({
-    errors
-  });
   const isMultiStep = !!steps;
   const currentFields = isMultiStep ? steps === null || steps === void 0 || (_steps$currentStep = steps[currentStep]) === null || _steps$currentStep === void 0 ? void 0 : _steps$currentStep.fields : fields || [];
   React.useEffect(() => {
-    if (isMultiStep && Object.keys(allFormValues).length > 0) {
+    getCurrentStep === null || getCurrentStep === void 0 || getCurrentStep(currentStep);
+  }, [currentStep, getCurrentStep]);
+  React.useEffect(() => {
+    if (isMultiStep) {
       formInstance.setFieldsValue(allFormValues);
     }
   }, [currentStep, allFormValues, formInstance, isMultiStep]);
@@ -40616,14 +40623,16 @@ function AuthForm(_ref) {
         }, field.props));
         break;
       case "select":
-        inputNode = /*#__PURE__*/jsxRuntime.jsx(antd.Select, _objectSpread2(_objectSpread2({
-          placeholder: field.placeholder
-        }, field.props), {}, {
-          children: (_field$options = field.options) === null || _field$options === void 0 ? void 0 : _field$options.map(opt => /*#__PURE__*/jsxRuntime.jsx(antd.Select.Option, {
-            value: opt.value,
-            children: opt.label
-          }, opt.value))
-        }));
+        inputNode = /*#__PURE__*/jsxRuntime.jsx(SelectStyle, {
+          children: /*#__PURE__*/jsxRuntime.jsx(antd.Select, _objectSpread2(_objectSpread2({
+            placeholder: field.placeholder
+          }, field.props), {}, {
+            children: (_field$options = field.options) === null || _field$options === void 0 ? void 0 : _field$options.map(opt => /*#__PURE__*/jsxRuntime.jsx(antd.Select.Option, {
+              value: opt.value,
+              children: opt.label
+            }, opt.value))
+          }))
+        });
         break;
       case "custom":
         inputNode = field.component;
@@ -40654,7 +40663,7 @@ function AuthForm(_ref) {
     children: /*#__PURE__*/jsxRuntime.jsxs(antd.Form, {
       form: formInstance,
       layout: "vertical",
-      initialValues: initialValues,
+      initialValues: isMultiStep ? allFormValues : initialValues,
       onFinish: handleSubmit,
       onValuesChange: handleValuesChange,
       children: [currentFields.map(renderField), formErrors ? renderErrors(formErrors, t) : null, isMultiStep && currentStep > 0 ? /*#__PURE__*/jsxRuntime.jsxs("div", {
@@ -40671,7 +40680,7 @@ function AuthForm(_ref) {
             return /*#__PURE__*/jsxRuntime.jsx("div", {
               className: "buttons",
               style: {
-                marginTop: 0
+                marginTop: '16px'
               },
               children: /*#__PURE__*/jsxRuntime.jsx(BorderedButton, {
                 type: "primary",
@@ -40686,7 +40695,7 @@ function AuthForm(_ref) {
         }), /*#__PURE__*/jsxRuntime.jsx("div", {
           className: "buttons",
           style: {
-            marginTop: 0
+            marginTop: '8px'
           },
           children: /*#__PURE__*/jsxRuntime.jsx(BorderedButton, {
             onClick: prev,

package/dist/layouts/index.js

@@ -6575,7 +6575,7 @@ const Style = dt.div`
     }
 
     &.ant-btn-primary {
-      background: var(--mmt-primary-70);
+      background: var(--color-primary-70);
 
       &[disabled] {
         opacity: 0.6;
@@ -6589,8 +6589,8 @@ const Style = dt.div`
     }
 
     &.ant-btn-default {
-      color: var(--mmt-primary-70);
-      border: 1.5px solid var(--mmt-primary-70);
+      color: var(--color-primary-70);
+      border: 1.5px solid var(--color-primary-70);
 
       &.default {
         color: #1F2A37;
@@ -6605,8 +6605,8 @@ const Style = dt.div`
     }
 
     &.blue-color {
-      color: var(--mmt-primary-70);
-      border-color: var(--mmt-primary-70);
+      color: var(--color-primary-70);
+      border-color: var(--color-primary-70);
     }
   }
 `;

package/package.json

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

package/src/@daf/core/components/AuthForm/index.jsx

@@ -1,6 +1,7 @@
 import React, { useState, useEffect, useCallback } from "react";
 import { Form, Input, Select } from "antd";
 import BorderedButton from "../Button/BorderedButton/index.jsx";
+import { SelectStyle } from "./style";
 
 function AuthForm ({
   steps,
@@ -12,19 +13,22 @@ function AuthForm ({
   errors,
   t = (key) => key,
   executeRecaptcha = () => {},
+  getCurrentStep = () => {}
 }){
   const [formInstance] = Form.useForm(form);
   const [currentStep, setCurrentStep] = useState(0);
   const [allFormValues, setAllFormValues] = useState(initialValues);
   const [formErrors, setFormErrors] = useState(null);
 
-  console.log({errors})
-
   const isMultiStep = !!steps;
   const currentFields = isMultiStep ? steps?.[currentStep]?.fields : fields || [];
 
   useEffect(() => {
-    if (isMultiStep && Object.keys(allFormValues).length > 0) {
+    getCurrentStep?.(currentStep);
+  }, [currentStep, getCurrentStep]);
+
+  useEffect(() => {
+    if (isMultiStep) {
       formInstance.setFieldsValue(allFormValues);
     }
   }, [currentStep, allFormValues, formInstance, isMultiStep]);
@@ -129,13 +133,15 @@ function AuthForm ({
         break;
       case "select":
         inputNode = (
-          <Select placeholder={field.placeholder} {...field.props}>
-            {field.options?.map((opt) => (
-              <Select.Option key={opt.value} value={opt.value}>
-                {opt.label}
-              </Select.Option>
-            ))}
-          </Select>
+          <SelectStyle>
+            <Select placeholder={field.placeholder} {...field.props}>
+              {field.options?.map((opt) => (
+                <Select.Option key={opt.value} value={opt.value}>
+                  {opt.label}
+                </Select.Option>
+              ))}
+            </Select>
+          </SelectStyle>
         );
         break;
       case "custom":
@@ -172,7 +178,7 @@ function AuthForm ({
         <Form
             form={formInstance}
             layout="vertical"
-            initialValues={initialValues}
+            initialValues={isMultiStep ? allFormValues : initialValues}
             onFinish={handleSubmit}
             onValuesChange={handleValuesChange}
         >
@@ -191,7 +197,7 @@ function AuthForm ({
                     const allFieldsFilled = checkRequiredFieldsFilled({}, form.getFieldsValue());
                     
                     return (
-                        <div className="buttons" style={{ marginTop: 0}}>                   
+                        <div className="buttons" style={{ marginTop: '16px'}}>                   
                             <BorderedButton 
                                 type="primary" 
                                 htmlType="submit"
@@ -204,7 +210,7 @@ function AuthForm ({
                     );
                 }}
                 </Form.Item>
-                <div className="buttons" style={{ marginTop: 0}}>
+                <div className="buttons" style={{ marginTop: '8px'}}>
                     <BorderedButton onClick={prev} block className="normal-br">
                         {t("Back")}
                     </BorderedButton>

package/src/@daf/core/components/AuthForm/style.js

@@ -0,0 +1,7 @@
+import styled from "styled-components";
+
+export const SelectStyle = styled.div`
+  .ant-select-arrow {
+    margin-top: 1px !important;
+  }
+`;

package/src/@daf/core/components/Button/BorderedButton/style.js

@@ -20,7 +20,7 @@ const Style = styled.div`
     }
 
     &.ant-btn-primary {
-      background: var(--mmt-primary-70);
+      background: var(--color-primary-70);
 
       &[disabled] {
         opacity: 0.6;
@@ -34,8 +34,8 @@ const Style = styled.div`
     }
 
     &.ant-btn-default {
-      color: var(--mmt-primary-70);
-      border: 1.5px solid var(--mmt-primary-70);
+      color: var(--color-primary-70);
+      border: 1.5px solid var(--color-primary-70);
 
       &.default {
         color: #1F2A37;
@@ -50,8 +50,8 @@ const Style = styled.div`
     }
 
     &.blue-color {
-      color: var(--mmt-primary-70);
-      border-color: var(--mmt-primary-70);
+      color: var(--color-primary-70);
+      border-color: var(--color-primary-70);
     }
   }
 `;