@nokecy/qc-ui 1.1.1 → 1.1.3

package/dist/cjs/ag-grid-plus/setting/ColumnSetting.js

@@ -225,7 +225,7 @@ var ColumnSetting = function ColumnSetting(_ref) {
    * 将扁平化配置转换回 Grid State 并应用到 AG-Grid
    */
   var handleSaveColumns = (0, _react.useCallback)( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-    var values, flatConfig, configToSave, gridColumnDefs, columnState;
+    var values, flatConfig, configToSave, invalidColumns, gridColumnDefs, columnState;
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
@@ -243,16 +243,28 @@ var ColumnSetting = function ColumnSetting(_ref) {
             _antd.message.info('检测到旧版本配置，已自动迁移到新格式');
           }
 
+          // 【修复】验证数据完整性，过滤掉无效的列配置
+          invalidColumns = configToSave.filter(function (item) {
+            return item.type === 'column' && !item.field;
+          });
+          if (invalidColumns.length > 0) {
+            _antd.message.warning("\u68C0\u6D4B\u5230 ".concat(invalidColumns.length, " \u4E2A\u5217\u7F3A\u5C11 field \u5B57\u6BB5\uFF0C\u5DF2\u81EA\u52A8\u8FC7\u6EE4"));
+            console.warn('[ColumnSetting] 无效的列配置:', invalidColumns);
+            configToSave = configToSave.filter(function (item) {
+              return item.type === 'group' || item.type === 'column' && item.field;
+            });
+          }
+
           // 【修复】转换为 AG-Grid 的列定义，传入原始列定义以保留自定义属性
           gridColumnDefs = (0, _columnGroupUtils.flatConfigToGridState)(configToSave, originalColumnDefs); // 【关键修复】先更新 columnDefs（处理分组结构变化）
           gridApi.setGridOption('columnDefs', gridColumnDefs);
 
           // 等待 columnDefs 更新完成
-          _context2.next = 10;
+          _context2.next = 12;
           return new Promise(function (resolve) {
             return setTimeout(resolve, 100);
           });
-        case 10:
+        case 12:
           // 【修复】然后应用列状态（宽度、隐藏、顺序等）
           columnState = (0, _columnGroupUtils.flatConfigToColumnState)(configToSave);
           gridApi.applyColumnState({
@@ -344,7 +356,7 @@ var ColumnSetting = function ColumnSetting(_ref) {
 
           // message.success 已经在上面的逻辑中处理了
           onClose();
-        case 15:
+        case 17:
         case "end":
           return _context2.stop();
       }

package/dist/cjs/ag-grid-plus/setting/columnGroupUtils.js

@@ -322,6 +322,9 @@ function flatConfigToColumnState(flatConfig) {
   return flatConfig.filter(function (item) {
     return item.type === 'column';
   }) // 只处理列节点，分组不在 columnState 中
+  .filter(function (item) {
+    return item.field;
+  }) // 【修复】过滤掉没有 field 的列，防止 colId 为 undefined
   .sort(function (a, b) {
     return a.order - b.order;
   }) // 按 order 字段排序

package/dist/cjs/draggableModal/index.js

@@ -9,7 +9,7 @@ var _antd = require("antd");
 var _react = _interopRequireWildcard(require("react"));
 var _reactDraggable = _interopRequireDefault(require("react-draggable"));
 require("./style.less");
-var _excluded = ["wrapClassName", "width"];
+var _excluded = ["wrapClassName", "width", "open"];
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 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; }
@@ -67,10 +67,24 @@ var DraggableModal = function DraggableModal(props) {
     modalPosition = _useState12[0],
     setModalPosition = _useState12[1];
 
-  // 解构 props,分离出 wrapClassName
+  // 解构 props,分离出 wrapClassName 和 open
   var propsWrapClassName = props.wrapClassName,
     width = props.width,
+    open = props.open,
     restProps = _objectWithoutProperties(props, _excluded);
+
+  // 修复 AgGrid 等组件在 Modal 中高度不展开的问题
+  // 当 Modal 打开时触发 window resize 事件
+  (0, _react.useEffect)(function () {
+    if (open) {
+      // 使用 requestAnimationFrame 和 setTimeout 确保 DOM 完全渲染
+      requestAnimationFrame(function () {
+        setTimeout(function () {
+          window.dispatchEvent(new Event('resize'));
+        }, 100);
+      });
+    }
+  }, [open]);
   var _onStart = function onStart(_event, uiData) {
     var _draggleRef$current;
     var _window$document$docu = window.document.documentElement,
@@ -167,12 +181,20 @@ var DraggableModal = function DraggableModal(props) {
         x: newLeft,
         y: newTop
       });
+
+      // 触发 window resize 事件，通知内部组件(如 AgGrid)重新计算尺寸
+      window.dispatchEvent(new Event('resize'));
     };
     var handleMouseUp = function handleMouseUp() {
       setIsResizing(false);
       setResizeDirection('');
       document.removeEventListener('mousemove', handleMouseMove);
       document.removeEventListener('mouseup', handleMouseUp);
+
+      // 拖拽结束后再次触发 resize 事件，确保内部组件完全更新
+      setTimeout(function () {
+        window.dispatchEvent(new Event('resize'));
+      }, 50);
     };
     document.addEventListener('mousemove', handleMouseMove);
     document.addEventListener('mouseup', handleMouseUp);
@@ -183,7 +205,8 @@ var DraggableModal = function DraggableModal(props) {
   var mergedWrapClassName = [propsWrapClassName, resizingClass].filter(Boolean).join(' ');
   return /*#__PURE__*/_react.default.createElement(_antd.Modal, _extends({
     maskClosable: false,
-    width: width
+    width: width,
+    open: open
   }, restProps, {
     wrapClassName: mergedWrapClassName,
     title: /*#__PURE__*/_react.default.createElement("div", {

package/dist/esm/ag-grid-plus/setting/ColumnSetting.js

@@ -216,7 +216,7 @@ var ColumnSetting = function ColumnSetting(_ref) {
    * 将扁平化配置转换回 Grid State 并应用到 AG-Grid
    */
   var handleSaveColumns = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-    var values, flatConfig, configToSave, gridColumnDefs, columnState;
+    var values, flatConfig, configToSave, invalidColumns, gridColumnDefs, columnState;
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
@@ -234,16 +234,28 @@ var ColumnSetting = function ColumnSetting(_ref) {
             message.info('检测到旧版本配置，已自动迁移到新格式');
           }
 
+          // 【修复】验证数据完整性，过滤掉无效的列配置
+          invalidColumns = configToSave.filter(function (item) {
+            return item.type === 'column' && !item.field;
+          });
+          if (invalidColumns.length > 0) {
+            message.warning("\u68C0\u6D4B\u5230 ".concat(invalidColumns.length, " \u4E2A\u5217\u7F3A\u5C11 field \u5B57\u6BB5\uFF0C\u5DF2\u81EA\u52A8\u8FC7\u6EE4"));
+            console.warn('[ColumnSetting] 无效的列配置:', invalidColumns);
+            configToSave = configToSave.filter(function (item) {
+              return item.type === 'group' || item.type === 'column' && item.field;
+            });
+          }
+
           // 【修复】转换为 AG-Grid 的列定义，传入原始列定义以保留自定义属性
           gridColumnDefs = flatConfigToGridState(configToSave, originalColumnDefs); // 【关键修复】先更新 columnDefs（处理分组结构变化）
           gridApi.setGridOption('columnDefs', gridColumnDefs);
 
           // 等待 columnDefs 更新完成
-          _context2.next = 10;
+          _context2.next = 12;
           return new Promise(function (resolve) {
             return setTimeout(resolve, 100);
           });
-        case 10:
+        case 12:
           // 【修复】然后应用列状态（宽度、隐藏、顺序等）
           columnState = flatConfigToColumnState(configToSave);
           gridApi.applyColumnState({
@@ -335,7 +347,7 @@ var ColumnSetting = function ColumnSetting(_ref) {
 
           // message.success 已经在上面的逻辑中处理了
           onClose();
-        case 15:
+        case 17:
         case "end":
           return _context2.stop();
       }

package/dist/esm/ag-grid-plus/setting/columnGroupUtils.js

@@ -306,6 +306,9 @@ export function flatConfigToColumnState(flatConfig) {
   return flatConfig.filter(function (item) {
     return item.type === 'column';
   }) // 只处理列节点，分组不在 columnState 中
+  .filter(function (item) {
+    return item.field;
+  }) // 【修复】过滤掉没有 field 的列，防止 colId 为 undefined
   .sort(function (a, b) {
     return a.order - b.order;
   }) // 按 order 字段排序

package/dist/esm/draggableModal/index.js

@@ -1,4 +1,4 @@
-var _excluded = ["wrapClassName", "width"];
+var _excluded = ["wrapClassName", "width", "open"];
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
@@ -9,7 +9,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { Modal } from 'antd';
-import React, { useRef, useState } from 'react';
+import React, { useRef, useState, useEffect } from 'react';
 import Draggable from 'react-draggable';
 import "./style.less";
 
@@ -58,10 +58,24 @@ var DraggableModal = function DraggableModal(props) {
     modalPosition = _useState12[0],
     setModalPosition = _useState12[1];
 
-  // 解构 props,分离出 wrapClassName
+  // 解构 props,分离出 wrapClassName 和 open
   var propsWrapClassName = props.wrapClassName,
     width = props.width,
+    open = props.open,
     restProps = _objectWithoutProperties(props, _excluded);
+
+  // 修复 AgGrid 等组件在 Modal 中高度不展开的问题
+  // 当 Modal 打开时触发 window resize 事件
+  useEffect(function () {
+    if (open) {
+      // 使用 requestAnimationFrame 和 setTimeout 确保 DOM 完全渲染
+      requestAnimationFrame(function () {
+        setTimeout(function () {
+          window.dispatchEvent(new Event('resize'));
+        }, 100);
+      });
+    }
+  }, [open]);
   var _onStart = function onStart(_event, uiData) {
     var _draggleRef$current;
     var _window$document$docu = window.document.documentElement,
@@ -158,12 +172,20 @@ var DraggableModal = function DraggableModal(props) {
         x: newLeft,
         y: newTop
       });
+
+      // 触发 window resize 事件，通知内部组件(如 AgGrid)重新计算尺寸
+      window.dispatchEvent(new Event('resize'));
     };
     var handleMouseUp = function handleMouseUp() {
       setIsResizing(false);
       setResizeDirection('');
       document.removeEventListener('mousemove', handleMouseMove);
       document.removeEventListener('mouseup', handleMouseUp);
+
+      // 拖拽结束后再次触发 resize 事件，确保内部组件完全更新
+      setTimeout(function () {
+        window.dispatchEvent(new Event('resize'));
+      }, 50);
     };
     document.addEventListener('mousemove', handleMouseMove);
     document.addEventListener('mouseup', handleMouseUp);
@@ -174,7 +196,8 @@ var DraggableModal = function DraggableModal(props) {
   var mergedWrapClassName = [propsWrapClassName, resizingClass].filter(Boolean).join(' ');
   return /*#__PURE__*/React.createElement(Modal, _extends({
     maskClosable: false,
-    width: width
+    width: width,
+    open: open
   }, restProps, {
     wrapClassName: mergedWrapClassName,
     title: /*#__PURE__*/React.createElement("div", {