datastake-daf 0.6.272 → 0.6.274

package/dist/utils/index.js

@@ -3479,13 +3479,13 @@ const renderTooltipJsx = ({
               }
             })
           }), /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
-            title: item.label,
+            title: item.tooltipLabel || item.label,
             children: /*#__PURE__*/jsxRuntime.jsx("span", {
               className: "daf-tooltip-name",
               children: item.label
             })
           }), /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
-            title: item.value,
+            title: item.tooltipValue || item.value,
             children: /*#__PURE__*/jsxRuntime.jsx("div", {
               style: {
                 height: "20px",

package/package.json

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

package/src/@daf/core/components/EditForm/EditForm.stories.js

@@ -93,7 +93,6 @@ const EForm = () => {
 						data={editValues}
 						getAppHeader={storyData.getAppHeader}
 						getApiBaseUrl={storyData.getApiBaseUrl}
-						fullWidth={true}
 						evaluationConfig={
 							[
 								// {

package/src/@daf/core/components/EditForm/_index.scss

@@ -53,7 +53,6 @@
     line-height: 20px !important;
     color: #001529;
   }
-
   .ant-page-header {
     .ant-page-header-heading-left {
       overflow: initial;
@@ -356,7 +355,6 @@
       overflow: auto;
       flex-direction: column;
       padding: 20px 100px 0 100px;
-
       &.has-section {
         width: calc(100% - 200px);
       }
@@ -368,10 +366,6 @@
         min-height: 100%;
         margin: auto;
 
-        &.full-width-form {
-          max-width: unset;
-        }
-
         @media screen and (max-width: 1200px) {
           min-width: 700px;
         }
@@ -381,16 +375,16 @@
         }
 
         .with-comment {
-          &>.ant-form-item-label>label {
+          & > .ant-form-item-label > label {
             width: 100%;
 
-            &>span {
+            & > span {
               display: flex;
               justify-content: space-between;
               width: 100%;
 
-              &>span {
-                &>button {
+              & > span {
+                & > button {
                   line-height: 1;
                   height: inherit;
                   font-size: 14px;
@@ -400,7 +394,7 @@
             }
           }
 
-          &.i-radioGroup>.ant-form-item-label>label>span {
+          &.i-radioGroup > .ant-form-item-label > label > span {
             font-style: normal;
             font-weight: bold;
             font-size: 18px;
@@ -479,25 +473,20 @@
             width: 100%;
             display: flex;
             flex-direction: column;
-
             .ant-transfer-list {
               height: 300px;
-
               .ant-transfer-list-body {
                 overflow-y: auto;
-
                 .ant-transfer-list-body-customize-wrapper {
                   padding: 0;
                 }
               }
-
               .ant-transfer-list-header {
                 .ant-transfer-list-header-selected {
                   display: flex;
                   flex-direction: row-reverse;
                   width: 100%;
                   justify-content: space-between;
-
                   .ant-transfer-list-header-title {
                     position: inherit;
                     font-size: var(--font-size-lg);
@@ -507,16 +496,13 @@
                 }
               }
             }
-
             .ant-transfer-operation {
               display: flex;
               justify-content: space-around;
               width: 100px;
               margin: 10px;
-
               button {
                 transform: rotate(90deg);
-
                 .anticon {
                   position: absolute;
                   top: 4px;
@@ -527,7 +513,6 @@
             }
           }
         }
-
         .ant-row.ant-form-item.comment-textarea {
           margin-top: -12px;
 
@@ -571,8 +556,7 @@
           align-self: stretch;
           flex-grow: 0;
         }
-
-        .i-transfer>.ant-form-item-label>label {
+        .i-transfer > .ant-form-item-label > label {
           padding: 14px 0;
         }
 
@@ -584,7 +568,7 @@
         }
 
         .i-modal {
-          &>.ant-col.ant-form-item-label label {
+          & > .ant-col.ant-form-item-label label {
             margin-top: 1.5rem !important;
             font-size: 18px;
             font-weight: 700;
@@ -592,7 +576,7 @@
             line-height: 22px;
             color: #001529;
 
-            span>span {
+            span > span {
               font-size: 18px;
               font-weight: 700;
               font-style: normal;
@@ -616,7 +600,6 @@
             line-height: var(--size);
             min-height: 32px;
             padding: 5px 0;
-
             &.even {
               background: #f9fafc;
             }
@@ -718,25 +701,20 @@
       }
     }
   }
-
   .total100 {
     display: flex;
     flex-direction: column;
     width: 100%;
-
     .ant-space-item:nth-of-type(3n) {
       flex-grow: initial;
     }
-
     .ant-space-item:not(:last-of-type) {
       width: calc(50% - 4px);
     }
-
     .ant-space {
       margin-top: 8px;
     }
   }
-
   .risk-plan {
     display: flex;
     flex-direction: row;
@@ -747,12 +725,10 @@
     border-radius: 2px;
     color: #001529;
     flex-wrap: wrap;
-
     .subScore {
       display: flex;
       min-width: 100px;
       padding-top: 3.5px;
-
       p {
         margin: 0;
         margin-bottom: 4px;
@@ -776,12 +752,10 @@
       }
     }
   }
-
   .risk-name {
     color: #001529;
     font-style: italic;
   }
-
   .i-imageUpload {
     margin-top: 22px;
   }
@@ -934,11 +908,9 @@
     line-height: 20px !important;
     color: #001529;
   }
-
   .ant-page-header {
     .ant-space {
       width: 100%;
-
       .ant-space-item {
         width: 100%;
       }
@@ -1266,10 +1238,6 @@
         min-height: 100%;
         margin: auto;
 
-        &.full-width-form {
-          max-width: unset;
-        }
-
         .ant-input-number-group-wrapper {
           width: 100%;
         }
@@ -1290,13 +1258,13 @@
           .ant-form-item-label label {
             width: 100%;
 
-            &>span {
+            & > span {
               display: flex;
               justify-content: space-between;
               width: 100%;
 
-              &>span {
-                &>button {
+              & > span {
+                & > button {
                   line-height: 1;
                   height: inherit;
                   font-size: 14px;
@@ -1306,7 +1274,7 @@
             }
           }
 
-          &.i-radioGroup>.ant-form-item-label>label>span {
+          &.i-radioGroup > .ant-form-item-label > label > span {
             font-style: normal;
             font-weight: bold;
             font-size: 18px;
@@ -1385,25 +1353,20 @@
             width: 100%;
             display: flex;
             flex-direction: column;
-
             .ant-transfer-list {
               height: 300px;
-
               .ant-transfer-list-body {
                 overflow-y: auto;
-
                 .ant-transfer-list-body-customize-wrapper {
                   padding: 0;
                 }
               }
-
               .ant-transfer-list-header {
                 .ant-transfer-list-header-selected {
                   display: flex;
                   flex-direction: row-reverse;
                   width: 100%;
                   justify-content: space-between;
-
                   .ant-transfer-list-header-title {
                     position: inherit;
                     font-size: var(--font-size-lg);
@@ -1413,16 +1376,13 @@
                 }
               }
             }
-
             .ant-transfer-operation {
               display: flex;
               justify-content: space-around;
               width: 100px;
               margin: 10px;
-
               button {
                 transform: rotate(90deg);
-
                 .anticon {
                   position: absolute;
                   top: 4px;
@@ -1450,7 +1410,6 @@
               display: none;
             }
           }
-
           .ant-form-item-control-input {
             max-width: 100%;
           }
@@ -1497,7 +1456,7 @@
           flex: 1;
         }
 
-        .i-transfer>.ant-form-item-label>label {
+        .i-transfer > .ant-form-item-label > label {
           padding: 14px 0;
         }
 
@@ -1540,7 +1499,7 @@
         }
 
         .i-modal {
-          &>.ant-col.ant-form-item-label label {
+          & > .ant-col.ant-form-item-label label {
             margin-top: 1.5rem !important;
             font-size: 18px;
             font-weight: 700;
@@ -1548,7 +1507,7 @@
             line-height: 22px;
             color: #001529;
 
-            span>span {
+            span > span {
               font-size: 18px;
               font-weight: 700;
               font-style: normal;
@@ -1604,7 +1563,6 @@
           .ajax-modal-view {
             padding-top: 0px;
           }
-
           .total-inputs-1 {
             .ajax-modal-view {
               .remove-button-row {
@@ -1869,20 +1827,16 @@
     display: flex;
     flex-direction: column;
     width: 100%;
-
     .ant-space-item:nth-of-type(3n) {
       flex-grow: initial;
     }
-
     .ant-space-item:not(:last-of-type) {
       width: calc(50% - 4px);
     }
-
     .ant-space {
       margin-top: 8px;
     }
   }
-
   .risk-plan {
     padding: var(--size-lg);
     border-radius: 4px;
@@ -1954,11 +1908,11 @@
   }
 
   .ant-upload-list {
-    width: var(--static-width, 614px) !important;
+    width: var(--static-width, 614px) !important;  
   }
 
   .ant-select-selector {
-    width: var(--static-width) !important;
+    width: var(--static-width) !important;    
   }
 
   .ant-upload-list-item-container {
@@ -2128,4 +2082,4 @@
       flex: 1;
     }
   }
-}
+}

package/src/@daf/core/components/EditForm/form.jsx

@@ -54,7 +54,6 @@ export const EditForm = ({
 	changeErrors = () => {},
 	evaluationConfig = [],
 	staticWidth = "614px",
-	fullWidth = false,
 }) => {
 	const [isSubmitting] = useState(false);
 	const formData = JSON.parse(JSON.stringify(convertUndefinedToNull(data) || {}));
@@ -343,8 +342,8 @@ export const EditForm = ({
 						key={id}
 						name={id}
 						layout="vertical"
-						style={{ maxWidth: fullWidth ? "unset" : 700 }}
-						className={`main-form${formClass ? ` ${formClass}` : ""} `}
+						style={{ maxWidth: 700 }}
+						className={`main-form${formClass ? ` ${formClass}` : ""}`}
 						onValuesChange={(_changedValue, _allValues) => {
 							const changedValue = { ..._changedValue };
 							const allValues = { ..._allValues };

package/src/@daf/core/components/ViewForm/ViewForm.stories.js

@@ -35,7 +35,6 @@ const ViewForm = ({ evalConfig }) => {
 			user={{ language: "en" }}
 			getApiBaseUrl={storyData.getApiBaseUrl}
 			evaluationConfig={evalConfig}
-			fullWidth={true}
 		/>
 	);
 };