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

src/assets/css/custom.css

@@ -1077,4 +1077,6 @@ caption {overflow: hidden; line-height: 0;text-indent: -2000px;}
 .pal-form .pal-form-btn button + button{margin-left:20px}
 
 .pal-popover-body{font-size:0.75rem;padding:0.8rem;}
-.pal-popover-icon{margin-left:4px;margin-top:-2px}
+.pal-popover-icon{margin-left:4px;margin-top:-2px}
+
+.coords-wrap{position:absolute;z-index: 99;right:20px;bottom:20px}

src/components/cstmrService/faq/FaqForm.js

@@ -41,7 +41,7 @@ export default function FaqForm({
                 </Label>
                 <Input
                   type='select'
-                  besize='sm'
+                  bsSize='sm'
                   value={formData.category}
                   onChange={e => {
                     const { value } = e.target;
@@ -63,7 +63,7 @@ export default function FaqForm({
                 <Label for='test'>생성 사용자</Label>
                 <Input
                   type='text'
-                  besize='sm'
+                  bsSize='sm'
                   placeholder=''
                   value={user?.userId}
                   disabled
@@ -120,7 +120,7 @@ export default function FaqForm({
                 </Label>
                 <Input
                   type='text'
-                  besize='sm'
+                  bsSize='sm'
                   placeholder=''
                   value={formData.title}
                   onChange={e => {

src/components/cstmrService/inquiry/QnaSearchBox.js

@@ -32,7 +32,7 @@ export default function QnaSearchBox() {
                             <Col className='list-input' xl='4' md='6' sm='12'>
                               <Input
                                 type='select'
-                                besize='sm'
+                                bsSize='sm'
                                 //   value={formData.category}
                                 onChange={e => {
                                   const { value } = e.target;
@@ -60,7 +60,7 @@ export default function QnaSearchBox() {
                             <Col className='list-input' xl='4' md='6' sm='12'>
                               <Input
                                 type='select'
-                                besize='sm'
+                                bsSize='sm'
                                 //   value={formData.category}
                                 onChange={e => {
                                   const { value } = e.target;
@@ -85,7 +85,7 @@ export default function QnaSearchBox() {
                             <Col className='list-input' xl='4' md='6' sm='12'>
                               <Input
                                 type='text'
-                                besize='sm'
+                                bsSize='sm'
                                 //   value={formData.category}
                                 onChange={e => {
                                   const { value } = e.target;

src/views/laanc/FlightArea.js

@@ -641,8 +641,8 @@ export default function FlightArea({
                 ) : null}
               </div>
               <div>
-                <span style={{ marginRight: '10px' }}>
-                  ※ 비행구역설정 완료를 원하시면 더블클릭해주시기 바랍니다.
+                <span style={{ marginRight: '300px', color: '#ff0000'}}>
+                  ※ 비행구역설정 완료를 원하시면 마지막 좌표 지점에서 더블클릭해주시기 바랍니다.
                 </span>
                 <Button
                   color='primary'

src/views/laanc/LaancAreaMap.js

@@ -59,6 +59,8 @@ export default function LaancAreaMap({
   const [detailLayer, setDetailLayer] = useState();
   const [coordArr, setCoordArr] = useState([]);
 
+  const [viewCoordObj, setViewCoordObj] = useState([]);
+
   const detailGeo = useMemo(() => {
     return {
       type: 'FeatureCollection',
@@ -316,62 +318,34 @@ export default function LaancAreaMap({
       <CardBody>
         <div style={{ position: 'relative' }}>
           <LaancMapSearch mapObject={mapObject} />
-          <div
-            className='d-flex absolute'
-            style={{
-              position: 'relative',
-              zIndex: 100,
-              margin: '470px 10px 10px 10px'
-            }}
-          >
+          <div className='d-flex coords-wrap'>
             {mapObject ? (
-              <div style={{ width: '400px' }}>
+              <div className='coords-box'>
                 {drawObj.getAll().features.length > 1
                   ? drawObj
                       .getAll()
                       .features.filter(obj => obj.properties.id !== 'BUFFER')
                       .map((obj, i) => {
-                        // console.log(obj, '>>>>>>obj');
                         const coord =
                           obj.properties.id === 'LINE'
                             ? obj.geometry.coordinates
                             : obj.geometry.coordinates[0];
 
                         return (
-                          <div
-                            style={{
-                              backgroundColor: '#fff',
-                              marginBottom: '10px'
-                            }}
-                          >
-                            <div>비행구역 {i + 1}</div>
-                            {coord?.map(co => {
-                              const fCoord = FormattingCoord(co);
-                              if (fCoord) {
-                                return (
-                                  <div>
-                                    {fCoord[0]}, {fCoord[1]}
-                                  </div>
-                                );
-                              }
-                            })}
-                            {/* {obj.geometry.coordinates.map(coord => {
-                            if (obj.properties.id === 'LINE') {
-                              const fCoord = FormattingCoord(coord);
-                              return (
-                                <div>
-                                  {fCoord[0]} , {fCoord[1]}
-                                </div>
-                              );
-                            } else if(obj.properties.id === 'POLYGON') {
-                              const fCoord = FormattingCoord(coord);
-                              return (
-                                <div>
-                                  {fCoord[0]} , {fCoord[1]}
-                                </div>
-                              );
-                            }
-                          })} */}
+                          <div>
+                            <h6 className='ti'>비행구역 {i + 1}</h6>
+                            <div className='coords-box-scroll'>
+                              {coord?.map(co => {
+                                const fCoord = FormattingCoord(co);
+                                if (fCoord) {
+                                  return (
+                                    <span>
+                                      {fCoord[0]}, {fCoord[1]}
+                                    </span>
+                                  );
+                                }
+                              })}
+                            </div>
                           </div>
                         );
                       })
@@ -422,6 +396,7 @@ export default function LaancAreaMap({
                 handlerCoordinates={handlerCoordinates}
                 handlerInitCoordinates={handlerInitCoordinates}
                 setCoordArr={setCoordArr}
+                setViewCoordObj={setViewCoordObj}
               />
               <FeatureAirZone map={mapObject} mapboxgl={mapboxgl} />
               {modal ? (