@nokecy/qc-ui 1.1.65 → 1.1.67

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

@@ -12,6 +12,7 @@ var _antd = require("antd");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _react2 = _interopRequireWildcard(require("react"));
 var _queryForm = _interopRequireDefault(require("./queryForm"));
+var _schemaKey = require("./schemaKey");
 var _boolSelect = _interopRequireDefault(require("../_utils/boolSelect"));
 require("./index.less");
 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); }
@@ -139,11 +140,15 @@ var FormRender = function FormRender(props) {
       }
     };
     var columns = colDefs === null || colDefs === void 0 ? void 0 : colDefs.map(function (colDef) {
+      var _searchComponentProps;
       var state = columnStates.find(function (x) {
         return x.colId == colDef.field;
       });
       var columnDefs = gridApi === null || gridApi === void 0 ? void 0 : gridApi.getColumnDef(colDef.field);
-      return _objectSpread(_objectSpread(_objectSpread({}, colDef), columnDefs), state);
+      // 查询组件属性（下拉选项）以本次传入的列为准：AG Grid 在本副作用之后才应用新 columnDefs，此刻取到的还是上一版。@author nokecy
+      return _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, colDef), columnDefs), state), {}, {
+        searchComponentProps: (_searchComponentProps = colDef.searchComponentProps) !== null && _searchComponentProps !== void 0 ? _searchComponentProps : columnDefs === null || columnDefs === void 0 ? void 0 : columnDefs.searchComponentProps
+      });
     });
     columns = columns ? (_columns = columns) === null || _columns === void 0 ? void 0 : _columns.filter(function (i) {
       return (i === null || i === void 0 ? void 0 : i.visible) != false && !(i !== null && i !== void 0 && i.hide) && !(i !== null && i !== void 0 && i.hideInSearch) || (i === null || i === void 0 ? void 0 : i.hideInTable);
@@ -203,8 +208,19 @@ var FormRender = function FormRender(props) {
   // 【新增】用于追踪是否已完成首次初始化
   var initializedRef = (0, _react2.useRef)(false);
   (0, _react2.useEffect)(function () {
+    var _new_schema$propertie, _new_schema$propertie2;
     var new_schema = getSchema(onReset);
     setSchema(new_schema);
+    // Formily 只在字段首次创建时读取 schema：已有查询项要把新标题、组件属性（如下拉选项）写回字段。@author nokecy
+    Object.entries((_new_schema$propertie = (_new_schema$propertie2 = new_schema.properties) === null || _new_schema$propertie2 === void 0 || (_new_schema$propertie2 = _new_schema$propertie2.queryForm) === null || _new_schema$propertie2 === void 0 ? void 0 : _new_schema$propertie2.properties) !== null && _new_schema$propertie !== void 0 ? _new_schema$propertie : {}).forEach(function (_ref) {
+      var _ref2 = _slicedToArray(_ref, 2),
+        name = _ref2[0],
+        fieldSchema = _ref2[1];
+      form.query(name).take(function (field) {
+        field.title = fieldSchema.title;
+        field.setComponentProps(fieldSchema['x-component-props']);
+      });
+    });
 
     // 【修复】在 schema 设置完成后调用 onInit
     // 使用 setTimeout 确保 Formily 有时间处理 schema 并应用默认值
@@ -217,11 +233,7 @@ var FormRender = function FormRender(props) {
         }, 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) {
-    return "".concat(c.field, "|").concat(c.headerName);
-  }).join('|')]);
+  }, [(0, _schemaKey.queryFormSchemaKey)(columnStates, colDefs)]);
   return /*#__PURE__*/_react2.default.createElement("div", {
     className: (0, _classnames.default)(className, "ag-grid-table-search ag-grid-table-search-query-filter"),
     style: {

package/dist/cjs/ag-grid-plus/queryForm/schemaKey.d.ts

@@ -0,0 +1,20 @@
+type ColumnStateLike = {
+    colId?: string | null;
+};
+type QueryColumnLike = {
+    field?: string;
+    headerName?: string;
+    searchComponentProps?: {
+        options?: readonly {
+            value?: unknown;
+            label?: unknown;
+        }[];
+    };
+};
+/**
+ * 查询区 schema 的重建键：列（id、字段、标题）或下拉选项变了才重建。
+ * 下拉选项常在首帧之后才到（如从基础资料接口取名称），只看列与标题时选项停在首帧。
+ * @author nokecy
+ */
+export declare const queryFormSchemaKey: (columnStates?: readonly ColumnStateLike[] | null, colDefs?: readonly QueryColumnLike[] | null) => string;
+export {};

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

@@ -0,0 +1,25 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.queryFormSchemaKey = void 0;
+var optionsSignature = function optionsSignature(options) {
+  return Array.isArray(options) ? options.map(function (option) {
+    return "".concat(String(option === null || option === void 0 ? void 0 : option.value), "=").concat(String(option === null || option === void 0 ? void 0 : option.label));
+  }).join(',') : '';
+};
+
+/**
+ * 查询区 schema 的重建键：列（id、字段、标题）或下拉选项变了才重建。
+ * 下拉选项常在首帧之后才到（如从基础资料接口取名称），只看列与标题时选项停在首帧。
+ * @author nokecy
+ */
+var queryFormSchemaKey = exports.queryFormSchemaKey = function queryFormSchemaKey(columnStates, colDefs) {
+  return [columnStates === null || columnStates === void 0 ? void 0 : columnStates.map(function (column) {
+    return column.colId;
+  }).join('|'), colDefs === null || colDefs === void 0 ? void 0 : colDefs.map(function (column) {
+    var _column$searchCompone;
+    return "".concat(column.field, "|").concat(column.headerName, "|").concat(optionsSignature((_column$searchCompone = column.searchComponentProps) === null || _column$searchCompone === void 0 ? void 0 : _column$searchCompone.options));
+  }).join('|')].join('#');
+};

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

@@ -18,6 +18,7 @@ import { Button, theme } from 'antd';
 import classNames from 'classnames';
 import React, { useEffect, useMemo, useRef, useState } from 'react';
 import QueryForm from "./queryForm";
+import { queryFormSchemaKey } from "./schemaKey";
 import BoolSelect from "../_utils/boolSelect";
 import "./index.less";
 var FormRender = function FormRender(props) {
@@ -131,11 +132,15 @@ var FormRender = function FormRender(props) {
       }
     };
     var columns = colDefs === null || colDefs === void 0 ? void 0 : colDefs.map(function (colDef) {
+      var _searchComponentProps;
       var state = columnStates.find(function (x) {
         return x.colId == colDef.field;
       });
       var columnDefs = gridApi === null || gridApi === void 0 ? void 0 : gridApi.getColumnDef(colDef.field);
-      return _objectSpread(_objectSpread(_objectSpread({}, colDef), columnDefs), state);
+      // 查询组件属性（下拉选项）以本次传入的列为准：AG Grid 在本副作用之后才应用新 columnDefs，此刻取到的还是上一版。@author nokecy
+      return _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, colDef), columnDefs), state), {}, {
+        searchComponentProps: (_searchComponentProps = colDef.searchComponentProps) !== null && _searchComponentProps !== void 0 ? _searchComponentProps : columnDefs === null || columnDefs === void 0 ? void 0 : columnDefs.searchComponentProps
+      });
     });
     columns = columns ? (_columns = columns) === null || _columns === void 0 ? void 0 : _columns.filter(function (i) {
       return (i === null || i === void 0 ? void 0 : i.visible) != false && !(i !== null && i !== void 0 && i.hide) && !(i !== null && i !== void 0 && i.hideInSearch) || (i === null || i === void 0 ? void 0 : i.hideInTable);
@@ -195,8 +200,19 @@ var FormRender = function FormRender(props) {
   // 【新增】用于追踪是否已完成首次初始化
   var initializedRef = useRef(false);
   useEffect(function () {
+    var _new_schema$propertie, _new_schema$propertie2;
     var new_schema = getSchema(onReset);
     setSchema(new_schema);
+    // Formily 只在字段首次创建时读取 schema：已有查询项要把新标题、组件属性（如下拉选项）写回字段。@author nokecy
+    Object.entries((_new_schema$propertie = (_new_schema$propertie2 = new_schema.properties) === null || _new_schema$propertie2 === void 0 || (_new_schema$propertie2 = _new_schema$propertie2.queryForm) === null || _new_schema$propertie2 === void 0 ? void 0 : _new_schema$propertie2.properties) !== null && _new_schema$propertie !== void 0 ? _new_schema$propertie : {}).forEach(function (_ref) {
+      var _ref2 = _slicedToArray(_ref, 2),
+        name = _ref2[0],
+        fieldSchema = _ref2[1];
+      form.query(name).take(function (field) {
+        field.title = fieldSchema.title;
+        field.setComponentProps(fieldSchema['x-component-props']);
+      });
+    });
 
     // 【修复】在 schema 设置完成后调用 onInit
     // 使用 setTimeout 确保 Formily 有时间处理 schema 并应用默认值
@@ -209,11 +225,7 @@ var FormRender = function FormRender(props) {
         }, 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) {
-    return "".concat(c.field, "|").concat(c.headerName);
-  }).join('|')]);
+  }, [queryFormSchemaKey(columnStates, colDefs)]);
   return /*#__PURE__*/React.createElement("div", {
     className: classNames(className, "ag-grid-table-search ag-grid-table-search-query-filter"),
     style: {

package/dist/esm/ag-grid-plus/queryForm/schemaKey.d.ts

@@ -0,0 +1,20 @@
+type ColumnStateLike = {
+    colId?: string | null;
+};
+type QueryColumnLike = {
+    field?: string;
+    headerName?: string;
+    searchComponentProps?: {
+        options?: readonly {
+            value?: unknown;
+            label?: unknown;
+        }[];
+    };
+};
+/**
+ * 查询区 schema 的重建键：列（id、字段、标题）或下拉选项变了才重建。
+ * 下拉选项常在首帧之后才到（如从基础资料接口取名称），只看列与标题时选项停在首帧。
+ * @author nokecy
+ */
+export declare const queryFormSchemaKey: (columnStates?: readonly ColumnStateLike[] | null, colDefs?: readonly QueryColumnLike[] | null) => string;
+export {};

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

@@ -0,0 +1,19 @@
+var optionsSignature = function optionsSignature(options) {
+  return Array.isArray(options) ? options.map(function (option) {
+    return "".concat(String(option === null || option === void 0 ? void 0 : option.value), "=").concat(String(option === null || option === void 0 ? void 0 : option.label));
+  }).join(',') : '';
+};
+
+/**
+ * 查询区 schema 的重建键：列（id、字段、标题）或下拉选项变了才重建。
+ * 下拉选项常在首帧之后才到（如从基础资料接口取名称），只看列与标题时选项停在首帧。
+ * @author nokecy
+ */
+export var queryFormSchemaKey = function queryFormSchemaKey(columnStates, colDefs) {
+  return [columnStates === null || columnStates === void 0 ? void 0 : columnStates.map(function (column) {
+    return column.colId;
+  }).join('|'), colDefs === null || colDefs === void 0 ? void 0 : colDefs.map(function (column) {
+    var _column$searchCompone;
+    return "".concat(column.field, "|").concat(column.headerName, "|").concat(optionsSignature((_column$searchCompone = column.searchComponentProps) === null || _column$searchCompone === void 0 ? void 0 : _column$searchCompone.options));
+  }).join('|')].join('#');
+};