@nokecy/qc-ui 0.1.50 → 0.1.51

package/dist/cjs/ag-grid-plus/ag-gridPlus.js

@@ -19,8 +19,6 @@ require("./global.scss");
 
 require("./index.less");
 
-var _interface = require("./interface");
-
 var _queryForm = _interopRequireDefault(require("./queryForm"));
 
 var _toolBar = _interopRequireDefault(require("./toolBar"));
@@ -232,6 +230,11 @@ function AgGridPlus(props) {
       onRefresh: onRefresh
     };
   }, [queryFilter, JSON.stringify(gridParams), JSON.stringify(sortColumn)]);
+  var colDefs = (0, _react.useMemo)(function () {
+    return _react.default.Children.map(children, function (child, index) {
+      return child.props;
+    });
+  }, [children]);
   return /*#__PURE__*/_react.default.createElement(_antd.Spin, {
     spinning: loading,
     wrapperClassName: "grid-spin"
@@ -355,18 +358,8 @@ function AgGridPlus(props) {
     } // animateRows={true}
     //停用默认分页组件
     ,
-    suppressPaginationPanel: true
-  }), props.rowSelection ? /*#__PURE__*/_react.default.createElement(_interface.AgGridColumn, {
-    field: "",
-    width: 30,
-    flex: 0,
-    headerCheckboxSelection: true,
-    checkboxSelection: true,
-    showDisabledCheckboxes: true,
-    filter: false,
-    pinned: "left"
-  }) : null, _react.default.Children.map(children, function (child, index) {
-    return child;
+    suppressPaginationPanel: true,
+    columnDefs: colDefs || props.columnDefs
   }))), /*#__PURE__*/_react.default.createElement("div", {
     style: {
       marginTop: 12,

package/dist/cjs/ag-grid-plus/global.scss

@@ -11,7 +11,6 @@
         --ag-font-family: ('microsoft yahei', 'Helvetica', 'Arial'),
 
         --ag-borders: solid 0px,
-        --ag-borders-row: solid 1px,
         --ag-row-border-color:#f0f0f0,
         --ag-grid-size: 4px,
 

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

@@ -1,5 +1,5 @@
-import { GridApi } from 'ag-grid-community';
-import { AgGridReactProps, AgGridColumnProps, AgGridColumnGroupProps } from 'ag-grid-react';
+import { GridApi, ColDef, ColGroupDef } from 'ag-grid-community';
+import { AgGridReactProps } from 'ag-grid-react';
 import React, { CSSProperties, ReactNode } from 'react';
 interface GridRef {
     onRefresh: () => void;
@@ -26,7 +26,7 @@ interface GridProps extends AgGridReactProps {
     gridColumnState?: any[];
     gridRef?: React.Ref<GridRef | undefined>;
 }
-interface AgGridColumnPropsClone extends AgGridColumnProps {
+interface AgGridColumnPropsClone extends ColDef {
     hideInTable?: boolean;
     hideInSearch?: boolean;
     queryField?: string;
@@ -34,5 +34,5 @@ interface AgGridColumnPropsClone extends AgGridColumnProps {
     searchComponentProps?: any;
     searchSort?: number;
 }
-declare function AgGridColumn(props: AgGridColumnPropsClone | AgGridColumnGroupProps): JSX.Element;
+declare function AgGridColumn(props: AgGridColumnPropsClone | ColGroupDef): JSX.Element;
 export { GridProps, AgGridColumn, GridRef };

package/dist/cjs/ag-grid-plus/interface.js

@@ -5,13 +5,11 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.AgGridColumn = AgGridColumn;
 
-var _agGridReact = require("ag-grid-react");
-
 var _react = _interopRequireDefault(require("react"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function AgGridColumn(props) {
   ///@ts-ignore
-  return /*#__PURE__*/_react.default.createElement(_agGridReact.AgGridColumn, props);
+  return /*#__PURE__*/_react.default.createElement(AgGridColumnClone, props);
 }

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

@@ -0,0 +1,62 @@
+import React from 'react';
+import { ButtonProps } from 'antd/lib/button';
+import { ArrayField } from '@formily/core';
+import { Schema, JSXComponent } from '@formily/react';
+export interface IArrayBaseAdditionProps extends ButtonProps {
+    title?: string;
+    method?: 'push' | 'unshift';
+    defaultValue?: any;
+}
+export interface IArrayBaseOperationProps extends ButtonProps {
+    title?: string;
+    index?: number;
+    ref?: React.Ref<HTMLElement>;
+}
+export interface IArrayBaseContext {
+    props: IArrayBaseProps;
+    field: ArrayField;
+    schema: Schema;
+}
+export interface IArrayBaseItemProps {
+    index: number;
+    record: ((index: number) => Record<string, any>) | Record<string, any>;
+    props: IArrayBaseProps;
+    field: ArrayField;
+    schema: Schema;
+}
+export declare type ArrayBaseMixins = {
+    Addition?: React.FC<React.PropsWithChildren<IArrayBaseAdditionProps>>;
+    Copy?: React.FC<React.PropsWithChildren<IArrayBaseOperationProps & {
+        index?: number;
+    }>>;
+    Remove?: React.FC<React.PropsWithChildren<IArrayBaseOperationProps & {
+        index?: number;
+    }>>;
+    MoveUp?: React.FC<React.PropsWithChildren<IArrayBaseOperationProps & {
+        index?: number;
+    }>>;
+    MoveDown?: React.FC<React.PropsWithChildren<IArrayBaseOperationProps & {
+        index?: number;
+    }>>;
+    SortHandle?: React.FC<React.PropsWithChildren<IArrayBaseOperationProps & {
+        index?: number;
+    }>>;
+    Index?: React.FC;
+    useArray?: () => IArrayBaseContext;
+    useIndex?: (index?: number) => number;
+    useRecord?: (record?: number) => any;
+};
+export interface IArrayBaseProps {
+    disabled?: boolean;
+    onAdd?: (index: number) => void;
+    onCopy?: (index: number) => void;
+    onRemove?: (index: number) => void;
+    onMoveDown?: (index: number) => void;
+    onMoveUp?: (index: number) => void;
+}
+declare type ComposedArrayBase = React.FC<React.PropsWithChildren<IArrayBaseProps>> & ArrayBaseMixins & {
+    Item?: React.FC<React.PropsWithChildren<IArrayBaseItemProps>>;
+    mixin?: <T extends JSXComponent>(target: T) => T & ArrayBaseMixins;
+};
+export declare const ArrayBase: ComposedArrayBase;
+export default ArrayBase;

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

@@ -0,0 +1,286 @@
+"use strict";
+
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = exports.ArrayBase = void 0;
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _antd = require("antd");
+
+var _icons = require("@ant-design/icons");
+
+var _react2 = require("@formily/react");
+
+var _shared = require("@formily/shared");
+
+var _builtins__ = require("@formily/antd-v5/lib/__builtins__");
+
+var _classnames = _interopRequireDefault(require("classnames"));
+
+var _excluded = ["children"];
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+
+var ItemContext = /*#__PURE__*/(0, _react.createContext)(null);
+
+var takeRecord = function takeRecord(val, index) {
+  return typeof val === 'function' ? val(index) : val;
+};
+
+var useArray = function useArray() {
+  return (0, _react.useContext)(ItemContext);
+};
+
+var useIndex = function useIndex(index) {
+  var ctx = (0, _react.useContext)(ItemContext);
+  return ctx ? ctx.index : index || 0;
+};
+
+var useRecord = function useRecord(record) {
+  var ctx = (0, _react.useContext)(ItemContext);
+  return takeRecord(ctx ? ctx.record : record, ctx === null || ctx === void 0 ? void 0 : ctx.index);
+};
+
+var getSchemaDefaultValue = function getSchemaDefaultValue(schema) {
+  if ((schema === null || schema === void 0 ? void 0 : schema.type) === 'array') return [];
+  if ((schema === null || schema === void 0 ? void 0 : schema.type) === 'object') return {};
+
+  if ((schema === null || schema === void 0 ? void 0 : schema.type) === 'void') {
+    for (var key in schema.properties) {
+      var value = getSchemaDefaultValue(schema.properties[key]);
+      if ((0, _shared.isValid)(value)) return value;
+    }
+  }
+};
+
+var getDefaultValue = function getDefaultValue(defaultValue, schema) {
+  if ((0, _shared.isValid)(defaultValue)) return (0, _shared.clone)(defaultValue);
+  if (Array.isArray(schema === null || schema === void 0 ? void 0 : schema.items)) return getSchemaDefaultValue(schema === null || schema === void 0 ? void 0 : schema.items[0]);
+  return getSchemaDefaultValue(schema === null || schema === void 0 ? void 0 : schema.items);
+};
+
+var ArrayBase = function ArrayBase(props) {
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, props.children);
+};
+
+exports.ArrayBase = ArrayBase;
+
+ArrayBase.Item = function (_ref) {
+  var children = _ref.children,
+      props = _objectWithoutProperties(_ref, _excluded);
+
+  return /*#__PURE__*/_react.default.createElement(ItemContext.Provider, {
+    value: props
+  }, children);
+};
+
+ArrayBase.Index = function (props) {
+  var index = useIndex();
+  var prefixCls = (0, _builtins__.usePrefixCls)('formily-array-base');
+  return /*#__PURE__*/_react.default.createElement("span", _extends({}, props, {
+    className: "".concat(prefixCls, "-index")
+  }), "#", (index ? index : 0) + 1, ".");
+};
+
+ArrayBase.Addition = function (props) {
+  var _array$field, _array$field2;
+
+  var self = (0, _react2.useField)();
+  var array = useArray();
+  var prefixCls = (0, _builtins__.usePrefixCls)('formily-array-base');
+  if (!array) return null;
+  if (((_array$field = array.field) === null || _array$field === void 0 ? void 0 : _array$field.pattern) !== 'editable' && ((_array$field2 = array.field) === null || _array$field2 === void 0 ? void 0 : _array$field2.pattern) !== 'disabled') return null;
+  return /*#__PURE__*/_react.default.createElement(_antd.Button, _extends({
+    type: "dashed",
+    block: true
+  }, props, {
+    disabled: self === null || self === void 0 ? void 0 : self.disabled,
+    className: (0, _classnames.default)("".concat(prefixCls, "-addition"), props.className),
+    onClick: function onClick(e) {
+      var _array$props;
+
+      if ((_array$props = array.props) !== null && _array$props !== void 0 && _array$props.disabled) return;
+      var defaultValue = getDefaultValue(props.defaultValue, array.schema);
+
+      if (props.method === 'unshift') {
+        var _array$field3, _array$field3$unshift, _array$props2, _array$props2$onAdd;
+
+        (_array$field3 = array.field) === null || _array$field3 === void 0 ? void 0 : (_array$field3$unshift = _array$field3.unshift) === null || _array$field3$unshift === void 0 ? void 0 : _array$field3$unshift.call(_array$field3, defaultValue);
+        (_array$props2 = array.props) === null || _array$props2 === void 0 ? void 0 : (_array$props2$onAdd = _array$props2.onAdd) === null || _array$props2$onAdd === void 0 ? void 0 : _array$props2$onAdd.call(_array$props2, 0);
+      } else {
+        var _array$field4, _array$field4$push, _array$props3, _array$props3$onAdd, _array$field5, _array$field5$value;
+
+        (_array$field4 = array.field) === null || _array$field4 === void 0 ? void 0 : (_array$field4$push = _array$field4.push) === null || _array$field4$push === void 0 ? void 0 : _array$field4$push.call(_array$field4, defaultValue);
+        (_array$props3 = array.props) === null || _array$props3 === void 0 ? void 0 : (_array$props3$onAdd = _array$props3.onAdd) === null || _array$props3$onAdd === void 0 ? void 0 : _array$props3$onAdd.call(_array$props3, (array === null || array === void 0 ? void 0 : (_array$field5 = array.field) === null || _array$field5 === void 0 ? void 0 : (_array$field5$value = _array$field5.value) === null || _array$field5$value === void 0 ? void 0 : _array$field5$value.length) - 1);
+      }
+
+      if (props.onClick) {
+        //@ts-ignore
+        props.onClick(e);
+      }
+    },
+    icon: (0, _shared.isUndef)(props.icon) ? /*#__PURE__*/_react.default.createElement(_icons.PlusOutlined, null) : props.icon
+  }), props.title || self.title);
+};
+
+ArrayBase.Copy = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
+  var _array$field6;
+
+  var self = (0, _react2.useField)();
+  var array = useArray();
+  var index = useIndex(props.index);
+  var prefixCls = (0, _builtins__.usePrefixCls)('formily-array-base');
+  if (!array) return null;
+  if (((_array$field6 = array.field) === null || _array$field6 === void 0 ? void 0 : _array$field6.pattern) !== 'editable') return null;
+  return /*#__PURE__*/_react.default.createElement(_antd.Button, _extends({
+    type: "text"
+  }, props, {
+    disabled: self === null || self === void 0 ? void 0 : self.disabled,
+    className: (0, _classnames.default)("".concat(prefixCls, "-copy"), self !== null && self !== void 0 && self.disabled ? "".concat(prefixCls, "-copy-disabled") : '', props.className),
+    ref: ref,
+    onClick: function onClick(e) {
+      var _array$props4, _array$field7, _array$field8, _array$field8$insert, _array$props5, _array$props5$onCopy;
+
+      if (self !== null && self !== void 0 && self.disabled) return;
+      e.stopPropagation();
+      if ((_array$props4 = array.props) !== null && _array$props4 !== void 0 && _array$props4.disabled) return;
+      var value = (0, _shared.clone)(array === null || array === void 0 ? void 0 : (_array$field7 = array.field) === null || _array$field7 === void 0 ? void 0 : _array$field7.value[index]);
+      var distIndex = index + 1;
+      (_array$field8 = array.field) === null || _array$field8 === void 0 ? void 0 : (_array$field8$insert = _array$field8.insert) === null || _array$field8$insert === void 0 ? void 0 : _array$field8$insert.call(_array$field8, distIndex, value);
+      (_array$props5 = array.props) === null || _array$props5 === void 0 ? void 0 : (_array$props5$onCopy = _array$props5.onCopy) === null || _array$props5$onCopy === void 0 ? void 0 : _array$props5$onCopy.call(_array$props5, distIndex);
+
+      if (props.onClick) {
+        //@ts-ignore
+        props.onClick(e);
+      }
+    },
+    icon: (0, _shared.isUndef)(props.icon) ? /*#__PURE__*/_react.default.createElement(_icons.CopyOutlined, null) : props.icon
+  }), props.title || self.title);
+});
+ArrayBase.Remove = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
+  var _array$field9;
+
+  var index = useIndex(props.index);
+  var self = (0, _react2.useField)();
+  var array = useArray();
+  var prefixCls = (0, _builtins__.usePrefixCls)('formily-array-base');
+  if (!array) return null;
+  if (((_array$field9 = array.field) === null || _array$field9 === void 0 ? void 0 : _array$field9.pattern) !== 'editable') return null;
+  return /*#__PURE__*/_react.default.createElement(_antd.Button, _extends({
+    type: "text"
+  }, props, {
+    disabled: self === null || self === void 0 ? void 0 : self.disabled,
+    className: (0, _classnames.default)("".concat(prefixCls, "-remove"), self !== null && self !== void 0 && self.disabled ? "".concat(prefixCls, "-remove-disabled") : '', props.className),
+    ref: ref,
+    onClick: function onClick(e) {
+      var _array$field10, _array$field10$remove, _array$props6, _array$props6$onRemov;
+
+      if (self !== null && self !== void 0 && self.disabled) return;
+      e.stopPropagation();
+      (_array$field10 = array.field) === null || _array$field10 === void 0 ? void 0 : (_array$field10$remove = _array$field10.remove) === null || _array$field10$remove === void 0 ? void 0 : _array$field10$remove.call(_array$field10, index);
+      (_array$props6 = array.props) === null || _array$props6 === void 0 ? void 0 : (_array$props6$onRemov = _array$props6.onRemove) === null || _array$props6$onRemov === void 0 ? void 0 : _array$props6$onRemov.call(_array$props6, index);
+
+      if (props.onClick) {
+        //@ts-ignore
+        props.onClick(e);
+      }
+    },
+    icon: (0, _shared.isUndef)(props.icon) ? /*#__PURE__*/_react.default.createElement(_icons.DeleteOutlined, null) : props.icon
+  }), props.title || self.title);
+});
+ArrayBase.MoveDown = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
+  var _array$field11;
+
+  var index = useIndex(props.index);
+  var self = (0, _react2.useField)();
+  var array = useArray();
+  var prefixCls = (0, _builtins__.usePrefixCls)('formily-array-base');
+  if (!array) return null;
+  if (((_array$field11 = array.field) === null || _array$field11 === void 0 ? void 0 : _array$field11.pattern) !== 'editable') return null;
+  return /*#__PURE__*/_react.default.createElement(_antd.Button, _extends({
+    type: "text"
+  }, props, {
+    disabled: self === null || self === void 0 ? void 0 : self.disabled,
+    className: (0, _classnames.default)("".concat(prefixCls, "-move-down"), self !== null && self !== void 0 && self.disabled ? "".concat(prefixCls, "-move-down-disabled") : '', props.className),
+    ref: ref,
+    onClick: function onClick(e) {
+      var _array$field12, _array$field12$moveDo, _array$props7, _array$props7$onMoveD;
+
+      if (self !== null && self !== void 0 && self.disabled) return;
+      e.stopPropagation();
+      (_array$field12 = array.field) === null || _array$field12 === void 0 ? void 0 : (_array$field12$moveDo = _array$field12.moveDown) === null || _array$field12$moveDo === void 0 ? void 0 : _array$field12$moveDo.call(_array$field12, index);
+      (_array$props7 = array.props) === null || _array$props7 === void 0 ? void 0 : (_array$props7$onMoveD = _array$props7.onMoveDown) === null || _array$props7$onMoveD === void 0 ? void 0 : _array$props7$onMoveD.call(_array$props7, index);
+
+      if (props.onClick) {
+        //@ts-ignore
+        props.onClick(e);
+      }
+    },
+    icon: (0, _shared.isUndef)(props.icon) ? /*#__PURE__*/_react.default.createElement(_icons.DownOutlined, null) : props.icon
+  }), props.title || self.title);
+});
+ArrayBase.MoveUp = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
+  var _array$field13;
+
+  var index = useIndex(props.index);
+  var self = (0, _react2.useField)();
+  var array = useArray();
+  var prefixCls = (0, _builtins__.usePrefixCls)('formily-array-base');
+  if (!array) return null;
+  if (((_array$field13 = array.field) === null || _array$field13 === void 0 ? void 0 : _array$field13.pattern) !== 'editable') return null;
+  return /*#__PURE__*/_react.default.createElement(_antd.Button, _extends({
+    type: "text"
+  }, props, {
+    disabled: self === null || self === void 0 ? void 0 : self.disabled,
+    className: (0, _classnames.default)("".concat(prefixCls, "-move-up"), self !== null && self !== void 0 && self.disabled ? "".concat(prefixCls, "-move-up-disabled") : '', props.className),
+    ref: ref,
+    onClick: function onClick(e) {
+      var _array$field14, _array$props8, _array$props8$onMoveU;
+
+      if (self !== null && self !== void 0 && self.disabled) return;
+      e.stopPropagation();
+      array === null || array === void 0 ? void 0 : (_array$field14 = array.field) === null || _array$field14 === void 0 ? void 0 : _array$field14.moveUp(index);
+      array === null || array === void 0 ? void 0 : (_array$props8 = array.props) === null || _array$props8 === void 0 ? void 0 : (_array$props8$onMoveU = _array$props8.onMoveUp) === null || _array$props8$onMoveU === void 0 ? void 0 : _array$props8$onMoveU.call(_array$props8, index);
+
+      if (props.onClick) {
+        //@ts-ignore
+        props.onClick(e);
+      }
+    },
+    icon: (0, _shared.isUndef)(props.icon) ? /*#__PURE__*/_react.default.createElement(_icons.UpOutlined, null) : props.icon
+  }), props.title || self.title);
+});
+ArrayBase.useArray = useArray;
+ArrayBase.useIndex = useIndex;
+ArrayBase.useRecord = useRecord;
+
+ArrayBase.mixin = function (target) {
+  target.Index = ArrayBase.Index;
+  target.SortHandle = ArrayBase.SortHandle;
+  target.Addition = ArrayBase.Addition;
+  target.Copy = ArrayBase.Copy;
+  target.Remove = ArrayBase.Remove;
+  target.MoveDown = ArrayBase.MoveDown;
+  target.MoveUp = ArrayBase.MoveUp;
+  target.useArray = ArrayBase.useArray;
+  target.useIndex = ArrayBase.useIndex;
+  target.useRecord = ArrayBase.useRecord;
+  return target;
+};
+
+var _default = ArrayBase;
+exports.default = _default;

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

@@ -11,16 +11,16 @@ var _sortBy2 = _interopRequireDefault(require("lodash/sortBy"));
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _agGridPlus = require("../ag-grid-plus");
+var _agGridReact = require("ag-grid-react");
 
 var _react2 = require("@formily/react");
 
-var _antdV = require("@formily/antd-v5");
-
 var _uniqueId = _interopRequireDefault(require("lodash/uniqueId"));
 
 var _utils = require("./utils");
 
+var _arrayBase = _interopRequireDefault(require("./arrayBase"));
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -68,11 +68,7 @@ var ArrayTable = (0, _react2.observer)(function (props) {
     style: {
       height: height ? height : 400
     }
-  }, /*#__PURE__*/_react.default.createElement(_antdV.ArrayBase, {
-    onAdd: function onAdd() {
-      setIsAdd(true);
-    }
-  }, /*#__PURE__*/_react.default.createElement(_agGridPlus.AgGridPlus, {
+  }, /*#__PURE__*/_react.default.createElement(_arrayBase.default, null, /*#__PURE__*/_react.default.createElement(_agGridReact.AgGridReact, {
     onGridReady: function onGridReady(params) {
       apiRef.current = params.api;
     },
@@ -85,14 +81,10 @@ var ArrayTable = (0, _react2.observer)(function (props) {
       }
     },
     className: "ag-theme-alpine",
-    search: false,
     getRowId: function getRowId(_ref) {
       var data = _ref.data;
       return data._id || data.id;
     },
-    toolBarRender: function toolBarRender() {
-      return [addition];
-    },
     rowDragEntireRow: true,
     onRowDragEnd: function onRowDragEnd(event) {
       var overIndex = event.overIndex,
@@ -133,14 +125,10 @@ ArrayTable.Column = function () {
   return /*#__PURE__*/_react.default.createElement(_react.Fragment, null);
 };
 
-_antdV.ArrayBase.mixin(ArrayTable);
+_arrayBase.default.mixin(ArrayTable);
 
 var Addition = function Addition(props) {
-  var self = (0, _react2.useField)();
-
-  var array = _antdV.ArrayBase.useArray();
-
-  return /*#__PURE__*/_react.default.createElement(_antdV.ArrayBase.Addition, _extends({
+  return /*#__PURE__*/_react.default.createElement(_arrayBase.default.Addition, _extends({
     type: "primary",
     children: "新增行"
   }, props, {

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

@@ -1,20 +1,26 @@
 "use strict";
 
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.useArrayTableSources = exports.useArrayTableColumns = exports.useAddition = exports.isColumnComponent = void 0;
 
-var _react = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
 
 var _react2 = require("@formily/react");
 
 var _shared = require("@formily/shared");
 
-var _antdV = require("@formily/antd-v5");
+var _arrayBase = _interopRequireDefault(require("./arrayBase"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -90,40 +96,50 @@ var useArrayTableSources = function useArrayTableSources() {
 };
 
 exports.useArrayTableSources = useArrayTableSources;
+var AgField = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
+  var value = _ref.value,
+      record = _ref.data,
+      dataSource = _ref.dataSource,
+      schema = _ref.schema,
+      field = _ref.field;
+  var index = dataSource === null || dataSource === void 0 ? void 0 : dataSource.indexOf(record);
+
+  var children = /*#__PURE__*/_react.default.createElement(_arrayBase.default.Item, {
+    index: index,
+    record: function record() {
+      var _field$value;
+
+      return (_field$value = field.value) === null || _field$value === void 0 ? void 0 : _field$value[index];
+    },
+    schema: schema,
+    field: field
+  }, /*#__PURE__*/_react.default.createElement(_react2.RecursionField, {
+    schema: schema,
+    name: index,
+    onlyRenderProperties: true
+  }));
+
+  return children;
+});
 
 var useArrayTableColumns = function useArrayTableColumns(dataSource, field, sources) {
-  return sources.reduce(function (buf, _ref, key) {
-    var name = _ref.name,
-        columnProps = _ref.columnProps,
-        schema = _ref.schema,
-        display = _ref.display;
+  return sources.reduce(function (buf, _ref2, key) {
+    var name = _ref2.name,
+        columnProps = _ref2.columnProps,
+        schema = _ref2.schema,
+        display = _ref2.display;
     if (display !== 'visible') return buf;
     if (!isColumnComponent(schema)) return buf;
     return buf.concat(_objectSpread(_objectSpread({}, columnProps), {}, {
       //@ts-ignore
       headerName: columnProps.headerName || columnProps.title,
       field: name,
-      cellRenderer: function cellRenderer(_ref2) {
-        var rowIndex = _ref2.rowIndex,
-            value = _ref2.value,
-            record = _ref2.data;
-        var index = dataSource === null || dataSource === void 0 ? void 0 : dataSource.indexOf(record);
-
-        var children = /*#__PURE__*/_react.default.createElement(_antdV.ArrayBase.Item, {
-          index: index,
-          record: function record() {
-            var _field$value;
-
-            return field === null || field === void 0 ? void 0 : (_field$value = field.value) === null || _field$value === void 0 ? void 0 : _field$value[index];
-          }
-        }, /*#__PURE__*/_react.default.createElement(_react2.RecursionField, {
-          schema: schema,
-          name: index,
-          onlyRenderProperties: true
-        }));
-
-        return children;
-      }
+      cellRendererParams: {
+        dataSource: dataSource,
+        schema: schema,
+        field: field
+      },
+      cellRenderer: AgField
     }));
   }, []);
 };

package/dist/esm/ag-grid-plus/ag-gridPlus.js

@@ -26,11 +26,10 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 
 import { AgGridReact } from 'ag-grid-react';
 import { Spin, Pagination, Card, Tag } from 'antd';
-import React, { useCallback, useEffect, useImperativeHandle, useRef, useState } from 'react';
+import React, { useCallback, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
 import "ag-grid-enterprise";
 import "./global.scss";
 import "./index.less";
-import { AgGridColumn } from "./interface";
 import FormRender from "./queryForm";
 import ToolBar from "./toolBar";
 import SettingItem from "./settingItem";
@@ -205,6 +204,11 @@ function AgGridPlus(props) {
       onRefresh: onRefresh
     };
   }, [queryFilter, JSON.stringify(gridParams), JSON.stringify(sortColumn)]);
+  var colDefs = useMemo(function () {
+    return React.Children.map(children, function (child, index) {
+      return child.props;
+    });
+  }, [children]);
   return /*#__PURE__*/React.createElement(Spin, {
     spinning: loading,
     wrapperClassName: "grid-spin"
@@ -328,18 +332,8 @@ function AgGridPlus(props) {
     } // animateRows={true}
     //停用默认分页组件
     ,
-    suppressPaginationPanel: true
-  }), props.rowSelection ? /*#__PURE__*/React.createElement(AgGridColumn, {
-    field: "",
-    width: 30,
-    flex: 0,
-    headerCheckboxSelection: true,
-    checkboxSelection: true,
-    showDisabledCheckboxes: true,
-    filter: false,
-    pinned: "left"
-  }) : null, React.Children.map(children, function (child, index) {
-    return child;
+    suppressPaginationPanel: true,
+    columnDefs: colDefs || props.columnDefs
   }))), /*#__PURE__*/React.createElement("div", {
     style: {
       marginTop: 12,