bill 2 vuotta sitten
vanhempi
commit
e5c45886e2

+ 7 - 1
src/public.scss

@@ -55,7 +55,13 @@ html, body, #root {
     white-space: normal;
     line-height: 24px;
   }
-  
+
+  &:nth-child(1) {
+    flex: 0 0 90px !important;
+  }
+  &:nth-child(2) {
+    flex: 0 0 170px !important;
+  }
 }
 .data-grid-container .body-container {
   height: auto !important;

+ 1 - 1
src/views/draw-file/eshape.tsx

@@ -156,7 +156,7 @@ const ContentInput = ({ shape }: { shape: ExtractShape<'content'> }) => {
   return (
     <Form.Item label="内容">
       <Button type="primary" onClick={() => setEdit(true)}>编辑</Button>
-      <Modal open={edit} onCancel={() => setEdit(false)} onOk={onSubmit}>
+      <Modal open={edit} onCancel={() => setEdit(false)} onOk={onSubmit} width="430px">
         <div id="edit-table" onKeyDown={ev => ev.stopPropagation()}>
           <ReactEditeTable 
             {...tableAttrs}

+ 3 - 3
src/views/draw-file/modal.tsx

@@ -99,7 +99,7 @@ export const SelectMap = (props: SelectImageProps) => {
 
   return (
     <Modal 
-      width="700px"
+      width="588px"
       title="选择地址" 
       open={open} 
       onCancel={() => setOpen(false)}
@@ -250,7 +250,7 @@ export const SelectFuse = (props: SelectImageProps & { caseId: number }) => {
 
   return (
     <Modal 
-      width="1060px"
+      width="1000px"
       title="选择户型图" 
       open={open} 
       onCancel={() => setOpen(false)}
@@ -278,7 +278,7 @@ export const SelectFuse = (props: SelectImageProps & { caseId: number }) => {
               />
             </div>
           </div>  
-          <div>
+          <div className={style['house-image-layout']}>
             <h4>户型图:<RedoOutlined className='icon' onClick={getCover} /></h4>
             <div className={style['house-image']}>
               { coverUrl && <img src={coverUrl} alt="预览图" /> }

+ 5 - 1
src/views/draw-file/slider.tsx

@@ -37,7 +37,11 @@ export const DfSlider = ({ board, type, caseId }: SliderProps) => {
     }
     if (taggings.length) {
       const table = await board.calcTableShape(
-        taggings.map((tag, index) => [`图例${index + 1}`, tag.tagTitle])
+        [
+          ["图例", "说明"],
+          ...taggings.map((tag, index) => [`图例${index + 1}`, tag.tagTitle])
+        ]
+        
       )
       board.setDefaultTable(null, table.content)
     }

+ 8 - 7
src/views/draw-file/style.module.scss

@@ -180,7 +180,8 @@
 }
 
 .def-select-map {
-  height: 500px;
+  width: 540px;
+  height: 390px
 }
 
 .search-layout {
@@ -238,12 +239,11 @@ body {
 
 .house-layout {
   display: flex;
-  height: 600px;
 }
 
 .iframe-layout {
-  min-height: 500px;
-  flex: 1;
+  height: 390px;
+  flex: 0 0 540px;
   iframe {
     border: none;
     width: 100%;
@@ -261,7 +261,6 @@ body {
 
   > div {
     flex: none;
-    height: 290px;
     display: flex;
     flex-direction: column;
 
@@ -288,12 +287,14 @@ body {
 
   
 }
-
 .house-image {
   border: 1px solid #D9D9D9;
+  padding-top: 72.2222%;
+  position: relative;
   img {
+    position: absolute;
+    inset: 0;
     width: 100%;
-    height: 253px;
     object-fit: cover;
   }
 }