@nokecy/qc-ui 0.1.40 → 0.1.42

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

@@ -173,6 +173,9 @@ function AgGridPlus(props) {
   (0, _react.useEffect)(function () {
     loadingProps !== undefined && setLoading(loadingProps);
   }, [loadingProps]);
+  var gridRowData = (0, _react.useMemo)(function () {
+    return props.treeData ? (0, _utils.flatten)((0, _utils.toTree)(rowData), treeParentName) : rowData;
+  }, [props.treeData, treeParentName, rowData]);
   var onGridReady = (0, _react.useCallback)(function (params) {
     var _columnsRef$current;
 
@@ -288,7 +291,7 @@ function AgGridPlus(props) {
   }, rest, {
     //指定客户端模式
     rowModelType: "clientSide",
-    rowData: props.treeData ? (0, _utils.flatten)((0, _utils.toTree)(rowData), treeParentName) : rowData,
+    rowData: gridRowData,
     onGridReady: onGridReady,
     defaultColDef: defaultColDef,
     onSortChanged: function onSortChanged(event) {

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

@@ -106,20 +106,21 @@ var useArrayTableColumns = function useArrayTableColumns(field, sources) {
       cellRenderer: function cellRenderer(_ref2) {
         var _field$value;
 
-        var value = _ref2.value,
+        var rowIndex = _ref2.rowIndex,
+            value = _ref2.value,
             record = _ref2.data;
         var index = field === null || field === void 0 ? void 0 : (_field$value = field.value) === null || _field$value === void 0 ? void 0 : _field$value.indexOf(record);
 
         var children = /*#__PURE__*/_react.default.createElement(_antdV.ArrayBase.Item, {
-          index: index,
+          index: rowIndex,
           record: function record() {
             var _field$value2;
 
-            return field === null || field === void 0 ? void 0 : (_field$value2 = field.value) === null || _field$value2 === void 0 ? void 0 : _field$value2[index];
+            return field === null || field === void 0 ? void 0 : (_field$value2 = field.value) === null || _field$value2 === void 0 ? void 0 : _field$value2[rowIndex];
           }
         }, /*#__PURE__*/_react.default.createElement(_react2.RecursionField, {
           schema: schema,
-          name: index,
+          name: rowIndex,
           onlyRenderProperties: true
         }));
 

package/dist/cjs/editable/index.d.ts

@@ -1,7 +1,7 @@
 import { ReactFC } from '@formily/react';
 import { PopoverProps } from 'antd/lib/popover';
-import { IFormItemProps } from '@formily/antd-v5';
 import React from 'react';
+import { IFormItemProps } from '@formily/antd-v5';
 export declare const Editable: ReactFC<IFormItemProps> & {
     Popover: React.MemoExoticComponent<ReactFC<PopoverProps>>;
 };

package/dist/cjs/editable/index.js

@@ -17,10 +17,10 @@ var _antd = require("antd");
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
-var _antdV = require("@formily/antd-v5");
-
 var _react2 = _interopRequireWildcard(require("react"));
 
+var _antdV = require("@formily/antd-v5");
+
 var _builtins__ = require("@formily/antd-v5/lib/__builtins__");
 
 var _style = _interopRequireDefault(require("./style"));
@@ -31,14 +31,14 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-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 _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return generator._invoke = function (innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; }(innerFn, self, context), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; this._invoke = function (method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); }; } function maybeInvokeDelegate(delegate, context) { var method = delegate.iterator[context.method]; if (undefined === method) { if (context.delegate = null, "throw" === context.method) { if (delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method)) return ContinueSentinel; context.method = "throw", context.arg = new TypeError("The iterator does not provide a 'throw' method"); } return ContinueSentinel; } var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) { if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; } return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, define(Gp, "constructor", GeneratorFunctionPrototype), define(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (object) { var keys = []; for (var key in object) { keys.push(key); } return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) { "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); } }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
 
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 
+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 _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -60,20 +60,12 @@ var useParentPattern = function useParentPattern() {
 
 var useEditable = function useEditable() {
   var pattern = useParentPattern();
-
-  var record = _antdV.ArrayBase.useRecord();
-
-  var field = (0, _react.useField)(); // useLayoutEffect(() => {
-  //     if (pattern === 'editable') {
-  //         return field.setPattern('readPretty')
-  //     }
-  // }, [pattern])
-
+  var field = (0, _react.useField)();
   (0, _react2.useLayoutEffect)(function () {
-    if ((field.initialValue || !(record !== null && record !== void 0 && record._isNew)) && pattern === 'editable') {
+    if (pattern === 'editable') {
       return field.setPattern('readPretty');
     }
-  }, [field.initialValue]);
+  }, [pattern]);
   return [field.pattern === 'editable', function (payload) {
     if (pattern !== 'editable') return;
     field.setPattern(payload ? 'editable' : 'readPretty');
@@ -118,61 +110,17 @@ var InternalEditable = (0, _react.observer)(function (props) {
   var ref = (0, _react2.useRef)();
   var innerRef = (0, _react2.useRef)(null);
 
-  var recover = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var _field$errors;
-
-      var errors;
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              if (!(editable && !(field !== null && field !== void 0 && (_field$errors = field.errors) !== null && _field$errors !== void 0 && _field$errors.length))) {
-                _context.next = 10;
-                break;
-              }
-
-              _context.prev = 1;
-              _context.next = 4;
-              return field.form.validate("".concat(field.path));
-
-            case 4:
-              _context.prev = 4;
-              errors = field.form.queryFeedbacks({
-                type: 'error',
-                address: "".concat(field.address)
-              });
-
-              if (!(errors !== null && errors !== void 0 && errors.length)) {
-                _context.next = 8;
-                break;
-              }
-
-              return _context.abrupt("return");
-
-            case 8:
-              if (ref.current && !(errors !== null && errors !== void 0 && errors.length)) {
-                setEditable(false);
-              }
-
-              return _context.finish(4);
-
-            case 10:
-            case "end":
-              return _context.stop();
-          }
-        }
-      }, _callee, null, [[1,, 4, 10]]);
-    }));
+  var recover = function recover() {
+    var _field$errors;
 
-    return function recover() {
-      return _ref.apply(this, arguments);
-    };
-  }();
+    if (ref.current && !(field !== null && field !== void 0 && (_field$errors = field.errors) !== null && _field$errors !== void 0 && _field$errors.length)) {
+      setEditable(false);
+    }
+  };
 
   var renderEditHelper = function renderEditHelper() {
     if (editable) return;
-    return /*#__PURE__*/_react2.default.createElement(_antdV.FormItem.BaseItem, _extends({}, props, itemProps), pattern === 'editable' && /*#__PURE__*/_react2.default.createElement(_icons.EditOutlined, {
+    return /*#__PURE__*/_react2.default.createElement(_antdV.BaseItem, _extends({}, props, itemProps), pattern === 'editable' && /*#__PURE__*/_react2.default.createElement(_icons.EditOutlined, {
       className: "".concat(prefixCls, "-edit-btn")
     }), pattern !== 'editable' && /*#__PURE__*/_react2.default.createElement(_icons.MessageOutlined, {
       className: "".concat(prefixCls, "-edit-btn")
@@ -181,7 +129,7 @@ var InternalEditable = (0, _react.observer)(function (props) {
 
   var renderCloseHelper = function renderCloseHelper() {
     if (!editable) return;
-    return /*#__PURE__*/_react2.default.createElement(_antdV.FormItem.BaseItem, props, /*#__PURE__*/_react2.default.createElement(_icons.CloseOutlined, {
+    return /*#__PURE__*/_react2.default.createElement(_antdV.BaseItem, props, /*#__PURE__*/_react2.default.createElement(_icons.CloseOutlined, {
       className: "".concat(prefixCls, "-close-btn")
     }));
   };
@@ -221,7 +169,7 @@ var InternalEditable = (0, _react.observer)(function (props) {
     onClick: onClick
   }, /*#__PURE__*/_react2.default.createElement("div", {
     className: "".concat(prefixCls, "-content")
-  }, /*#__PURE__*/_react2.default.createElement(_antdV.FormItem.BaseItem, _extends({}, props, itemProps), props.children), renderEditHelper(), renderCloseHelper())));
+  }, /*#__PURE__*/_react2.default.createElement(_antdV.BaseItem, _extends({}, props, itemProps), props.children), renderEditHelper(), renderCloseHelper())));
 });
 var Popover = (0, _react.observer)(function (props) {
   var field = (0, _react.useField)();
@@ -240,44 +188,44 @@ var Popover = (0, _react.observer)(function (props) {
       hashId = _useStyle4[1];
 
   var closePopover = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var errors;
-      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) {
-          switch (_context2.prev = _context2.next) {
+          switch (_context.prev = _context.next) {
             case 0:
-              _context2.prev = 0;
-              _context2.next = 3;
+              _context.prev = 0;
+              _context.next = 3;
               return field.form.validate("".concat(field.address, ".*"));
 
             case 3:
-              _context2.prev = 3;
+              _context.prev = 3;
               errors = field.form.queryFeedbacks({
                 type: 'error',
                 address: "".concat(field.address, ".*")
               });
 
               if (!(errors !== null && errors !== void 0 && errors.length)) {
-                _context2.next = 7;
+                _context.next = 7;
                 break;
               }
 
-              return _context2.abrupt("return");
+              return _context.abrupt("return");
 
             case 7:
               setOpen(false);
-              return _context2.finish(3);
+              return _context.finish(3);
 
             case 9:
             case "end":
-              return _context2.stop();
+              return _context.stop();
           }
         }
-      }, _callee2, null, [[0,, 3, 9]]);
+      }, _callee, null, [[0,, 3, 9]]);
     }));
 
     return function closePopover() {
-      return _ref2.apply(this, arguments);
+      return _ref.apply(this, arguments);
     };
   }();
 
@@ -299,7 +247,7 @@ var Popover = (0, _react.observer)(function (props) {
         closePopover();
       }
     }
-  }), /*#__PURE__*/_react2.default.createElement("div", null, /*#__PURE__*/_react2.default.createElement(_antdV.FormItem.BaseItem, {
+  }), /*#__PURE__*/_react2.default.createElement("div", null, /*#__PURE__*/_react2.default.createElement(_antdV.BaseItem, {
     className: "".concat(prefixCls, "-trigger")
   }, /*#__PURE__*/_react2.default.createElement("div", {
     className: "".concat(prefixCls, "-content")

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

@@ -26,7 +26,7 @@ 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";
@@ -146,6 +146,9 @@ function AgGridPlus(props) {
   useEffect(function () {
     loadingProps !== undefined && setLoading(loadingProps);
   }, [loadingProps]);
+  var gridRowData = useMemo(function () {
+    return props.treeData ? flatten(toTree(rowData), treeParentName) : rowData;
+  }, [props.treeData, treeParentName, rowData]);
   var onGridReady = useCallback(function (params) {
     var _columnsRef$current;
 
@@ -261,7 +264,7 @@ function AgGridPlus(props) {
   }, rest, {
     //指定客户端模式
     rowModelType: "clientSide",
-    rowData: props.treeData ? flatten(toTree(rowData), treeParentName) : rowData,
+    rowData: gridRowData,
     onGridReady: onGridReady,
     defaultColDef: defaultColDef,
     onSortChanged: function onSortChanged(event) {

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

@@ -90,19 +90,20 @@ var useArrayTableColumns = function useArrayTableColumns(field, sources) {
       cellRenderer: function cellRenderer(_ref2) {
         var _field$value;
 
-        var value = _ref2.value,
+        var rowIndex = _ref2.rowIndex,
+            value = _ref2.value,
             record = _ref2.data;
         var index = field === null || field === void 0 ? void 0 : (_field$value = field.value) === null || _field$value === void 0 ? void 0 : _field$value.indexOf(record);
         var children = /*#__PURE__*/React.createElement(ArrayBase.Item, {
-          index: index,
+          index: rowIndex,
           record: function record() {
             var _field$value2;
 
-            return field === null || field === void 0 ? void 0 : (_field$value2 = field.value) === null || _field$value2 === void 0 ? void 0 : _field$value2[index];
+            return field === null || field === void 0 ? void 0 : (_field$value2 = field.value) === null || _field$value2 === void 0 ? void 0 : _field$value2[rowIndex];
           }
         }, /*#__PURE__*/React.createElement(RecursionField, {
           schema: schema,
-          name: index,
+          name: rowIndex,
           onlyRenderProperties: true
         }));
         return children;

package/dist/esm/editable/index.d.ts

@@ -1,7 +1,7 @@
 import { ReactFC } from '@formily/react';
 import { PopoverProps } from 'antd/lib/popover';
-import { IFormItemProps } from '@formily/antd-v5';
 import React from 'react';
+import { IFormItemProps } from '@formily/antd-v5';
 export declare const Editable: ReactFC<IFormItemProps> & {
     Popover: React.MemoExoticComponent<ReactFC<PopoverProps>>;
 };

package/dist/esm/editable/index.js

@@ -1,13 +1,13 @@
 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); }
 
-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 _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return generator._invoke = function (innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; }(innerFn, self, context), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; this._invoke = function (method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); }; } function maybeInvokeDelegate(delegate, context) { var method = delegate.iterator[context.method]; if (undefined === method) { if (context.delegate = null, "throw" === context.method) { if (delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method)) return ContinueSentinel; context.method = "throw", context.arg = new TypeError("The iterator does not provide a 'throw' method"); } return ContinueSentinel; } var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) { if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; } return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, define(Gp, "constructor", GeneratorFunctionPrototype), define(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (object) { var keys = []; for (var key in object) { keys.push(key); } return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) { "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); } }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
 
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 
+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 _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -25,8 +25,8 @@ import { isVoidField } from '@formily/core';
 import { observer, useField } from '@formily/react';
 import { Popover as AntdPopover } from 'antd';
 import cls from 'classnames';
-import { ArrayBase, FormItem } from '@formily/antd-v5';
 import React, { useLayoutEffect, useRef, useState } from 'react';
+import { BaseItem } from '@formily/antd-v5';
 import { useClickAway, usePrefixCls } from '@formily/antd-v5/lib/__builtins__';
 import useStyle from "./style";
 
@@ -39,18 +39,12 @@ var useParentPattern = function useParentPattern() {
 
 var useEditable = function useEditable() {
   var pattern = useParentPattern();
-  var record = ArrayBase.useRecord();
-  var field = useField(); // useLayoutEffect(() => {
-  //     if (pattern === 'editable') {
-  //         return field.setPattern('readPretty')
-  //     }
-  // }, [pattern])
-
+  var field = useField();
   useLayoutEffect(function () {
-    if ((field.initialValue || !(record !== null && record !== void 0 && record._isNew)) && pattern === 'editable') {
+    if (pattern === 'editable') {
       return field.setPattern('readPretty');
     }
-  }, [field.initialValue]);
+  }, [pattern]);
   return [field.pattern === 'editable', function (payload) {
     if (pattern !== 'editable') return;
     field.setPattern(payload ? 'editable' : 'readPretty');
@@ -95,61 +89,17 @@ var InternalEditable = observer(function (props) {
   var ref = useRef();
   var innerRef = useRef(null);
 
-  var recover = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var _field$errors;
-
-      var errors;
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              if (!(editable && !(field !== null && field !== void 0 && (_field$errors = field.errors) !== null && _field$errors !== void 0 && _field$errors.length))) {
-                _context.next = 10;
-                break;
-              }
-
-              _context.prev = 1;
-              _context.next = 4;
-              return field.form.validate("".concat(field.path));
-
-            case 4:
-              _context.prev = 4;
-              errors = field.form.queryFeedbacks({
-                type: 'error',
-                address: "".concat(field.address)
-              });
-
-              if (!(errors !== null && errors !== void 0 && errors.length)) {
-                _context.next = 8;
-                break;
-              }
-
-              return _context.abrupt("return");
-
-            case 8:
-              if (ref.current && !(errors !== null && errors !== void 0 && errors.length)) {
-                setEditable(false);
-              }
-
-              return _context.finish(4);
-
-            case 10:
-            case "end":
-              return _context.stop();
-          }
-        }
-      }, _callee, null, [[1,, 4, 10]]);
-    }));
+  var recover = function recover() {
+    var _field$errors;
 
-    return function recover() {
-      return _ref.apply(this, arguments);
-    };
-  }();
+    if (ref.current && !(field !== null && field !== void 0 && (_field$errors = field.errors) !== null && _field$errors !== void 0 && _field$errors.length)) {
+      setEditable(false);
+    }
+  };
 
   var renderEditHelper = function renderEditHelper() {
     if (editable) return;
-    return /*#__PURE__*/React.createElement(FormItem.BaseItem, _extends({}, props, itemProps), pattern === 'editable' && /*#__PURE__*/React.createElement(EditOutlined, {
+    return /*#__PURE__*/React.createElement(BaseItem, _extends({}, props, itemProps), pattern === 'editable' && /*#__PURE__*/React.createElement(EditOutlined, {
       className: "".concat(prefixCls, "-edit-btn")
     }), pattern !== 'editable' && /*#__PURE__*/React.createElement(MessageOutlined, {
       className: "".concat(prefixCls, "-edit-btn")
@@ -158,7 +108,7 @@ var InternalEditable = observer(function (props) {
 
   var renderCloseHelper = function renderCloseHelper() {
     if (!editable) return;
-    return /*#__PURE__*/React.createElement(FormItem.BaseItem, props, /*#__PURE__*/React.createElement(CloseOutlined, {
+    return /*#__PURE__*/React.createElement(BaseItem, props, /*#__PURE__*/React.createElement(CloseOutlined, {
       className: "".concat(prefixCls, "-close-btn")
     }));
   };
@@ -198,7 +148,7 @@ var InternalEditable = observer(function (props) {
     onClick: onClick
   }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(prefixCls, "-content")
-  }, /*#__PURE__*/React.createElement(FormItem.BaseItem, _extends({}, props, itemProps), props.children), renderEditHelper(), renderCloseHelper())));
+  }, /*#__PURE__*/React.createElement(BaseItem, _extends({}, props, itemProps), props.children), renderEditHelper(), renderCloseHelper())));
 });
 var Popover = observer(function (props) {
   var field = useField();
@@ -217,44 +167,44 @@ var Popover = observer(function (props) {
       hashId = _useStyle4[1];
 
   var closePopover = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var errors;
-      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) {
-          switch (_context2.prev = _context2.next) {
+          switch (_context.prev = _context.next) {
             case 0:
-              _context2.prev = 0;
-              _context2.next = 3;
+              _context.prev = 0;
+              _context.next = 3;
               return field.form.validate("".concat(field.address, ".*"));
 
             case 3:
-              _context2.prev = 3;
+              _context.prev = 3;
               errors = field.form.queryFeedbacks({
                 type: 'error',
                 address: "".concat(field.address, ".*")
               });
 
               if (!(errors !== null && errors !== void 0 && errors.length)) {
-                _context2.next = 7;
+                _context.next = 7;
                 break;
               }
 
-              return _context2.abrupt("return");
+              return _context.abrupt("return");
 
             case 7:
               setOpen(false);
-              return _context2.finish(3);
+              return _context.finish(3);
 
             case 9:
             case "end":
-              return _context2.stop();
+              return _context.stop();
           }
         }
-      }, _callee2, null, [[0,, 3, 9]]);
+      }, _callee, null, [[0,, 3, 9]]);
     }));
 
     return function closePopover() {
-      return _ref2.apply(this, arguments);
+      return _ref.apply(this, arguments);
     };
   }();
 
@@ -276,7 +226,7 @@ var Popover = observer(function (props) {
         closePopover();
       }
     }
-  }), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(FormItem.BaseItem, {
+  }), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(BaseItem, {
     className: "".concat(prefixCls, "-trigger")
   }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(prefixCls, "-content")