km-card-layout-component-miniprogram 0.1.18 → 0.1.20

package/src/components/card-layout/elements/text-element/index.ts

@@ -1,23 +1,34 @@
 import {
   buildTextContentStyle,
   buildTextIconMeta,
+  buildTextValueStyle,
   buildWrapperStyle,
   getTextValue,
   styleObjectToString,
   type TextElement,
-} from '../../../../vendor/km-card-layout-core/index';
-import { ICON_CODE_MAP } from '../../icon-map';
+} from "../../../../vendor/km-card-layout-core/index";
+import { ICON_CODE_MAP } from "../../icon-map";
 
-const mapIconGlyph = (name?: string, fallback?: string) => {
-  if (!name) return fallback;
-  const glyph = ICON_CODE_MAP[name];
-  if (glyph) return String.fromCharCode(parseInt(glyph, 16));
-  return fallback || name;
+const normalizeIconName = (name?: string) => {
+  if (!name) return "";
+  return name.startsWith("icon-") ? name.slice(5) : name;
+};
+
+const buildIconClassName = (name?: string) => {
+  const normalized = normalizeIconName(name);
+  if (!normalized) return "";
+  return `icon-${normalized}`;
+};
+
+const buildIconCode = (name?: string) => {
+  const normalized = normalizeIconName(name);
+  if (!normalized) return "";
+  return ICON_CODE_MAP[normalized] || "";
 };
 
 Component({
   options: {
-    styleIsolation: 'apply-shared',
+    styleIsolation: "apply-shared",
   },
   properties: {
     element: {
@@ -30,28 +41,46 @@ Component({
     },
   },
   data: {
-    wrapperStyle: '',
-    contentStyle: '',
-    textValue: '',
+    wrapperStyle: "",
+    contentStyle: "",
+    textValue: "",
+    textStyle: "",
     iconMeta: null as any,
   },
   observers: {
-    element(el: TextElement) {
+    element() {
+      this.rebuild();
+    },
+    rootData() {
+      this.rebuild();
+    },
+  },
+  methods: {
+    rebuild() {
+      const el = this.data.element as TextElement;
       if (!el) return;
-      const data: Record<string, any> = this.data.rootData || {};
-      const wrapperStyle = styleObjectToString(buildWrapperStyle(el, 'rpx'), 'rpx');
-      const contentStyle = styleObjectToString(buildTextContentStyle(el, 'rpx'), 'rpx');
+      const data = this.data.rootData || {};
+      const wrapperStyle = styleObjectToString(buildWrapperStyle(el, "rpx"), "rpx");
+      const contentStyle = styleObjectToString(buildTextContentStyle(el, "rpx"), "rpx");
       const textValue = getTextValue(el, data);
-      const iconRaw = buildTextIconMeta(el, 'rpx');
+      const textStyle = styleObjectToString(
+        {
+          ...buildTextContentStyle(el, "rpx"),
+          ...buildTextValueStyle(el, "rpx"),
+        },
+        "rpx"
+      );
+      const iconRaw = buildTextIconMeta(el, "rpx");
       const iconMeta =
         iconRaw && iconRaw.name
           ? {
               ...iconRaw,
-              text: mapIconGlyph(iconRaw.name, iconRaw.name),
-              wrapperStyle: styleObjectToString(iconRaw.wrapperStyle, 'rpx'),
+              className: buildIconClassName(iconRaw.name),
+              iconCode: buildIconCode(iconRaw.name),
+              wrapperStyle: styleObjectToString(iconRaw.wrapperStyle, "rpx"),
             }
           : iconRaw;
-      this.setData({ wrapperStyle, contentStyle, textValue, iconMeta });
+      this.setData({ wrapperStyle, contentStyle, textValue, textStyle, iconMeta });
     },
   },
 });

package/src/components/card-layout/elements/text-element/index.wxml

@@ -1,42 +1,18 @@
-<view class="km-node km-node--text" style="{{wrapperStyle}}">
-  <view class="km-node__text" style="{{contentStyle}}">
-    <block wx:if="{{(iconMeta && (iconMeta.name || iconMeta.text)) && (element.icon && element.icon.style !== 'text')}}">
-      <view class="km-node__text-content">
-
-        <!-- icon 在右侧 -->
-        <block wx:if="{{iconMeta && iconMeta.align === 'right'}}">
-          <text class="km-node__text-value">{{(element.icon && element.icon.style === 'text' && element.icon.enable) ? (element.label + '：') : ''}}{{textValue || ''}}</text>
+<view class="km-node km-node--text canvas-item" style="{{wrapperStyle}}">
+  <view class="km-node__text canvas-item" style="{{contentStyle}}">
+    <block wx:if="{{iconMeta && iconMeta.name && (element.icon && element.icon.style !== 'text')}}">
+      <view class="km-node__text-content canvas-item">
           <view
-            class="km-node__text-icon--wrapper"
+            class="km-node__text-icon--wrapper canvas-item"
             style="{{iconMeta.wrapperStyle}}"
           >
-            <text
-              class="km-node__text-icon icon"
-              style="font-size: {{iconMeta.size || '16px'}}; color: {{iconMeta.color || ''}}; margin-right: {{iconMeta.gap || ''}};"
-            >{{iconMeta.text || iconMeta.name || ''}}</text>
+            <i class="km-node__text-icon icon {{iconMeta.className}} canvas-item" style="font-size: {{iconMeta.size || '16px'}}; color: {{iconMeta.color || ''}}; margin-right: {{iconMeta.gap || ''}};" data-icon="{{iconMeta.iconCode}}" ></i>
           </view>
-        </block>
-
-        <!-- icon 在左侧 -->
-        <block wx:else>
-          <view
-            class="km-node__text-icon--wrapper"
-            style="{{iconMeta.wrapperStyle}}"
-          >
-            <text
-              class="km-node__text-icon icon"
-              style="font-size: {{iconMeta.size || '16px'}}; color: {{iconMeta.color || ''}}; margin-right: {{iconMeta.gap || ''}};"
-            >{{iconMeta.text || iconMeta.name || ''}}</text>
-          </view>
-          <text class="km-node__text-value">{{textValue || ''}}</text>
-        </block>
-
+          <text class="km-node__text-value canvas-item"  style="{{textStyle}}" data-text="{{textValue || ''}}">{{textValue || ''}}</text>
       </view>
     </block>
-
-    <!-- 无 icon -->
     <block wx:else>
-      <text class="km-node__text-value">{{(element.icon && element.icon.style === 'text' && element.icon.enable) ? (element.label + '：') : ''}}{{textValue || ''}}</text>
+      <text class="km-node__text-value canvas-item"  style="{{textStyle}}" data-text="{{(element.icon && element.icon.style === 'text' && element.icon.enable) ? (element.label + '：') : ''}}{{textValue || ''}}">{{(element.icon && element.icon.style === 'text' && element.icon.enable) ? (element.label + '：') : ''}}{{textValue || ''}}</text>
     </block>
   </view>
 </view>

package/src/components/card-layout/elements/text-element/index.wxss

@@ -1,12 +1,10 @@
+@import "../icon-font.wxss";
+
 .km-node {
   box-sizing: border-box;
   color: inherit;
 }
 
-.km-node--text {
-  /* overflow hidden if needed */
-}
-
 .km-node--text text {
   display: inline;
 }
@@ -23,6 +21,7 @@
   display: inline-block;
   vertical-align: middle;
   height: 100%;
+  display: inline-flex;
 }
 
 .km-node__text-icon {
@@ -38,22 +37,6 @@
   vertical-align: middle;
 }
 
-@font-face {
-  font-family: 'km-icon';
-  src: url('data:font/woff;charset=utf-8;base64,d09GRgABAAAAAEl4AA0AAAAAcmgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABGRlRNAABJXAAAABoAAAAcrMtJV0dERUYAAEk8AAAAHgAAAB4AKQByT1MvMgAAAaQAAABGAAAAYDw3SVljbWFwAAAC7AAAAM8AAAIW8XL3K2dhc3AAAEk0AAAACAAAAAj//wADZ2x5ZgAABJgAAEBZAABkZPJymXJoZWFkAAABMAAAADEAAAA2MtZiFmhoZWEAAAFkAAAAIAAAACQNagmCaG10eAAAAewAAAD/AAABqqs3Ii9sb2NhAAADvAAAANoAAADaKv0P7G1heHAAAAGEAAAAHwAAACABmQHEbmFtZQAARPQAAAFGAAACgl6CAQJwb3N0AABGPAAAAvUAAATh1g15W3jaY2BkYGAA4lqffPd4fpuvDNwsDCDwVIyfA0b///i/gXMWcyeQy8HABBIFAAVdCfwAAAB42mNgZGBgbvjfwBDDOfP/x///OWcxAEVQQCYAuxgH/XjaY2BkYGDIYdzBoMwAAkxAzAWEDAz/wXwGACjlAl8AeNpjYGFRYJzAwMrAwNTJdIaBgaEfQjO+ZjBi5ACKMrAyM2AFAWmuKQwHnjE+y2Ju+N/AwMB8h6ERKMyIpESBgREAenQNCwAAeNo90cErBGEYx/Hf1LMH7MVxoigHtS600pzWnMjBlt2dFAeiNuWgXLgokgslbpyE/Aduyl38J3ty4aCs7/vOk6lPv+d5531n3nfGVF5JIZlUx9fAbawnEfIFq14/YhddFPjFmynZ9n4TbYzg2tcMW6Epr4NQT3jSJ2lcW9ec1fSEAheMnVume7KKBbQwiMye+5/kEpqYwQoOY59pn1xGw3Lt8NwHS7UY35frivqbet2fNYZp+4j76vj+GpUhjZJreLfxODecay/eTzVPzmIj9uX7VLnUmfdb/2fN4trcv0kYv8Oxe/V5Rzhg7inZ8wzjN5b0f6z8PV2d/AHivi0JAHja3dBFUoVRDITR88PD3d3d3d3d3d33zQqYwwVGbIGk8qV6kK7qIN7vlIsCRdlBRT865iPsWOig318/PwOjbwYd+7mKSZAoSbIUqdKky5ApS7YcufLkK1CoSLESpcqCZ4VKVarVqFWnXoNGTZq1aNWmXYdOXbr16NWn34BBQ4aNGDVm3IRJU6bNmDVn3oJFS5atWLVm3YZNW7bt2LVn34FDR46dOHXm3IVLV67duHXn3oNHT8Hv2YtXbyFaot9HfMeMC4jztyL/vr4AXx4eawAAAAAAAAAAAACwAPIDSgQ8BLIFUgWUBcIF/gY8BpIHCgdAB3wHoAgOCHAIxgk+CV4JzAnqCkQKrgtUC8QMEAxsDNQNFA1SDegONg6qDyQPgg/CEAIQxBEwEaQSHBLYE14T4hRcFPIVTBYMFkwWqBckGGAYxhmYGegaEBpeGuIbXhvwHPQd5B62Hygf6CBeILog9CFUIbgiBCJ0ItQjbCQSJGgkuCVsJcImKib0J44ocijOKSApUCo2KmQqtituK34sJixkLMgtdC3WLpgvPC+QMBww/DGCMagyMgAA') format('woff');
-  font-weight: normal;
-  font-style: normal;
-  font-display: swap;
-}
-
-.icon {
-  font-family: 'km-icon' !important;
-  font-size: 16px;
-  font-style: normal;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-
-.km-node__text-icon--wrapper{
+.km-node__text-icon--wrapper {
   display: inline-block;
-}
+}

package/src/components/card-layout/index.json

@@ -4,6 +4,8 @@
     "text-element": "./elements/text-element/index",
     "image-element": "./elements/image-element/index",
     "icon-element": "./elements/icon-element/index",
-    "custom-element": "./elements/custom-element/index"
+    "custom-element": "./elements/custom-element/index",
+    "layout-panel-element": "./elements/layout-panel-element/index",
+    "wxml2canvas": "../../vendor/wxml2canvas-2d/index"
   }
 }

package/src/components/card-layout/index.ts

@@ -1,29 +1,23 @@
 import type {
   CardElement,
-  CardLayoutInput,
   CardLayoutSchema,
-  LayoutPanelElement,
-} from '../../vendor/km-card-layout-core/index';
+} from "../../vendor/km-card-layout-core/index";
 import {
   buildBackgroundStyle,
   buildCardStyle,
-  buildPanelContentStyle,
-  buildWrapperStyle,
   normalizeLayout,
   processCardLayout,
   styleObjectToString,
-} from '../../vendor/km-card-layout-core/index';
+} from "../../vendor/km-card-layout-core/index";
 
 type CompanyDuty = {
   company: string;
   duty: string;
 };
 
-
-
 const EMPTY_COMPANY_DUTY: CompanyDuty = {
-  company: '',
-  duty: '',
+  company: "",
+  duty: "",
 };
 
 /**
@@ -60,7 +54,6 @@ export function normalizeMoreCompany(data: AnyObject): AnyObject {
   };
 }
 
-
 const handleSpecialFields = (data: { user: Record<string, any> }) => {
   const user = data.user ?? {};
   return {
@@ -68,15 +61,13 @@ const handleSpecialFields = (data: { user: Record<string, any> }) => {
     user: {
       ...user,
       baseCompanyDuty:
-        user.company && user.duty
-          ? `${user.company} ${user.duty}`
-          : user.baseCompanyDuty,
+        user.company && user.duty ? `${user.company} ${user.duty}` : user.baseCompanyDuty,
       moreCardInfo: user.moreCardInfo
         ? {
             ...user.moreCardInfo,
             company: Array.isArray(user.moreCardInfo.company)
               ? (user.moreCardInfo.company as CompanyDuty[]).map(
-                  item => `${item.company} ${item.duty}`
+                  (item) => `${item.company} ${item.duty}`
                 )
               : user.moreCardInfo.company,
           }
@@ -85,13 +76,7 @@ const handleSpecialFields = (data: { user: Record<string, any> }) => {
   };
 };
 
-type PanelElement = LayoutPanelElement & {
-  wrapperStyle: string;
-  contentStyle: string;
-  children?: RenderElement[];
-};
-
-type RenderElement = CardElement | PanelElement;
+type RenderElement = CardElement;
 
 type RenderCard = {
   id: string;
@@ -101,59 +86,33 @@ type RenderCard = {
   elements: RenderElement[];
 };
 
-const ensureArray = (input: CardLayoutInput | any): CardLayoutInput => {
-  if (!input) return [];
-  return Array.isArray(input) ? input : [input];
-};
-
 const pickCardId = (layout: any, idx: number) => {
   if (layout && (layout.name || layout.id)) return layout.name || layout.id;
   return `card-${idx}`;
 };
 
-const decorateElements = (children: CardElement[] = []): RenderElement[] =>
-  (children || []).map(el => {
-    if (el.type === 'layout-panel') {
-      const panel = el as LayoutPanelElement;
-      return {
-        ...panel,
-        wrapperStyle: styleObjectToString(buildWrapperStyle(panel, 'rpx'), 'rpx'),
-        contentStyle: styleObjectToString(buildPanelContentStyle(panel, 'rpx'), 'rpx'),
-        children: decorateElements(panel.children || []),
-      };
-    }
-    return el;
-  });
-
 const buildCards = (layouts: CardLayoutSchema[]) => {
   return layouts.map((layout, idx) => ({
     id: pickCardId(layouts[idx], idx),
-    cardStyle: styleObjectToString(buildCardStyle(layout, 'rpx'), 'rpx'),
-    backgroundImage: layout.backgroundImage || '',
-    backgroundStyle: styleObjectToString(buildBackgroundStyle(layout, 'rpx'), 'rpx'),
-    elements: decorateElements(layout.children || []),
+    cardStyle: styleObjectToString(buildCardStyle(layout, "rpx"), "rpx"),
+    backgroundImage: layout.backgroundImage || "",
+    backgroundStyle: styleObjectToString(buildBackgroundStyle(layout, "rpx"), "rpx"),
+    elements: layout.children || [],
   }));
 };
 
-
-export const hasCompanyDutyKey = (
-  schemas: CardLayoutSchema[]
-): boolean => {
-  const TARGET_KEYS = new Set([
-    'company_duty_custom',
-    'company_duty_1',
-    'company_duty_2',
-  ]);
+export const hasCompanyDutyKey = (schemas: CardLayoutSchema[]): boolean => {
+  const TARGET_KEYS = new Set(["company_duty_custom", "company_duty_1", "company_duty_2"]);
 
   const traverse = (elements: CardElement[]): boolean => {
-    return elements.some(el => {
+    return elements.some((el) => {
       // 命中 key
       if (el.key && TARGET_KEYS.has(el.key)) {
         return true;
       }
 
       // 递归 layout-panel
-      if (el.type === 'layout-panel' && el.children?.length) {
+      if (el.type === "layout-panel" && el.children?.length) {
         return traverse(el.children);
       }
 
@@ -161,13 +120,12 @@ export const hasCompanyDutyKey = (
     });
   };
 
-  return schemas.some(schema => traverse(schema.children));
+  return schemas.some((schema) => traverse(schema.children));
 };
 
-
 Component({
   options: {
-    styleIsolation: 'apply-shared',
+    styleIsolation: "apply-shared",
   },
   properties: {
     layout: {
@@ -185,6 +143,7 @@ Component({
   data: {
     cards: [] as RenderCard[],
     rootData: {} as Record<string, any>,
+    firstCard: [] as RenderCard[],
   },
   observers: {
     layout() {
@@ -201,8 +160,10 @@ Component({
   },
   methods: {
     rebuild() {
-      const data = normalizeMoreCompany(this.data.data)
-      const layoutInput = hasCompanyDutyKey(this.data.layout)?processCardLayout(this.data.layout, data as any): this.data.layout;
+      const data = normalizeMoreCompany(this.data.data);
+      const layoutInput = hasCompanyDutyKey(this.data.layout)
+        ? processCardLayout(this.data.layout, data as any)
+        : this.data.layout;
       const rootData = handleSpecialFields(data as any);
       if (!layoutInput.length) {
         this.setData({ cards: [], rootData });
@@ -210,7 +171,18 @@ Component({
       }
       const normalizedLayouts = normalizeLayout(layoutInput);
       const cards = buildCards(normalizedLayouts);
-      this.setData({ cards, rootData });
+      this.setData({ cards, rootData, firstCard: [cards[0]] });
+    },
+
+    async handleDrawCanvas() {
+      try {
+        const canvas = this.selectComponent(`#layout-canvas`);
+        await canvas.draw(this);
+        const filePath = await canvas.toTempFilePath();
+        return filePath;
+      } catch {
+        wx.showToast({ title: "保存失败", icon: "error" });
+      }
     },
   },
 });

package/src/components/card-layout/index.wxml

@@ -1,42 +1,38 @@
-<view class="km-card-layout">
-  <block wx:for="{{cards}}" wx:key="id">
-    <view class="km-card-layout__item">
-      <view class="km-card" style="{{item.cardStyle}}">
-        <image
-          wx:if="{{item.backgroundImage}}"
-          class="km-card__bg"
-          style="{{item.backgroundStyle}}"
-          src="{{item.backgroundImage}}"
-          mode="aspectFill"
-        />
-        <block wx:for="{{item.elements}}" wx:key="id">
-          <template wx:if="{{item.visible !== false}}" is="render-element" data="{{el:item, rootData: rootData}}" />
-        </block>
+<template name="layout-template">
+  <view class="km-card-layout layout-container">
+    <block wx:for="{{renderCards}}" wx:key="id">
+      <view class="km-card-layout__item canvas-item">
+        <view class="km-card canvas-item" style="{{item.cardStyle}}">
+          <image wx:if="{{item.backgroundImage}}" class="km-card__bg canvas-item" style="{{item.backgroundStyle}}" src="{{item.backgroundImage}}" mode="aspectFill" />
+          <block wx:for="{{item.elements}}" wx:key="id">
+            <template wx:if="{{item.visible !== false}}" is="render-element" data="{{el:item, rootData: rootData}}" />
+          </block>
+        </view>
       </view>
-    </view>
-  </block>
-</view>
-
+    </block>
+  </view>
+</template>
+<template is="layout-template" data="{{ renderCards: cards, rootData: rootData }}"></template>
+<!-- 暂时只绘制第一张卡片 -->
+<wxml2canvas id="layout-canvas" container-class="layout-container" item-class="canvas-item"></wxml2canvas>
 <template name="render-element">
   <block wx:if="{{el.type === 'image'}}">
-    <image-element element="{{el}}" rootData="{{rootData}}" />
+    <image-element id="node-{{el.id}}" class="canvas-item" data-component="{{true}}" element="{{el}}" rootData="{{rootData}}" />
   </block>
   <block wx:elif="{{el.type === 'icon'}}">
-    <icon-element element="{{el}}" rootData="{{rootData}}" />
+    <icon-element id="node-{{el.id}}" class="canvas-item" data-component="{{true}}" element="{{el}}" rootData="{{rootData}}" />
   </block>
   <block wx:elif="{{el.type === 'layout-panel'}}">
-    <view class="km-node" style="{{el.wrapperStyle}}">
-      <view class="km-node__panel" style="{{el.contentStyle}}">
-        <block wx:for="{{el.children}}" wx:key="id">
-          <template is="render-element" data="{{el:item, rootData: rootData}}" />
-        </block>
-      </view>
-    </view>
+    <layout-panel-element id="node-{{el.id}}" class="canvas-item" data-component="{{true}}" element="{{el}}" rootData="{{rootData}}">
+      <block wx:for="{{el.children}}" wx:key="id">
+        <template is="render-element" data="{{el:item, rootData: rootData}}" />
+      </block>
+    </layout-panel-element>
   </block>
   <block wx:elif="{{el.type === 'custom'}}">
-    <custom-element element="{{el}}" rootData="{{rootData}}" />
+    <custom-element id="node-{{el.id}}" class="canvas-item" data-component="{{true}}" element="{{el}}" rootData="{{rootData}}" />
   </block>
   <block wx:else>
-    <text-element element="{{el}}" rootData="{{rootData}}" />
+    <text-element id="node-{{el.id}}" class="canvas-item" data-component="{{true}}" element="{{el}}" rootData="{{rootData}}" />
   </block>
 </template>