@nokecy/qc-ui 1.1.42 → 1.1.43

package/dist/cjs/deleteConfirm/index.js

@@ -8,6 +8,12 @@ var _react = _interopRequireDefault(require("react"));
 var _antd = require("antd");
 var _icons = require("@ant-design/icons");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+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 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); }
 var confirm = _antd.Modal.confirm;
 /**
  * DeleteConfirm 删除确认组件
@@ -31,31 +37,45 @@ var DeleteConfirm = function DeleteConfirm(props) {
   var onConfirm = props.onConfirm,
     title = props.title,
     content = props.content,
+    okText = props.okText,
+    _props$danger = props.danger,
+    danger = _props$danger === void 0 ? true : _props$danger,
     children = props.children;
-  var showPromiseConfirm = function showPromiseConfirm() {
+  var showPromiseConfirm = function showPromiseConfirm(event) {
     // 智能转换 title：支持字符串、ReactNode 或使用默认值
     var titleText = title || '确认操作';
 
-    // 如果没有提供 content，生成默认内容
-    // 只有当 title 是字符串时才拼接，否则使用通用提示
-    var defaultContent = typeof title === 'string' ? "\u5371\u9669\u64CD\u4F5C,\u4E3A\u9632\u6B62\u8BEF\u89E6\u53D1,".concat(title) : '危险操作,为防止误触发,请确认操作';
-    var contentText = content || defaultContent;
-    confirm({
+    // 正文要说清动的是哪条、几条，这只有调用方知道，所以 content 交给调用方。
+    // 不传时的兜底只承诺「不可撤销」：原来的默认正文是把 title 拼进去，
+    // 拼出来是一句病句，而且始终没告诉用户动的是哪条数据。@author nokecy
+    var contentText = content || '该操作不可撤销，请确认后继续。';
+    confirm(_objectSpread(_objectSpread({
       title: titleText,
       icon: /*#__PURE__*/_react.default.createElement(_icons.ExclamationCircleFilled, null),
       content: contentText,
+      okButtonProps: {
+        danger: danger
+      }
+    }, okText ? {
+      okText: okText
+    } : {}), {}, {
       onOk: function onOk() {
         return new Promise(function (resolve, reject) {
-          onConfirm().then(resolve).catch(function (error) {
-            console.error('Oops errors!', error);
-            reject();
-          });
+          // 回调既可能返回 Promise（异步删除），也可能是同步的普通值，两种都要接住。
+          var result = onConfirm(event);
+          if (result && typeof result.then === 'function') {
+            result.then(resolve).catch(function (error) {
+              console.error('Oops errors!', error);
+              reject();
+            });
+          } else {
+            resolve(result);
+          }
         }).catch(function () {
-          return void 0;
+          return undefined;
         });
-      },
-      onCancel: function onCancel() {}
-    });
+      }
+    }));
   };
   return /*#__PURE__*/_react.default.createElement("span", {
     onClick: showPromiseConfirm

package/dist/cjs/dialogSelect/index.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
 });
@@ -20,6 +19,7 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
 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); }); }; }
+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; }
@@ -142,22 +142,36 @@ var DialogSelect = function DialogSelect(props) {
     onGridReady: function onGridReady(gridReadEvent) {
       setGridApi(gridReadEvent.api);
     },
+    onFirstDataRendered: function onFirstDataRendered(_ref) {
+      var api = _ref.api;
+      // 多选时重开弹窗要把已经选中的行勾回来，否则用户会以为之前的选择丢了。
+      // 放在首屏数据渲染完成时做：弹窗是 destroyOnClose，打开的那一刻表格还没有数据。@author nokecy
+      if (!Array.isArray(state) || state.length === 0) return;
+      var key = valueField !== null && valueField !== void 0 ? valueField : 'id';
+      var selected = state.map(function (it) {
+        return it && _typeof(it) === 'object' ? it.value : it;
+      });
+      api.forEachNode(function (node) {
+        if (node.data && selected.includes(node.data[key])) {
+          node.setSelected(true);
+        }
+      });
+    },
     search: (columnDefs === null || columnDefs === void 0 ? void 0 : columnDefs.filter(function (i) {
       return !i.hideInSearch;
     }).length) !== 0,
     onSelectionChanged: onSelectionChanged,
     rowSelection: props.mode === 'multiple' ? props.mode : 'single',
-    onRowDoubleClicked: function onRowDoubleClicked(_ref) {
-      var data = _ref.data;
+    onRowDoubleClicked: function onRowDoubleClicked(_ref2) {
+      var data = _ref2.data;
       setFalse();
       setState(getValue([data]));
-      if (onChangeItem) onChangeItem(props.mode === 'multiple' ? [data] : {
-        label: data.name,
-        value: data.code
-      });
+      // 回传完整数据行：原来这里硬编码成 { label: data.name, value: data.code }，
+      // 与「确定」按钮走的 handleOk 口径不一致，且对没有 name/code 字段的实体直接取到 undefined。@author nokecy
+      if (onChangeItem) onChangeItem(props.mode === 'multiple' ? [data] : data);
     },
     request: ( /*#__PURE__*/function () {
-      var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(params, _, record) {
+      var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(params, _, record) {
         var _props$pagedApiAdapte;
         var adapter, data, requestData;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -187,7 +201,7 @@ var DialogSelect = function DialogSelect(props) {
         }, _callee);
       }));
       return function (_x, _x2, _x3) {
-        return _ref2.apply(this, arguments);
+        return _ref3.apply(this, arguments);
       };
     }()),
     columnDefs: columnDefs

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

@@ -9,6 +9,17 @@ export interface FullScreenAlertProps {
     onChange?: (active: boolean) => void;
     /** 自动关闭时间（毫秒），默认3000ms */
     duration?: number;
+    /**
+     * 中央提示语。不传时按 type 给「成功」/「失败」。
+     * @author nokecy
+     */
+    message?: React.ReactNode;
+    /**
+     * 是否显示中央的图标与文字，默认 true。
+     * 只靠边框颜色区分成功与失败，对色觉障碍者等于零反馈；这一层是给状态加的第二种编码。
+     * @author nokecy
+     */
+    showIcon?: boolean;
     /** 其他 HTML div 属性 */
     [key: string]: any;
 }

package/dist/cjs/fullScreenAlert/index.js

@@ -5,9 +5,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _icons = require("@ant-design/icons");
 var _react = _interopRequireWildcard(require("react"));
 require("./index.less");
-var _excluded = ["active", "type", "onChange", "duration"];
+var _excluded = ["active", "type", "onChange", "duration", "message", "showIcon"];
 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 _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); }
@@ -41,6 +42,9 @@ var FullScreenAlert = function FullScreenAlert(props) {
     onChange = props.onChange,
     _props$duration = props.duration,
     duration = _props$duration === void 0 ? 3000 : _props$duration,
+    message = props.message,
+    _props$showIcon = props.showIcon,
+    showIcon = _props$showIcon === void 0 ? true : _props$showIcon,
     restProps = _objectWithoutProperties(props, _excluded);
   var timerRef = (0, _react.useRef)();
   var _useState = (0, _react.useState)(activeProps),
@@ -75,8 +79,11 @@ var FullScreenAlert = function FullScreenAlert(props) {
     return null;
   }
   var className = ['alertOverlay', 'alert-active', type === 'error' ? 'errorOverlay' : 'successOverlay'].join(' ');
-  return /*#__PURE__*/_react.default.createElement("div", _extends({
+  var isError = type === 'error';
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", _extends({
     className: className
-  }, restProps), /*#__PURE__*/_react.default.createElement("div", null));
+  }, restProps), /*#__PURE__*/_react.default.createElement("div", null)), showIcon ? /*#__PURE__*/_react.default.createElement("div", {
+    className: "alertBadge ".concat(isError ? 'alertBadge-error' : 'alertBadge-success')
+  }, isError ? /*#__PURE__*/_react.default.createElement(_icons.CloseCircleFilled, null) : /*#__PURE__*/_react.default.createElement(_icons.CheckCircleFilled, null), /*#__PURE__*/_react.default.createElement("span", null, message !== null && message !== void 0 ? message : isError ? '失败' : '成功')) : null);
 };
 var _default = exports.default = FullScreenAlert;

package/dist/cjs/fullScreenAlert/index.less

@@ -131,3 +131,34 @@
 		opacity: 0;
 	}
 }
+
+/* 中央状态徽标：给成功/失败加上颜色之外的第二种编码（图标 + 文字）。
+   只靠绿边框/红边框区分，对色觉障碍者等于没有反馈；车间侧光屏上也常常看不出色差。
+   放在闪烁层之外，所以它不跟着 blink 一起忽明忽暗。@author nokecy */
+.alertBadge {
+	position: absolute;
+	top: 50%;
+	left: 50%;
+	z-index: 2;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	gap: 12px;
+	font-size: 28px;
+	font-weight: 700;
+	text-shadow: 0 1px 2px rgb(255 255 255 / 80%);
+	transform: translate(-50%, -50%);
+	pointer-events: none;
+
+	.anticon {
+		font-size: 128px;
+	}
+}
+
+.alertBadge-success {
+	color: green;
+}
+
+.alertBadge-error {
+	color: red;
+}

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

@@ -1,4 +1,4 @@
-var _excluded = ["style", "loading", "params", "request", "dataSource", "treeKeyName", "treeParentName", "rowData", "gridRef", "headerTitle", "toolBarRender", "search", "hideTool", "onGridReady", "gridKey", "children", "defaultSearchExpand", "overlayNoRowsTemplateText", "queryDefaultRows", "onSelectedRowsChange", "enableClickSelection", "rowSelection", "useNativeTreeFilter", "entityType"];
+var _excluded = ["style", "loading", "params", "request", "dataSource", "treeKeyName", "treeParentName", "rowData", "gridRef", "headerTitle", "toolBarRender", "search", "hideTool", "onGridReady", "gridKey", "children", "defaultSearchExpand", "overlayNoRowsTemplateText", "queryDefaultRows", "onSelectedRowsChange", "emptyState", "accessible", "enableClickSelection", "rowSelection", "useNativeTreeFilter", "entityType"];
 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 _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 _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
@@ -35,6 +35,7 @@ import ToolBar from "./toolBar";
 import SettingItem from "./settingItem";
 import { RedoOutlined, FilterOutlined } from '@ant-design/icons';
 import { convertFilterModel, dateTimeValueFormatter, dateValueFormatter, flatten, toTree } from "./utils";
+import { toColumnType } from "./utils/columnProcessors";
 import AdvancedQueryBuilder from "./queryForm/AdvancedQueryBuilder";
 import { v4 as uuidv4 } from 'uuid';
 import Setting from "./setting";
@@ -42,6 +43,9 @@ import { useGridPlusColumnState } from '.';
 import { useRowId } from "./hooks/useRowId";
 import _, { isArray } from 'lodash';
 import CustomGroupCellRenderer from "./_utils/customGroupCellRenderer";
+import NoRowsOverlay from "./shared/NoRowsOverlay";
+import { DEFAULT_PAGE_SIZE_OPTIONS } from "./utils/constants";
+import { hasEffectiveFilter, resolveEmptyBranch, resolveEmptyText } from "./utils/emptyState";
 import processColumnGroups from "./_utils/processColumnGroups";
 import flattenColumnState from "./_utils/processFormColumnState";
 import { Select } from '@formily/antd-v5';
@@ -51,7 +55,6 @@ import { QueryFormContext } from "./context/queryFormContext";
 import { useGridSchemes } from "./context/useSchemeManager";
 import { useSchemeDataFlow } from "./context/useSchemeDataFlow";
 import { extractItemsOrder, extractHiddenFields } from "./shared/utils/schemeDataMigration";
-import { createSafeHtmlTemplate } from "./utils/sanitize";
 import { computeAggregationRow } from "./utils/aggregation";
 import { sortFormItemsByOrder, filterHiddenFormItems } from "./utils/queryFormDerivation";
 import { filterVisibleSelectedRows } from "./utils/rowSelection";
@@ -95,6 +98,9 @@ function AgGridPlus(props) {
     overlayNoRowsTemplateText = props.overlayNoRowsTemplateText,
     queryDefaultRows = props.queryDefaultRows,
     onSelectedRowsChange = props.onSelectedRowsChange,
+    emptyState = props.emptyState,
+    _props$accessible = props.accessible,
+    accessible = _props$accessible === void 0 ? true : _props$accessible,
     _props$enableClickSel = props.enableClickSelection,
     enableClickSelection = _props$enableClickSel === void 0 ? true : _props$enableClickSel,
     propsRowSelection = props.rowSelection,
@@ -141,35 +147,44 @@ function AgGridPlus(props) {
     _useState6 = _slicedToArray(_useState5, 2),
     loading = _useState6[0],
     setLoading = _useState6[1];
-  var _useState7 = useState(),
+  // 空态四分需要的两个事实：这次请求是不是失败了、用户有没有施加筛选。@author nokecy
+  var _useState7 = useState(null),
     _useState8 = _slicedToArray(_useState7, 2),
-    columnState = _useState8[0],
-    setColumnState = _useState8[1];
-  var _useState9 = useState({}),
+    loadError = _useState8[0],
+    setLoadError = _useState8[1];
+  var _useState9 = useState(false),
     _useState10 = _slicedToArray(_useState9, 2),
-    columnCellClass = _useState10[0],
-    setColumnCellClass = _useState10[1];
-  var _useState11 = useState([]),
+    filtered = _useState10[0],
+    setFiltered = _useState10[1];
+  var _useState11 = useState(),
     _useState12 = _slicedToArray(_useState11, 2),
-    rowData = _useState12[0],
-    setRowData = _useState12[1];
+    columnState = _useState12[0],
+    setColumnState = _useState12[1];
   var _useState13 = useState({}),
     _useState14 = _slicedToArray(_useState13, 2),
-    queryFilter = _useState14[0],
-    setQueryFilter = _useState14[1];
-  var _useState15 = useState(),
+    columnCellClass = _useState14[0],
+    setColumnCellClass = _useState14[1];
+  var _useState15 = useState([]),
     _useState16 = _slicedToArray(_useState15, 2),
-    sortColumn = _useState16[0],
-    setSortColumn = _useState16[1];
+    rowData = _useState16[0],
+    setRowData = _useState16[1];
+  var _useState17 = useState({}),
+    _useState18 = _slicedToArray(_useState17, 2),
+    queryFilter = _useState18[0],
+    setQueryFilter = _useState18[1];
+  var _useState19 = useState(),
+    _useState20 = _slicedToArray(_useState19, 2),
+    sortColumn = _useState20[0],
+    setSortColumn = _useState20[1];
   // 初始化分页参数，支持外部传入的pageSize
-  var _useState17 = useState({
+  var _useState21 = useState({
       pageSize: props.pageSize !== undefined ? props.pageSize : props.hidePagination ? 10000 : 200,
       current: 1,
       total: dataSource ? dataSource.length : 0
     }),
-    _useState18 = _slicedToArray(_useState17, 2),
-    pagination = _useState18[0],
-    setPagination = _useState18[1];
+    _useState22 = _slicedToArray(_useState21, 2),
+    pagination = _useState22[0],
+    setPagination = _useState22[1];
 
   // ============ 方案管理 - 使用集中式 Context ============
   var _useGridSchemes = useGridSchemes(),
@@ -188,16 +203,16 @@ function AgGridPlus(props) {
     getColumnSchemes = _useGridSchemes.getColumnSchemes,
     getQuerySchemes = _useGridSchemes.getQuerySchemes,
     getCurrentScheme = _useGridSchemes.getCurrentScheme;
-  var _useState19 = useState([]),
-    _useState20 = _slicedToArray(_useState19, 2),
-    queryItemsOrder = _useState20[0],
-    setQueryItemsOrder = _useState20[1];
+  var _useState23 = useState([]),
+    _useState24 = _slicedToArray(_useState23, 2),
+    queryItemsOrder = _useState24[0],
+    setQueryItemsOrder = _useState24[1];
 
   // 高级查询状态
-  var _useState21 = useState(false),
-    _useState22 = _slicedToArray(_useState21, 2),
-    advancedPopoverOpen = _useState22[0],
-    setAdvancedPopoverOpen = _useState22[1];
+  var _useState25 = useState(false),
+    _useState26 = _slicedToArray(_useState25, 2),
+    advancedPopoverOpen = _useState26[0],
+    setAdvancedPopoverOpen = _useState26[1];
   var createEmptyRuleGroup = function createEmptyRuleGroup() {
     return {
       id: uuidv4(),
@@ -205,10 +220,10 @@ function AgGridPlus(props) {
       children: []
     };
   };
-  var _useState23 = useState(createEmptyRuleGroup),
-    _useState24 = _slicedToArray(_useState23, 2),
-    advancedQueryRules = _useState24[0],
-    setAdvancedQueryRules = _useState24[1];
+  var _useState27 = useState(createEmptyRuleGroup),
+    _useState28 = _slicedToArray(_useState27, 2),
+    advancedQueryRules = _useState28[0],
+    setAdvancedQueryRules = _useState28[1];
 
   /**
    * 【P1 架构优化】使用单向数据流架构
@@ -468,7 +483,7 @@ function AgGridPlus(props) {
         });
         return match ? match.label : params.value;
       };
-      return _objectSpread(_objectSpread(_objectSpread({}, dataType), col), {}, {
+      return _objectSpread(_objectSpread(_objectSpread({}, toColumnType(dataType)), col), {}, {
         cellRenderer: function cellRenderer(params) {
           var match = valueEnum.find(function (item) {
             return item.value == params.value;
@@ -528,7 +543,7 @@ function AgGridPlus(props) {
         cellRenderer: cellRenderer
       });
     }
-    return _objectSpread(_objectSpread(_objectSpread({}, dataType), col), {}, {
+    return _objectSpread(_objectSpread(_objectSpread({}, toColumnType(dataType)), col), {}, {
       customCellRenderer: col.cellRenderer,
       cellRenderer: cellRenderer
     });
@@ -689,6 +704,8 @@ function AgGridPlus(props) {
     try {
       // 处理高级查询模式 / 简单模式的过滤字符串构建
       var filter = buildFilterString(queryFilter, allColDefsRef.current);
+      // 空结果要不要说「换个筛选条件试试」，取决于用户这次到底有没有筛。@author nokecy
+      setFiltered(hasEffectiveFilter(filter, queryFilter));
       var params = _objectSpread(_objectSpread({
         filter: filter
       }, stableGridParams), {}, {
@@ -726,6 +743,7 @@ function AgGridPlus(props) {
           });
         });
         setLoading(false);
+        setLoadError(null);
         logger.info('数据请求成功', {
           rowCount: rowCount
         });
@@ -788,6 +806,9 @@ function AgGridPlus(props) {
           originalError: error
         }, error);
 
+        // 失败必须留痕：不留痕的话表格只会显示「没有找到数据」，把接口故障说成没数据。@author nokecy
+        setLoadError(gridError);
+
         // 记录错误
         logger.error('数据请求失败', gridError.getDetails());
 
@@ -807,6 +828,7 @@ function AgGridPlus(props) {
         queryFilter: queryFilter,
         allColDefs: allColDefsRef.current
       }, error instanceof Error ? error : undefined);
+      setLoadError(gridError);
       logger.error('数据请求处理失败', gridError.getDetails());
       message.error(gridError.getUserMessage());
       if (onErrorRef.current) {
@@ -887,6 +909,27 @@ function AgGridPlus(props) {
       onRequest(stableQueryFilter);
     }
   }, [onRequest, stableQueryFilter]);
+
+  // 空态四分：加载失败 / 无权限 / 筛选无结果 / 无数据，各说各的，失败那支还给出「重试」。
+  // 以前四种情况共用一句「没有找到数据，试试调整筛选条件吧！」，接口挂了也这么说，
+  // 用户按提示去调筛选，越调越没有。@author nokecy
+  var noRowsOverlayParams = useMemo(function () {
+    return {
+      branch: resolveEmptyBranch({
+        hasError: !!loadError,
+        accessible: accessible,
+        filtered: filtered
+      }),
+      text: resolveEmptyText({
+        hasError: !!loadError,
+        accessible: accessible,
+        filtered: filtered,
+        override: overlayNoRowsTemplateText,
+        texts: emptyState
+      }),
+      onRetry: onRefresh
+    };
+  }, [loadError, accessible, filtered, overlayNoRowsTemplateText, emptyState, onRefresh]);
   useEffect(function () {
     gridRef.current = {
       onRefresh: onRefresh
@@ -1328,7 +1371,12 @@ function AgGridPlus(props) {
       ensureDomOrder: true,
       columnHoverHighlight: true
     },
-    overlayNoRowsTemplate: createSafeHtmlTemplate(overlayNoRowsTemplateText || '没有找到数据，试试调整筛选条件吧！'),
+    noRowsOverlayComponent: NoRowsOverlay,
+    noRowsOverlayComponentParams: noRowsOverlayParams
+    // 加载中不显示空态：外层 Spin 已经在转，再叠一句「暂无数据」会让用户
+    // 以为真的没数据（冒烟截图里这两者确实同时出现过）。@author nokecy
+    ,
+    suppressNoRowsOverlay: loading,
     enableRangeSelection: true,
     suppressCopyRowsToClipboard: true,
     autoGroupColumnDef: autoGroupColumnDef
@@ -1408,7 +1456,7 @@ function AgGridPlus(props) {
     showTotal: function showTotal(total, range) {
       return "\u7B2C ".concat(range[0], "-").concat(range[1], " \u6761/\u603B\u5171 ").concat(total, " \u6761");
     },
-    pageSizeOptions: props.pageSizeOptions || [10, 20, 50, 100, 200, 500, 1000, 10000],
+    pageSizeOptions: props.pageSizeOptions || DEFAULT_PAGE_SIZE_OPTIONS,
     hideOnSinglePage: false,
     showQuickJumper: false
   })))))));

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

@@ -2,6 +2,7 @@ import { GridApi, ColDef, ColGroupDef } from "ag-grid-community";
 import { AgGridReactProps } from "ag-grid-react";
 import React, { CSSProperties, ReactNode } from "react";
 import type { GridPlusError } from "./errors";
+import type { EmptyStateTexts } from "./utils/emptyState";
 interface GridRef {
     onRefresh: () => void;
 }
@@ -42,9 +43,24 @@ interface GridProps extends AgGridReactProps {
      */
     gridColumnState?: any[];
     /**
-     * 列表空数据文字提示
+     * 列表空数据文字提示。
+     * 传了它就一律用它（最高优先级），保持既有调用点行为不变；
+     * 想按「无数据 / 筛选无结果 / 无权限 / 加载失败」分别给文案，用 `emptyState`。
      */
     overlayNoRowsTemplateText?: string;
+    /**
+     * 空态四分文案覆盖：{ noData, noResult, noPermission, error }。
+     * 不传就用内置默认：加载失败说加载失败并给「重试」，没筛选就说「暂无数据」，
+     * 不再一律引导用户去调筛选条件。
+     * @author nokecy
+     */
+    emptyState?: EmptyStateTexts;
+    /**
+     * 当前用户是否有权查看该列表。传 false 时空态说「没有权限」而不是「暂无数据」，
+     * 免得用户以为是数据还没录进来。
+     * @author nokecy
+     */
+    accessible?: boolean;
     /**
      * 查询Form默认展示行数
      */

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

@@ -74,7 +74,7 @@ var QueryForm = observer(function (props) {
 
   var renderActions = function renderActions() {
     return /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement(Submit, {
-      type: "default",
+      type: "primary",
       icon: /*#__PURE__*/React.createElement(SearchOutlined, null)
     }, "\u67E5\u8BE2"), /*#__PURE__*/React.createElement(Button, {
       icon: /*#__PURE__*/React.createElement(ClearOutlined, null),

package/dist/esm/ag-grid-plus/shared/NoRowsOverlay.d.ts

@@ -0,0 +1,22 @@
+import React from 'react';
+import type { EmptyStateBranch } from '../utils/emptyState';
+/**
+ * 表格空态浮层。
+ *
+ * 换掉原来的 `overlayNoRowsTemplate` 纯 HTML 模板：模板只能放一句话，
+ * 于是「接口挂了」和「这条数据确实没有」共用了同一句
+ * 「没有找到数据，试试调整筛选条件吧！」，把用户往错误的方向引。
+ * 用 React 浮层才放得下「重试」这样的出路。
+ *
+ * @author nokecy
+ */
+export interface NoRowsOverlayParams {
+    /** 当前该走哪一支：加载失败 / 无权限 / 筛选无结果 / 无数据 */
+    branch?: EmptyStateBranch;
+    /** 该支的文案 */
+    text?: string;
+    /** 加载失败时的重试入口 */
+    onRetry?: () => void;
+}
+declare const NoRowsOverlay: React.FC<NoRowsOverlayParams>;
+export default NoRowsOverlay;

package/dist/esm/ag-grid-plus/shared/NoRowsOverlay.js

@@ -0,0 +1,35 @@
+import { Button, Empty } from 'antd';
+import React from 'react';
+
+/**
+ * 表格空态浮层。
+ *
+ * 换掉原来的 `overlayNoRowsTemplate` 纯 HTML 模板：模板只能放一句话，
+ * 于是「接口挂了」和「这条数据确实没有」共用了同一句
+ * 「没有找到数据，试试调整筛选条件吧！」，把用户往错误的方向引。
+ * 用 React 浮层才放得下「重试」这样的出路。
+ *
+ * @author nokecy
+ */
+
+var NoRowsOverlay = function NoRowsOverlay(_ref) {
+  var branch = _ref.branch,
+    text = _ref.text,
+    onRetry = _ref.onRetry;
+  return /*#__PURE__*/React.createElement("div", {
+    style: {
+      display: 'flex',
+      flexDirection: 'column',
+      alignItems: 'center',
+      gap: 8
+    }
+  }, /*#__PURE__*/React.createElement(Empty, {
+    image: Empty.PRESENTED_IMAGE_SIMPLE,
+    description: text
+  }), branch === 'error' && onRetry ? /*#__PURE__*/React.createElement(Button, {
+    size: "small",
+    danger: true,
+    onClick: onRetry
+  }, "\u91CD\u8BD5") : null);
+};
+export default NoRowsOverlay;

package/dist/esm/ag-grid-plus/utils/columnProcessors.d.ts

@@ -49,6 +49,22 @@ export declare function handleGridPlusColumnState(columnState: ExtendedColumnSta
  * @returns 数据类型推断结果
  */
 export declare function inferDataType(data: any, colName: string, valueEnum?: ValueEnumItem[]): DataTypeInference | undefined;
+/**
+ * 把「推断出的数据类型」翻译成列定义片段。
+ *
+ * dataType.type 是数据类型（number/string/...），不是 AG Grid 的列类型（columnTypes）。
+ * 早先是把整个 dataType 摊进 colDef，等于给列设了 type:"number"——而注册的 columnTypes 里
+ * 根本没有叫 number 的类型，这个字段一直没生效。
+ *
+ * 数量型数值列真正该有的是右对齐：位数对齐了才能一眼比大小。只有 calculateType 为真
+ * （可求和的数量型）才右对齐；用 valueEnum 表示分类的数值列（状态码之类）不动。
+ *
+ * @author nokecy
+ */
+export declare function toColumnType(dataType?: DataTypeInference): {
+    calculateType?: any;
+    type?: string;
+};
 /**
  * 处理枚举列定义
  *