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

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.normalizeMoreCompany = void 0;
+exports.hasCompanyDutyKey = exports.normalizeMoreCompany = void 0;
 const index_1 = require("../../vendor/km-card-layout-core/index");
 const EMPTY_COMPANY_DUTY = {
     company: '',
@@ -88,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',
@@ -125,7 +148,7 @@ Component({
     methods: {
         rebuild() {
             const data = normalizeMoreCompany(this.data.data);
-            const layoutInput = (0, index_1.processCardLayout)(this.data.layout, 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 });

package/package.json

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

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

@@ -135,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',
@@ -172,7 +202,7 @@ Component({
   methods: {
     rebuild() {
       const data = normalizeMoreCompany(this.data.data)
-      const layoutInput = processCardLayout(this.data.layout, data as any);
+      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 });