@lark-apaas/coding-steering 0.1.32-beta.0 → 0.1.32-dev.3598eb3

package/steering/design-html/skills/pptx-style-extract/scripts/parts.py

@@ -39,15 +39,15 @@ class Package:
         self.masters = sorted((n for n in self.names if MASTER_RE.match(n)), key=_num)
         self.themes, self.theme_discovery = self._find_themes(ct)
         # zip directory entries ('ppt/media/') must not be counted as assets —
-        # 票 03 recon counted one, which is why its media totals run one high.
+        # they inflate media totals by one.
         self.media = sorted(n for n in self.names
                             if n.startswith('ppt/media/') and not n.endswith('/'))
 
     def _find_themes(self, ct):
         """Theme parts come from [Content_Types].xml, not from a path pattern.
 
-        Compressors relocate them — 飞书压缩版 puts them at
-        ppt/slideMasters/theme/themeN.xml — and a `ppt/theme/` regex then finds
+        Compressors relocate them — some rewrite them under
+        ppt/slideMasters/theme/ — and a `ppt/theme/` regex then finds
         nothing to bind the masters to, so every schemeClr resolves to
         UNRESOLVED:no-scheme. The path regex stays as the fallback for packages
         whose content types are unreadable.
@@ -299,6 +299,22 @@ NV_TAGS = {'sp': 'p:nvSpPr', 'pic': 'p:nvPicPr', 'grpSp': 'p:nvGrpSpPr',
            'cxnSp': 'p:nvCxnSpPr', 'graphicFrame': 'p:nvGraphicFramePr'}
 
 
+def blip_opacity(blip):
+    """Combine the alpha modulation transforms attached to one local picture."""
+    opacity = 1.0
+    found = False
+    for effect in blip:
+        if local(effect.tag) not in ('alphaMod', 'alphaModFix'):
+            continue
+        try:
+            amount = int(effect.get('amt'))
+        except (TypeError, ValueError):
+            continue
+        opacity *= max(0.0, min(amount / 100000.0, 1.0))
+        found = True
+    return round(opacity, 6) if found else None
+
+
 def walk_tree(el, ctx, out, path=(), xf=(1.0, 1.0, 0.0, 0.0), depth=0):
     sx, sy, dx, dy = xf
     U, W, H = ctx.units, ctx.units.w, ctx.units.h
@@ -393,6 +409,9 @@ def walk_tree(el, ctx, out, path=(), xf=(1.0, 1.0, 0.0, 0.0), depth=0):
             blip = sp.find('p:blipFill/a:blip', NS)
             if blip is not None:
                 rec['media'] = ctx.media_of(blip.get(R_EMBED)) or ctx.media_of(blip.get(R_LINK))
+                opacity = blip_opacity(blip)
+                if opacity is not None:
+                    rec['opacity'] = opacity
                 svg = blip.find('a:extLst//asvg:svgBlip', NS)
                 if svg is not None:
                     rec['media_svg'] = ctx.media_of(svg.get(R_EMBED))

package/steering/design-html/skills/pptx-style-extract/scripts/query.py

@@ -244,14 +244,10 @@ def _recipe_css(fill, line, radii, effects):
             dash = (line or {}).get('dash')
             style = 'dashed' if dash and 'dash' in dash else 'solid'
             out.append('border: %dpx %s %s' % (w, style, lc))
-    if radii:
+    if radii and all(r >= 1 for r in radii):
         lo, hi = min(radii), max(radii)
         if abs(hi - lo) <= 0.5:
             out.append('border-radius: %gpx' % round(lo, 1))
-        else:
-            out.append('border-radius: %gpx\x00/* 源内 %g~%gpx 共 %d 档，归一档位由 L11 定 */'
-                       % (round(sum(radii) / len(radii), 1), round(lo, 1), round(hi, 1),
-                          len(set(round(r, 1) for r in radii))))
     for e in effects or []:
         if e.get('type') == 'outerShdw':
             col = _css_color(e.get('color')) or 'rgba(0,0,0,0.25)'
@@ -266,8 +262,8 @@ def _recipe_css(fill, line, radii, effects):
 
 def _sig(fill, line, effects):
     """分组键 = 填充 + 描边 + 效果。**不含圆角**——OOXML 圆角是 min(w,h) 的百分比，
-    同一配方在不同尺寸的卡上绝对 px 必然不同（feishu 三张 glassCard 实测 10.8/12.8/19.5），
-    把它计入键会把一个配方拆成三组；归一到哪一档是 L11 的判断，脚本只报区间。"""
+    同一配方在不同尺寸的卡上绝对 px 必然不同，把它计入键会把一个配方拆成多组；
+    只有组内每个形状都明确共享同一绝对半径时才输出组级圆角，否则留给逐形状 CSS。"""
     f = 'none'
     if isinstance(fill, dict):
         if fill.get('type') == 'solid':
@@ -305,8 +301,7 @@ def cmd_recipes(a, outdir):
         g = groups.setdefault(k, {'n': 0, 'parts': Counter(), 'sizes': [], 'radii': [],
                                   'fill': fill, 'line': line, 'fx': fx})
         g['n'] += 1
-        if radius:
-            g['radii'].append(radius)
+        g['radii'].append(radius or 0)
         g['parts'][short(s['part'])] += 1
         b = s.get('box') or {}
         if b.get('w'):

package/steering/design-html/skills/pptx-style-extract/scripts/render_pages.py

@@ -88,13 +88,15 @@ def css_gradient(grad):
 def background_css(bg):
     """页底 <p:bg> 描述符 → CSS background 值。解析不出返回 None，交上层回退到下一层底色。
 
-    bgPr solid / bgRef 都带 `color`；gradient 与形状渐变共用 css_gradient；
-    背景图不重建（媒体未必导出），按无底色处理。
+    bgPr solid / bgRef 都带 `color`；线性 gradient 与形状渐变共用 css_gradient；
+    path 渐变和背景图不重建，按无底色处理，不能伪装成线性渐变。
     """
     if not bg:
         return None
     kind = bg.get('type')
     if kind == 'gradient':
+        if bg.get('path'):
+            return None
         return css_gradient(bg)
     if kind in ('image', 'none', 'pattern'):
         return None
@@ -279,18 +281,19 @@ def render_shape(shape, media_url, stats):
 
 HEAD = """<style>
 body{margin:0;background:#2b2b2b;font-family:%s}
-.page{position:relative;width:1920px;height:1080px;overflow:hidden}
+.page{position:relative;width:%dpx;height:%dpx;overflow:hidden}
 .sp{position:absolute;box-sizing:border-box}
 .sp p{margin:0}
 .ph{position:absolute;left:6px;top:4px;font:16px/1.2 monospace;color:#ff2b88;background:#fff9;padding:1px 4px}
 </style>
-""" % CJK_STACK
+"""
 
+# 缩略框跟着画布比例走，缩放比也一起算——写死 16:9 会把非 16:9 模板的页面裁掉一截
 INDEX_EXTRA = """<style>
-.wrap{width:960px;margin:0 auto;padding:16px 0}
+.wrap{width:%dpx;margin:0 auto;padding:16px 0}
 .lbl{color:#eee;font:13px/1.6 monospace;margin:14px 0 4px}
-.box{width:960px;height:540px;overflow:hidden;margin-bottom:6px}
-.box .page{transform:scale(.5);transform-origin:top left}
+.box{width:%dpx;height:%dpx;overflow:hidden;margin-bottom:6px}
+.box .page{transform:scale(%g);transform-origin:top left}
 </style>
 """
 
@@ -508,7 +511,8 @@ def render_pages_png(pages, outdir, data, scale=0.5):
                    for m in data.get('media') or [] if m.get('exported') and m.get('out')}
     png_dir = os.path.join(outdir, 'ref', 'rebuild', 'png')
     os.makedirs(png_dir, exist_ok=True)
-    W, H = int(1920 * scale), int(1080 * scale)
+    cpx = ((data.get('canvas') or {}).get('px') or [1920, 1080])
+    W, H = int(cpx[0] * scale), int(cpx[1] * scale)
     for kind, n, label, layers, default_color, page_bg in pages:
         canvas = Image.new('RGBA', (W, H), _rgba(page_bg) or (136, 136, 136, 255))
         g = _grad_stops(page_bg or '')
@@ -642,15 +646,19 @@ def main():
                           tx1_of_master.get(master, '#000000'),
                           layout_bg.get(part, '#888')))
 
-    if only is not None:
-        pages = [p for p in pages if p[0] != 'slide' or p[1] in only]
+    if only is not None:      # 对样张和版式一律生效（form=3 的代表页是版式，不是样张）
+        pages = [p for p in pages if p[1] in only]
 
     stats = {'shapes': 0, 'text': 0, 'img_ok': 0, 'img_missing': 0, 'no_box': 0}
-    index = [HEAD, INDEX_EXTRA, '<div class="wrap">']
+    cw, ch = ((data.get('canvas') or {}).get('px') or [1920, 1080])[:2]
+    head = HEAD % (CJK_STACK, cw, ch)   # 视口跟画布走，非 16:9 模板不能按 1920x1080 裁
+    thumb_scale = 960.0 / cw
+    index = [head, INDEX_EXTRA % (960, 960, round(ch * thumb_scale), thumb_scale),
+             '<div class="wrap">']
     for kind, n, label, layers, default_color, page_bg in (() if args.no_html else pages):
         html = page_html(layers, default_color, page_bg, media_url, stats)
         with open(os.path.join(rebuild, '%s-%d.html' % (kind, n)), 'w', encoding='utf-8') as f:
-            f.write(HEAD + html)
+            f.write(head + html)
         index += ['<div class="lbl">%s</div>' % esc(label),
                   '<div class="box">%s</div>' % html]
     index.append('</div>')