cnhis-design-vue 3.4.0-beta.9 → 3.4.0-release.7

package/es/components/iho-table/src/plugins/verticalTablePlugin/src/utils.js

@@ -35,9 +35,12 @@ function bindHeaderInfoAndFlatten(fieldList, depth) {
     Object.entries(fieldItem).forEach(([key, value]) => {
       if (!key.match(/^header_(\d+)$/))
         return;
+      if (key === `header_${depth}`)
+        return;
       if (value !== prevItem[key] || !value)
         return;
-      if (key === `header_${depth}`)
+      const fieldKey = key + "_key";
+      if (fieldItem[fieldKey] && prevItem[fieldKey] && fieldItem[fieldKey] !== prevItem[fieldKey])
         return;
       fieldItem[`${key}_colspan`] = 0;
       fieldItem[`${key}_rowspan`] = 0;
@@ -47,6 +50,7 @@ function bindHeaderInfoAndFlatten(fieldList, depth) {
   function setHeaderInfo(field, depth2) {
     if (!field.parent) {
       field[`header_${depth2}`] = field.title;
+      field[`header_${depth2}_key`] = field.val_key;
       range(depth2 + 1).forEach((idx) => {
         field[`header_${idx}_colspan`] = idx === depth2 ? depth2 + 1 : 0;
         field[`header_${idx}_rowspan`] = idx === depth2 ? 1 : 0;
@@ -61,15 +65,17 @@ function bindHeaderInfoAndFlatten(fieldList, depth) {
       fieldLine.unshift(currentField);
     }
     range(depth2 + 1).forEach((index) => {
-      var _a, _b;
+      var _a, _b, _c, _d;
       const item = fieldLine[index];
       if (!item) {
         field[`header_${index}`] = "";
+        field[`header_${index}_key`] = "";
         field[`header_${index}_colspan`] = 0;
         field[`header_${index}_rowspan`] = 0;
         return;
       }
       field[`header_${index}`] = (_b = (_a = fieldLine[index]) == null ? void 0 : _a.title) != null ? _b : "";
+      field[`header_${index}_key`] = (_d = (_c = fieldLine[index]) == null ? void 0 : _c.val_key) != null ? _d : "";
       field[`header_${index}_colspan`] = index < fieldDepth ? 1 : depth2 - fieldDepth + 1;
       field[`header_${index}_rowspan`] = getChildrenNum(item);
     });

package/es/components/iho-table/src/types/index.d.ts

@@ -156,7 +156,9 @@ export declare namespace IhoTableLowCodeField {
         }>;
     }>;
     type FilterSetting = Partial<{
-        daterange: boolean;
+        daterange: Partial<{
+            datePickerProps: AnyObject;
+        }>;
         type: 'daterange' | 'text' | 'remote';
         pagination: boolean;
         text: Partial<{