km-card-layout-component-miniprogram 0.1.14 → 0.1.16

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

@@ -1,6 +1,41 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.hasCompanyDutyKey = 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 : {};
@@ -53,6 +88,29 @@ const buildCards = (layouts) => {
         elements: decorateElements(layout.children || []),
     }));
 };
+const hasCompanyDutyKey = (schemas) => {
+    const TARGET_KEYS = new Set([
+        'company_duty_custom',
+        'company_duty_1',
+        'company_duty_2',
+    ]);
+    const traverse = (elements) => {
+        return elements.some(el => {
+            var _a;
+            // 命中 key
+            if (el.key && TARGET_KEYS.has(el.key)) {
+                return true;
+            }
+            // 递归 layout-panel
+            if (el.type === 'layout-panel' && ((_a = el.children) === null || _a === void 0 ? void 0 : _a.length)) {
+                return traverse(el.children);
+            }
+            return false;
+        });
+    };
+    return schemas.some(schema => traverse(schema.children));
+};
+exports.hasCompanyDutyKey = hasCompanyDutyKey;
 Component({
     options: {
         styleIsolation: 'apply-shared',
@@ -89,8 +147,9 @@ Component({
     },
     methods: {
         rebuild() {
-            const layoutInput = (0, index_1.processCardLayout)(this.data.layout, this.data.data);
-            const rootData = handleSpecialFields(this.data.data);
+            const data = normalizeMoreCompany(this.data.data);
+            const layoutInput = (0, exports.hasCompanyDutyKey)(this.data.layout) ? (0, index_1.processCardLayout)(this.data.layout, data) : this.data.layout;
+            const rootData = handleSpecialFields(data);
             if (!layoutInput.length) {
                 this.setData({ cards: [], rootData });
                 return;

package/package.json

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

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

@@ -19,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 {
@@ -93,6 +135,36 @@ const buildCards = (layouts: CardLayoutSchema[]) => {
   }));
 };
 
+
+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 => {
+      // 命中 key
+      if (el.key && TARGET_KEYS.has(el.key)) {
+        return true;
+      }
+
+      // 递归 layout-panel
+      if (el.type === 'layout-panel' && el.children?.length) {
+        return traverse(el.children);
+      }
+
+      return false;
+    });
+  };
+
+  return schemas.some(schema => traverse(schema.children));
+};
+
+
 Component({
   options: {
     styleIsolation: 'apply-shared',
@@ -129,8 +201,9 @@ Component({
   },
   methods: {
     rebuild() {
-      const layoutInput = processCardLayout(this.data.layout, this.data.data);
-      const rootData = handleSpecialFields(this.data.data);
+      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 });
         return;