km-card-layout-component-miniprogram 0.1.13 → 0.1.15

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

@@ -1,18 +1,28 @@
 <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?.style!=='text'}}">
+    <block wx:if="{{(iconMeta && (iconMeta.name || iconMeta.text)) && (element.icon && element.icon.style !== 'text')}}">
       <view class="km-node__text-content">
-        <block wx:if="{{iconMeta.align === 'right'}}">
-          <text class="km-node__text-value">{{element.icon?.style==='text'&& element.icon.enable?`${element.label}：`:''}}{{textValue || ''}}</text>
-          <view style="{{iconMeta.wrapperStyle}}" class="km-node__text-icon--wrapper"  >
+
+        <!-- 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__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>
         </block>
+
+        <!-- icon 在左侧 -->
         <block wx:else>
-          <view style="{{iconMeta.wrapperStyle}}" class="km-node__text-icon--wrapper">
+          <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 || ''}};"
@@ -20,10 +30,13 @@
           </view>
           <text class="km-node__text-value">{{textValue || ''}}</text>
         </block>
+
       </view>
     </block>
+
+    <!-- 无 icon -->
     <block wx:else>
-      <text class="km-node__text-value">{{element.icon?.style==='text'&& element.icon.enable?`${element.label}：`:''}}{{textValue || ''}}</text>
+      <text class="km-node__text-value">{{(element.icon && element.icon.style === 'text' && element.icon.enable) ? (element.label + '：') : ''}}{{textValue || ''}}</text>
     </block>
   </view>
 </view>

package/miniprogram_dist/components/card-layout/index.js

@@ -1,6 +1,41 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.normalizeMoreCompany = void 0;
 const index_1 = require("../../vendor/km-card-layout-core/index");
+const EMPTY_COMPANY_DUTY = {
+    company: '',
+    duty: '',
+};
+/**
+ * 规范化 moreCardInfo.company，保证长度始终为 2
+ */
+function normalizeMoreCompany(data) {
+    var _a, _b;
+    const origin = (_b = (_a = data.user) === null || _a === void 0 ? void 0 : _a.moreCardInfo) === null || _b === void 0 ? void 0 : _b.company;
+    // 不存在 / 不是数组 → 不处理
+    if (!Array.isArray(origin)) {
+        return data;
+    }
+    // 长度 === 0 → 不处理
+    if (origin.length === 0) {
+        return data;
+    }
+    const normalized = origin.slice(0, 2);
+    while (normalized.length < 2) {
+        normalized.push({ ...EMPTY_COMPANY_DUTY });
+    }
+    return {
+        ...data,
+        user: {
+            ...data.user,
+            moreCardInfo: {
+                ...data.user.moreCardInfo,
+                company: normalized,
+            },
+        },
+    };
+}
+exports.normalizeMoreCompany = normalizeMoreCompany;
 const handleSpecialFields = (data) => {
     var _a;
     const user = (_a = data.user) !== null && _a !== void 0 ? _a : {};
@@ -89,8 +124,9 @@ Component({
     },
     methods: {
         rebuild() {
-            const layoutInput = ensureArray(this.data.layout);
-            const rootData = handleSpecialFields(this.data.data);
+            const data = normalizeMoreCompany(this.data.data);
+            const layoutInput = (0, index_1.processCardLayout)(this.data.layout, data);
+            const rootData = handleSpecialFields(data);
             if (!layoutInput.length) {
                 this.setData({ cards: [], rootData });
                 return;

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

@@ -1,9 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-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;
+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.mockBaseCompanyDutyTemplateItem = void 0;
 const helpers_1 = require("../helpers");
 const layout_1 = require("../layout");
 const data_1 = require("../data");
+exports.mockBaseCompanyDutyTemplateItem = {
+    id: -1,
+    name: 'company_duty_custom',
+    bind: 'user.baseCompanyDuty',
+    key: 'company_duty_custom',
+    type: 'text',
+    cate: 0,
+};
 const buildWrapperStyle = (el, unit = 'px') => {
     const abs = (0, layout_1.getAbsLayout)(el);
     if (!abs)
@@ -99,7 +107,11 @@ const buildImageContentStyle = (el, unit = 'px') => {
 };
 exports.buildImageContentStyle = buildImageContentStyle;
 const getTextValue = (el, data) => {
-    const bound = el.binding && data ? (0, data_1.resolveBindingValue)(el.binding, data) : undefined;
+    // 如果 id 匹配，则使用 mock 的 binding，否则用原来的
+    const binding = el.id === String(exports.mockBaseCompanyDutyTemplateItem.id)
+        ? exports.mockBaseCompanyDutyTemplateItem.bind
+        : el.binding;
+    const bound = binding && data ? (0, data_1.resolveBindingValue)(binding, data) : undefined;
     const val = bound !== undefined && bound !== null
         ? bound
         : el.defaultValue !== undefined && el.defaultValue !== null

package/package.json

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

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

@@ -1,18 +1,28 @@
 <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?.style!=='text'}}">
+    <block wx:if="{{(iconMeta && (iconMeta.name || iconMeta.text)) && (element.icon && element.icon.style !== 'text')}}">
       <view class="km-node__text-content">
-        <block wx:if="{{iconMeta.align === 'right'}}">
-          <text class="km-node__text-value">{{element.icon?.style==='text'&& element.icon.enable?`${element.label}：`:''}}{{textValue || ''}}</text>
-          <view style="{{iconMeta.wrapperStyle}}" class="km-node__text-icon--wrapper"  >
+
+        <!-- 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__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>
         </block>
+
+        <!-- icon 在左侧 -->
         <block wx:else>
-          <view style="{{iconMeta.wrapperStyle}}" class="km-node__text-icon--wrapper">
+          <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 || ''}};"
@@ -20,10 +30,13 @@
           </view>
           <text class="km-node__text-value">{{textValue || ''}}</text>
         </block>
+
       </view>
     </block>
+
+    <!-- 无 icon -->
     <block wx:else>
-      <text class="km-node__text-value">{{element.icon?.style==='text'&& element.icon.enable?`${element.label}：`:''}}{{textValue || ''}}</text>
+      <text class="km-node__text-value">{{(element.icon && element.icon.style === 'text' && element.icon.enable) ? (element.label + '：') : ''}}{{textValue || ''}}</text>
     </block>
   </view>
 </view>

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

@@ -10,6 +10,7 @@ import {
   buildPanelContentStyle,
   buildWrapperStyle,
   normalizeLayout,
+  processCardLayout,
   styleObjectToString,
 } from '../../vendor/km-card-layout-core/index';
 
@@ -18,6 +19,48 @@ type CompanyDuty = {
   duty: string;
 };
 
+
+
+const EMPTY_COMPANY_DUTY: CompanyDuty = {
+  company: '',
+  duty: '',
+};
+
+/**
+ * 规范化 moreCardInfo.company，保证长度始终为 2
+ */
+export function normalizeMoreCompany(data: AnyObject): AnyObject {
+  const origin = data.user?.moreCardInfo?.company;
+
+  // 不存在 / 不是数组 → 不处理
+  if (!Array.isArray(origin)) {
+    return data;
+  }
+
+  // 长度 === 0 → 不处理
+  if (origin.length === 0) {
+    return data;
+  }
+
+  const normalized = origin.slice(0, 2);
+
+  while (normalized.length < 2) {
+    normalized.push({ ...EMPTY_COMPANY_DUTY });
+  }
+
+  return {
+    ...data,
+    user: {
+      ...data.user,
+      moreCardInfo: {
+        ...data.user.moreCardInfo,
+        company: normalized,
+      },
+    },
+  };
+}
+
+
 const handleSpecialFields = (data: { user: Record<string, any> }) => {
   const user = data.user ?? {};
   return {
@@ -128,8 +171,9 @@ Component({
   },
   methods: {
     rebuild() {
-      const layoutInput = ensureArray(this.data.layout as CardLayoutInput);
-      const rootData = handleSpecialFields(this.data.data);
+      const data = normalizeMoreCompany(this.data.data)
+      const layoutInput = processCardLayout(this.data.layout, data as any);
+      const rootData = handleSpecialFields(data as any);
       if (!layoutInput.length) {
         this.setData({ cards: [], rootData });
         return;

package/src/vendor/km-card-layout-core/render/helpers.ts

@@ -7,9 +7,19 @@ import type {
   IconElement,
   ImageElement,
   LayoutPanelElement,
+  TemplateItem,
   TextElement,
 } from '../interface';
 
+export const mockBaseCompanyDutyTemplateItem: TemplateItem = {
+  id: -1,
+  name: 'company_duty_custom',
+  bind: 'user.baseCompanyDuty',
+  key: 'company_duty_custom',
+  type: 'text',
+  cate: 0,
+};
+
 export const buildWrapperStyle = (
   el: CardElement,
   unit: 'px' | 'rpx' = 'px'
@@ -124,18 +134,30 @@ export const buildImageContentStyle = (
   return style;
 };
 
-export const getTextValue = (el: TextElement, data?: Record<string, any>) => {
+export const getTextValue = (
+  el: TextElement,
+  data?: Record<string, any>
+) => {
+  // 如果 id 匹配，则使用 mock 的 binding，否则用原来的
+  const binding =
+    el.id === String(mockBaseCompanyDutyTemplateItem.id)
+      ? mockBaseCompanyDutyTemplateItem.bind
+      : el.binding;
+
   const bound =
-    el.binding && data ? resolveBindingValue(el.binding, data) : undefined;
+    binding && data ? resolveBindingValue(binding, data) : undefined;
+
   const val =
     bound !== undefined && bound !== null
       ? bound
       : el.defaultValue !== undefined && el.defaultValue !== null
       ? el.defaultValue
       : '';
+
   return `${val ?? ''}`;
 };
 
+
 export const getImageSrc = (el: ImageElement, data?: Record<string, any>) => {
   const bound =
     el.binding && data ? resolveBindingValue(el.binding, data) : undefined;