@nokecy/qc-ui 1.1.28 → 1.1.29

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

@@ -174,39 +174,45 @@ function AgGridPlus(props) {
     _useState2 = _slicedToArray(_useState, 2),
     ready = _useState2[0],
     setReady = _useState2[1];
-  var _useState3 = (0, _react.useState)(loadingProps ? loadingProps : false),
+  // 【修复】追踪搜索表单是否已完成初始化（包含默认值）
+  // 只有当 search !== false 时才需要等待表单初始化
+  var _useState3 = (0, _react.useState)(search === false),
     _useState4 = _slicedToArray(_useState3, 2),
-    loading = _useState4[0],
-    setLoading = _useState4[1];
-  var _useState5 = (0, _react.useState)(),
+    formInitialized = _useState4[0],
+    setFormInitialized = _useState4[1];
+  var _useState5 = (0, _react.useState)(loadingProps ? loadingProps : false),
     _useState6 = _slicedToArray(_useState5, 2),
-    columnState = _useState6[0],
-    setColumnState = _useState6[1];
-  var _useState7 = (0, _react.useState)({}),
+    loading = _useState6[0],
+    setLoading = _useState6[1];
+  var _useState7 = (0, _react.useState)(),
     _useState8 = _slicedToArray(_useState7, 2),
-    columnCellClass = _useState8[0],
-    setColumnCellClass = _useState8[1];
-  var _useState9 = (0, _react.useState)([]),
+    columnState = _useState8[0],
+    setColumnState = _useState8[1];
+  var _useState9 = (0, _react.useState)({}),
     _useState10 = _slicedToArray(_useState9, 2),
-    rowData = _useState10[0],
-    setRowData = _useState10[1];
-  var _useState11 = (0, _react.useState)({}),
+    columnCellClass = _useState10[0],
+    setColumnCellClass = _useState10[1];
+  var _useState11 = (0, _react.useState)([]),
     _useState12 = _slicedToArray(_useState11, 2),
-    queryFilter = _useState12[0],
-    setQueryFilter = _useState12[1];
-  var _useState13 = (0, _react.useState)(),
+    rowData = _useState12[0],
+    setRowData = _useState12[1];
+  var _useState13 = (0, _react.useState)({}),
     _useState14 = _slicedToArray(_useState13, 2),
-    sortColumn = _useState14[0],
-    setSortColumn = _useState14[1];
+    queryFilter = _useState14[0],
+    setQueryFilter = _useState14[1];
+  var _useState15 = (0, _react.useState)(),
+    _useState16 = _slicedToArray(_useState15, 2),
+    sortColumn = _useState16[0],
+    setSortColumn = _useState16[1];
   // 初始化分页参数，支持外部传入的pageSize
-  var _useState15 = (0, _react.useState)({
+  var _useState17 = (0, _react.useState)({
       pageSize: props.pageSize !== undefined ? props.pageSize : props.hidePagination ? 10000 : 200,
       current: 1,
       total: dataSource ? dataSource.length : 0
     }),
-    _useState16 = _slicedToArray(_useState15, 2),
-    pagination = _useState16[0],
-    setPagination = _useState16[1];
+    _useState18 = _slicedToArray(_useState17, 2),
+    pagination = _useState18[0],
+    setPagination = _useState18[1];
 
   // ============ 方案管理 - 使用集中式 Context ============
   var _useGridSchemes = (0, _useSchemeManager.useGridSchemes)(),
@@ -225,16 +231,16 @@ function AgGridPlus(props) {
     getColumnSchemes = _useGridSchemes.getColumnSchemes,
     getQuerySchemes = _useGridSchemes.getQuerySchemes,
     getCurrentScheme = _useGridSchemes.getCurrentScheme;
-  var _useState17 = (0, _react.useState)([]),
-    _useState18 = _slicedToArray(_useState17, 2),
-    queryItemsOrder = _useState18[0],
-    setQueryItemsOrder = _useState18[1];
+  var _useState19 = (0, _react.useState)([]),
+    _useState20 = _slicedToArray(_useState19, 2),
+    queryItemsOrder = _useState20[0],
+    setQueryItemsOrder = _useState20[1];
 
   // 高级查询状态
-  var _useState19 = (0, _react.useState)(false),
-    _useState20 = _slicedToArray(_useState19, 2),
-    advancedPopoverOpen = _useState20[0],
-    setAdvancedPopoverOpen = _useState20[1];
+  var _useState21 = (0, _react.useState)(false),
+    _useState22 = _slicedToArray(_useState21, 2),
+    advancedPopoverOpen = _useState22[0],
+    setAdvancedPopoverOpen = _useState22[1];
   var createEmptyRuleGroup = function createEmptyRuleGroup() {
     return {
       id: (0, _uuid.v4)(),
@@ -242,10 +248,10 @@ function AgGridPlus(props) {
       children: []
     };
   };
-  var _useState21 = (0, _react.useState)(createEmptyRuleGroup),
-    _useState22 = _slicedToArray(_useState21, 2),
-    advancedQueryRules = _useState22[0],
-    setAdvancedQueryRules = _useState22[1];
+  var _useState23 = (0, _react.useState)(createEmptyRuleGroup),
+    _useState24 = _slicedToArray(_useState23, 2),
+    advancedQueryRules = _useState24[0],
+    setAdvancedQueryRules = _useState24[1];
 
   /**
    * 【P1 架构优化】使用单向数据流架构
@@ -819,9 +825,10 @@ function AgGridPlus(props) {
       paginationPageSize: pagination.pageSize,
       stableSortColumn: stableSortColumn
     };
-    if (ready && requestRef.current) {
+    if (ready && formInitialized && requestRef.current) {
       _logger.logger.debug('useEffect 触发数据请求', {
         ready: ready,
+        formInitialized: formInitialized,
         hasRequest: !!requestRef.current,
         queryFilter: stableQueryFilter,
         stableGridParams: stableGridParams,
@@ -832,7 +839,7 @@ function AgGridPlus(props) {
       });
       onRequest(stableQueryFilter);
     }
-  }, [ready, stableQueryFilter, stableGridParams, pagination.current, pagination.pageSize, stableSortColumn]);
+  }, [ready, formInitialized, stableQueryFilter, stableGridParams, pagination.current, pagination.pageSize, stableSortColumn]);
   var handelgridPlusColumnState = function handelgridPlusColumnState(columnState) {
     var cellMap = {};
     if ((0, _isArray2.default)(columnState)) {
@@ -1257,7 +1264,10 @@ function AgGridPlus(props) {
       onRequest && onRequest(formValues);
     },
     onInit: function onInit(defaultValues) {
+      // 【修复】先设置 queryFilter，再标记表单已初始化
+      // 这样确保首次请求时 queryFilter 已包含默认值
       setQueryFilter(defaultValues);
+      setFormInitialized(true);
     }
   }), /*#__PURE__*/_react.default.createElement(_antd.Card, {
     bordered: false,

package/dist/cjs/ag-grid-plus/queryForm/index.js

@@ -57,9 +57,11 @@ var FormRender = function FormRender(props) {
       }
     });
   }, []);
-  (0, _react2.useEffect)(function () {
-    props.onInit && props.onInit(form.values);
-  }, []);
+
+  // 【修复】移除此处的 onInit 调用
+  // 原因：此时 schema 尚未设置，form.values 为空，默认值还未应用
+  // 改为在下方 schema 设置完成后调用 onInit
+
   var SchemaField = (0, _react2.useMemo)(function () {
     return (0, _react.createSchemaField)({
       components: {
@@ -193,9 +195,24 @@ var FormRender = function FormRender(props) {
     }
     return rootSchema;
   };
+
+  // 【新增】用于追踪是否已完成首次初始化
+  var initializedRef = (0, _react2.useRef)(false);
   (0, _react2.useEffect)(function () {
     var new_schema = getSchema(onReset);
     setSchema(new_schema);
+
+    // 【修复】在 schema 设置完成后调用 onInit
+    // 使用 setTimeout 确保 Formily 有时间处理 schema 并应用默认值
+    if (!initializedRef.current) {
+      initializedRef.current = true;
+      // 使用 requestAnimationFrame + setTimeout 确保默认值已应用
+      requestAnimationFrame(function () {
+        setTimeout(function () {
+          props.onInit && props.onInit(form.values);
+        }, 0);
+      });
+    }
   }, [columnStates === null || columnStates === void 0 ? void 0 : columnStates.map(function (c) {
     return c.colId;
   }).join('|'), colDefs === null || colDefs === void 0 ? void 0 : colDefs.map(function (c) {

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

@@ -166,39 +166,45 @@ function AgGridPlus(props) {
     _useState2 = _slicedToArray(_useState, 2),
     ready = _useState2[0],
     setReady = _useState2[1];
-  var _useState3 = useState(loadingProps ? loadingProps : false),
+  // 【修复】追踪搜索表单是否已完成初始化（包含默认值）
+  // 只有当 search !== false 时才需要等待表单初始化
+  var _useState3 = useState(search === false),
     _useState4 = _slicedToArray(_useState3, 2),
-    loading = _useState4[0],
-    setLoading = _useState4[1];
-  var _useState5 = useState(),
+    formInitialized = _useState4[0],
+    setFormInitialized = _useState4[1];
+  var _useState5 = useState(loadingProps ? loadingProps : false),
     _useState6 = _slicedToArray(_useState5, 2),
-    columnState = _useState6[0],
-    setColumnState = _useState6[1];
-  var _useState7 = useState({}),
+    loading = _useState6[0],
+    setLoading = _useState6[1];
+  var _useState7 = useState(),
     _useState8 = _slicedToArray(_useState7, 2),
-    columnCellClass = _useState8[0],
-    setColumnCellClass = _useState8[1];
-  var _useState9 = useState([]),
+    columnState = _useState8[0],
+    setColumnState = _useState8[1];
+  var _useState9 = useState({}),
     _useState10 = _slicedToArray(_useState9, 2),
-    rowData = _useState10[0],
-    setRowData = _useState10[1];
-  var _useState11 = useState({}),
+    columnCellClass = _useState10[0],
+    setColumnCellClass = _useState10[1];
+  var _useState11 = useState([]),
     _useState12 = _slicedToArray(_useState11, 2),
-    queryFilter = _useState12[0],
-    setQueryFilter = _useState12[1];
-  var _useState13 = useState(),
+    rowData = _useState12[0],
+    setRowData = _useState12[1];
+  var _useState13 = useState({}),
     _useState14 = _slicedToArray(_useState13, 2),
-    sortColumn = _useState14[0],
-    setSortColumn = _useState14[1];
+    queryFilter = _useState14[0],
+    setQueryFilter = _useState14[1];
+  var _useState15 = useState(),
+    _useState16 = _slicedToArray(_useState15, 2),
+    sortColumn = _useState16[0],
+    setSortColumn = _useState16[1];
   // 初始化分页参数，支持外部传入的pageSize
-  var _useState15 = useState({
+  var _useState17 = useState({
       pageSize: props.pageSize !== undefined ? props.pageSize : props.hidePagination ? 10000 : 200,
       current: 1,
       total: dataSource ? dataSource.length : 0
     }),
-    _useState16 = _slicedToArray(_useState15, 2),
-    pagination = _useState16[0],
-    setPagination = _useState16[1];
+    _useState18 = _slicedToArray(_useState17, 2),
+    pagination = _useState18[0],
+    setPagination = _useState18[1];
 
   // ============ 方案管理 - 使用集中式 Context ============
   var _useGridSchemes = useGridSchemes(),
@@ -217,16 +223,16 @@ function AgGridPlus(props) {
     getColumnSchemes = _useGridSchemes.getColumnSchemes,
     getQuerySchemes = _useGridSchemes.getQuerySchemes,
     getCurrentScheme = _useGridSchemes.getCurrentScheme;
-  var _useState17 = useState([]),
-    _useState18 = _slicedToArray(_useState17, 2),
-    queryItemsOrder = _useState18[0],
-    setQueryItemsOrder = _useState18[1];
+  var _useState19 = useState([]),
+    _useState20 = _slicedToArray(_useState19, 2),
+    queryItemsOrder = _useState20[0],
+    setQueryItemsOrder = _useState20[1];
 
   // 高级查询状态
-  var _useState19 = useState(false),
-    _useState20 = _slicedToArray(_useState19, 2),
-    advancedPopoverOpen = _useState20[0],
-    setAdvancedPopoverOpen = _useState20[1];
+  var _useState21 = useState(false),
+    _useState22 = _slicedToArray(_useState21, 2),
+    advancedPopoverOpen = _useState22[0],
+    setAdvancedPopoverOpen = _useState22[1];
   var createEmptyRuleGroup = function createEmptyRuleGroup() {
     return {
       id: uuidv4(),
@@ -234,10 +240,10 @@ function AgGridPlus(props) {
       children: []
     };
   };
-  var _useState21 = useState(createEmptyRuleGroup),
-    _useState22 = _slicedToArray(_useState21, 2),
-    advancedQueryRules = _useState22[0],
-    setAdvancedQueryRules = _useState22[1];
+  var _useState23 = useState(createEmptyRuleGroup),
+    _useState24 = _slicedToArray(_useState23, 2),
+    advancedQueryRules = _useState24[0],
+    setAdvancedQueryRules = _useState24[1];
 
   /**
    * 【P1 架构优化】使用单向数据流架构
@@ -811,9 +817,10 @@ function AgGridPlus(props) {
       paginationPageSize: pagination.pageSize,
       stableSortColumn: stableSortColumn
     };
-    if (ready && requestRef.current) {
+    if (ready && formInitialized && requestRef.current) {
       logger.debug('useEffect 触发数据请求', {
         ready: ready,
+        formInitialized: formInitialized,
         hasRequest: !!requestRef.current,
         queryFilter: stableQueryFilter,
         stableGridParams: stableGridParams,
@@ -824,7 +831,7 @@ function AgGridPlus(props) {
       });
       onRequest(stableQueryFilter);
     }
-  }, [ready, stableQueryFilter, stableGridParams, pagination.current, pagination.pageSize, stableSortColumn]);
+  }, [ready, formInitialized, stableQueryFilter, stableGridParams, pagination.current, pagination.pageSize, stableSortColumn]);
   var handelgridPlusColumnState = function handelgridPlusColumnState(columnState) {
     var cellMap = {};
     if (_isArray(columnState)) {
@@ -1249,7 +1256,10 @@ function AgGridPlus(props) {
       onRequest && onRequest(formValues);
     },
     onInit: function onInit(defaultValues) {
+      // 【修复】先设置 queryFilter，再标记表单已初始化
+      // 这样确保首次请求时 queryFilter 已包含默认值
       setQueryFilter(defaultValues);
+      setFormInitialized(true);
     }
   }), /*#__PURE__*/React.createElement(Card, {
     bordered: false,

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

@@ -16,7 +16,7 @@ import { onFieldInit } from '@formily/core';
 import { createSchemaField } from '@formily/react';
 import { Button } from 'antd';
 import classNames from 'classnames';
-import React, { useEffect, useMemo, useState } from 'react';
+import React, { useEffect, useMemo, useRef, useState } from 'react';
 import QueryForm from "./queryForm";
 import BoolSelect from "../_utils/boolSelect";
 import "./index.less";
@@ -49,9 +49,11 @@ var FormRender = function FormRender(props) {
       }
     });
   }, []);
-  useEffect(function () {
-    props.onInit && props.onInit(form.values);
-  }, []);
+
+  // 【修复】移除此处的 onInit 调用
+  // 原因：此时 schema 尚未设置，form.values 为空，默认值还未应用
+  // 改为在下方 schema 设置完成后调用 onInit
+
   var SchemaField = useMemo(function () {
     return createSchemaField({
       components: {
@@ -185,9 +187,24 @@ var FormRender = function FormRender(props) {
     }
     return rootSchema;
   };
+
+  // 【新增】用于追踪是否已完成首次初始化
+  var initializedRef = useRef(false);
   useEffect(function () {
     var new_schema = getSchema(onReset);
     setSchema(new_schema);
+
+    // 【修复】在 schema 设置完成后调用 onInit
+    // 使用 setTimeout 确保 Formily 有时间处理 schema 并应用默认值
+    if (!initializedRef.current) {
+      initializedRef.current = true;
+      // 使用 requestAnimationFrame + setTimeout 确保默认值已应用
+      requestAnimationFrame(function () {
+        setTimeout(function () {
+          props.onInit && props.onInit(form.values);
+        }, 0);
+      });
+    }
   }, [columnStates === null || columnStates === void 0 ? void 0 : columnStates.map(function (c) {
     return c.colId;
   }).join('|'), colDefs === null || colDefs === void 0 ? void 0 : colDefs.map(function (c) {