Update image

chuanyi · Oct 25, 2021 · a0dedc0 · a0dedc0
1 parent 4a40cb8
commit a0dedc0
Show file tree

Hide file tree

Showing 18 changed files with 34 additions and 145 deletions.
diff --git a/README.md b/README.md
diff --git a/lib/msexcel-builder.js b/lib/msexcel-builder.js
diff --git a/lib/msexcel-builder.js.map b/lib/msexcel-builder.js.map
diff --git a/src/msexcel-builder.coffee b/src/msexcel-builder.coffee
@@ -635,46 +635,6 @@ class Anchor
     wb.ele('bookViews').ele('workbookView', {xWindow: '0', yWindow: '90', windowWidth: '19200', windowHeight: '11640'})
 
 
-class Image
-  # constructor: (@content, @contentType)
-  constructor: (@worksheet, @model) ->
-
-  @property 'model', {
-    get: () ->
-      switch (@type)
-        when 'background' then return {type: @type, imageId: @imageId}
-        when 'image' then return{
-          type: @type,
-          imageId: @imageId,
-          hyperlinks: @range.hyperlinks,
-          range: {
-            tl: @range.tl.model,
-            br: @range.br && @range.br.model,
-            ext: @range.ext,
-            editAs: @range.editAs,
-          }
-        }
-        else throw new Error('Invalid Image Type')
-      set: (model) ->
-        @type = model.type;
-        @imageId = model.imageId;
-
-        if model.type == 'image'
-          if typeof model.range == 'string'
-            decoded = colCache.decode(model.range)
-            @range = {
-              tl: new Anchor(@worksheet, {col: decoded.left, row: decoded.top}, -1),
-              br: new Anchor(@worksheet, {col: decoded.right, row: decoded.bottom}, 0),
-              editAs: 'oneCell',
-            }
-          else @range = {
-            tl: new Anchor(@worksheet, model.range.tl, 0),
-            br: model.range.br && new Anchor(@worksheet, model.range.br, 0),
-            ext: model.range.ext,
-            editAs: model.range.editAs,
-            hyperlinks: model.hyperlinks || model.range.hyperlinks,
-          }
-  }
 
 class Sheet
   constructor: (@book, @name, @cols, @rows) ->
@@ -714,10 +674,8 @@ class Sheet
       editAs: 'oneCell',
     }
 
-    ## tries to uncompress base64
-
     id = @book.medias.length + 1
-    imageToAdd = new Image(id, image.extension, image.base64, @range)
+    imageToAdd = new Image(id, image.extension, image.base64, @range, image.options||{})
     media = @book._addMediaFromImage(imageToAdd)
     # drawingId = @book._addDrawingFromImage(imageToAdd)
     # wsDwRelId = @sheet._addDrawingFromImage(imageToAdd)
@@ -1281,23 +1239,23 @@ class Style
     return ss.end({pretty: false})
 
 class Image
-  constructor: (@id, @extension, @content, @range) ->
+  constructor: (@id, @extension, @content, @range, @options) ->
     @editAs = 'oneCell'
 
 
   publish: (sheet, zip, media)->
-## Inject image, it's used by sheet
-## 1. write data to media folder
-##    convert base 64 to text
-##    define filename based on number of existing medias
-##    writes to media
-##
-## 2. create reference for media to drawing
-## 3. create the actual drawing using reference for media and set location
-## 4. creates reference for drawing to sheet.
-## 5. use image rel to sheet.
-
-  toDrawingXml: (relId,type)->
+    ## Inject image, it's used by sheet
+    ## 1. write data to media folder
+    ##    convert base 64 to text
+    ##    define filename based on number of existing medias
+    ##    writes to media
+    ##
+    ## 2. create reference for media to drawing
+    ## 3. create the actual drawing using reference for media and set location
+    ## 4. creates reference for drawing to sheet.
+    ## 5. use image rel to sheet.
+
+  toDrawingXml: (relId,spec)->
     # pngVersionRel = 'rId1'
     # svgVersionRel = 'rId2'
 
@@ -1357,7 +1315,7 @@ class Image
     , 'val': 0
     })
 
-    if type =='svg'
+    if @extension =='svg'
       ext = extLst.ele('a:ext', {
         'uri': '{96DAC541-7B7A-43D3-8B79-37D633B846F1}'
       })
@@ -1367,15 +1325,15 @@ class Image
       })
 
 
-    blipFill.ele('a:stretch')
+    if @options.stretch
+      blipFill.ele('a:stretch')
     blipFill.ele('srcRect')
     #.ele('a:fillRect')
     spPr = pic.ele('xdr:spPr')
     xfrm = spPr.ele('a:xfrm')
     xfrm.ele('a:off', {'x': 609600, 'y': 190500})
     xfrm.ele('a:ext', {'cx': 2857500, 'cy': 2857500})
     spPr.ele('a:prstGeom', {'prst': 'rect'}).ele('a:avLst')
-
     twoCellAnchor.ele('xdr:clientData')
     dr.end({pretty: false})
 
@@ -1481,7 +1439,7 @@ class Workbook
         # - build xl/drawings/drawing(1-N).xml
         drawingFilename = wbMediaCounter + '.xml'
         sheet.wsRels.push({id: relId, target: '../drawings/drawing' + drawingFilename})
-        zip.file('xl/drawings/drawing' + drawingFilename, image.toDrawingXml(relId, image.type))
+        zip.file('xl/drawings/drawing' + drawingFilename, image.toDrawingXml(relId, image))
 
         # - build xl/drawings/_rels/drawing(1-N).xml.rels
         zip.file('xl/drawings/_rels/drawing' + wbMediaCounter + '.xml.rels', new XlDrawingRels(dwRels).toxml())

diff --git a/test/.Rhistory b/test/.Rhistory
diff --git a/test/image-png.js b/test/image-png.js
diff --git a/test/out/autofilter.xlsx b/test/out/autofilter.xlsx
diff --git a/test/out/borders.xlsx b/test/out/borders.xlsx
diff --git a/test/out/example-1.xlsx b/test/out/example-1.xlsx
diff --git a/test/out/example.xlsx b/test/out/example.xlsx
diff --git a/test/out/example2.xlsx b/test/out/example2.xlsx
diff --git a/test/out/example3.xlsx b/test/out/example3.xlsx
diff --git a/test/out/formula.xlsx b/test/out/formula.xlsx
diff --git a/test/out/freeze.xlsx b/test/out/freeze.xlsx
diff --git a/test/out/numberformat.xlsx b/test/out/numberformat.xlsx
diff --git a/test/out/print.xlsx b/test/out/print.xlsx
diff --git a/test/out/style.xlsx b/test/out/style.xlsx
diff --git a/test/out/style2.xlsx b/test/out/style2.xlsx