@nokecy/qc-ui 1.1.66 → 1.1.68

package/dist/cjs/ag-grid-plus/queryForm/index.js

@@ -140,11 +140,15 @@ var FormRender = function FormRender(props) {
       }
     };
     var columns = colDefs === null || colDefs === void 0 ? void 0 : colDefs.map(function (colDef) {
+      var _searchComponentProps;
       var state = columnStates.find(function (x) {
         return x.colId == colDef.field;
       });
       var columnDefs = gridApi === null || gridApi === void 0 ? void 0 : gridApi.getColumnDef(colDef.field);
-      return _objectSpread(_objectSpread(_objectSpread({}, colDef), columnDefs), state);
+      // 查询组件属性（下拉选项）以本次传入的列为准：AG Grid 在本副作用之后才应用新 columnDefs，此刻取到的还是上一版。@author nokecy
+      return _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, colDef), columnDefs), state), {}, {
+        searchComponentProps: (_searchComponentProps = colDef.searchComponentProps) !== null && _searchComponentProps !== void 0 ? _searchComponentProps : columnDefs === null || columnDefs === void 0 ? void 0 : columnDefs.searchComponentProps
+      });
     });
     columns = columns ? (_columns = columns) === null || _columns === void 0 ? void 0 : _columns.filter(function (i) {
       return (i === null || i === void 0 ? void 0 : i.visible) != false && !(i !== null && i !== void 0 && i.hide) && !(i !== null && i !== void 0 && i.hideInSearch) || (i === null || i === void 0 ? void 0 : i.hideInTable);

package/dist/cjs/array-table/index.js

@@ -11,6 +11,7 @@ var _react2 = require("@formily/react");
 var _uniqueId = _interopRequireDefault(require("lodash/uniqueId"));
 var _utils = require("./utils");
 var _columnGroup = require("./columnGroup");
+var _indexColumn = require("./indexColumn");
 var _hooks = require("./hooks");
 var _arrayBase = _interopRequireDefault(require("./arrayBase"));
 var _arrayAddBtn = _interopRequireDefault(require("./arrayAddBtn"));
@@ -134,8 +135,13 @@ var ArrayTableInner = (0, _react2.observer)(function (props) {
    * 列的状态(宽度、顺序、隐藏等)由方案通过 applyColumnState 控制，不需要通过 columnDefs 传递
    */
   var stableColumnDefs = (0, _react.useMemo)(function () {
+    var _buildArrayTableColum;
     // 只依赖 sources，不依赖 dataSource 和 field.value
-    var cols = (0, _utils.buildArrayTableColumns)([], field, sources);
+    var cols = (_buildArrayTableColum = (0, _utils.buildArrayTableColumns)([], field, sources)) !== null && _buildArrayTableColum !== void 0 ? _buildArrayTableColum : [];
+    // 默认在最左加序号列;schema 里已经放了 ArrayTable.Index 的不再加。@author nokecy
+    if (cols.length > 0 && !(0, _indexColumn.hasOwnIndexColumn)(sources)) {
+      cols.unshift((0, _indexColumn.makeIndexColumn)());
+    }
     //@ts-ignore
     if (cols.length > 0 && props.onRowDrag) {
       //@ts-ignore
@@ -369,6 +375,14 @@ var ArrayTableInner = (0, _react2.observer)(function (props) {
     },
     onRowDragMove: handleRowDragMove,
     onRowDataUpdated: function onRowDataUpdated(e) {
+      // 增删行、拖动换行后行位置变了,未改动的行不会自己重算序号,统一刷新序号列 @author nokecy
+      if (stableColumnDefs.some(function (c) {
+        return (c === null || c === void 0 ? void 0 : c.field) === _indexColumn.ARRAY_TABLE_INDEX_FIELD;
+      })) {
+        e.api.refreshCells({
+          columns: [_indexColumn.ARRAY_TABLE_INDEX_FIELD]
+        });
+      }
       if (isAdd) {
         var _apiRef$current;
         (_apiRef$current = apiRef.current) === null || _apiRef$current === void 0 || _apiRef$current.ensureIndexVisible(dataSource.length - 1, "bottom");

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

@@ -0,0 +1,17 @@
+import type { ColDef } from 'ag-grid-community';
+/** 默认序号列的字段名;不对应任何数据字段,值由 valueGetter 按行位置生成 */
+export declare const ARRAY_TABLE_INDEX_FIELD = "__arrayTableIndex";
+/**
+ * 表格是否已经自己写了序号列(某个可见列里放了 ArrayTable.Index)。
+ * 写了就不再加默认序号列,免得出现两列序号;「行号」等业务数据列不算序号列。@author nokecy
+ */
+export declare const hasOwnIndexColumn: (sources: Array<{
+    schema: any;
+    display?: string;
+}>) => boolean;
+/**
+ * 默认序号列:按行在表格里的位置编号(1 起),不依赖业务行号或主键,与列表页的序号一致。
+ * 固定在最左、不可隐藏/拖动/排序;合计等固定行不编号。
+ * 增删行、拖动换行后由 ArrayTable 在 onRowDataUpdated 里刷新本列,见 index.tsx。@author nokecy
+ */
+export declare const makeIndexColumn: () => ColDef;

package/dist/cjs/array-table/indexColumn.js

@@ -0,0 +1,58 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.makeIndexColumn = exports.hasOwnIndexColumn = exports.ARRAY_TABLE_INDEX_FIELD = void 0;
+/** 默认序号列的字段名;不对应任何数据字段,值由 valueGetter 按行位置生成 */
+var ARRAY_TABLE_INDEX_FIELD = exports.ARRAY_TABLE_INDEX_FIELD = '__arrayTableIndex';
+
+/** schema 里含 ArrayTable.Index / ArrayBase.Index 之类的序号组件 */
+var containsIndexComponent = function containsIndexComponent(schema) {
+  var _schema$properties;
+  if (!schema) return false;
+  var component = schema['x-component'];
+  if (typeof component === 'string' && /(?:^|\.)Index$/.test(component)) return true;
+  return Object.values((_schema$properties = schema.properties) !== null && _schema$properties !== void 0 ? _schema$properties : {}).some(containsIndexComponent);
+};
+
+/**
+ * 表格是否已经自己写了序号列(某个可见列里放了 ArrayTable.Index)。
+ * 写了就不再加默认序号列,免得出现两列序号;「行号」等业务数据列不算序号列。@author nokecy
+ */
+var hasOwnIndexColumn = exports.hasOwnIndexColumn = function hasOwnIndexColumn(sources) {
+  return sources.some(function (_ref) {
+    var schema = _ref.schema,
+      display = _ref.display;
+    return (!display || display === 'visible') && containsIndexComponent(schema);
+  });
+};
+
+/**
+ * 默认序号列:按行在表格里的位置编号(1 起),不依赖业务行号或主键,与列表页的序号一致。
+ * 固定在最左、不可隐藏/拖动/排序;合计等固定行不编号。
+ * 增删行、拖动换行后由 ArrayTable 在 onRowDataUpdated 里刷新本列,见 index.tsx。@author nokecy
+ */
+var makeIndexColumn = exports.makeIndexColumn = function makeIndexColumn() {
+  return {
+    field: ARRAY_TABLE_INDEX_FIELD,
+    headerName: '序号',
+    width: 60,
+    pinned: 'left',
+    lockPosition: 'left',
+    lockPinned: true,
+    lockVisible: true,
+    suppressMovable: true,
+    suppressColumnsToolPanel: true,
+    sortable: false,
+    filter: false,
+    resizable: false,
+    editable: false,
+    valueGetter: function valueGetter(params) {
+      var _params$node, _params$node2;
+      if ((_params$node = params.node) !== null && _params$node !== void 0 && _params$node.rowPinned) return '';
+      var rowIndex = (_params$node2 = params.node) === null || _params$node2 === void 0 ? void 0 : _params$node2.rowIndex;
+      return rowIndex == null ? '' : rowIndex + 1;
+    }
+  };
+};

package/dist/esm/ag-grid-plus/queryForm/index.js

@@ -132,11 +132,15 @@ var FormRender = function FormRender(props) {
       }
     };
     var columns = colDefs === null || colDefs === void 0 ? void 0 : colDefs.map(function (colDef) {
+      var _searchComponentProps;
       var state = columnStates.find(function (x) {
         return x.colId == colDef.field;
       });
       var columnDefs = gridApi === null || gridApi === void 0 ? void 0 : gridApi.getColumnDef(colDef.field);
-      return _objectSpread(_objectSpread(_objectSpread({}, colDef), columnDefs), state);
+      // 查询组件属性（下拉选项）以本次传入的列为准：AG Grid 在本副作用之后才应用新 columnDefs，此刻取到的还是上一版。@author nokecy
+      return _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, colDef), columnDefs), state), {}, {
+        searchComponentProps: (_searchComponentProps = colDef.searchComponentProps) !== null && _searchComponentProps !== void 0 ? _searchComponentProps : columnDefs === null || columnDefs === void 0 ? void 0 : columnDefs.searchComponentProps
+      });
     });
     columns = columns ? (_columns = columns) === null || _columns === void 0 ? void 0 : _columns.filter(function (i) {
       return (i === null || i === void 0 ? void 0 : i.visible) != false && !(i !== null && i !== void 0 && i.hide) && !(i !== null && i !== void 0 && i.hideInSearch) || (i === null || i === void 0 ? void 0 : i.hideInTable);

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

@@ -19,6 +19,7 @@ import { connect, mapProps, mapReadPretty } from "@formily/react";
 import uniqueId from "lodash/uniqueId";
 import { useAddition, buildArrayTableColumns, useArrayTableSources, useArrayTableActions, isColumnComponent } from "./utils";
 import { groupColumnDefs } from "./columnGroup";
+import { ARRAY_TABLE_INDEX_FIELD, hasOwnIndexColumn, makeIndexColumn } from "./indexColumn";
 import { useCellFocus, useKeyboardNavigation, useRowDrag, suppressNativeInputKeys } from "./hooks";
 import ArrayBase from "./arrayBase";
 import ArrayAddBtn from "./arrayAddBtn";
@@ -130,8 +131,13 @@ var ArrayTableInner = observer(function (props) {
    * 列的状态(宽度、顺序、隐藏等)由方案通过 applyColumnState 控制，不需要通过 columnDefs 传递
    */
   var stableColumnDefs = useMemo(function () {
+    var _buildArrayTableColum;
     // 只依赖 sources，不依赖 dataSource 和 field.value
-    var cols = buildArrayTableColumns([], field, sources);
+    var cols = (_buildArrayTableColum = buildArrayTableColumns([], field, sources)) !== null && _buildArrayTableColum !== void 0 ? _buildArrayTableColum : [];
+    // 默认在最左加序号列;schema 里已经放了 ArrayTable.Index 的不再加。@author nokecy
+    if (cols.length > 0 && !hasOwnIndexColumn(sources)) {
+      cols.unshift(makeIndexColumn());
+    }
     //@ts-ignore
     if (cols.length > 0 && props.onRowDrag) {
       //@ts-ignore
@@ -365,6 +371,14 @@ var ArrayTableInner = observer(function (props) {
     },
     onRowDragMove: handleRowDragMove,
     onRowDataUpdated: function onRowDataUpdated(e) {
+      // 增删行、拖动换行后行位置变了,未改动的行不会自己重算序号,统一刷新序号列 @author nokecy
+      if (stableColumnDefs.some(function (c) {
+        return (c === null || c === void 0 ? void 0 : c.field) === ARRAY_TABLE_INDEX_FIELD;
+      })) {
+        e.api.refreshCells({
+          columns: [ARRAY_TABLE_INDEX_FIELD]
+        });
+      }
       if (isAdd) {
         var _apiRef$current;
         (_apiRef$current = apiRef.current) === null || _apiRef$current === void 0 || _apiRef$current.ensureIndexVisible(dataSource.length - 1, "bottom");

package/dist/esm/array-table/indexColumn.d.ts

@@ -0,0 +1,17 @@
+import type { ColDef } from 'ag-grid-community';
+/** 默认序号列的字段名;不对应任何数据字段,值由 valueGetter 按行位置生成 */
+export declare const ARRAY_TABLE_INDEX_FIELD = "__arrayTableIndex";
+/**
+ * 表格是否已经自己写了序号列(某个可见列里放了 ArrayTable.Index)。
+ * 写了就不再加默认序号列,免得出现两列序号;「行号」等业务数据列不算序号列。@author nokecy
+ */
+export declare const hasOwnIndexColumn: (sources: Array<{
+    schema: any;
+    display?: string;
+}>) => boolean;
+/**
+ * 默认序号列:按行在表格里的位置编号(1 起),不依赖业务行号或主键,与列表页的序号一致。
+ * 固定在最左、不可隐藏/拖动/排序;合计等固定行不编号。
+ * 增删行、拖动换行后由 ArrayTable 在 onRowDataUpdated 里刷新本列,见 index.tsx。@author nokecy
+ */
+export declare const makeIndexColumn: () => ColDef;

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

@@ -0,0 +1,52 @@
+/** 默认序号列的字段名;不对应任何数据字段,值由 valueGetter 按行位置生成 */
+export var ARRAY_TABLE_INDEX_FIELD = '__arrayTableIndex';
+
+/** schema 里含 ArrayTable.Index / ArrayBase.Index 之类的序号组件 */
+var containsIndexComponent = function containsIndexComponent(schema) {
+  var _schema$properties;
+  if (!schema) return false;
+  var component = schema['x-component'];
+  if (typeof component === 'string' && /(?:^|\.)Index$/.test(component)) return true;
+  return Object.values((_schema$properties = schema.properties) !== null && _schema$properties !== void 0 ? _schema$properties : {}).some(containsIndexComponent);
+};
+
+/**
+ * 表格是否已经自己写了序号列(某个可见列里放了 ArrayTable.Index)。
+ * 写了就不再加默认序号列,免得出现两列序号;「行号」等业务数据列不算序号列。@author nokecy
+ */
+export var hasOwnIndexColumn = function hasOwnIndexColumn(sources) {
+  return sources.some(function (_ref) {
+    var schema = _ref.schema,
+      display = _ref.display;
+    return (!display || display === 'visible') && containsIndexComponent(schema);
+  });
+};
+
+/**
+ * 默认序号列:按行在表格里的位置编号(1 起),不依赖业务行号或主键,与列表页的序号一致。
+ * 固定在最左、不可隐藏/拖动/排序;合计等固定行不编号。
+ * 增删行、拖动换行后由 ArrayTable 在 onRowDataUpdated 里刷新本列,见 index.tsx。@author nokecy
+ */
+export var makeIndexColumn = function makeIndexColumn() {
+  return {
+    field: ARRAY_TABLE_INDEX_FIELD,
+    headerName: '序号',
+    width: 60,
+    pinned: 'left',
+    lockPosition: 'left',
+    lockPinned: true,
+    lockVisible: true,
+    suppressMovable: true,
+    suppressColumnsToolPanel: true,
+    sortable: false,
+    filter: false,
+    resizable: false,
+    editable: false,
+    valueGetter: function valueGetter(params) {
+      var _params$node, _params$node2;
+      if ((_params$node = params.node) !== null && _params$node !== void 0 && _params$node.rowPinned) return '';
+      var rowIndex = (_params$node2 = params.node) === null || _params$node2 === void 0 ? void 0 : _params$node2.rowIndex;
+      return rowIndex == null ? '' : rowIndex + 1;
+    }
+  };
+};