@hzab/list-render 1.10.0-beta → 1.10.0-beta1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hzab/list-render",
-  "version": "1.10.0-beta",
+  "version": "1.10.0-beta1",
   "description": "",
   "main": "src",
   "scripts": {

package/src/common/handleQuerySchema.ts

@@ -3,6 +3,60 @@ import { getFieldMap } from "./utils";
 import { isRunStr, handleSchemaStrVal, isScopeKey as formIsScopeKey, getScopeKeyVal } from '@hzab/form-render/src/common/schema-handler';
 import { URL_PARAM_NAME } from "./constant";
 
+// ===================== 类型定义 =====================
+
+type AntdDateComponent = 'DatePicker' | 'DatePicker.RangePicker';
+
+interface XComponentProps {
+  isSplitTimes?: boolean;
+  startKey?: string;
+  endKey?: string;
+  [k: string]: unknown;
+}
+
+interface FormilyField {
+  type?: string;
+  title?: string;
+  'x-decorator'?: string;
+  'x-component'?: string;
+  'x-validator'?: unknown[];
+  'x-component-props'?: XComponentProps;
+  'x-decorator-props'?: Record<string, unknown>;
+  'x-designable-id'?: string;
+  'x-index'?: number;
+  [k: string]: unknown;
+}
+
+interface FormilyV1SchemaNode {
+  type?: string;
+  properties?: Record<string, FormilyField>;
+  [k: string]: unknown;
+}
+
+interface FormilyV1Schema {
+  form?: Record<string, unknown>;
+  schema: FormilyV1SchemaNode;
+}
+
+type URLQueryObject = Record<string, any> | null | undefined;
+
+interface ExtractOptions {
+  /** 分拆开关字段名，位于 x-component-props；默认 'isSplitTimes' */
+  splitFlag?: string;
+  /** 分拆开关的期望值；默认 true */
+  splitFlagExpectedValue?: unknown;
+  /** 默认开始/结束键名（当 schema 未显式配置时），默认 'startTime' / 'endTime' */
+  defaultStartKey?: string;
+  defaultEndKey?: string;
+  /** 认为是 antd 日期组件的名单，默认 DatePicker / DatePicker.RangePicker */
+  antdDateComponents?: readonly AntdDateComponent[];
+  /**
+   * 命中并成功赋值后，是否从返回对象中删除对应的 startKey / endKey
+   * 默认 true（删除）
+   */
+  removeMatchedKeys?: boolean;
+}
+
 export const handleQuerySchema = (opt) => {
   const { schema, search, filters, onSearch, replaceComList, schemaScope } = opt || {};
   const queryProperties = {};
@@ -379,4 +433,95 @@ export function getURLObjectQueryParam<T = any>(paramName = URL_PARAM_NAME): T |
   }
 }
 
+
+// ===================== 辅助函数 =====================
+
+const pickFormilyProperties = (schema: FormilyV1Schema): Record<string, FormilyField> =>
+  (schema?.schema?.properties ?? {});
+
+const isAntdDateComponent = (comp: unknown, whitelist: readonly string[]) =>
+  typeof comp === 'string' && whitelist.includes(comp);
+
+const filterKeys = (props: Record<string, FormilyField>, filters: readonly string[]) => {
+  const filterSet = new Set(filters);
+  return Object.entries(props).filter(([k]) => filterSet.has(k));
+};
+
+const matchSplitFlag = (field: FormilyField, splitFlag: string, expected: unknown) =>
+  field?.['x-component-props']?.[splitFlag] === expected;
+
+/** 两个值都缺失则返回 undefined；否则返回二元组 */
+const getRangeTupleOrUndefined = (
+  urlObj: URLQueryObject,
+  startKey: string,
+  endKey: string
+): [any, any] | undefined => {
+  const obj = (urlObj ?? {}) as Record<string, any>;
+  const hasStart = Object.prototype.hasOwnProperty.call(obj, startKey);
+  const hasEnd = Object.prototype.hasOwnProperty.call(obj, endKey);
+  if (!hasStart && !hasEnd) return undefined;
+  return [obj[startKey], obj[endKey]];
+};
+
+// ===================== 主函数 =====================
+/**
+ * 根据formilySchema配置逆解析表单key并将url query赋值
+ * 三层筛选：根据filters + splitFlag + antdDateComponents 提取formilySchema配置项然后通过配置的key赋值并返回
+ * */
+export function extractSplitDateRanges(
+  filters: string[],
+  formilySchema: FormilyV1Schema,
+  urlObj: URLQueryObject,
+  options: ExtractOptions = {}
+): Record<string, any> {
+  const {
+    splitFlag = 'isSplitTimes',
+    splitFlagExpectedValue = true,
+    defaultStartKey = 'startTime',
+    defaultEndKey = 'endTime',
+    antdDateComponents = ['DatePicker', 'DatePicker.RangePicker'],
+    removeMatchedKeys = true,
+  } = options;
+
+  const properties = pickFormilyProperties(formilySchema);
+  const candidates = filterKeys(properties, filters);
+
+  // 保持不变性
+  const base = _.cloneDeep(urlObj) as Record<string, any>;
+
+  // 统一延迟删除，避免顺序影响
+  const keysToDelete = new Set<string>();
+
+  for (const [fieldKey, field] of candidates) {
+    // 未命中则直接跳过本次循环
+    if (!isAntdDateComponent(field?.['x-component'], antdDateComponents)) continue;
+    if (!matchSplitFlag(field, splitFlag, splitFlagExpectedValue)) continue;
+
+    const props = field?.['x-component-props'] ?? {};
+    const startKey = (props?.startKey as string) || defaultStartKey;
+    const endKey = (props?.endKey as string) || defaultEndKey;
+
+    const tuple = getRangeTupleOrUndefined(base, startKey, endKey);
+    if (!tuple) continue; // 两个值都没有则不赋值、不删除
+
+    // 命中，给 fieldKey 赋值
+    base[fieldKey] = tuple;
+
+    // 按需记录要删除的键（只删除“命中的”）
+    if (removeMatchedKeys) {
+      if (Object.prototype.hasOwnProperty.call(base, startKey)) keysToDelete.add(startKey);
+      if (Object.prototype.hasOwnProperty.call(base, endKey)) keysToDelete.add(endKey);
+    }
+  }
+
+  // 统一执行删除，保证无顺序副作用
+  if (removeMatchedKeys) {
+    for (const k of keysToDelete) {
+      delete base[k];
+    }
+  }
+
+  return base;
+}
+
 export default handleQuerySchema;

package/src/list-render.jsx

@@ -15,7 +15,7 @@ import FormModal from "./FormModal";
 import DetailModal from "./DetailModal";
 
 import { objToFormData } from "./common/utils";
-import { setURLObjectQueryParam, getURLObjectQueryParam, removeURLObjectQueryParam } from "./common/handleQuerySchema";
+import { setURLObjectQueryParam, getURLObjectQueryParam, removeURLObjectQueryParam, extractSplitDateRanges } from "./common/handleQuerySchema";
 import { URL_PARAM_NAME } from "./common/constant";
 
 import "./index.less";
@@ -89,7 +89,7 @@ const ListRender = forwardRef(function (props, parentRef) {
     onDel,
   }));
 
-  const { schema = {}, config = {}, model = {}, msgConf = {} } = props;
+  const { schema = {}, config = {}, model = {}, msgConf = {}, filters } = props;
 
   // useEffect(() => {
   //   const list = props.paginationConf?.pageSizeOptions || pageSizeOptionMap[props.layout] || [10, 20, 50, 100];
@@ -117,7 +117,11 @@ const ListRender = forwardRef(function (props, parentRef) {
     // 延迟获取表单实例
     Promise.resolve().then(() => {
       if (queryRef.current && queryRef.current?.formRef?.current.formRender) {
-        queryRef.current.formRef.current.formRender?.setValues(getUrlQuery)
+        const extractValues = extractSplitDateRanges(filters, schema, getUrlQuery);
+
+        queryRef.current.formRef.current.formRender?.setValues(extractValues)
+
+        formQueryRef.current = _.cloneDeep(getUrlQuery)
       }
     })
 
@@ -177,7 +181,7 @@ const ListRender = forwardRef(function (props, parentRef) {
       delete mergedQueries.$timerange;
     }
 
-    model.query = mergedQueries;
+    // model.query = mergedQueries;
     // 取消上一次请求
     getListSourceRef.current?.cancel({ code: 601, message: "取消上一次请求" });
 
@@ -227,9 +231,8 @@ const ListRender = forwardRef(function (props, parentRef) {
 
   function onSearch(quer, source, isReset = false) {
     const query = source === "queryRender" ? { ...quer } : { ...formQueryRef.current, ...quer };
-
     // 重置操作时不赋值
-    if (!isReset && appendUrlQuery) setURLObjectQueryParam(query, appendUrlQueryKey);
+    if (source === "queryRender" && !isReset && appendUrlQuery) setURLObjectQueryParam(query, appendUrlQueryKey);
 
     if (model && !model.query) {
       model.query = {};