Browse Source

fix:添加对接

bill 2 years ago
parent
commit
f975141410

+ 1 - 0
src/views/draw-file/board/index.d.ts

@@ -62,6 +62,7 @@ export type Board = {
   setImage(url: string): void
   getStore(): Promise<BoardData>
   calcTableShape(data: string[][]): Promise<TableShapeData>
+  setDefaultTable(bottomData: TableShapeData['content'] | null, topData: setDefaultTable['content'] | null)
   export(): Promise<Blob>
   destroy(): void
 }

+ 6 - 1
src/views/draw-file/board/index.js

@@ -119,6 +119,12 @@ export const create = (store, canvas) => {
       layer.uiControl.clearUI()
     },
     setDefaultTable(rbTable, rtTable) {
+      if (rbTable) {
+        layer.uiControl.initDownTable(rbTable)
+      }
+      if (rtTable) {
+        layer.uiControl.initTopTable(rtTable)
+      }
     },
     readyAddShape(shapeType, onFine) {
       layer.uiControl.selectUI = shapeType
@@ -136,7 +142,6 @@ export const create = (store, canvas) => {
       history.handleRedo()
     },
     setImage(url) {
-      console.log(url)
       layer.uiControl.setAttributes(bgImage, 'update', url)
     },
     export() {

+ 8 - 3
src/views/draw-file/eshape.tsx

@@ -49,7 +49,12 @@ const TextInput = ({ shape }: { shape: ExtractShape<'text'> }) => {
       <Input 
         style={{ width: 120 }}
         value={text}
-        onKeyDown={ev => ev.key === 'Enter' && onChang()}
+        onKeyDown={
+          ev => {
+            ev.key === 'Enter' && onChang()
+            ev.stopPropagation()
+          }
+        }
         onBlur={onChang}
         onChange={ev => setText(ev.target.value)}
       />
@@ -152,7 +157,7 @@ const ContentInput = ({ shape }: { shape: ExtractShape<'content'> }) => {
     <Form.Item label="内容">
       <Button type="primary" onClick={() => setEdit(true)}>编辑</Button>
       <Modal open={edit} onCancel={() => setEdit(false)} onOk={onSubmit}>
-        <div id="edit-table">
+        <div id="edit-table" onKeyDown={ev => ev.stopPropagation()}>
           <ReactEditeTable 
             {...tableAttrs}
             onDelete={onDelete}
@@ -229,7 +234,7 @@ export const EShape = ({ board }: EShapeProps) => {
         ["绘图人", user.nickName],
         ["绘图时间", "2022年10月10日"]
       ]).then(data => {
-        console.log('===>', data)
+        board.setDefaultTable(data.content, null)
       })
       
     }

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

@@ -39,7 +39,7 @@ export const DfSlider = ({ board, type, caseId }: SliderProps) => {
       const table = await board.calcTableShape(
         taggings.map((tag, index) => [`图例${index + 1}`, tag.tagTitle])
       )
-      console.log(table)
+      board.setDefaultTable(null, table.content)
     }
   }
   const SelectImage = type  === BoardType.map ? SelectMap : SelectFuse