km-card-layout-component-miniprogram 0.1.9 → 0.1.11

package/miniprogram_dist/vendor/km-card-layout-core/index.js

@@ -1,10 +1,4 @@
 "use strict";
-/**
- * CardMaster 布局 JSON 渲染核心
- *
- * - 平台无关：不依赖 DOM/小程序 API，方便在 Web/小程序/Node 复用。
- * - 职责：将布局 Schema 与业务数据合成可渲染树，外层只需将节点映射到各端组件。
- */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -20,7 +14,11 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildTextIconMeta = exports.getIconName = exports.getImageSrc = exports.getTextValue = exports.buildImageContentStyle = exports.buildTextContentStyle = exports.buildPanelContentStyle = exports.buildBaseContentStyle = exports.buildBackgroundStyle = exports.buildCardStyle = exports.buildWrapperStyle = exports.buildRenderData = exports.updateElementsStyle = exports.applyBackground = exports.applySpecialStyle = exports.resolveSpecialStyle = exports.DEFAULT_DECOR_COLOR = exports.backgroundChange = exports.getTemplateBackgrounds = exports.getTemplateItems = exports.applyItemCollectBindings = exports.stripLayoutBindings = exports.resolveBindingValue = exports.areChildrenEqual = exports.parseLayout = exports.normalizeId = exports.collectBindings = exports.getAbsLayout = exports.roundToInt = exports.sanitizeElement = exports.sanitizeLayout = exports.normalizeLayout = exports.isObject = exports.toNumber = exports.styleObjectToString = exports.addUnit = void 0;
+exports.processCardLayout = exports.handleSpecialFields = exports.buildTextIconMeta = exports.getIconName = exports.getImageSrc = exports.getTextValue = exports.buildImageContentStyle = exports.buildTextValueStyle = exports.buildTextContentStyle = exports.buildPanelContentStyle = exports.buildBaseContentStyle = exports.buildBackgroundStyle = exports.buildCardStyle = exports.buildWrapperStyle = exports.backgroundChange = exports.applyItemCollectBindings = exports.stripLayoutBindings = exports.resolveBindingValue = exports.parseLayout = exports.normalizeId = exports.getAbsLayout = exports.roundToInt = exports.sanitizeElement = exports.sanitizeLayout = exports.normalizeLayout = exports.isObject = exports.toNumber = exports.styleObjectToString = exports.addUnit = void 0;
+/**
+ * Core exports for card layout helpers.
+ * Platform-agnostic utilities shared by web/mini-program renderers.
+ */
 __exportStar(require("./interface/index"), exports);
 var helpers_1 = require("./helpers");
 Object.defineProperty(exports, "addUnit", { enumerable: true, get: function () { return helpers_1.addUnit; } });
@@ -33,26 +31,15 @@ Object.defineProperty(exports, "sanitizeLayout", { enumerable: true, get: functi
 Object.defineProperty(exports, "sanitizeElement", { enumerable: true, get: function () { return layout_1.sanitizeElement; } });
 Object.defineProperty(exports, "roundToInt", { enumerable: true, get: function () { return layout_1.roundToInt; } });
 Object.defineProperty(exports, "getAbsLayout", { enumerable: true, get: function () { return layout_1.getAbsLayout; } });
-Object.defineProperty(exports, "collectBindings", { enumerable: true, get: function () { return layout_1.collectBindings; } });
 Object.defineProperty(exports, "normalizeId", { enumerable: true, get: function () { return layout_1.normalizeId; } });
 Object.defineProperty(exports, "parseLayout", { enumerable: true, get: function () { return layout_1.parseLayout; } });
-Object.defineProperty(exports, "areChildrenEqual", { enumerable: true, get: function () { return layout_1.areChildrenEqual; } });
 var data_1 = require("./data");
 Object.defineProperty(exports, "resolveBindingValue", { enumerable: true, get: function () { return data_1.resolveBindingValue; } });
 var bindings_1 = require("./bindings");
 Object.defineProperty(exports, "stripLayoutBindings", { enumerable: true, get: function () { return bindings_1.stripLayoutBindings; } });
 Object.defineProperty(exports, "applyItemCollectBindings", { enumerable: true, get: function () { return bindings_1.applyItemCollectBindings; } });
-Object.defineProperty(exports, "getTemplateItems", { enumerable: true, get: function () { return bindings_1.getTemplateItems; } });
-Object.defineProperty(exports, "getTemplateBackgrounds", { enumerable: true, get: function () { return bindings_1.getTemplateBackgrounds; } });
 var changeBackground_1 = require("./ops/changeBackground");
 Object.defineProperty(exports, "backgroundChange", { enumerable: true, get: function () { return changeBackground_1.backgroundChange; } });
-Object.defineProperty(exports, "DEFAULT_DECOR_COLOR", { enumerable: true, get: function () { return changeBackground_1.DEFAULT_DECOR_COLOR; } });
-Object.defineProperty(exports, "resolveSpecialStyle", { enumerable: true, get: function () { return changeBackground_1.resolveSpecialStyle; } });
-Object.defineProperty(exports, "applySpecialStyle", { enumerable: true, get: function () { return changeBackground_1.applySpecialStyle; } });
-Object.defineProperty(exports, "applyBackground", { enumerable: true, get: function () { return changeBackground_1.applyBackground; } });
-Object.defineProperty(exports, "updateElementsStyle", { enumerable: true, get: function () { return changeBackground_1.updateElementsStyle; } });
-var tool_1 = require("./render/tool");
-Object.defineProperty(exports, "buildRenderData", { enumerable: true, get: function () { return tool_1.buildRenderData; } });
 var helpers_2 = require("./render/helpers");
 Object.defineProperty(exports, "buildWrapperStyle", { enumerable: true, get: function () { return helpers_2.buildWrapperStyle; } });
 Object.defineProperty(exports, "buildCardStyle", { enumerable: true, get: function () { return helpers_2.buildCardStyle; } });
@@ -60,8 +47,12 @@ Object.defineProperty(exports, "buildBackgroundStyle", { enumerable: true, get:
 Object.defineProperty(exports, "buildBaseContentStyle", { enumerable: true, get: function () { return helpers_2.buildBaseContentStyle; } });
 Object.defineProperty(exports, "buildPanelContentStyle", { enumerable: true, get: function () { return helpers_2.buildPanelContentStyle; } });
 Object.defineProperty(exports, "buildTextContentStyle", { enumerable: true, get: function () { return helpers_2.buildTextContentStyle; } });
+Object.defineProperty(exports, "buildTextValueStyle", { enumerable: true, get: function () { return helpers_2.buildTextValueStyle; } });
 Object.defineProperty(exports, "buildImageContentStyle", { enumerable: true, get: function () { return helpers_2.buildImageContentStyle; } });
 Object.defineProperty(exports, "getTextValue", { enumerable: true, get: function () { return helpers_2.getTextValue; } });
 Object.defineProperty(exports, "getImageSrc", { enumerable: true, get: function () { return helpers_2.getImageSrc; } });
 Object.defineProperty(exports, "getIconName", { enumerable: true, get: function () { return helpers_2.getIconName; } });
 Object.defineProperty(exports, "buildTextIconMeta", { enumerable: true, get: function () { return helpers_2.buildTextIconMeta; } });
+var init_1 = require("./render/init");
+Object.defineProperty(exports, "handleSpecialFields", { enumerable: true, get: function () { return init_1.handleSpecialFields; } });
+Object.defineProperty(exports, "processCardLayout", { enumerable: true, get: function () { return init_1.processCardLayout; } });

package/miniprogram_dist/vendor/km-card-layout-core/interface/index.js

@@ -17,4 +17,3 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./elements"), exports);
 __exportStar(require("./layout"), exports);
 __exportStar(require("./data/payload"), exports);
-__exportStar(require("./context"), exports);

package/miniprogram_dist/vendor/km-card-layout-core/layout.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.areChildrenEqual = exports.normalizeLayout = exports.parseLayout = exports.normalizeId = exports.collectBindings = exports.sanitizeLayout = exports.sanitizeElement = exports.getAbsLayout = exports.roundToInt = void 0;
+exports.normalizeLayout = exports.parseLayout = exports.normalizeId = exports.sanitizeLayout = exports.sanitizeElement = exports.getAbsLayout = exports.roundToInt = void 0;
 const helpers_1 = require("./helpers");
 const DEFAULT_CARD_WIDTH = 343;
 const DEFAULT_CARD_HEIGHT = 210;
@@ -40,18 +40,6 @@ const sanitizeLayout = (layout) => ({
     children: (layout.children || []).map(child => (0, exports.sanitizeElement)(child)),
 });
 exports.sanitizeLayout = sanitizeLayout;
-const collectBindings = (elements = []) => {
-    const result = [];
-    elements.forEach(el => {
-        if (el.binding)
-            result.push(el.binding);
-        if (el.type === 'layout-panel' && el.children) {
-            result.push(...(0, exports.collectBindings)(el.children));
-        }
-    });
-    return Array.from(new Set(result));
-};
-exports.collectBindings = collectBindings;
 const normalizeId = (id) => {
     if (id === undefined || id === null)
         return undefined;
@@ -111,7 +99,3 @@ const normalizeLayout = (layout) => {
         .filter((value) => Boolean(value));
 };
 exports.normalizeLayout = normalizeLayout;
-const areChildrenEqual = (a, b) => {
-    return JSON.stringify(a === null || a === void 0 ? void 0 : a.children) === JSON.stringify(b === null || b === void 0 ? void 0 : b.children);
-};
-exports.areChildrenEqual = areChildrenEqual;

package/miniprogram_dist/vendor/km-card-layout-core/ops/changeBackground.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setElementVisible = exports.updateElementsStyle = exports.applyBackground = exports.applySpecialStyle = exports.resolveSpecialStyle = exports.DEFAULT_DECOR_COLOR = exports.backgroundChange = void 0;
+exports.backgroundChange = void 0;
 const toNameArray = (name) => {
     if (Array.isArray(name))
         return name.filter(Boolean);
@@ -12,10 +12,10 @@ const toNameArray = (name) => {
         .filter(Boolean);
 };
 function backgroundChange(bg, layout) {
+    var _a;
+    const extras = bg.fontColorExtra || [];
+    const iconSpecialColor = (_a = extras.find(sc => toNameArray(sc.name).some(n => n === 'icon'))) === null || _a === void 0 ? void 0 : _a.color;
     const applySpecialColor = (el) => {
-        const extras = bg.fontColorExtra || [];
-        if (!extras.length)
-            return el;
         const keys = [];
         if (el.binding)
             keys.push(String(el.binding));
@@ -26,13 +26,48 @@ function backgroundChange(bg, layout) {
         if (el.type === 'custom')
             keys.push('decor');
         const matched = extras.find(sc => toNameArray(sc.name).some(n => keys.some(k => k === null || k === void 0 ? void 0 : k.startsWith(n))));
-        if (!matched)
-            return el;
         const baseStyle = { ...(el.style || {}) };
-        if (el.type === 'custom') {
-            return { ...el, style: { ...baseStyle, backgroundColor: matched.color } };
+        let nextEl = el;
+        if (matched) {
+            if (el.type === 'custom') {
+                nextEl = { ...el, style: { ...baseStyle, backgroundColor: matched.color } };
+            }
+            else {
+                nextEl = { ...el, style: { ...baseStyle, color: matched.color } };
+            }
+        }
+        else {
+            const nextStyle = { ...baseStyle };
+            let changed = false;
+            if (el.type === 'custom') {
+                if ('backgroundColor' in nextStyle) {
+                    delete nextStyle.backgroundColor;
+                    changed = true;
+                }
+                if ('background' in nextStyle) {
+                    delete nextStyle.background;
+                    changed = true;
+                }
+            }
+            if ('color' in nextStyle) {
+                delete nextStyle.color;
+                changed = true;
+            }
+            if (changed) {
+                nextEl = { ...el, style: nextStyle };
+            }
+        }
+        if (nextEl.type === 'text' && nextEl.icon) {
+            const nextIcon = { ...nextEl.icon };
+            if (iconSpecialColor) {
+                nextIcon.color = iconSpecialColor;
+            }
+            else if ('color' in nextIcon) {
+                delete nextIcon.color;
+            }
+            nextEl = { ...nextEl, icon: nextIcon };
         }
-        return { ...el, style: { ...baseStyle, color: matched.color } };
+        return nextEl;
     };
     const traverse = (children = []) => children.map(el => {
         if (!el)
@@ -45,98 +80,12 @@ function backgroundChange(bg, layout) {
         }
         return applySpecialColor(el);
     });
+    const nextChildren = traverse(layout.children || []);
     return {
         ...layout,
         backgroundImage: bg.imgUrl,
         fontColor: bg.fontColor || layout.fontColor,
-        children: traverse(layout.children || []),
+        children: nextChildren,
     };
 }
 exports.backgroundChange = backgroundChange;
-exports.DEFAULT_DECOR_COLOR = '#94a3b8';
-const resolveSpecialStyle = (element, background) => {
-    var _a;
-    if (!background)
-        return {};
-    const keys = [];
-    if (element.binding)
-        keys.push(String(element.binding));
-    if (element.id)
-        keys.push(String(element.id));
-    if (element.type === 'icon')
-        keys.push('icon');
-    if (element.type === 'custom')
-        keys.push('decor');
-    const matched = (_a = background.specialColors) === null || _a === void 0 ? void 0 : _a.find(sc => {
-        const names = toNameArray(sc.name);
-        return names.some(n => keys.some(k => k === null || k === void 0 ? void 0 : k.startsWith(n)));
-    });
-    if (!matched)
-        return {};
-    if (element.type === 'custom') {
-        return { backgroundColor: matched.color };
-    }
-    return { color: matched.color };
-};
-exports.resolveSpecialStyle = resolveSpecialStyle;
-const applySpecialStyle = (el, background = null, options = {}) => {
-    const specialStyle = (0, exports.resolveSpecialStyle)(el, background);
-    const baseStyle = { ...(el.style || {}) };
-    const isCustom = el.type === 'custom';
-    const hasExplicit = isCustom
-        ? Boolean(baseStyle.backgroundColor || baseStyle.background)
-        : baseStyle.color !== undefined && baseStyle.color !== null;
-    const overrideExisting = options.overrideExisting === true;
-    const hasSpecial = Object.keys(specialStyle).length > 0;
-    const defaultDecorColor = options.defaultDecorColor || exports.DEFAULT_DECOR_COLOR;
-    if (hasSpecial) {
-        if (hasExplicit && !overrideExisting)
-            return el;
-        return { ...el, style: { ...baseStyle, ...specialStyle } };
-    }
-    if (overrideExisting && hasExplicit) {
-        const nextStyle = { ...baseStyle };
-        if (isCustom) {
-            nextStyle.backgroundColor = (background === null || background === void 0 ? void 0 : background.mainColor) || defaultDecorColor;
-        }
-        else {
-            delete nextStyle.color;
-        }
-        return { ...el, style: nextStyle };
-    }
-    return el;
-};
-exports.applySpecialStyle = applySpecialStyle;
-const applyBackground = (layout, background, _options = {}) => {
-    var _a;
-    const bgId = Number(background.id);
-    const payload = {
-        id: Number.isFinite(bgId) ? bgId : 0,
-        name: background.name,
-        imgUrl: background.imageUrl,
-        fontColor: background.mainColor,
-        fontColorExtra: ((_a = background.specialColors) === null || _a === void 0 ? void 0 : _a.map(sc => ({
-            name: sc.name,
-            color: sc.color,
-        }))) || [],
-    };
-    return backgroundChange(payload, layout);
-};
-exports.applyBackground = applyBackground;
-const updateElementsStyle = (layout, targetIds, updates) => {
-    const targets = new Set(targetIds);
-    return {
-        ...layout,
-        children: layout.children.map(el => targets.has(el.id)
-            ? { ...el, style: { ...(el.style || {}), ...updates } }
-            : el),
-    };
-};
-exports.updateElementsStyle = updateElementsStyle;
-const setElementVisible = (layout, key, visible) => {
-    return layout.map(la => ({
-        ...la,
-        children: la.children.map(el => (el.key === key ? { ...el, visible } : el)),
-    }));
-};
-exports.setElementVisible = setElementVisible;

package/miniprogram_dist/vendor/km-card-layout-core/render/helpers.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildTextIconMeta = exports.getIconName = exports.getImageSrc = exports.getTextValue = exports.buildImageContentStyle = exports.buildTextContentStyle = exports.buildPanelContentStyle = exports.buildBaseContentStyle = exports.buildBackgroundStyle = exports.buildCardStyle = exports.buildWrapperStyle = void 0;
+exports.buildTextIconMeta = exports.getIconName = exports.getImageSrc = exports.getTextValue = exports.buildImageContentStyle = exports.buildTextValueStyle = exports.buildTextContentStyle = exports.buildPanelContentStyle = exports.buildBaseContentStyle = exports.buildBackgroundStyle = exports.buildCardStyle = exports.buildWrapperStyle = void 0;
 const helpers_1 = require("../helpers");
 const layout_1 = require("../layout");
+const data_1 = require("../data");
 const buildWrapperStyle = (el, unit = 'px') => {
     const abs = (0, layout_1.getAbsLayout)(el);
     if (!abs)
@@ -22,9 +23,6 @@ const buildCardStyle = (layout, unit = 'px') => ({
     width: (0, helpers_1.addUnit)(layout.width, unit),
     height: (0, helpers_1.addUnit)(layout.height, unit),
     color: layout.fontColor,
-    borderRadius: layout.borderRadius !== undefined
-        ? (0, helpers_1.addUnit)(layout.borderRadius, unit)
-        : undefined,
     padding: layout.padding !== undefined ? (0, helpers_1.addUnit)(layout.padding, unit) : undefined,
     position: 'relative',
     overflow: 'hidden',
@@ -34,9 +32,6 @@ const buildCardStyle = (layout, unit = 'px') => ({
 exports.buildCardStyle = buildCardStyle;
 const buildBackgroundStyle = (layout, unit = 'px') => ({
     zIndex: layout.backgroundZIndex,
-    borderRadius: layout.borderRadius !== undefined
-        ? (0, helpers_1.addUnit)(layout.borderRadius, unit)
-        : undefined,
     width: '100%',
     height: '100%',
     position: 'absolute',
@@ -75,23 +70,45 @@ const buildTextContentStyle = (el, unit = 'px') => {
     return style;
 };
 exports.buildTextContentStyle = buildTextContentStyle;
-const buildImageContentStyle = (el) => {
+const buildTextValueStyle = (el, unit = 'px') => {
+    var _a, _b;
+    const style = {
+        letterSpacing: ((_a = el.style) === null || _a === void 0 ? void 0 : _a.letterSpacing) !== undefined && ((_b = el.style) === null || _b === void 0 ? void 0 : _b.letterSpacing) !== null
+            ? (0, helpers_1.addUnit)(el.style.letterSpacing, unit)
+            : '0',
+    };
+    return style;
+};
+exports.buildTextValueStyle = buildTextValueStyle;
+const buildImageContentStyle = (el, unit = 'px') => {
+    var _a, _b, _c, _d;
     const style = { ...(el.style || {}) };
-    const borderWidth = Number(style.borderWidth);
-    if (Number.isFinite(borderWidth) && borderWidth > 0) {
-        if (!style.borderStyle)
-            style.borderStyle = 'solid';
-        if (!style.borderColor)
-            style.borderColor = '#000000';
-    }
+    style.borderWidth =
+        ((_a = el.style) === null || _a === void 0 ? void 0 : _a.borderWidth) !== undefined && ((_b = el.style) === null || _b === void 0 ? void 0 : _b.borderWidth) !== null
+            ? (0, helpers_1.addUnit)(el.style.borderWidth, unit)
+            : '0';
+    style.borderRadius =
+        ((_c = el.style) === null || _c === void 0 ? void 0 : _c.borderRadius) !== undefined && ((_d = el.style) === null || _d === void 0 ? void 0 : _d.borderRadius) !== null
+            ? (0, helpers_1.addUnit)(el.style.borderRadius, unit)
+            : '0';
+    console.log(style);
     return style;
 };
 exports.buildImageContentStyle = buildImageContentStyle;
-const getTextValue = (el) => el.defaultValue !== undefined && el.defaultValue !== null
-    ? `${el.defaultValue}`
-    : '';
+const getTextValue = (el, data) => {
+    const bound = el.binding && data ? (0, data_1.resolveBindingValue)(el.binding, data) : undefined;
+    const val = bound !== undefined && bound !== null
+        ? bound
+        : el.defaultValue !== undefined && el.defaultValue !== null
+            ? el.defaultValue
+            : '';
+    return `${val !== null && val !== void 0 ? val : ''}`;
+};
 exports.getTextValue = getTextValue;
-const getImageSrc = (el) => el.defaultUrl || el.defaultValue || '';
+const getImageSrc = (el, data) => {
+    const bound = el.binding && data ? (0, data_1.resolveBindingValue)(el.binding, data) : undefined;
+    return bound || el.defaultUrl || el.defaultValue || '';
+};
 exports.getImageSrc = getImageSrc;
 const getIconName = (el) => (el.name || el.defaultValue || '');
 exports.getIconName = getIconName;

package/miniprogram_dist/vendor/km-card-layout-core/render/init.js

@@ -0,0 +1,82 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.processCardLayout = exports.handleSpecialFields = void 0;
+function handleSpecialFields(data) {
+    var _a;
+    const user = (_a = data.user) !== null && _a !== void 0 ? _a : {};
+    return {
+        ...data,
+        user: {
+            ...user,
+            // 1. 构造 baseCompanyDuty
+            baseCompanyDuty: user.company && user.duty
+                ? `${user.company} ${user.duty}`
+                : user.baseCompanyDuty,
+            // 2. 构造 moreCardInfo.company
+            moreCardInfo: user.moreCardInfo
+                ? {
+                    ...user.moreCardInfo,
+                    company: Array.isArray(user.moreCardInfo.company)
+                        ? user.moreCardInfo.company.map(item => `${item.company} ${item.duty}`)
+                        : user.moreCardInfo.company,
+                }
+                : user.moreCardInfo,
+        },
+    };
+}
+exports.handleSpecialFields = handleSpecialFields;
+const SHOW_KEYS = new Set([
+    "company_duty_custom",
+    "company_duty_1",
+    "company_duty_2",
+]);
+const HIDE_KEYS = new Set(["company", "duty"]);
+function getCompanyLen(data) {
+    var _a, _b;
+    const company = (_b = (_a = data === null || data === void 0 ? void 0 : data.user) === null || _a === void 0 ? void 0 : _a.moreCardInfo) === null || _b === void 0 ? void 0 : _b.company;
+    return Array.isArray(company) ? company.length : 0;
+}
+function updateElementsVisible(elements, showMore) {
+    if (!elements)
+        return elements;
+    return elements.map((el) => {
+        // 先递归处理 layout-panel 的 children
+        let next = el;
+        if (el.type === "layout-panel") {
+            next = {
+                ...el,
+                children: updateElementsVisible(el.children, showMore),
+            };
+        }
+        const key = next.key;
+        if (!key)
+            return next;
+        // showMore=true: 显示 company_duty_*，隐藏 company/duty
+        // showMore=false: 反过来
+        if (SHOW_KEYS.has(key)) {
+            return { ...next, visible: showMore };
+        }
+        if (HIDE_KEYS.has(key)) {
+            return { ...next, visible: !showMore };
+        }
+        return next;
+    });
+}
+/**
+ * 根据 user.moreCardInfo.company 数组长度切换元素 visible：
+ * - length > 0: key in [company_duty_custom, company_duty_1, company_duty_2] => visible=true
+ *              key in [company, duty] => visible=false
+ * - length === 0: 反之
+ */
+function processCardLayout(layout, data) {
+    const companyLen = getCompanyLen(data);
+    const showMore = companyLen > 0;
+    return layout.map((card) => {
+        var _a;
+        return ({
+            ...card,
+            children: ((_a = updateElementsVisible(card.children, showMore)) !== null && _a !== void 0 ? _a : card.children),
+        });
+    });
+}
+exports.processCardLayout = processCardLayout;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "km-card-layout-component-miniprogram",
-  "version": "0.1.9",
+  "version": "0.1.11",
   "description": "",
   "main": "miniprogram_dist/index.js",
   "miniprogram": "miniprogram_dist",

package/script/sync-core.js

@@ -8,7 +8,6 @@ const targetDir = path.resolve(pkgRoot, 'src/vendor/km-card-layout-core');
 const filesToCopy = [
   'index.ts',
   'types.d.ts',
-  'utils.ts',
   'helpers.ts',
   'layout.ts',
   'data.ts',

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

@@ -14,6 +14,10 @@ Component({
       type: Object,
       value: {},
     },
+    rootData: {
+      type: Object,
+      value: {},
+    },
   },
   data: {
     wrapperStyle: '',

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

@@ -23,6 +23,10 @@ Component({
       type: Object,
       value: {},
     },
+    rootData: {
+      type: Object,
+      value: {},
+    },
   },
   data: {
     wrapperStyle: '',

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

@@ -15,6 +15,10 @@ Component({
       type: Object,
       value: {},
     },
+    rootData: {
+      type: Object,
+      value: {},
+    },
   },
   data: {
     wrapperStyle: '',
@@ -25,9 +29,10 @@ Component({
   observers: {
     element(el: ImageElement) {
       if (!el) return;
+      const data: Record<string, any> = this.data.rootData || {};
       const wrapperStyle = styleObjectToString(buildWrapperStyle(el, 'rpx'), 'rpx');
       const contentStyle = styleObjectToString(buildImageContentStyle(el), 'rpx');
-      const imageSrc = getImageSrc(el);
+      const imageSrc = getImageSrc(el, data);
       const mode = el.fit === 'contain' ? 'aspectFit' : 'aspectFill';
       this.setData({ wrapperStyle, contentStyle, imageSrc, mode });
     },

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

@@ -24,6 +24,10 @@ Component({
       type: Object,
       value: {},
     },
+    rootData: {
+      type: Object,
+      value: {},
+    },
   },
   data: {
     wrapperStyle: '',
@@ -34,9 +38,10 @@ Component({
   observers: {
     element(el: 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 textValue = getTextValue(el);
+      const textValue = getTextValue(el, data);
       const iconRaw = buildTextIconMeta(el, 'rpx');
       const iconMeta =
         iconRaw && iconRaw.name

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

@@ -13,6 +13,35 @@ import {
   styleObjectToString,
 } from '../../vendor/km-card-layout-core/index';
 
+type CompanyDuty = {
+  company: string;
+  duty: string;
+};
+
+const handleSpecialFields = (data: { user: Record<string, any> }) => {
+  const user = data.user ?? {};
+  return {
+    ...data,
+    user: {
+      ...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}`
+                )
+              : user.moreCardInfo.company,
+          }
+        : user.moreCardInfo,
+    },
+  };
+};
+
 type PanelElement = LayoutPanelElement & {
   wrapperStyle: string;
   contentStyle: string;
@@ -82,6 +111,7 @@ Component({
   },
   data: {
     cards: [] as RenderCard[],
+    rootData: {} as Record<string, any>,
   },
   observers: {
     layout() {
@@ -99,16 +129,14 @@ Component({
   methods: {
     rebuild() {
       const layoutInput = ensureArray(this.data.layout as CardLayoutInput);
-
+      const rootData = handleSpecialFields(this.data.data);
       if (!layoutInput.length) {
-        this.setData({ cards: [] });
+        this.setData({ cards: [], rootData });
         return;
       }
-
       const normalizedLayouts = normalizeLayout(layoutInput);
       const cards = buildCards(normalizedLayouts);
-
-      this.setData({ cards });
+      this.setData({ cards, rootData });
     },
   },
 });

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

@@ -10,7 +10,7 @@
           mode="aspectFill"
         />
         <block wx:for="{{item.elements}}" wx:key="id">
-          <template is="render-element" data="{{el:item}}" />
+          <template is="render-element" data="{{el:item, rootData: rootData}}" />
         </block>
       </view>
     </view>
@@ -19,24 +19,24 @@
 
 <template name="render-element">
   <block wx:if="{{el.type === 'image'}}">
-    <image-element element="{{el}}" />
+    <image-element element="{{el}}" rootData="{{rootData}}" />
   </block>
   <block wx:elif="{{el.type === 'icon'}}">
-    <icon-element element="{{el}}" />
+    <icon-element 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}}" />
+          <template is="render-element" data="{{el:item, rootData: rootData}}" />
         </block>
       </view>
     </view>
   </block>
   <block wx:elif="{{el.type === 'custom'}}">
-    <custom-element element="{{el}}" />
+    <custom-element element="{{el}}" rootData="{{rootData}}" />
   </block>
   <block wx:else>
-    <text-element element="{{el}}" />
+    <text-element element="{{el}}" rootData="{{rootData}}" />
   </block>
 </template>