Merge branch 'master' of http://gitea.palntour.com/pav/pav-home

src/assets/css/custom.css

@@ -783,3 +783,6 @@ background-size: 75% auto;
 .search-result:hover{background-color:#e7e7e7}
 .search-result .title{font-size:14px;color:#000}
 .search-result .address{font-size:13px;color:#343D55}
+
+.pal-modal-body{padding:0;}
+.pal-modal-body .pal-card-box + .pal-card-box{margin-top:0;}

src/components/analysis/simulation/AnalysisSimulationReport.js

@@ -70,7 +70,7 @@ export const AnalysisSimulationReport = props => {
                 <div
                   className='layer-content-list'
                   onClick={() => props.handlerDetail(item.cntrlId)}
-                  key={item.cntrlId}
+                  key={Math.random()}
                 >
                   <dl>
                     <dt>

src/components/basis/flight/plan/FlightPlanArcrft.js

@@ -2,6 +2,8 @@ import React from 'react';
 import {Button, Card, CardBody, Col, CustomInput, Row, FormGroup, Input, Label} from 'reactstrap';
 import {Search} from 'react-feather';
 import {GridDatabase} from '../../../crud/grid/GridDatatable';
+import '../../../../assets/css/custom.css';
+import '@styles/react/libs/tables/react-dataTable-component.scss';
 
 const FlightPlanArcrft = ({ arcrftList, handleSelectArcrft, onClickEvent, name, returnArcrft,onChange }) => {
     const columns = [

src/components/basis/flight/plan/FlightPlanModal.js

@@ -20,7 +20,7 @@ export const FlightPlanModal = ({isOpen, title, description, type, handleModal})
         >
           {title}
         </ModalHeader>
-        <ModalBody>
+        <ModalBody className='pal-modal-body'>
           {description}
         </ModalBody>        
       </Modal>

src/components/basis/flight/plan/FlightPlanPilot.js

@@ -3,6 +3,8 @@ import {Button, Card, CardBody, Col, CustomInput, Row, FormGroup, Input, Label}
 import {Search} from 'react-feather';
 import {GridDatabase} from '../../../crud/grid/GridDatatable';
 import { AiOutlineSearch } from 'react-icons/ai';
+import '../../../../assets/css/custom.css';
+import '@styles/react/libs/tables/react-dataTable-component.scss';
 
 const FlightPlanPilot = ({ handleSelectPilot, returnPilot, onClickEvent, onChange,name}) => {