@nokecy/qc-ui 1.1.87 → 1.1.89

package/dist/cjs/editable/index.js

@@ -12,6 +12,7 @@ var _antd = require("antd");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _antdV = require("@formily/antd-v5");
 var _arrayBase = require("../array-table/arrayBase");
+var _cellFocusScope = require("../array-table/cellFocusScope");
 var _react2 = _interopRequireWildcard(require("react"));
 var _builtins__ = require("@formily/antd-v5/lib/__builtins__");
 var _style = _interopRequireDefault(require("./style"));
@@ -19,7 +20,6 @@ function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 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 _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 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 e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
 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); }); }; }
@@ -92,7 +92,6 @@ var InternalEditable = (0, _react.observer)(function (props) {
   var pattern = useParentPattern();
   var itemProps = useFormItemProps();
   var field = (0, _react.useField)();
-  var basePrefixCls = (0, _builtins__.usePrefixCls)();
   var prefixCls = (0, _builtins__.usePrefixCls)('formily-editable');
   var _useStyle = (0, _style.default)(prefixCls),
     _useStyle2 = _slicedToArray(_useStyle, 2),
@@ -100,175 +99,138 @@ var InternalEditable = (0, _react.observer)(function (props) {
     hashId = _useStyle2[1];
   var ref = (0, _react2.useRef)();
   var innerRef = (0, _react2.useRef)(null);
+  var focusRequestRef = (0, _react2.useRef)(false);
+  var focusGenerationRef = (0, _react2.useRef)(0);
+  var focusTimerRef = (0, _react2.useRef)();
 
-  // 通用的聚焦函数
-  var focusInput = _react2.default.useCallback(function () {
-    var _innerRef$current;
-    var input = (_innerRef$current = innerRef.current) === null || _innerRef$current === void 0 ? void 0 : _innerRef$current.querySelector('input:not([readonly]):not([disabled]), textarea:not([readonly]):not([disabled])');
-    if (input) {
-      input.focus();
-      // setSelectionRange 仅 textarea 与 text/search/url/tel/password 类型 input 支持;
-      // checkbox/number/date 等会抛 InvalidStateError,故用白名单守卫。@author nokecy
-      if (input.tagName === 'TEXTAREA' || /^(text|search|url|tel|password)$/i.test(input.type || 'text')) {
-        var _input$value;
-        var length = ((_input$value = input.value) === null || _input$value === void 0 ? void 0 : _input$value.length) || 0;
-        setTimeout(function () {
-          input.setSelectionRange(length, length);
-        }, 10);
-      }
-      return true;
-    }
-    return false;
+  /** 离开或重新进入时作废旧聚焦任务，同时保护仍在等待的异步校验。@author nokecy */
+  var cancelFocusRequest = _react2.default.useCallback(function () {
+    focusGenerationRef.current += 1;
+    focusRequestRef.current = false;
+    clearTimeout(focusTimerRef.current);
   }, []);
+  var activate = function activate() {
+    if (ref.current || pattern !== 'editable') return;
+    cancelFocusRequest();
+    focusRequestRef.current = true;
+    ref.current = true;
+    setEditable(true);
+  };
 
-  // 重试聚焦函数
-  var retryFocus = _react2.default.useCallback(function () {
-    if (!focusInput()) {
-      setTimeout(function () {
-        if (!focusInput()) {
-          setTimeout(focusInput, 50);
-        }
-      }, 50);
-    }
-  }, [focusInput]);
+  /** 与懒挂载单元格共用离开规则：保留错误，且旧校验不能收起已重新进入的字段。@author nokecy */
   var recover = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var _field$errors;
-      var errors;
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(isStale) {
+      var hadFocus,
+        generation,
+        _args = arguments;
       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;
+            hadFocus = _args.length > 1 && _args[1] !== undefined ? _args[1] : true;
+            cancelFocusRequest();
+            generation = focusGenerationRef.current;
+            if (!(!ref.current || pattern !== 'editable')) {
+              _context.next = 5;
               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;
+            return _context.abrupt("return");
+          case 5:
+            if (!(!hadFocus && isDeepEmpty(field.value))) {
+              _context.next = 7;
               break;
             }
             return _context.abrupt("return");
-          case 8:
-            if (ref.current && !(errors !== null && errors !== void 0 && errors.length)) {
-              setEditable(false);
-            }
-            return _context.finish(4);
+          case 7:
+            _context.prev = 7;
+            _context.next = 10;
+            return field.validate();
           case 10:
+            _context.next = 15;
+            break;
+          case 12:
+            _context.prev = 12;
+            _context.t0 = _context["catch"](7);
+            return _context.abrupt("return");
+          case 15:
+            if (!(isStale() || generation !== focusGenerationRef.current || !ref.current || field.errors.length)) {
+              _context.next = 17;
+              break;
+            }
+            return _context.abrupt("return");
+          case 17:
+            setEditable(false);
+          case 18:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[1,, 4, 10]]);
+      }, _callee, null, [[7, 12]]);
     }));
-    return function recover() {
+    return function recover(_x) {
       return _ref.apply(this, arguments);
     };
   }();
-  (0, _builtins__.useClickAway)(function (e) {
-    var _innerRef$current2;
-    var target = e.target;
-    if (target !== null && target !== void 0 && target.closest(".".concat(basePrefixCls, "-select-dropdown"))) return;
-    if (target !== null && target !== void 0 && target.closest(".".concat(basePrefixCls, "-picker-dropdown"))) return;
-    if (target !== null && target !== void 0 && target.closest(".".concat(basePrefixCls, "-cascader-menus"))) return;
 
-    // 检查是否点击的是当前组件内的输入框或相关元素
-    var inputElements = (_innerRef$current2 = innerRef.current) === null || _innerRef$current2 === void 0 ? void 0 : _innerRef$current2.querySelectorAll('input, textarea, .ant-input, .ant-input-wrapper');
-    if (inputElements) {
-      //@ts-ignore
-      var _iterator = _createForOfIteratorHelper(inputElements),
-        _step;
-      try {
-        for (_iterator.s(); !(_step = _iterator.n()).done;) {
-          var input = _step.value;
-          if (target === input || input.contains(target) || target.closest('.ant-input-wrapper')) {
-            return; // 不触发recover
-          }
-        }
-      } catch (err) {
-        _iterator.e(err);
-      } finally {
-        _iterator.f();
-      }
-    }
-    recover();
-  }, innerRef);
-  var onClick = function onClick(e) {
-    var _innerRef$current3;
-    var target = e.target;
-    var close = ((_innerRef$current3 = innerRef.current) === null || _innerRef$current3 === void 0 ? void 0 : _innerRef$current3.querySelector(".".concat(prefixCls, "-close-btn"))) || null;
-    if (target !== null && target !== void 0 && target.contains(close) || close !== null && close !== void 0 && close.contains(target)) {
-      recover();
-    } else if (!ref.current) {
-      // 只有在非编辑状态时才触发编辑状态
-      setTimeout(function () {
-        setEditable(true);
-        setTimeout(retryFocus, 100);
-      });
-    } else {
-      // 如果已经处于编辑状态，检查点击的是否是输入框或其相关元素
-      var isInputElement = target.tagName === 'INPUT' || target.tagName === 'TEXTAREA';
-      var isInputRelated = target.closest('input, textarea, .ant-input, .ant-input-wrapper');
-      if (isInputElement || isInputRelated) {
-        // 如果点击的是输入框或相关元素，不做任何操作，让输入框自己处理焦点
-        e.stopPropagation();
-        return;
-      }
-      // 如果点击的是其他区域且已经处于编辑状态，也不做任何操作（保持编辑状态）
+  // 输入节点在本次提交后即可聚焦；少数延迟挂载组件允许短暂重试，离开和卸载会取消任务。
+  // 不延迟改写光标，避免用户已经切格或选中文字后再抢回焦点。@author nokecy
+  (0, _react2.useLayoutEffect)(function () {
+    if (!editable || pattern !== 'editable') {
+      cancelFocusRequest();
+      return;
     }
-  };
-
-  // 监听键盘导航事件，自动进入编辑状态
-  _react2.default.useEffect(function () {
-    var handleKeyDown = function handleKeyDown(e) {
-      if (e.key === 'Enter' || e.key === 'F2') {
-        if (!editable && pattern === 'editable') {
-          e.preventDefault();
-          setEditable(true);
-          setTimeout(retryFocus, 100);
+    if (!focusRequestRef.current) return;
+    var generation = focusGenerationRef.current;
+    var focusInput = function focusInput() {
+      var attempt = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
+      var root = innerRef.current;
+      if (generation !== focusGenerationRef.current || !focusRequestRef.current || !(root !== null && root !== void 0 && root.isConnected)) return;
+      var input = root.querySelector('input:not([readonly]):not([disabled]), textarea:not([readonly]):not([disabled])');
+      if (input) {
+        focusRequestRef.current = false;
+        if (document.activeElement === input) return;
+        input.focus();
+        if (!input.closest('.ant-picker') && (input.tagName === 'TEXTAREA' || /^(text|search|url|tel|password)$/i.test(input.type || 'text'))) {
+          var _input$value;
+          var length = ((_input$value = input.value) === null || _input$value === void 0 ? void 0 : _input$value.length) || 0;
+          input.setSelectionRange(length, length);
         }
+      } else if (attempt < 2) {
+        focusTimerRef.current = setTimeout(function () {
+          return focusInput(attempt + 1);
+        }, 50);
       }
     };
-    var element = innerRef.current;
-    if (element) {
-      element.addEventListener('keydown', handleKeyDown);
-      return function () {
-        element.removeEventListener('keydown', handleKeyDown);
-      };
-    }
-  }, [editable, pattern, setEditable, retryFocus]);
-
-  // 当组件获得焦点时自动进入编辑状态
+    focusInput();
+  }, [editable, pattern, cancelFocusRequest]);
   _react2.default.useEffect(function () {
-    var handleFocus = function handleFocus() {
-      if (!editable && pattern === 'editable') {
-        setEditable(true);
-        setTimeout(retryFocus, 100);
-      }
-    };
-    var element = innerRef.current;
-    if (element) {
-      element.addEventListener('focus', handleFocus, true);
-      return function () {
-        element.removeEventListener('focus', handleFocus, true);
-      };
-    }
-  }, [editable, pattern, setEditable, retryFocus]);
+    return cancelFocusRequest;
+  }, [cancelFocusRequest]);
   ref.current = editable;
-  return wrapSSR( /*#__PURE__*/_react2.default.createElement("div", {
+  return wrapSSR( /*#__PURE__*/_react2.default.createElement(_cellFocusScope.CellFocusScope, {
+    onLeave: recover
+  }, /*#__PURE__*/_react2.default.createElement("div", {
     className: (0, _classnames.default)(prefixCls, hashId),
     ref: innerRef,
-    onClick: onClick,
+    onClick: function onClick(event) {
+      var target = event.target;
+      if (target.closest(".".concat(prefixCls, "-close-btn"))) void recover(function () {
+        return false;
+      });else activate();
+    },
+    onFocusCapture: function onFocusCapture() {
+      cancelFocusRequest();
+      activate();
+    },
+    onBlurCapture: cancelFocusRequest,
+    onKeyDown: function onKeyDown(event) {
+      if (!ref.current && (event.key === 'Enter' || event.key === 'F2')) {
+        event.preventDefault();
+        activate();
+      }
+    },
     "data-editable-state": editable ? 'editing' : 'readonly'
   }, /*#__PURE__*/_react2.default.createElement("div", {
     className: "".concat(prefixCls, "-content")
-  }, /*#__PURE__*/_react2.default.createElement(_antdV.FormItem.BaseItem, _extends({}, props, itemProps), props.children))));
+  }, /*#__PURE__*/_react2.default.createElement(_antdV.FormItem.BaseItem, _extends({}, props, itemProps), props.children)))));
 });
 var Popover = (0, _react.observer)(function (props) {
   var field = (0, _react.useField)();

package/dist/cjs/index.d.ts

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

package/dist/cjs/index.js

@@ -51,6 +51,8 @@ var _exportNames = {
   registerReadOnlyFormatter: true,
   registerReadOnlyLabels: true,
   registerReadOnlyRenderer: true,
+  withReadOnlyFormatter: true,
+  formatSelectDisplay: true,
   createEntitySelect: true,
   ExportButton: true,
   buildExportUrl: true,
@@ -359,6 +361,12 @@ Object.defineProperty(exports, "formatDecimal", {
     return _businessDecimal.formatDecimal;
   }
 });
+Object.defineProperty(exports, "formatSelectDisplay", {
+  enumerable: true,
+  get: function get() {
+    return _readOnlyFormatters.formatSelectDisplay;
+  }
+});
 Object.defineProperty(exports, "fromHsl", {
   enumerable: true,
   get: function get() {
@@ -497,6 +505,12 @@ Object.defineProperty(exports, "useTemplateManager", {
     return _RegexEditor.useTemplateManager;
   }
 });
+Object.defineProperty(exports, "withReadOnlyFormatter", {
+  enumerable: true,
+  get: function get() {
+    return _readOnlyFormatters.withReadOnlyFormatter;
+  }
+});
 Object.defineProperty(exports, "withStandardForm", {
   enumerable: true,
   get: function get() {

package/dist/cjs/readPretty/arrayTable.js

@@ -1,6 +1,5 @@
 "use strict";
 
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -15,13 +14,30 @@ var _hoistStatics = require("./hoistStatics");
 var _react2 = _interopRequireWildcard(require("react"));
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 /** 阅读态直接使用 ArrayTable 的列定义，避免 AgGridPlus 的原值渲染器覆盖格式化结果。@author nokecy */
+
 var ReadingArrayTable = (0, _react.observer)(function (_ref) {
   var _buildArrayTableColum;
-  var height = _ref.height;
+  var height = _ref.height,
+    _ref$rowSelection = _ref.rowSelection,
+    rowSelection = _ref$rowSelection === void 0 ? {
+      mode: 'singleRow',
+      enableClickSelection: true,
+      checkboxes: false
+    } : _ref$rowSelection,
+    selectionColumnDef = _ref.selectionColumnDef,
+    onSelectionChanged = _ref.onSelectionChanged,
+    onGridReady = _ref.onGridReady,
+    _onRowDataUpdated = _ref.onRowDataUpdated;
   var field = (0, _react.useField)();
   var sources = (0, _utils.useArrayTableSources)();
   var rows = Array.isArray(field.value) ? field.value.slice() : [];
@@ -45,16 +61,15 @@ var ReadingArrayTable = (0, _react.observer)(function (_ref) {
       sortable: true,
       filter: true
     },
-    rowSelection: {
-      mode: 'singleRow',
-      enableClickSelection: true
-    },
-    selectionColumnDef: {
+    rowSelection: rowSelection,
+    selectionColumnDef: _objectSpread({
       pinned: 'left',
       lockPosition: true,
       width: 50,
       suppressHeaderMenuButton: true
-    },
+    }, selectionColumnDef),
+    onSelectionChanged: onSelectionChanged,
+    onGridReady: onGridReady,
     columnDefs: (0, _columnGroup.groupColumnDefs)(columns),
     rowData: rows,
     getRowId: function getRowId(_ref2) {
@@ -73,12 +88,12 @@ var ReadingArrayTable = (0, _react.observer)(function (_ref) {
       }
       return rowId;
     },
-    onRowDataUpdated: function onRowDataUpdated(_ref3) {
-      var api = _ref3.api;
-      if (showIndex) api.refreshCells({
+    onRowDataUpdated: function onRowDataUpdated(event) {
+      if (showIndex) event.api.refreshCells({
         columns: [_indexColumn.ARRAY_TABLE_INDEX_FIELD],
         force: true
       });
+      _onRowDataUpdated === null || _onRowDataUpdated === void 0 || _onRowDataUpdated(event);
     }
   }));
 });
@@ -109,9 +124,9 @@ var columnsOf = function columnsOf(schema) {
  * @author nokecy
  */
 var withReadingArrayTable = exports.withReadingArrayTable = function withReadingArrayTable(Control) {
-  var ReactiveTable = (0, _react.observer)(function (_ref4) {
-    var columns = _ref4.columns,
-      tableProps = _ref4.tableProps;
+  var ReactiveTable = (0, _react.observer)(function (_ref3) {
+    var columns = _ref3.columns,
+      tableProps = _ref3.tableProps;
     var field = (0, _react.useField)();
     // 阅读视图本身未订阅列状态，在此建立依赖，条件变化后重新提取表头。@author nokecy
     var _iterator = _createForOfIteratorHelper(columns),

package/dist/cjs/readPretty/formily.d.ts

@@ -1,2 +1,3 @@
+export { withReactiveSchemaScope } from './schemaScope';
 /** 动态表单统一入口：禁用/只读的数据控件使用阅读展示，保持字段值和校验模型。@author nokecy */
 export declare function withReadingFields(components: Record<string, any>): Record<string, any>;

package/dist/cjs/readPretty/formily.js

@@ -3,6 +3,12 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+Object.defineProperty(exports, "withReactiveSchemaScope", {
+  enumerable: true,
+  get: function get() {
+    return _schemaScope.withReactiveSchemaScope;
+  }
+});
 exports.withReadingFields = withReadingFields;
 var _react = require("@formily/react");
 var _react2 = _interopRequireDefault(require("react"));
@@ -10,6 +16,7 @@ var _hoistStatics = require("./hoistStatics");
 var Reading = _interopRequireWildcard(require("./controls"));
 var _selectNumberInputTextOnClick = require("./selectNumberInputTextOnClick");
 var _arrayTable = require("./arrayTable");
+var _schemaScope = require("./schemaScope");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

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

@@ -5,6 +5,7 @@
  */
 export * as ReadPrettyControls from './controls';
 export { withReadingFields } from './formily';
+export { withReactiveSchemaScope } from './schemaScope';
 export { withReadingArrayTable } from './arrayTable';
 export { DecimalInput, DecimalPicker } from './decimal';
 export { flattenOptions, selectedLabels } from './values';

package/dist/cjs/readPretty/index.js

@@ -47,6 +47,12 @@ Object.defineProperty(exports, "selectedLabels", {
     return _values.selectedLabels;
   }
 });
+Object.defineProperty(exports, "withReactiveSchemaScope", {
+  enumerable: true,
+  get: function get() {
+    return _schemaScope.withReactiveSchemaScope;
+  }
+});
 Object.defineProperty(exports, "withReadingArrayTable", {
   enumerable: true,
   get: function get() {
@@ -62,6 +68,7 @@ Object.defineProperty(exports, "withReadingFields", {
 var _ReadPrettyControls = _interopRequireWildcard(require("./controls"));
 exports.ReadPrettyControls = _ReadPrettyControls;
 var _formily = require("./formily");
+var _schemaScope = require("./schemaScope");
 var _arrayTable = require("./arrayTable");
 var _decimal = require("./decimal");
 var _values = require("./values");

package/dist/cjs/readPretty/schemaScope.d.ts

@@ -0,0 +1,2 @@
+/** 将 React 页面作用域接入 Formily 响应式表达式，保留字段、输入值和已有对象引用。@author nokecy */
+export declare const withReactiveSchemaScope: (Control: any) => any;

package/dist/cjs/readPretty/schemaScope.js

@@ -0,0 +1,49 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.withReactiveSchemaScope = void 0;
+var _reactive = require("@formily/reactive");
+var _react = _interopRequireWildcard(require("react"));
+var _hoistStatics = require("./hoistStatics");
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+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 ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+/** 将 React 页面作用域接入 Formily 响应式表达式，保留字段、输入值和已有对象引用。@author nokecy */
+var withReactiveSchemaScope = exports.withReactiveSchemaScope = function withReactiveSchemaScope(Control) {
+  var Component = function Component(props) {
+    var scope = (0, _react.useMemo)(function () {
+      return _reactive.observable.shallow(_objectSpread({}, props.scope));
+    }, []);
+    // 字段反应在初始化时绑定作用域，因此始终传同一对象，再于提交后同步当前页面数据。
+    // autorun 同时兼容调用方直接传入的 observable 作用域；untracked 避免订阅同步目标。@author nokecy
+    (0, _react.useEffect)(function () {
+      return (0, _reactive.autorun)(function () {
+        var _props$scope;
+        var current = (_props$scope = props.scope) !== null && _props$scope !== void 0 ? _props$scope : {};
+        var values = _objectSpread({}, current);
+        (0, _reactive.untracked)(function () {
+          return (0, _reactive.batch)(function () {
+            for (var _i = 0, _Object$keys = Object.keys(scope); _i < _Object$keys.length; _i++) {
+              var key = _Object$keys[_i];
+              if (!Object.prototype.hasOwnProperty.call(values, key)) delete scope[key];
+            }
+            Object.assign(scope, values);
+          });
+        });
+      });
+    });
+    return /*#__PURE__*/_react.default.createElement(Control, _extends({}, props, {
+      scope: scope
+    }));
+  };
+  Component.displayName = 'ReactiveSchemaScope';
+  return (0, _hoistStatics.hoistStatics)(Component, Control);
+};