@nokecy/qc-ui 1.1.87 → 1.1.89

package/dist/cjs/ag-grid-plus/setting/columnGroupUtils.d.ts

@@ -8,6 +8,20 @@ import type { FlatColumnItem, OldColumnState } from './columnGroupTypes';
  * 生成唯一 ID
  */
 export declare const generateId: () => string;
+/** 方案与 AG-Grid 使用相同的列标识规则。@author nokecy */
+export declare function getColumnIdentity(column: {
+    colId?: string;
+    field?: string;
+}): string | undefined;
+/** 递归匹配业务列；仅对缺失标识的已存方案使用唯一原始标题恢复。@author nokecy */
+export declare function findOriginalColumn(item: {
+    colId?: string;
+    field?: string;
+    originalHeaderName?: string;
+    headerName?: string;
+}, definitions?: (ColDef | ColGroupDef)[]): ColDef | undefined;
+/** 为列方案补齐业务列身份，保留用户的顺序、标题与布局设置。@author nokecy */
+export declare function normalizeColumnConfig(items: FlatColumnItem[], definitions?: (ColDef | ColGroupDef)[]): FlatColumnItem[];
 /**
  * 去掉只做查询条件的列（hideInTable），含分组内的
  * 这类列只进查询表单，不是表格列：列方案的还原、新增列检测都不能把它带进表格

package/dist/cjs/ag-grid-plus/setting/columnGroupUtils.js

@@ -7,13 +7,16 @@ exports.checkIsLastChild = checkIsLastChild;
 exports.dropQueryOnlyItems = dropQueryOnlyItems;
 exports.excludeQueryOnlyColumns = excludeQueryOnlyColumns;
 exports.findLastDescendantIndex = findLastDescendantIndex;
+exports.findOriginalColumn = findOriginalColumn;
 exports.flatConfigToColumnState = flatConfigToColumnState;
 exports.flatConfigToGridState = flatConfigToGridState;
 exports.generateId = void 0;
+exports.getColumnIdentity = getColumnIdentity;
 exports.gridStateToFlatConfig = gridStateToFlatConfig;
 exports.isOldSchemeData = isOldSchemeData;
 exports.migrateOldScheme = migrateOldScheme;
 exports.normalizeCellAlign = normalizeCellAlign;
+exports.normalizeColumnConfig = normalizeColumnConfig;
 exports.reorderItems = reorderItems;
 var _lodash = require("lodash");
 var _logger = require("../utils/logger");
@@ -40,6 +43,49 @@ var generateId = exports.generateId = function generateId() {
   return (0, _lodash.uniqueId)('col_');
 };
 
+/** 方案与 AG-Grid 使用相同的列标识规则。@author nokecy */
+function getColumnIdentity(column) {
+  return column.colId || column.field || undefined;
+}
+
+/** 递归匹配业务列；仅对缺失标识的已存方案使用唯一原始标题恢复。@author nokecy */
+function findOriginalColumn(item, definitions) {
+  var columns = [];
+  var collect = function collect(defs) {
+    return defs.forEach(function (def) {
+      if ('children' in def && def.children) collect(def.children);else columns.push(def);
+    });
+  };
+  collect(definitions !== null && definitions !== void 0 ? definitions : []);
+  if (item.colId) return columns.find(function (column) {
+    return getColumnIdentity(column) === item.colId;
+  });
+  var title = item.originalHeaderName || item.headerName;
+  var candidates = item.field ? columns.filter(function (column) {
+    return column.field === item.field;
+  }) : columns.filter(function (column) {
+    return !!getColumnIdentity(column) && !!title && column.headerName === title;
+  });
+  if (candidates.length === 1) return candidates[0];
+  var named = candidates.filter(function (column) {
+    return !!title && column.headerName === title;
+  });
+  return named.length === 1 ? named[0] : undefined;
+}
+
+/** 为列方案补齐业务列身份，保留用户的顺序、标题与布局设置。@author nokecy */
+function normalizeColumnConfig(items, definitions) {
+  return items.map(function (item) {
+    if (item.type !== 'column') return item;
+    var original = findOriginalColumn(item, definitions);
+    return original ? _objectSpread(_objectSpread({}, item), {}, {
+      colId: original.colId,
+      field: original.field,
+      originalHeaderName: original.headerName || item.originalHeaderName
+    }) : item;
+  });
+}
+
 /**
  * 去掉只做查询条件的列（hideInTable），含分组内的
  * 这类列只进查询表单，不是表格列：列方案的还原、新增列检测都不能把它带进表格
@@ -64,12 +110,12 @@ function dropQueryOnlyItems(flatConfig, originalColumnDefs) {
   var queryOnlyFields = new Set();
   var collect = function collect(defs) {
     return defs.forEach(function (def) {
-      if ('children' in def && def.children) collect(def.children);else if (def.hideInTable && def.field) queryOnlyFields.add(def.field);
+      if ('children' in def && def.children) collect(def.children);else if (def.hideInTable && getColumnIdentity(def)) queryOnlyFields.add(getColumnIdentity(def));
     });
   };
   collect(originalColumnDefs !== null && originalColumnDefs !== void 0 ? originalColumnDefs : []);
   return flatConfig.filter(function (item) {
-    return item.type !== 'column' || !item.field || !queryOnlyFields.has(item.field);
+    return item.type !== 'column' || !getColumnIdentity(item) || !queryOnlyFields.has(getColumnIdentity(item));
   });
 }
 
@@ -85,37 +131,6 @@ function gridStateToFlatConfig(columnDefs, originalColumnDefs) {
   var result = [];
   var order = 0;
 
-  /**
-   * 从原始列定义中查找指定字段的原始 headerName
-   */
-  function findOriginalHeaderName(field, defs) {
-    if (!defs || !field) return undefined;
-    var _iterator = _createForOfIteratorHelper(defs),
-      _step;
-    try {
-      for (_iterator.s(); !(_step = _iterator.n()).done;) {
-        var def = _step.value;
-        // 检查是否是分组
-        if ('children' in def && def.children) {
-          // 递归查找分组内的列
-          var found = findOriginalHeaderName(field, def.children);
-          if (found) return found;
-        } else {
-          // 检查是否是目标列
-          var colDef = def;
-          if (colDef.field === field) {
-            return colDef.headerName;
-          }
-        }
-      }
-    } catch (err) {
-      _iterator.e(err);
-    } finally {
-      _iterator.f();
-    }
-    return undefined;
-  }
-
   /**
    * 递归遍历列定义树
    */
@@ -140,10 +155,11 @@ function gridStateToFlatConfig(columnDefs, originalColumnDefs) {
         // 递归处理子节点
         traverse(item.children, level + 1, groupId);
       } else {
+        var _findOriginalColumn;
         // 这是一个列节点
         var _headerName = item.headerName || item.field || '未命名列';
         // 从原始列定义中获取 originalHeaderName,如果没有则使用当前 headerName
-        var originalHeaderName = item.field ? findOriginalHeaderName(item.field, originalColumnDefs) || _headerName : _headerName;
+        var originalHeaderName = ((_findOriginalColumn = findOriginalColumn(item, originalColumnDefs)) === null || _findOriginalColumn === void 0 ? void 0 : _findOriginalColumn.headerName) || _headerName;
         result.push({
           id: generateId(),
           type: 'column',
@@ -151,6 +167,7 @@ function gridStateToFlatConfig(columnDefs, originalColumnDefs) {
           level: level,
           order: order++,
           field: item.field,
+          colId: item.colId,
           headerName: _headerName,
           originalHeaderName: originalHeaderName,
           // 从原始定义获取,或使用当前值
@@ -183,50 +200,19 @@ function gridStateToFlatConfig(columnDefs, originalColumnDefs) {
  */
 function flatConfigToGridState(flatConfig, originalColumnDefs) {
   // 只做查询条件的列不进表格：方案里存过的剔除，也不当新增列补回 @author nokecy
-  flatConfig = dropQueryOnlyItems(flatConfig, originalColumnDefs);
+  flatConfig = dropQueryOnlyItems(normalizeColumnConfig(flatConfig, originalColumnDefs), originalColumnDefs);
   originalColumnDefs = excludeQueryOnlyColumns(originalColumnDefs);
 
-  /**
-   * 从原始列定义中查找指定字段的列定义（支持递归查找分组内的列）
-   */
-  function findOriginalColDef(field, defs) {
-    if (!defs) return undefined;
-    var _iterator2 = _createForOfIteratorHelper(defs),
-      _step2;
-    try {
-      for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-        var def = _step2.value;
-        // 检查是否是分组
-        if ('children' in def && def.children) {
-          // 递归查找分组内的列
-          var found = findOriginalColDef(field, def.children);
-          if (found) return found;
-        } else {
-          // 检查是否是目标列（使用类型守卫）
-          var colDef = def;
-          if (colDef.field === field) {
-            return colDef;
-          }
-        }
-      }
-    } catch (err) {
-      _iterator2.e(err);
-    } finally {
-      _iterator2.f();
-    }
-    return undefined;
-  }
-
   /**
    * 递归收集所有列定义（包括分组内的列）
    */
   function collectAllColumns(defs) {
     var columns = [];
-    var _iterator3 = _createForOfIteratorHelper(defs),
-      _step3;
+    var _iterator = _createForOfIteratorHelper(defs),
+      _step;
     try {
-      for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-        var def = _step3.value;
+      for (_iterator.s(); !(_step = _iterator.n()).done;) {
+        var def = _step.value;
         if ('children' in def && def.children) {
           columns.push.apply(columns, _toConsumableArray(collectAllColumns(def.children)));
         } else {
@@ -234,9 +220,9 @@ function flatConfigToGridState(flatConfig, originalColumnDefs) {
         }
       }
     } catch (err) {
-      _iterator3.e(err);
+      _iterator.e(err);
     } finally {
-      _iterator3.f();
+      _iterator.f();
     }
     return columns;
   }
@@ -264,7 +250,7 @@ function flatConfigToGridState(flatConfig, originalColumnDefs) {
       } else {
         // 构建列节点
         // 查找原始列定义
-        var originalDef = item.field ? findOriginalColDef(item.field, originalColumnDefs) : undefined;
+        var originalDef = findOriginalColumn(item, originalColumnDefs);
 
         // 如果找到原始列定义，合并所有属性
         if (originalDef) {
@@ -284,6 +270,7 @@ function flatConfigToGridState(flatConfig, originalColumnDefs) {
         // 如果没有找到原始定义，使用基本属性
         return {
           field: item.field,
+          colId: item.colId,
           headerName: item.headerName,
           width: item.width,
           hide: item.hide,
@@ -302,9 +289,9 @@ function flatConfigToGridState(flatConfig, originalColumnDefs) {
   if (originalColumnDefs && originalColumnDefs.length > 0) {
     // 收集 flatConfig 中所有已存在的 field
     var existingFields = new Set(flatConfig.filter(function (item) {
-      return item.type === 'column' && item.field;
+      return item.type === 'column' && getColumnIdentity(item);
     }).map(function (item) {
-      return item.field;
+      return getColumnIdentity(item);
     }));
 
     // 收集原始列定义中所有的列（保留顺序索引）
@@ -313,7 +300,7 @@ function flatConfigToGridState(flatConfig, originalColumnDefs) {
     // 找出新增的列及其在原始定义中的索引
     var newColumnsWithIndex = [];
     allOriginalColumns.forEach(function (col, index) {
-      if (col.field && !existingFields.has(col.field)) {
+      if (getColumnIdentity(col) && !existingFields.has(getColumnIdentity(col))) {
         newColumnsWithIndex.push({
           col: col,
           originalIndex: index
@@ -328,23 +315,23 @@ function flatConfigToGridState(flatConfig, originalColumnDefs) {
       });
 
       // 将新增列插入到正确位置（基于其在原始定义中的相对位置）
-      var _iterator4 = _createForOfIteratorHelper(newColumnsWithIndex),
-        _step4;
+      var _iterator2 = _createForOfIteratorHelper(newColumnsWithIndex),
+        _step2;
       try {
-        for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
-          var _step4$value = _step4.value,
-            col = _step4$value.col,
-            originalIndex = _step4$value.originalIndex;
+        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+          var _step2$value = _step2.value,
+            col = _step2$value.col,
+            originalIndex = _step2$value.originalIndex;
           var insertIndex = 0; // 默认插入到开头
 
           // 从该列之前的列开始查找，找到第一个在 result 中存在的列
           var _loop = function _loop() {
               var prevCol = allOriginalColumns[i];
-              if (!prevCol.field) return 0; // continue
+              if (!getColumnIdentity(prevCol)) return 0; // continue
 
               // 在 result 中找到这个前置列的位置
               var prevIndexInResult = result.findIndex(function (r) {
-                return r.field === prevCol.field;
+                return getColumnIdentity(r) === getColumnIdentity(prevCol);
               });
               if (prevIndexInResult !== -1) {
                 insertIndex = prevIndexInResult + 1;
@@ -362,9 +349,9 @@ function flatConfigToGridState(flatConfig, originalColumnDefs) {
           result.splice(insertIndex, 0, col);
         }
       } catch (err) {
-        _iterator4.e(err);
+        _iterator2.e(err);
       } finally {
-        _iterator4.f();
+        _iterator2.f();
       }
     }
   }
@@ -409,6 +396,7 @@ function migrateOldScheme(oldState) {
       level: col.groupName ? 1 : 0,
       order: order++,
       field: col.field,
+      colId: col.colId,
       headerName: col.headerName,
       width: col.width,
       hide: col.hide,
@@ -504,7 +492,7 @@ function isOldSchemeData(data) {
  */
 function flatConfigToColumnState(flatConfig, originalColumnDefs) {
   // 只做查询条件的列不进表格：方案里存过的剔除，也不当新增列补回 @author nokecy
-  flatConfig = dropQueryOnlyItems(flatConfig, originalColumnDefs);
+  flatConfig = dropQueryOnlyItems(normalizeColumnConfig(flatConfig, originalColumnDefs), originalColumnDefs);
   originalColumnDefs = excludeQueryOnlyColumns(originalColumnDefs);
 
   /**
@@ -512,11 +500,11 @@ function flatConfigToColumnState(flatConfig, originalColumnDefs) {
    */
   function collectAllColumns(defs) {
     var columns = [];
-    var _iterator5 = _createForOfIteratorHelper(defs),
-      _step5;
+    var _iterator3 = _createForOfIteratorHelper(defs),
+      _step3;
     try {
-      for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
-        var def = _step5.value;
+      for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+        var def = _step3.value;
         if ('children' in def && def.children) {
           columns.push.apply(columns, _toConsumableArray(collectAllColumns(def.children)));
         } else {
@@ -524,9 +512,9 @@ function flatConfigToColumnState(flatConfig, originalColumnDefs) {
         }
       }
     } catch (err) {
-      _iterator5.e(err);
+      _iterator3.e(err);
     } finally {
-      _iterator5.f();
+      _iterator3.f();
     }
     return columns;
   }
@@ -534,14 +522,14 @@ function flatConfigToColumnState(flatConfig, originalColumnDefs) {
     return item.type === 'column';
   }) // 只处理列节点，分组不在 columnState 中
   .filter(function (item) {
-    return item.field;
-  }) // 【修复】过滤掉没有 field 的列，防止 colId 为 undefined
+    return getColumnIdentity(item);
+  }) // 控件列可只有 colId。@author nokecy
   .sort(function (a, b) {
     return a.order - b.order;
   }) // 按 order 字段排序
   .map(function (item) {
     var state = {
-      colId: item.field // 使用 field 作为 colId
+      colId: getColumnIdentity(item)
     };
 
     // 只设置有值的属性，undefined 表示不改变该属性
@@ -560,9 +548,9 @@ function flatConfigToColumnState(flatConfig, originalColumnDefs) {
   if (originalColumnDefs && originalColumnDefs.length > 0) {
     // 收集 flatConfig 中所有已存在的 field
     var existingFields = new Set(flatConfig.filter(function (item) {
-      return item.type === 'column' && item.field;
+      return item.type === 'column' && getColumnIdentity(item);
     }).map(function (item) {
-      return item.field;
+      return getColumnIdentity(item);
     }));
 
     // 收集原始列定义中所有的列（保留顺序索引）
@@ -571,7 +559,7 @@ function flatConfigToColumnState(flatConfig, originalColumnDefs) {
     // 找出新增的列及其在原始定义中的索引
     var newColumnsWithIndex = [];
     allOriginalColumns.forEach(function (col, index) {
-      if (col.field && !existingFields.has(col.field)) {
+      if (getColumnIdentity(col) && !existingFields.has(getColumnIdentity(col))) {
         newColumnsWithIndex.push({
           col: col,
           originalIndex: index
@@ -586,23 +574,23 @@ function flatConfigToColumnState(flatConfig, originalColumnDefs) {
       });
 
       // 将新增列插入到正确位置（基于其在原始定义中的相对位置）
-      var _iterator6 = _createForOfIteratorHelper(newColumnsWithIndex),
-        _step6;
+      var _iterator4 = _createForOfIteratorHelper(newColumnsWithIndex),
+        _step4;
       try {
-        for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
-          var _step6$value = _step6.value,
-            col = _step6$value.col,
-            originalIndex = _step6$value.originalIndex;
+        for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+          var _step4$value = _step4.value,
+            col = _step4$value.col,
+            originalIndex = _step4$value.originalIndex;
           var insertIndex = 0; // 默认插入到开头
 
           // 从该列之前的列开始查找，找到第一个在 result 中存在的列
           var _loop2 = function _loop2() {
               var prevCol = allOriginalColumns[i];
-              if (!prevCol.field) return 0; // continue
+              if (!getColumnIdentity(prevCol)) return 0; // continue
 
               // 在 result 中找到这个前置列的位置
               var prevIndexInResult = result.findIndex(function (r) {
-                return r.colId === prevCol.field;
+                return r.colId === getColumnIdentity(prevCol);
               });
               if (prevIndexInResult !== -1) {
                 insertIndex = prevIndexInResult + 1;
@@ -618,14 +606,14 @@ function flatConfigToColumnState(flatConfig, originalColumnDefs) {
 
           // 在 insertIndex 位置插入新列状态
           result.splice(insertIndex, 0, {
-            colId: col.field
+            colId: getColumnIdentity(col)
             // 新增列使用默认状态，不设置 hide/width 等
           });
         }
       } catch (err) {
-        _iterator6.e(err);
+        _iterator4.e(err);
       } finally {
-        _iterator6.f();
+        _iterator4.f();
       }
     }
   }

package/dist/cjs/ag-grid-plus/types.d.ts

@@ -128,6 +128,8 @@ export interface ExtendedColDef extends ColDef {
     hideInSearch?: boolean;
     /** 查询字段名 (不同于显示字段) */
     queryField?: string;
+    /** 查询区独立标题；优先于列方案中的表头名称。@author nokecy */
+    searchTitle?: string;
     /** 是否文本缩略显示并使用 tooltip */
     ellipsis?: boolean;
     /** 枚举值配置 */
@@ -142,6 +144,8 @@ export interface ExtendedColDef extends ColDef {
     searchComponent?: ReactNode | ((props: any) => JSX.Element);
     /** 搜索组件属性 */
     searchComponentProps?: any;
+    /** 查询组件的枚举数据源。@author nokecy */
+    enum?: any[];
     /** 搜索表单排序顺序 */
     searchSort?: number;
     /** 列计算类型 */
@@ -208,6 +212,8 @@ export interface QueryFormItem {
     field: string;
     /** 表头名称 */
     headerName: string;
+    /** 查询区独立标题。@author nokecy */
+    searchTitle?: string;
     /** 排序顺序 */
     order: number;
     /** 是否精确查询 */

package/dist/cjs/array-table/batchRemove.d.ts

@@ -0,0 +1,36 @@
+import React from 'react';
+import type { ArrayField } from '@formily/core';
+import type { GridApi, IRowNode, SelectionChangedEvent } from 'ag-grid-community';
+import type { ArrayTableProps, ObservableColumnSource } from './interface';
+/** 标准删除控件在行内的字段路径与静态约束。@author nokecy */
+export type RemovalAction = {
+    path: string[];
+    schemas: any[];
+    column: ObservableColumnSource;
+};
+/** 收集标准删除入口，保留列级显隐约束，不把其他业务按钮当成删除。@author nokecy */
+export declare function collectRemovalActions(sources: ObservableColumnSource[]): RemovalAction[];
+/**
+ * 与行内删除共用字段的运行时权限；未挂载的普通行采用静态规则。
+ * 含动态权限且尚未求值的行保持不可删除，避免绕过业务禁用条件。@author nokecy
+ */
+export declare function findRemovalAction(field: ArrayField, index: number, actions: RemovalAction[]): RemovalAction | undefined;
+/**
+ * 把选择时的稳定行标识转换为当前表单索引；确认前全部复核，倒序删除保持数组地址正确。
+ * 返回 false 表示所选行已删除或变为不可删除，整个批次不执行。@author nokecy
+ */
+export declare function removeSelectedRows(field: ArrayField, ids: string[], actions: RemovalAction[], getId: (row: any) => string, onRemove?: (index: number) => void, event?: React.MouseEvent): boolean;
+/** 公共明细表格的勾选及批量删除，沿用业务行权限、行标识与删除通知。@author nokecy */
+export declare function useArrayTableBatchRemove(field: ArrayField, sources: ObservableColumnSource[], props: ArrayTableProps, apiRef: React.MutableRefObject<GridApi | undefined>, getId: (row: any) => string): {
+    rowSelection: "multiple" | "single" | import("ag-grid-community/dist/types/src/entities/gridOptions").SingleRowSelectionOptions<any, any> | import("ag-grid-community/dist/types/src/entities/gridOptions").MultiRowSelectionOptions<any, any> | {
+        isRowSelectable: (node: IRowNode) => boolean;
+        headerCheckbox?: boolean | undefined;
+        selectAll?: "filtered" | undefined;
+        mode: "singleRow" | "multiRow";
+        checkboxes: boolean;
+        enableClickSelection: boolean;
+    } | undefined;
+    selectionColumnDef: import("ag-grid-community").SelectionColumnDef | undefined;
+    onSelectionChanged: (event: SelectionChangedEvent) => void;
+    toolbar: React.JSX.Element;
+};