km-card-layout-core 0.1.12 → 0.1.15

package/dist/ops/changeBackground.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateElementsStyle = exports.applyBackground = exports.applySpecialStyle = exports.resolveSpecialStyle = exports.DEFAULT_DECOR_COLOR = void 0;
+exports.setElementVisible = exports.updateElementsStyle = exports.applyBackground = exports.applySpecialStyle = exports.resolveSpecialStyle = exports.DEFAULT_DECOR_COLOR = void 0;
 exports.backgroundChange = backgroundChange;
 const toNameArray = (name) => {
     if (Array.isArray(name))
@@ -133,3 +133,10 @@ const updateElementsStyle = (layout, targetIds, updates) => {
     };
 };
 exports.updateElementsStyle = updateElementsStyle;
+const setElementVisible = (layout, key, visible) => {
+    return layout.map(la => ({
+        ...la,
+        children: la.children.map(el => (el.id === key ? { ...el, visible } : el)),
+    }));
+};
+exports.setElementVisible = setElementVisible;

package/dist/render/builder.js

@@ -81,11 +81,12 @@ const buildImageContentStyle = (el, unit) => {
     return (0, helpers_1.styleObjectToString)(style, unit);
 };
 const buildTextIcon = (el, unit) => {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e;
     const icon = el.icon;
     if (!icon || icon.enable === false)
         return undefined;
     const style = icon.style || 'fill';
+    // el.extra.icon || 
     const baseName = el.key || el.binding || el.id;
     let name;
     if (style === 'dot')
@@ -109,9 +110,7 @@ const buildTextIcon = (el, unit) => {
         color: color,
         align: icon.align || 'left',
         wrapperStyle: (0, helpers_1.styleObjectToString)({
-            display: 'inline-flex',
-            alignItems: 'center',
-            height: ((_d = el.style) === null || _d === void 0 ? void 0 : _d.lineHeight) || '1',
+            height: ((_d = el.style) === null || _d === void 0 ? void 0 : _d.lineHeight) || ((_e = el.style) === null || _e === void 0 ? void 0 : _e.fontSize),
         }, unit),
     };
 };

package/dist/utils.js

@@ -15,11 +15,24 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DEFAULT_DECOR_COLOR = exports.resolveSpecialStyle = exports.updateElementsStyle = exports.applyBackground = exports.applySpecialStyle = exports.backgroundChange = void 0;
+exports.buildRenderData = buildRenderData;
+const km_card_layout_core_1 = require("km-card-layout-core");
+const changeBackground_1 = require("./ops/changeBackground");
 __exportStar(require("./bindings"), exports);
-var changeBackground_1 = require("./ops/changeBackground");
-Object.defineProperty(exports, "backgroundChange", { enumerable: true, get: function () { return changeBackground_1.backgroundChange; } });
-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; } });
-Object.defineProperty(exports, "resolveSpecialStyle", { enumerable: true, get: function () { return changeBackground_1.resolveSpecialStyle; } });
-Object.defineProperty(exports, "DEFAULT_DECOR_COLOR", { enumerable: true, get: function () { return changeBackground_1.DEFAULT_DECOR_COLOR; } });
+var changeBackground_2 = require("./ops/changeBackground");
+Object.defineProperty(exports, "backgroundChange", { enumerable: true, get: function () { return changeBackground_2.backgroundChange; } });
+Object.defineProperty(exports, "applySpecialStyle", { enumerable: true, get: function () { return changeBackground_2.applySpecialStyle; } });
+Object.defineProperty(exports, "applyBackground", { enumerable: true, get: function () { return changeBackground_2.applyBackground; } });
+Object.defineProperty(exports, "updateElementsStyle", { enumerable: true, get: function () { return changeBackground_2.updateElementsStyle; } });
+Object.defineProperty(exports, "resolveSpecialStyle", { enumerable: true, get: function () { return changeBackground_2.resolveSpecialStyle; } });
+Object.defineProperty(exports, "DEFAULT_DECOR_COLOR", { enumerable: true, get: function () { return changeBackground_2.DEFAULT_DECOR_COLOR; } });
+function buildRenderData(layout, items, config) {
+    // 绑定数据
+    let renderLayout = (0, km_card_layout_core_1.applyItemCollectBindings)(layout, items);
+    // 设置显示逻辑
+    renderLayout = (0, changeBackground_1.setElementVisible)(renderLayout, 'avatar', config.showAvatar);
+    renderLayout = (0, changeBackground_1.setElementVisible)(renderLayout, 'logo', config.showLogo);
+    // 设置背景
+    renderLayout = renderLayout.map((la, index) => (0, km_card_layout_core_1.backgroundChange)(config.currentBg[index], la));
+    return renderLayout;
+}

package/interface/data/payload.ts

@@ -21,6 +21,7 @@ export interface TemplateItem {
   bind: string;
   key?: string;
   icon?: string;
+  extra?: { icon?: string };
   default?: string;
   type: 'text' | 'image';
   cate: number;

package/ops/changeBackground.ts

@@ -102,10 +102,9 @@ export const applySpecialStyle = (
   const specialStyle = 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 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;
@@ -140,8 +139,8 @@ export const applyBackground = (
   const bgId = Number(background.id);
   const payload: TemplateBackground = {
     id: Number.isFinite(bgId) ? bgId : 0,
-    name: background.name,
-    imgUrl: background.imageUrl,
+    name: background.name!,
+    imgUrl: background.imageUrl!,
     fontColor: background.mainColor,
     fontColorExtra:
       background.specialColors?.map(sc => ({
@@ -167,3 +166,14 @@ export const updateElementsStyle = (
     ),
   };
 };
+
+export const setElementVisible = (
+  layout: CardLayoutSchema[],
+  key: string,
+  visible: boolean
+): CardLayoutSchema[] => {
+  return layout.map(la => ({
+    ...la,
+    children: la.children.map(el => (el.id === key ? { ...el, visible } : el)),
+  }));
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "km-card-layout-core",
-  "version": "0.1.12",
+  "version": "0.1.15",
   "description": "Shared render helpers for CardMaster layout JSON (binding resolution, layout normalization).",
   "main": "dist/index.js",
   "types": "types.d.ts",

package/render/builder.ts

@@ -126,8 +126,9 @@ const buildTextIcon = (
 ): RenderNode['icon'] | undefined => {
   const icon = el.icon;
   if (!icon || icon.enable === false) return undefined;
-
+  
   const style = icon.style || 'fill';
+  // el.extra.icon || 
   const baseName = el.key || el.binding || el.id;
   let name: string | undefined;
   if (style === 'dot') name = 'round';
@@ -155,9 +156,7 @@ const buildTextIcon = (
     align: icon.align || 'left',
     wrapperStyle: styleObjectToString(
       {
-        display: 'inline-flex',
-        alignItems: 'center',
-        height: el.style?.lineHeight || '1',
+        height: el.style?.lineHeight || el.style?.fontSize,
       },
       unit
     ),

package/types.d.ts

@@ -149,3 +149,11 @@ export function buildRenderResult(
   data: Record<string, any>,
   unit?: 'px' | 'rpx'
 ): RenderResult;
+
+
+export function buildRenderData (
+  layout: CardLayoutSchema[],
+  items: TemplateItem[],
+  dataInput: Record<string, any>,
+  config: Config
+): CardLayoutSchema[];

package/utils.ts

@@ -1,3 +1,12 @@
+import {
+  applyItemCollectBindings,
+  backgroundChange,
+  CardLayoutSchema,
+  TemplateBackground,
+  TemplateItem,
+} from 'km-card-layout-core';
+import { setElementVisible } from './ops/changeBackground';
+
 export * from './bindings';
 export {
   backgroundChange,
@@ -7,3 +16,29 @@ export {
   resolveSpecialStyle,
   DEFAULT_DECOR_COLOR,
 } from './ops/changeBackground';
+
+export type Config = {
+  showAvatar: boolean;
+  showLogo: boolean;
+  /**
+   * 当前背景 (0 为正面背景 1 为背面背景)
+   */
+  currentBg: TemplateBackground[];
+};
+
+export function buildRenderData(
+  layout: CardLayoutSchema[],
+  items: TemplateItem[],
+  config: Config
+): CardLayoutSchema[] {
+  // 绑定数据
+  let renderLayout = applyItemCollectBindings(layout, items);
+  // 设置显示逻辑
+  renderLayout = setElementVisible(renderLayout, 'avatar', config.showAvatar);
+  renderLayout = setElementVisible(renderLayout, 'logo', config.showLogo);
+  // 设置背景
+  renderLayout = renderLayout.map((la, index) =>
+    backgroundChange(config.currentBg[index], la)
+  );
+  return renderLayout;
+}