@nokecy/qc-ui 1.1.50 → 1.1.51

package/dist/esm/array-table/utils.js

@@ -1,5 +1,5 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-var _excluded = ["hide", "sort", "sortIndex", "forceAgField"];
+var _excluded = ["hide", "sort", "sortIndex", "forceAgField", "headerGroup", "defaultHide"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -14,6 +14,7 @@ import { isArr, lazyMerge } from '@formily/shared';
 import { Schema } from '@formily/json-schema';
 import ArrayBase from "./arrayBase";
 import { getReadOnlyFormatter } from "./readOnlyFormatters";
+import { markHeaderGroup } from "./columnGroup";
 var isColumnComponent = function isColumnComponent(schema) {
   var _schema$xComponent;
   return ((_schema$xComponent = schema['x-component']) === null || _schema$xComponent === void 0 ? void 0 : _schema$xComponent.indexOf('Column')) > -1;
@@ -205,10 +206,12 @@ var resolveLazyCellPattern = function resolveLazyCellPattern(arrayField, record,
   try {
     var _arrayField$value$ind, _arrayField$value, _arrayField$value$ind2;
     var index = (_arrayField$value$ind = (_arrayField$value = arrayField.value) === null || _arrayField$value === void 0 || (_arrayField$value$ind2 = _arrayField$value.indexOf) === null || _arrayField$value$ind2 === void 0 ? void 0 : _arrayField$value$ind2.call(_arrayField$value, record)) !== null && _arrayField$value$ind !== void 0 ? _arrayField$value$ind : -1;
-    var path = arrayField.address.concat(index).concat(dataKey);
+    // 与真字段一致:path 是数据路径(不含 void 容器),address 含 void 容器;表达式里 getValuesIn($self.path...) 靠前者
+    var path = arrayField.path.concat(index).concat(dataKey);
+    var address = arrayField.address.concat(index).concat(dataKey);
     var self = {
       path: path,
-      address: path,
+      address: address,
       index: index,
       form: form,
       parent: arrayField,
@@ -413,6 +416,8 @@ var buildArrayTableColumns = function buildArrayTableColumns(dataSource, field,
       sort = columnProps.sort,
       sortIndex = columnProps.sortIndex,
       forceAgField = columnProps.forceAgField,
+      headerGroup = columnProps.headerGroup,
+      defaultHide = columnProps.defaultHide,
       safeColumnProps = _objectWithoutProperties(columnProps, _excluded);
     var base = _objectSpread(_objectSpread({}, safeColumnProps), {}, {
       // 保留 width 作为列的初始宽度
@@ -420,7 +425,15 @@ var buildArrayTableColumns = function buildArrayTableColumns(dataSource, field,
       //@ts-ignore
       headerName: columnProps.headerName || columnProps.title,
       field: name
-    });
+    }, defaultHide === true ? {
+      initialHide: true
+    } : {});
+
+    // 记下分组名再输出列定义;真正合并成列组在 index.tsx 交给 AG-Grid 之前(groupColumnDefs)做,
+    // 这里产出的仍是扁平列定义。@author nokecy
+    var emit = function emit(colDef) {
+      return buf.concat(markHeaderGroup(colDef, headerGroup));
+    };
 
     // 三分流渲染策略:@author nokecy
     //   ① 只读纯文本(永不可编辑):只读列 + 有格式化器 -> valueFormatter,不挂 Formily 树。
@@ -456,7 +469,7 @@ var buildArrayTableColumns = function buildArrayTableColumns(dataSource, field,
       // 读 AG-Grid 缓存值不刷新 → 反应式只读渲染。整表 readPretty(明细/详情页,数据 setValues 整体加载、
       // 行引用整体替换、AG-Grid 自然刷新)仍走更廉价的静态 valueFormatter 快路径。@author nokecy
       if (arrayPattern !== 'readPretty') {
-        return buf.concat(_objectSpread(_objectSpread(_objectSpread({}, base), valueGetter ? {
+        return emit(_objectSpread(_objectSpread(_objectSpread({}, base), valueGetter ? {
           valueGetter: valueGetter
         } : {}), {}, {
           cellRenderer: LazyReadOnlyText,
@@ -467,7 +480,7 @@ var buildArrayTableColumns = function buildArrayTableColumns(dataSource, field,
           }
         }));
       }
-      return buf.concat(_objectSpread(_objectSpread(_objectSpread({}, base), valueGetter ? {
+      return emit(_objectSpread(_objectSpread(_objectSpread({}, base), valueGetter ? {
         valueGetter: valueGetter
       } : {}), {}, {
         // 显式清掉可能从 safeColumnProps 漏带的 cellRenderer(AG-Grid 中 renderer 优先级高于 formatter)
@@ -483,7 +496,7 @@ var buildArrayTableColumns = function buildArrayTableColumns(dataSource, field,
 
     // ② 可编辑懒挂载(排除单击直控的 Switch/Checkbox:须 eager 出真控件)
     if (!readOnly && formatter && !hasReactions && !forceEager && !isInlineToggle && canFastPath) {
-      return buf.concat(_objectSpread(_objectSpread(_objectSpread({}, base), valueGetter ? {
+      return emit(_objectSpread(_objectSpread(_objectSpread({}, base), valueGetter ? {
         valueGetter: valueGetter
       } : {}), {}, {
         cellRenderer: LazyAgField,
@@ -500,7 +513,7 @@ var buildArrayTableColumns = function buildArrayTableColumns(dataSource, field,
     }
 
     // ③ 兜底全树
-    return buf.concat(_objectSpread(_objectSpread({}, base), {}, {
+    return emit(_objectSpread(_objectSpread({}, base), {}, {
       cellRendererParams: {
         dataSource: dataSource,
         schema: schema,