@nokecy/qc-ui 1.1.79 → 1.1.81

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

@@ -22,7 +22,7 @@ import { useField, useFieldSchema, RecursionField, Observer, useExpressionScope
 import { isArr, lazyMerge } from '@formily/shared';
 import { Schema } from '@formily/json-schema';
 import ArrayBase from "./arrayBase";
-import { fallbackFormatter, getReadOnlyFormatter } from "./readOnlyFormatters";
+import { fallbackFormatter, getReadOnlyFormatter, getReadOnlyRenderer } from "./readOnlyFormatters";
 import { markHeaderGroup } from "./columnGroup";
 import { CellFocusScope } from "./cellFocusScope";
 var isColumnComponent = function isColumnComponent(schema) {
@@ -342,6 +342,7 @@ var LazyAgField = function LazyAgField(params) {
     colDef = params.colDef,
     context = params.context,
     formatter = params.formatter,
+    renderer = params.renderer,
     columnProps = params.columnProps,
     fieldSchema = params.fieldSchema,
     required = params.required;
@@ -461,6 +462,11 @@ var LazyAgField = function LazyAgField(params) {
         }
       }, resolveEmptyPlaceholder(fieldSchema));
     }
+    // 登记了只读渲染器的组件(如带颜色的 Tag)按渲染器出内容,与组件自己的阅读态一致
+    var shown = renderer && text !== '' ? renderer(liveValue, {
+      columnProps: columnProps,
+      fieldSchema: fieldSchema
+    }) : text;
     return /*#__PURE__*/React.createElement("span", {
       className: "ag-array-table-lazy-text",
       style: {
@@ -468,7 +474,7 @@ var LazyAgField = function LazyAgField(params) {
         width: '100%',
         cursor: 'text'
       }
-    }, text);
+    }, shown);
   });
 };
 
@@ -488,6 +494,7 @@ var LazyReadOnlyText = function LazyReadOnlyText(params) {
     record = params.data,
     colDef = params.colDef,
     formatter = params.formatter,
+    renderer = params.renderer,
     columnProps = params.columnProps,
     fieldSchema = params.fieldSchema;
   var dataKey = (_fieldSchema$name2 = fieldSchema === null || fieldSchema === void 0 ? void 0 : fieldSchema.name) !== null && _fieldSchema$name2 !== void 0 ? _fieldSchema$name2 : colDef === null || colDef === void 0 ? void 0 : colDef.field;
@@ -497,13 +504,17 @@ var LazyReadOnlyText = function LazyReadOnlyText(params) {
       columnProps: columnProps,
       fieldSchema: fieldSchema
     }) : liveValue == null ? '' : String(liveValue);
+    var shown = renderer && text !== '' ? renderer(liveValue, {
+      columnProps: columnProps,
+      fieldSchema: fieldSchema
+    }) : text;
     return /*#__PURE__*/React.createElement("span", {
       className: "ag-array-table-readonly-text",
       style: {
         display: 'inline-block',
         width: '100%'
       }
-    }, text);
+    }, shown);
   });
 };
 
@@ -623,7 +634,9 @@ var buildArrayTableColumns = function buildArrayTableColumns(dataSource, field,
     var readOnly = isColumnReadOnlyEligible(arrayPattern, dataField, columnProps);
     // 可编辑的数据字段(非 void 操作按钮)即使是业务自定义组件,也按兜底格式化器出懒挂载文本,默认阅读态;
     // 只读列不兜底:自定义只读组件常显示别的字段(如 SiblingText),按自身值出文本会错。@author nokecy
-    var formatter = (_getReadOnlyFormatter = getReadOnlyFormatter(component)) !== null && _getReadOnlyFormatter !== void 0 ? _getReadOnlyFormatter : !readOnly && component && (dataField === null || dataField === void 0 ? void 0 : dataField.type) !== 'void' ? fallbackFormatter : null;
+    // 登记了只读渲染器的组件只读列也走快路径(渲染器出内容,兜底格式化器只用于判空)。@author nokecy
+    var renderer = getReadOnlyRenderer(component);
+    var formatter = (_getReadOnlyFormatter = getReadOnlyFormatter(component)) !== null && _getReadOnlyFormatter !== void 0 ? _getReadOnlyFormatter : (!readOnly || renderer) && component && (dataField === null || dataField === void 0 ? void 0 : dataField.type) !== 'void' ? fallbackFormatter : null;
     var hasReactions = !!(dataField && dataField['x-reactions']);
     if (!readOnly) applyNumberInputDefaults(dataField);
     var forceEager = (columnProps === null || columnProps === void 0 ? void 0 : columnProps.forceAgField) === true;
@@ -656,11 +669,32 @@ var buildArrayTableColumns = function buildArrayTableColumns(dataSource, field,
           cellRenderer: LazyReadOnlyText,
           cellRendererParams: {
             formatter: formatter,
+            renderer: renderer,
             columnProps: columnProps,
             fieldSchema: dataField
           }
         }));
       }
+      if (renderer) {
+        // 登记了渲染器:整表阅读态也出渲染器内容(如 Tag),不退化成纯文字
+        return emit(_objectSpread(_objectSpread(_objectSpread({}, base), valueGetter ? {
+          valueGetter: valueGetter
+        } : {}), {}, {
+          cellRenderer: function cellRenderer(params) {
+            var ctx = {
+              columnProps: columnProps,
+              fieldSchema: dataField
+            };
+            return formatter(params.value, ctx) === '' ? '' : renderer(params.value, ctx);
+          },
+          valueFormatter: function valueFormatter(params) {
+            return formatter(params.value, {
+              columnProps: columnProps,
+              fieldSchema: dataField
+            });
+          }
+        }));
+      }
       return emit(_objectSpread(_objectSpread(_objectSpread({}, base), valueGetter ? {
         valueGetter: valueGetter
       } : {}), {}, {
@@ -686,6 +720,7 @@ var buildArrayTableColumns = function buildArrayTableColumns(dataSource, field,
           schema: schema,
           field: field,
           formatter: formatter,
+          renderer: renderer,
           columnProps: columnProps,
           fieldSchema: dataField,
           lazyEditable: true,

package/dist/esm/index.d.ts

@@ -29,6 +29,8 @@ export type * from "./importModal";
 export type * from "./fullScreenAlert";
 export type * from "./RuleBuilder";
 export type { ColumnConfig } from "./array-table/columnHelper";
+export { registerReadOnlyFormatter, registerReadOnlyLabels, registerReadOnlyRenderer } from "./array-table/readOnlyFormatters";
+export type { ReadOnlyFormatter, ReadOnlyFormatterCtx, ReadOnlyLabels, ReadOnlyRenderer } from "./array-table/readOnlyFormatters";
 export type { CentralizedColumnScheme, QueryScheme, SchemeStorageAdapter, SchemeSyncDataDto, CurrentSchemeDto, SchemeStorageConfig, LocalStorageAdapterConfig, BackendApiAdapterConfig, UseSchemeManagerConfig, GridPlusContextValue, GlobalConfigPermissions, } from "./ag-grid-plus";
 export * from './adapters';
 export * from "./readPretty";

package/dist/esm/index.js

@@ -35,6 +35,9 @@ useSchemeManager, useGridSchemes, LocalStorageSchemeAdapter, BackendApiSchemeAda
 
 // 导出类型定义
 
+// ArrayTable 格子文本:业务自定义组件登记「值 -> 名称」或自定义格式化器
+export { registerReadOnlyFormatter, registerReadOnlyLabels, registerReadOnlyRenderer } from "./array-table/readOnlyFormatters";
+
 // 集中式方案管理类型
 
 // 注意: 旧的方案管理类型已废弃