best-lowcode-runtime 0.1.2 → 0.2.1

package/dist/index.js

@@ -1,7 +1,41 @@
+// src/lowcode/adapter.ts
+import dayjs from "dayjs";
+function normalizeBestValues(values, normalize = defaultNormalize) {
+  return Object.fromEntries(
+    Object.entries(values).map(([field, value]) => [
+      field,
+      normalizeNested(value, normalize, field)
+    ])
+  );
+}
+function normalizeNested(value, normalize, field) {
+  if (Array.isArray(value)) return value.map((item) => normalizeNested(item, normalize, field));
+  if (dayjs.isDayjs(value) || value instanceof Date) return value;
+  if (value && typeof value === "object") {
+    return Object.fromEntries(
+      Object.entries(value).map(([key, item]) => [key, normalizeNested(item, normalize, key)])
+    );
+  }
+  return normalize(value, field);
+}
+function defaultNormalize(value) {
+  if (typeof value === "string") return value.trim() === "" ? void 0 : value.trim();
+  return value;
+}
+function createBestCrudAdapter(options = {}) {
+  const normalize = options.normalize ?? defaultNormalize;
+  return {
+    fromList: options.fromList,
+    fromDetail: options.fromDetail,
+    toCreatePayload: (values) => options.toCreatePayload?.(normalizeBestValues(values, normalize)) ?? normalizeBestValues(values, normalize),
+    toUpdatePayload: (values, record) => options.toUpdatePayload?.(normalizeBestValues(values, normalize), record) ?? normalizeBestValues(values, normalize)
+  };
+}
+
 // src/lowcode/BestCrudPage.tsx
 import { Button as Button4, Modal as Modal2, message } from "antd";
-import dayjs3 from "dayjs";
-import { useCallback, useEffect as useEffect3, useMemo as useMemo3, useRef, useState as useState3 } from "react";
+import dayjs5 from "dayjs";
+import { useCallback, useEffect as useEffect3, useLayoutEffect, useMemo as useMemo5, useRef as useRef3, useState as useState3 } from "react";
 
 // src/runtime/BestProvider.tsx
 import { ConfigProvider } from "antd";
@@ -141,22 +175,105 @@ function BestFilePreview({ files, onDownload }) {
 
 // src/ui/BestForm.tsx
 import { Button as Button2, DatePicker, Form, Input as Input2, InputNumber, Select, Space } from "antd";
-import { useEffect, useState as useState2 } from "react";
+import dayjs2 from "dayjs";
+import { useEffect, useMemo as useMemo3, useRef, useState as useState2 } from "react";
 import { Fragment, jsx as jsx5, jsxs as jsxs2 } from "react/jsx-runtime";
+function toNamePath(path) {
+  return path === void 0 ? [] : Array.isArray(path) ? path : [path];
+}
+function isNamePath(value) {
+  return Array.isArray(value);
+}
+function isRecord(value) {
+  if (!value || typeof value !== "object" || Array.isArray(value) || value instanceof Date) {
+    return false;
+  }
+  if (dayjs2.isDayjs(value)) return false;
+  const prototype = Object.getPrototypeOf(value);
+  return prototype === Object.prototype || prototype === null;
+}
+function appendNamePath(path, ...segments) {
+  return [...toNamePath(path), ...segments];
+}
+function getConditionFieldValue(values, field) {
+  if (Object.hasOwn(values, field)) return values[field];
+  return getPathValue(values, field.split("."));
+}
+function getScopedValues(values, itemPath) {
+  const itemValues = getPathValue(values, itemPath);
+  return isRecord(itemValues) ? { ...values, ...itemValues } : values;
+}
+function isFieldVisible(field, values, mode) {
+  return !field.hidden && (!field.visibleWhen || evaluateCondition(field.visibleWhen, values, mode));
+}
+function resolveFieldDisabled(field, values, mode) {
+  return field.disabled || Boolean(field.disabledWhen && evaluateCondition(field.disabledWhen, values, mode));
+}
+function toDayjsValue(value) {
+  if (dayjs2.isDayjs(value)) return value;
+  if (value instanceof Date) return dayjs2(value);
+  if (typeof value === "number") {
+    const normalized = Math.abs(value) >= 1e12 ? value : value * 1e3;
+    const parsed = dayjs2(normalized);
+    return parsed.isValid() ? parsed : null;
+  }
+  if (typeof value === "string") {
+    const trimmed = value.trim();
+    if (!trimmed) return null;
+    const parsed = dayjs2(trimmed);
+    return parsed.isValid() ? parsed : null;
+  }
+  return null;
+}
+function toDatePickerValue(value) {
+  return toDayjsValue(value);
+}
+function toDateRangePickerValue(value) {
+  if (!Array.isArray(value)) return null;
+  const nextValue = [toDayjsValue(value[0]), toDayjsValue(value[1])];
+  return nextValue[0] || nextValue[1] ? nextValue : null;
+}
+function serializeDatePickerValue(_, dateString) {
+  return dateString || void 0;
+}
+function serializeDateRangePickerValue(_, dateStrings) {
+  return dateStrings[0] || dateStrings[1] ? dateStrings : void 0;
+}
+function fieldSignature(field) {
+  return {
+    field: field.field,
+    component: field.component,
+    defaultValue: field.defaultValue,
+    remoteService: field.remoteService,
+    searchField: field.searchField,
+    labelField: field.labelField,
+    valueField: field.valueField,
+    debounceMs: field.debounceMs,
+    pageSize: field.pageSize,
+    itemFields: field.itemFields?.map((itemField) => fieldSignature(itemField))
+  };
+}
 function FormControl({
   field,
   values,
+  scopeValues,
   mode = "create",
   form,
+  namePath,
+  value,
+  onChange,
   ...controlProps
 }) {
   const registry = useBestRegistry();
+  const renderValues = scopeValues ?? values;
   switch (field.component) {
     case "select":
       return /* @__PURE__ */ jsx5(
         Select,
         {
           ...controlProps,
+          value,
+          onChange,
           disabled: field.disabled,
           options: field.options,
           placeholder: field.placeholder
@@ -167,10 +284,13 @@ function FormControl({
         RemoteSelect,
         {
           field,
-          value: values[field.field],
+          value: value !== void 0 ? value : getPathValue(values, namePath ?? field.field),
           disabled: field.disabled,
           placeholder: field.placeholder,
-          onChange: (value) => form.setFieldValue(field.field, value),
+          onChange: (nextValue) => {
+            if (onChange) onChange(nextValue);
+            else form.setFieldValue(namePath ?? field.field, nextValue);
+          },
           registry
         }
       );
@@ -179,18 +299,31 @@ function FormControl({
         InputNumber,
         {
           ...controlProps,
+          value,
+          onChange,
           disabled: field.disabled,
           placeholder: field.placeholder,
           style: { width: "100%" }
         }
       );
     case "date":
-      return /* @__PURE__ */ jsx5(DatePicker, { ...controlProps, disabled: field.disabled, style: { width: "100%" } });
+      return /* @__PURE__ */ jsx5(
+        DatePicker,
+        {
+          ...controlProps,
+          value: toDatePickerValue(value),
+          onChange: (date, dateString) => onChange?.(serializeDatePickerValue(date, dateString)),
+          disabled: field.disabled,
+          style: { width: "100%" }
+        }
+      );
     case "dateRange":
       return /* @__PURE__ */ jsx5(
         DatePicker.RangePicker,
         {
           ...controlProps,
+          value: toDateRangePickerValue(value),
+          onChange: (dates, dateStrings) => onChange?.(serializeDateRangePickerValue(dates, dateStrings)),
           disabled: field.disabled,
           style: { width: "100%" }
         }
@@ -200,6 +333,8 @@ function FormControl({
         Input2.TextArea,
         {
           ...controlProps,
+          value,
+          onChange,
           disabled: field.disabled,
           placeholder: field.placeholder
         }
@@ -207,48 +342,135 @@ function FormControl({
     case "slot":
       return /* @__PURE__ */ jsx5(Fragment, { children: field.render?.({
         field: field.field,
-        values,
-        value: values[field.field],
+        values: renderValues,
+        value: value !== void 0 ? value : getPathValue(values, namePath ?? field.field),
         mode,
         disabled: field.disabled,
-        setValue: (name, value) => form.setFieldValue(name, value)
+        setValue: (name, nextValue) => form.setFieldValue(
+          namePath ? isNamePath(name) ? name : [...toNamePath(namePath).slice(0, -1), name] : name,
+          nextValue
+        )
       }) });
     case "repeatable":
-      return /* @__PURE__ */ jsx5(Form.List, { name: field.field, children: (items, { add, remove }) => /* @__PURE__ */ jsxs2(Fragment, { children: [
-        items.map((item) => /* @__PURE__ */ jsxs2(Space, { align: "start", children: [
-          field.itemFields?.map((itemField) => /* @__PURE__ */ jsx5(
-            Form.Item,
-            {
-              label: itemField.label,
-              name: [item.name, itemField.field],
-              rules: toAntRules(itemField.rules),
-              children: /* @__PURE__ */ jsx5(FormControl, { field: itemField, form, mode, values })
-            },
-            itemField.field
-          )),
-          /* @__PURE__ */ jsx5(
-            Button2,
+      return /* @__PURE__ */ jsx5(
+        RepeatableField,
+        {
+          field,
+          form,
+          mode,
+          namePath,
+          values
+        }
+      );
+    default:
+      return /* @__PURE__ */ jsx5(
+        Input2,
+        {
+          ...controlProps,
+          value,
+          onChange,
+          disabled: field.disabled,
+          placeholder: field.placeholder
+        }
+      );
+  }
+}
+function RepeatableField({
+  field,
+  form,
+  mode,
+  namePath,
+  values
+}) {
+  const listName = namePath ?? field.field;
+  return /* @__PURE__ */ jsx5(Form.List, { name: listName, children: (items, { add, remove }) => /* @__PURE__ */ jsxs2(Fragment, { children: [
+    items.map((item) => /* @__PURE__ */ jsx5(
+      RepeatableFieldRow,
+      {
+        field,
+        form,
+        itemCount: items.length,
+        itemName: item.name,
+        itemKey: item.key,
+        listName,
+        mode,
+        remove,
+        values
+      },
+      item.key
+    )),
+    /* @__PURE__ */ jsx5(
+      Button2,
+      {
+        disabled: field.maxItems !== void 0 && items.length >= field.maxItems,
+        onClick: () => add(resolveInitialValues(field.itemFields ?? [], void 0)),
+        type: "dashed",
+        children: "\u65B0\u589E\u4E00\u9879"
+      }
+    )
+  ] }) });
+}
+function RepeatableFieldRow({
+  field,
+  form,
+  itemCount,
+  itemName,
+  itemKey,
+  listName,
+  mode,
+  remove,
+  values
+}) {
+  const itemPath = appendNamePath(listName, itemName);
+  const itemValues = getPathValue(values, itemPath);
+  const scopeValues = getScopedValues(values, itemPath);
+  useEffect(() => {
+    field.itemFields?.forEach((itemField) => {
+      if (!itemField.clearWhenHidden) return;
+      const nextPath = appendNamePath(itemPath, itemField.field);
+      if (!isFieldVisible(itemField, scopeValues, mode) && getPathValue(values, nextPath) !== void 0) {
+        form.setFieldValue(nextPath, void 0);
+      }
+    });
+  }, [field.itemFields, form, itemPath, mode, scopeValues, values]);
+  return /* @__PURE__ */ jsxs2(Space, { align: "start", children: [
+    field.itemFields?.map((itemField) => {
+      if (!isFieldVisible(itemField, scopeValues, mode)) return null;
+      const nextPath = appendNamePath(itemPath, itemField.field);
+      return /* @__PURE__ */ jsx5(
+        Form.Item,
+        {
+          label: itemField.label,
+          name: [itemName, itemField.field],
+          rules: toAntRules(itemField.rules),
+          children: /* @__PURE__ */ jsx5(
+            FormControl,
             {
-              disabled: items.length <= (field.minItems ?? 0),
-              onClick: () => remove(item.name),
-              type: "link",
-              children: "\u5220\u9664"
+              field: {
+                ...itemField,
+                disabled: resolveFieldDisabled(itemField, scopeValues, mode)
+              },
+              form,
+              mode,
+              namePath: nextPath,
+              scopeValues,
+              values: isRecord(itemValues) ? { ...values, ...itemValues } : values
             }
           )
-        ] }, item.key)),
-        /* @__PURE__ */ jsx5(
-          Button2,
-          {
-            disabled: Boolean(field.maxItems && items.length >= field.maxItems),
-            onClick: () => add(),
-            type: "dashed",
-            children: "\u65B0\u589E\u4E00\u9879"
-          }
-        )
-      ] }) });
-    default:
-      return /* @__PURE__ */ jsx5(Input2, { ...controlProps, disabled: field.disabled, placeholder: field.placeholder });
-  }
+        },
+        itemField.field
+      );
+    }),
+    /* @__PURE__ */ jsx5(
+      Button2,
+      {
+        disabled: itemCount <= (field.minItems ?? 0),
+        onClick: () => remove(itemName),
+        type: "link",
+        children: "\u5220\u9664"
+      }
+    )
+  ] }, itemKey);
 }
 function FormFields({ fields, form, initialValues, mode = "create" }) {
   const values = Form.useWatch([], { form, preserve: true }) ?? initialValues ?? {};
@@ -290,7 +512,7 @@ function toAntRules(rules) {
     type: rule.type === "string" ? void 0 : rule.type,
     min: rule.min ?? rule.minLength,
     max: rule.max ?? rule.maxLength,
-    pattern: rule.pattern ? new RegExp(rule.pattern) : void 0,
+    pattern: safeRegExp(rule.pattern),
     message: rule.message,
     validator: rule.type === "integer" ? async (_, value) => {
       if (value === void 0 || value === null || value === "") return;
@@ -298,6 +520,14 @@ function toAntRules(rules) {
     } : void 0
   }));
 }
+function safeRegExp(pattern) {
+  if (!pattern) return void 0;
+  try {
+    return new RegExp(pattern);
+  } catch {
+    return void 0;
+  }
+}
 function RemoteSelect({
   field,
   value,
@@ -306,39 +536,105 @@ function RemoteSelect({
   onChange,
   registry
 }) {
-  const [options, setOptions] = useState2([]);
+  const [keywordOptions, setKeywordOptions] = useState2([]);
+  const [selectedOptions, setSelectedOptions] = useState2([]);
   const [loading, setLoading] = useState2(false);
   const [keyword, setKeyword] = useState2("");
+  const keywordRequestId = useRef(0);
+  const selectedRequestId = useRef(0);
   const service = field.remoteService ? registry.services[field.remoteService] : void 0;
   const labelField = field.labelField ?? "label";
   const valueField = field.valueField ?? "value";
   const searchField = field.searchField ?? "keyword";
   const debounceMs = field.debounceMs ?? 300;
+  const pageSize = field.pageSize ?? 20;
+  const parseOptions = (response) => {
+    const raw = Array.isArray(response) ? response : response?.items ?? response?.list ?? [];
+    return raw.flatMap((item) => {
+      if (!item || typeof item !== "object") return [];
+      const record = item;
+      const optionValue = record[valueField];
+      if (typeof optionValue !== "string" && typeof optionValue !== "number") return [];
+      return [
+        {
+          label: String(record[labelField] ?? optionValue ?? ""),
+          value: optionValue,
+          disabled: Boolean(record.disabled)
+        }
+      ];
+    });
+  };
+  const mergeOptions = (base, extra) => {
+    const merged = new Map(base.map((item) => [String(item.value), item]));
+    extra.forEach((item) => {
+      merged.set(String(item.value), item);
+    });
+    return [...merged.values()];
+  };
+  const options = useMemo3(
+    () => mergeOptions(keywordOptions, selectedOptions),
+    [keywordOptions, selectedOptions]
+  );
   useEffect(() => {
-    if (!service) return;
+    const currentRequestId = ++keywordRequestId.current;
+    if (!service) {
+      setKeywordOptions([]);
+      setLoading(false);
+      return;
+    }
     const controller = new AbortController();
+    const isCurrent = () => currentRequestId === keywordRequestId.current && !controller.signal.aborted;
     const timer = window.setTimeout(async () => {
       setLoading(true);
       try {
         const response = await service(
-          { [searchField]: keyword, page: 1, pageSize: field.pageSize ?? 20 },
+          { [searchField]: keyword, page: 1, pageSize },
           { signal: controller.signal }
         );
-        const raw = Array.isArray(response) ? response : response?.items ?? response?.list ?? [];
-        setOptions(
-          raw.filter((item) => !!item && typeof item === "object").map((item) => ({ label: String(item[labelField] ?? ""), value: item[valueField] }))
-        );
+        if (isCurrent()) setKeywordOptions(parseOptions(response));
       } catch {
-        setOptions([]);
+        if (isCurrent()) setKeywordOptions([]);
       } finally {
-        if (!controller.signal.aborted) setLoading(false);
+        if (isCurrent()) setLoading(false);
       }
     }, debounceMs);
     return () => {
       window.clearTimeout(timer);
       controller.abort();
     };
-  }, [debounceMs, field.pageSize, keyword, labelField, searchField, service, valueField]);
+  }, [debounceMs, keyword, labelField, pageSize, searchField, service, valueField]);
+  useEffect(() => {
+    const currentRequestId = ++selectedRequestId.current;
+    if (!service) {
+      setSelectedOptions([]);
+      return;
+    }
+    if (value === void 0 || value === null || value === "") {
+      setSelectedOptions([]);
+      return;
+    }
+    if (typeof value !== "string" && typeof value !== "number") {
+      setSelectedOptions([]);
+      return;
+    }
+    const controller = new AbortController();
+    const isCurrent = () => currentRequestId === selectedRequestId.current && !controller.signal.aborted;
+    const fallbackOption = {
+      label: String(value),
+      value
+    };
+    setSelectedOptions([fallbackOption]);
+    void service({ [valueField]: value, page: 1, pageSize }, { signal: controller.signal }).then((response) => {
+      if (!isCurrent()) return;
+      const resolvedOptions = parseOptions(response);
+      if (resolvedOptions.length) {
+        setSelectedOptions(mergeOptions([fallbackOption], resolvedOptions));
+      }
+    }).catch(() => void 0);
+    return () => {
+      controller.abort();
+    };
+  }, [labelField, pageSize, service, value, valueField]);
   return /* @__PURE__ */ jsx5(
     Select,
     {
@@ -363,6 +659,39 @@ function BestForm({
   mode,
   onSubmit,
   onCancel
+}) {
+  const resolvedInitialValues = useMemo3(
+    () => resolveInitialValues(fields, initialValues),
+    [fields, initialValues]
+  );
+  const formSignature = useMemo3(
+    () => JSON.stringify([mode, fields.map((field) => fieldSignature(field)), resolvedInitialValues]),
+    [fields, mode, resolvedInitialValues]
+  );
+  return /* @__PURE__ */ jsx5(
+    BestFormBody,
+    {
+      extra,
+      fields,
+      initialValues: resolvedInitialValues,
+      loading,
+      mode,
+      onCancel,
+      onSubmit,
+      submitText
+    },
+    formSignature
+  );
+}
+function BestFormBody({
+  fields,
+  initialValues,
+  loading,
+  submitText = "\u63D0\u4EA4",
+  extra,
+  mode,
+  onSubmit,
+  onCancel
 }) {
   const [form] = Form.useForm();
   return /* @__PURE__ */ jsxs2(Form, { form, initialValues, layout: "vertical", onFinish: onSubmit, children: [
@@ -374,12 +703,49 @@ function BestForm({
     ] })
   ] });
 }
+function getDefaultValues(fields) {
+  return Object.fromEntries(
+    fields.filter((field) => field.defaultValue !== void 0).map((field) => [field.field, field.defaultValue])
+  );
+}
+function resolveInitialValues(fields, initialValues) {
+  const values = mergeDefinedValues(getDefaultValues(fields), initialValues);
+  const resolvedValues = { ...values };
+  fields.forEach((field) => {
+    if (field.component !== "repeatable" || !field.itemFields) return;
+    const items = Array.isArray(resolvedValues[field.field]) ? resolvedValues[field.field] : [];
+    resolvedValues[field.field] = items.map(
+      (item) => resolveInitialValues(field.itemFields ?? [], isRecord(item) ? item : {})
+    );
+  });
+  return resolvedValues;
+}
+function mergeDefinedValues(baseValues, nextValues) {
+  const mergedValues = { ...baseValues };
+  Object.entries(nextValues ?? {}).forEach(([key, value]) => {
+    if (value === void 0) return;
+    const currentValue = mergedValues[key];
+    if (isRecord(currentValue) && isRecord(value)) {
+      mergedValues[key] = mergeDefinedValues(currentValue, value);
+      return;
+    }
+    mergedValues[key] = value;
+  });
+  return mergedValues;
+}
+function getPathValue(values, path) {
+  const parts = Array.isArray(path) ? path : [path];
+  return parts.reduce((current, part) => {
+    if (current && typeof current === "object") return current[part];
+    return void 0;
+  }, values);
+}
 function evaluateCondition(condition, values, mode) {
   switch (condition.operator) {
     case "equals":
-      return values[condition.field] === condition.value;
+      return getConditionFieldValue(values, condition.field) === condition.value;
     case "notEmpty":
-      return values[condition.field] !== void 0 && values[condition.field] !== null && values[condition.field] !== "";
+      return getConditionFieldValue(values, condition.field) !== void 0 && getConditionFieldValue(values, condition.field) !== null && getConditionFieldValue(values, condition.field) !== "";
     case "modeEquals":
       return mode === condition.value;
     case "and":
@@ -430,17 +796,36 @@ function BestModal({ children, open, title, onClose }) {
 
 // src/ui/BestSearch.tsx
 import { Button as Button3, Col, DatePicker as DatePicker2, Form as Form2, Input as Input3, InputNumber as InputNumber2, Row, Select as Select2 } from "antd";
-import dayjs from "dayjs";
-import { useEffect as useEffect2 } from "react";
+import dayjs3 from "dayjs";
+import { useEffect as useEffect2, useMemo as useMemo4, useRef as useRef2 } from "react";
 import { jsx as jsx8, jsxs as jsxs3 } from "react/jsx-runtime";
-function FieldControl({ field }) {
+function searchFormSignature(fields, initialValues) {
+  return JSON.stringify([
+    fields.map((field) => ({
+      field: field.field,
+      component: field.component,
+      defaultValue: field.defaultValue,
+      remoteService: field.remoteService,
+      searchField: field.searchField,
+      labelField: field.labelField,
+      valueField: field.valueField,
+      debounceMs: field.debounceMs,
+      pageSize: field.pageSize
+    })),
+    initialValues
+  ]);
+}
+function FieldControl({ field, value, onChange, ...controlProps }) {
   const registry = useBestRegistry();
   switch (field.component) {
     case "select":
       return /* @__PURE__ */ jsx8(
         Select2,
         {
+          ...controlProps,
           allowClear: true,
+          value,
+          onChange,
           disabled: field.disabled,
           options: field.options,
           placeholder: field.placeholder
@@ -450,6 +835,9 @@ function FieldControl({ field }) {
       return /* @__PURE__ */ jsx8(
         InputNumber2,
         {
+          ...controlProps,
+          value,
+          onChange,
           disabled: field.disabled,
           placeholder: field.placeholder,
           style: { width: "100%" }
@@ -460,8 +848,10 @@ function FieldControl({ field }) {
         RemoteSelect,
         {
           field,
-          value: void 0,
-          onChange: () => void 0,
+          value,
+          onChange: onChange ?? (() => void 0),
+          disabled: field.disabled,
+          placeholder: field.placeholder,
           registry
         }
       );
@@ -469,8 +859,11 @@ function FieldControl({ field }) {
       return /* @__PURE__ */ jsx8(
         DatePicker2,
         {
+          ...controlProps,
+          value: toDatePickerValue(value),
+          onChange: (date, dateString) => onChange?.(serializeDatePickerValue(date, dateString)),
           disabled: field.disabled,
-          disabledDate: (current) => field.maxDate === "today" && current.isAfter(dayjs(), "day"),
+          disabledDate: (current) => field.maxDate === "today" && current.isAfter(dayjs3(), "day"),
           placeholder: field.placeholder,
           style: { width: "100%" }
         }
@@ -479,38 +872,108 @@ function FieldControl({ field }) {
       return /* @__PURE__ */ jsx8(
         DatePicker2.RangePicker,
         {
+          ...controlProps,
+          value: toDateRangePickerValue(value),
+          onChange: (dates, dateStrings) => onChange?.(serializeDateRangePickerValue(dates, dateStrings)),
           disabled: field.disabled,
-          disabledDate: (current) => field.maxDate === "today" && current.isAfter(dayjs(), "day"),
+          disabledDate: (current) => field.maxDate === "today" && current.isAfter(dayjs3(), "day"),
           style: { width: "100%" }
         }
       );
     case "textarea":
-      return /* @__PURE__ */ jsx8(Input3.TextArea, { disabled: field.disabled, placeholder: field.placeholder });
+      return /* @__PURE__ */ jsx8(
+        Input3.TextArea,
+        {
+          ...controlProps,
+          value,
+          onChange,
+          disabled: field.disabled,
+          placeholder: field.placeholder
+        }
+      );
     default:
-      return /* @__PURE__ */ jsx8(Input3, { allowClear: true, disabled: field.disabled, placeholder: field.placeholder });
+      return /* @__PURE__ */ jsx8(
+        Input3,
+        {
+          ...controlProps,
+          allowClear: true,
+          value,
+          onChange,
+          disabled: field.disabled,
+          placeholder: field.placeholder
+        }
+      );
   }
 }
-function syncValues(form, value) {
-  form.setFieldsValue(value ?? {});
+function syncValues(form, value, fields) {
+  form.setFieldsValue(Object.fromEntries(fields.map((field) => [field.field, void 0])));
+  form.setFieldsValue(value);
 }
 function BestSearch({
   fields,
   value,
+  defaultValues,
   loading,
   submitText = "\u67E5\u8BE2",
   extra,
   onChange,
   onSearch,
   onReset
+}) {
+  const initialValues = useMemo4(
+    () => mergeDefinedValues(getDefaultValues(fields), defaultValues),
+    [fields, defaultValues]
+  );
+  return /* @__PURE__ */ jsx8(
+    BestSearchBody,
+    {
+      extra,
+      fields,
+      initialValues,
+      loading,
+      onChange,
+      onReset,
+      onSearch,
+      submitText,
+      value
+    },
+    searchFormSignature(fields, initialValues)
+  );
+}
+function BestSearchBody({
+  fields,
+  value,
+  initialValues,
+  loading,
+  submitText,
+  extra,
+  onChange,
+  onSearch,
+  onReset
 }) {
   const [form] = Form2.useForm();
+  const valueSignatureRef = useRef2(void 0);
+  const controlledRef = useRef2(false);
   useEffect2(() => {
-    syncValues(form, value);
-  }, [form, value]);
+    if (value === void 0) {
+      if (controlledRef.current) {
+        syncValues(form, {}, fields);
+        valueSignatureRef.current = JSON.stringify({});
+        controlledRef.current = false;
+      }
+      return;
+    }
+    controlledRef.current = true;
+    const signature = JSON.stringify(value);
+    if (valueSignatureRef.current === signature) return;
+    syncValues(form, value, fields);
+    valueSignatureRef.current = signature;
+  }, [fields, form, value]);
   return /* @__PURE__ */ jsx8(
     Form2,
     {
       form,
+      initialValues,
       layout: "vertical",
       onFinish: (values) => onSearch(values),
       onValuesChange: (_, values) => onChange?.(values),
@@ -523,7 +986,8 @@ function BestSearch({
             Button3,
             {
               onClick: () => {
-                form.resetFields();
+                syncValues(form, {}, fields);
+                valueSignatureRef.current = JSON.stringify({});
                 onChange?.({});
                 onReset?.();
               },
@@ -601,9 +1065,9 @@ function BestTable({
 }
 
 // src/lowcode/runtime.ts
-import dayjs2 from "dayjs";
+import dayjs4 from "dayjs";
 import utc from "dayjs/plugin/utc.js";
-dayjs2.extend(utc);
+dayjs4.extend(utc);
 function toBestListQuery(params, sort) {
   const { current, pageSize, ...filters } = params;
   const normalizedSort = Object.fromEntries(
@@ -636,7 +1100,7 @@ function formatCrudValue(value, format) {
     const numericValue = typeof value === "number" ? value : Number(value.trim());
     timestamp = Number.isFinite(numericValue) && numericValue !== 0 ? Math.abs(numericValue) >= 1e12 ? numericValue : numericValue * 1e3 : value;
   }
-  const date = dayjs2.utc(timestamp);
+  const date = dayjs4.utc(timestamp);
   if (!date.isValid()) return String(value);
   return date.format(format === "date" ? "YYYY-MM-DD" : "YYYY-MM-DD HH:mm:ss");
 }
@@ -753,6 +1217,13 @@ function validateFields(fields, path, registry, diagnostics) {
         "field.repeatable",
         "repeatable \u7EC4\u4EF6\u81F3\u5C11\u9700\u8981\u4E00\u4E2A itemFields \u5B57\u6BB5"
       );
+    if (field.itemFields?.length)
+      validateFields(
+        field.itemFields,
+        `${fieldPath}/itemFields`,
+        registry,
+        diagnostics
+      );
     if (field.minItems !== void 0 && field.maxItems !== void 0 && field.minItems > field.maxItems)
       push(diagnostics, fieldPath, "field.repeatable.range", "minItems \u4E0D\u80FD\u5927\u4E8E maxItems");
     if (field.slot && registry && !registry.slots[field.slot])
@@ -809,6 +1280,22 @@ function validateCrudPageSchema(schema, registry) {
       `\u672A\u6CE8\u518C\u670D\u52A1\uFF1A${schema.dataSource.detail}`
     );
   }
+  if (schema.dataSource?.create && registry && !registry.services[schema.dataSource.create]) {
+    push(
+      diagnostics,
+      "/dataSource/create",
+      "registry.service",
+      `\u672A\u6CE8\u518C\u670D\u52A1\uFF1A${schema.dataSource.create}`
+    );
+  }
+  if (schema.dataSource?.update && registry && !registry.services[schema.dataSource.update]) {
+    push(
+      diagnostics,
+      "/dataSource/update",
+      "registry.service",
+      `\u672A\u6CE8\u518C\u670D\u52A1\uFF1A${schema.dataSource.update}`
+    );
+  }
   if (schema.dataSource?.remove && registry && !registry.services[schema.dataSource.remove]) {
     push(
       diagnostics,
@@ -884,8 +1371,10 @@ ${message2}`);
 
 // src/lowcode/BestCrudPage.tsx
 import { Fragment as Fragment2, jsx as jsx11, jsxs as jsxs4 } from "react/jsx-runtime";
-function toFieldDefinition(field, options, slots) {
+function toFieldDefinition(field, dictionaries, slots) {
   const slot = field.slot;
+  const options = field.dict ? dictionaries[field.dict] ?? [] : [];
+  const rules = field.rules ?? [];
   return {
     field: field.field,
     label: field.label,
@@ -903,25 +1392,22 @@ function toFieldDefinition(field, options, slots) {
     hidden: field.hidden,
     maxDate: field.maxDate,
     span: field.span,
+    defaultValue: field.defaultValue,
     visibleWhen: field.visibleWhen,
     disabledWhen: field.disabledWhen,
     clearWhenHidden: field.clearWhenHidden,
-    itemFields: field.itemFields?.map((item) => toFieldDefinition(item, [], slots)),
+    itemFields: field.itemFields?.map(
+      (item) => toFieldDefinition(item, dictionaries, slots)
+    ),
     minItems: field.minItems,
     maxItems: field.maxItems,
     render: slot ? (context) => slots[slot]?.(context) : void 0,
-    rules: field.required ? [{ required: true, message: `\u8BF7\u586B\u5199${field.label}` }, ...field.rules ?? []] : field.rules
+    rules: field.required && !rules.some((rule) => rule.required) ? [{ required: true, message: `\u8BF7\u586B\u5199${field.label}` }, ...rules] : rules
   };
 }
 function useFields(fields = []) {
   const registry = useBestRegistry();
-  return fields.map(
-    (field) => toFieldDefinition(
-      field,
-      field.dict ? registry.dictionaries[field.dict] ?? [] : [],
-      registry.slots
-    )
-  );
+  return fields.map((field) => toFieldDefinition(field, registry.dictionaries, registry.slots));
 }
 function toDetailField(field, dictionary, slots) {
   const slot = field.slot;
@@ -937,6 +1423,7 @@ function toDetailField(field, dictionary, slots) {
   };
 }
 function toTableColumn(column, dictionary, slots) {
+  const slot = column.slot;
   const valueEnum = column.dict ? Object.fromEntries(
     (dictionary[column.dict] ?? []).map((item) => [String(item.value), { text: item.label }])
   ) : void 0;
@@ -946,7 +1433,12 @@ function toTableColumn(column, dictionary, slots) {
     title: column.title,
     width: column.width,
     valueEnum,
-    render: (value, record) => column.slot ? slots[column.slot]?.({ field: column.field, record, value }) ?? "-" : formatCrudValue(value, column.format)
+    renderText: column.format && !slot && !column.dict ? (value) => formatCrudValue(value, column.format) : void 0,
+    render: slot ? (_value, record) => slots[slot]?.({
+      field: column.field,
+      record,
+      value: record[column.field]
+    }) ?? "-" : void 0
   };
 }
 function toProTableSearchColumn(field, dictionary) {
@@ -974,7 +1466,7 @@ function toProTableSearchColumn(field, dictionary) {
     initialValue: field.defaultValue,
     fieldProps: {
       ...options ? { options } : {},
-      ...field.maxDate === "today" ? { disabledDate: (current) => current.isAfter(dayjs3(), "day") } : {}
+      ...field.maxDate === "today" ? { disabledDate: (current) => current.isAfter(dayjs5(), "day") } : {}
     }
   };
 }
@@ -995,20 +1487,41 @@ function BestCrudPage({ adapter, className, schema }) {
   const registeredListService = useBestListService(schema.dataSource.list);
   if (!registeredListService) throw new Error(`\u672A\u6CE8\u518C\u5217\u8868\u670D\u52A1\uFF1A${schema.dataSource.list}`);
   const listService = useCallback(
-    async (query, options) => {
-      const response = await registeredListService(query, options);
+    async (query2, options) => {
+      const response = await registeredListService(query2, options);
       return adapter?.fromList ? { ...response, items: adapter.fromList(response.items) } : response;
     },
     [adapter, registeredListService]
   );
   const searchFields = useFields(schema.search);
-  const useBestSearch = schema.searchMode === "bestSearch";
+  const useBestSearch = schema.searchMode === "bestSearch" || schema.search?.some((field) => field.component === "remoteSelect");
   const formFields = useFields(schema.form);
-  const actionRef = useRef(void 0);
-  const pageRequestRef = useRef(void 0);
-  const queryRef = useRef({});
+  const actionRef = useRef3(void 0);
+  const searchDefaultValues = useMemo5(() => getDefaultValues(searchFields), [searchFields]);
+  const searchFieldNames = useMemo5(
+    () => new Set(searchFields.map((field) => field.field)),
+    [searchFields]
+  );
+  const searchSchemaSignature = useMemo5(
+    () => JSON.stringify(
+      searchFields.map((field) => ({
+        field: field.field,
+        component: field.component,
+        defaultValue: field.defaultValue
+      }))
+    ),
+    [searchFields]
+  );
+  const [query, setQuery] = useState3(searchDefaultValues);
+  const queryRef = useRef3(searchDefaultValues);
+  const queryStateRef = useRef3({
+    schemaId: schema.id,
+    searchSchemaSignature,
+    userTouched: false
+  });
   const [drawer, setDrawer] = useState3({ mode: "closed" });
   const [submitting, setSubmitting] = useState3(false);
+  const submittingRef = useRef3(false);
   const handleAction = useCallback(
     async (action, record) => {
       if (action.access && !registry.access(action.access)) return;
@@ -1038,7 +1551,10 @@ function BestCrudPage({ adapter, className, schema }) {
       if (action.effect === "openCreate") setDrawer({ mode: "create" });
       if (action.effect === "remove" && schema.dataSource.remove) {
         const removeService = registry.services[schema.dataSource.remove];
-        if (!removeService) return;
+        if (!removeService) {
+          message.error(`\u672A\u6CE8\u518C\u670D\u52A1\uFF1A${schema.dataSource.remove}`);
+          return;
+        }
         try {
           const deleted = await removeCrudRecord(
             record ?? {},
@@ -1055,17 +1571,22 @@ function BestCrudPage({ adapter, className, schema }) {
         }
       }
       if (action.effect === "runAction" && action.action) {
+        const runAction = registry.actions[action.action];
+        if (!runAction) {
+          message.error(`\u672A\u6CE8\u518C\u52A8\u4F5C\uFF1A${action.action}`);
+          return;
+        }
         try {
-          await registry.actions[action.action]?.({ record });
+          await runAction({ record });
           actionRef.current?.reload();
         } catch (error) {
           message.error(errorMessage(error, `${action.label}\u5931\u8D25\uFF0C\u8BF7\u7A0D\u540E\u91CD\u8BD5`));
         }
       }
     },
-    [registry]
+    [adapter, registry, schema]
   );
-  const columns = useMemo3(() => {
+  const columns = useMemo5(() => {
     const proTableSearchFields = useBestSearch ? [] : schema.search ?? [];
     const searchColumns = new Map(
       proTableSearchFields.map((field) => [
@@ -1097,31 +1618,57 @@ function BestCrudPage({ adapter, className, schema }) {
     schema.table.columns,
     useBestSearch
   ]);
-  const request = useMemo3(() => {
-    pageRequestRef.current?.abort();
-    const pageRequest = createLatestPageRequest(
+  const pageRequest = useMemo5(
+    () => createLatestPageRequest(
       listService,
       (error) => message.error(errorMessage(error, `${schema.title}\u52A0\u8F7D\u5931\u8D25\uFF0C\u8BF7\u7A0D\u540E\u91CD\u8BD5`))
+    ),
+    [listService, schema.title]
+  );
+  const request = useCallback(
+    (params, sort) => pageRequest.request(
+      toBestListQuery({ ...params, ...useBestSearch ? queryRef.current : {} }, sort)
+    ),
+    [pageRequest, useBestSearch]
+  );
+  useLayoutEffect(() => {
+    const previous = queryStateRef.current;
+    if (previous.schemaId === schema.id && previous.searchSchemaSignature === searchSchemaSignature)
+      return;
+    const shouldUseDefaults = previous.schemaId !== schema.id || !previous.userTouched;
+    const nextQuery = shouldUseDefaults ? searchDefaultValues : Object.fromEntries(
+      Object.entries(queryRef.current).filter(([field]) => searchFieldNames.has(field))
     );
-    pageRequestRef.current = pageRequest;
-    return (params, sort) => pageRequest.request(toBestListQuery({ ...params, ...queryRef.current }, sort));
-  }, [listService, schema.title]);
-  useEffect3(() => () => pageRequestRef.current?.abort(), []);
+    queryRef.current = nextQuery;
+    setQuery(nextQuery);
+    queryStateRef.current = {
+      schemaId: schema.id,
+      searchSchemaSignature,
+      userTouched: shouldUseDefaults ? false : previous.userTouched
+    };
+  }, [schema.id, searchDefaultValues, searchFieldNames, searchSchemaSignature]);
+  useEffect3(() => () => pageRequest.abort(), [pageRequest]);
   const rowKey = schema.table.rowKey;
   const submitForm = useCallback(
     async (values) => {
-      if (submitting) return;
+      if (submittingRef.current) return;
       const serviceKey = drawer.mode === "edit" ? schema.dataSource.update : schema.dataSource.create;
       if (!serviceKey) {
         message.error(`${drawer.mode === "edit" ? "\u66F4\u65B0" : "\u521B\u5EFA"}\u670D\u52A1\u672A\u914D\u7F6E`);
         return;
       }
+      const service = registry.services[serviceKey];
+      if (!service) {
+        message.error(`\u672A\u6CE8\u518C\u670D\u52A1\uFF1A${serviceKey}`);
+        return;
+      }
       const record = drawer.mode === "closed" ? void 0 : drawer.record;
+      submittingRef.current = true;
       setSubmitting(true);
       try {
         const mergedValues = { ...record, ...values };
         const payload = drawer.mode === "edit" ? adapter?.toUpdatePayload?.(mergedValues, record) ?? mergedValues : adapter?.toCreatePayload?.(mergedValues) ?? mergedValues;
-        await registry.services[serviceKey]?.(payload);
+        await service(payload);
         message.success("\u4FDD\u5B58\u6210\u529F");
         setDrawer({ mode: "closed" });
         actionRef.current?.reload();
@@ -1129,21 +1676,28 @@ function BestCrudPage({ adapter, className, schema }) {
         message.error(errorMessage(error, "\u4FDD\u5B58\u5931\u8D25\uFF0C\u8BF7\u7A0D\u540E\u91CD\u8BD5"));
       } finally {
         setSubmitting(false);
+        submittingRef.current = false;
       }
     },
-    [adapter, drawer, registry.services, schema.dataSource.create, schema.dataSource.update, submitting]
+    [adapter, drawer, registry.services, schema.dataSource.create, schema.dataSource.update]
   );
   return /* @__PURE__ */ jsxs4(Fragment2, { children: [
     useBestSearch && searchFields.length ? /* @__PURE__ */ jsx11(
       BestSearch,
       {
         fields: searchFields,
+        value: query,
+        defaultValues: searchDefaultValues,
         onReset: () => {
           queryRef.current = {};
+          queryStateRef.current = { ...queryStateRef.current, userTouched: true };
+          setQuery({});
           actionRef.current?.reload();
         },
         onSearch: (values) => {
           queryRef.current = values;
+          queryStateRef.current = { ...queryStateRef.current, userTouched: true };
+          setQuery(values);
           actionRef.current?.reload();
         }
       }
@@ -1218,35 +1772,6 @@ function BestCrudPage({ adapter, className, schema }) {
     );
   }
 }
-
-// src/lowcode/adapter.ts
-function normalizeBestValues(values, normalize = defaultNormalize) {
-  return Object.fromEntries(
-    Object.entries(values).map(([field, value]) => [field, normalizeNested(value, normalize, field)])
-  );
-}
-function normalizeNested(value, normalize, field) {
-  if (Array.isArray(value)) return value.map((item) => normalizeNested(item, normalize, field));
-  if (value && typeof value === "object" && !(value instanceof Date)) {
-    return Object.fromEntries(
-      Object.entries(value).map(([key, item]) => [key, normalizeNested(item, normalize, key)])
-    );
-  }
-  return normalize(value, field);
-}
-function defaultNormalize(value) {
-  if (typeof value === "string") return value.trim() === "" ? void 0 : value.trim();
-  return value;
-}
-function createBestCrudAdapter(options = {}) {
-  const normalize = options.normalize ?? defaultNormalize;
-  return {
-    fromList: options.fromList,
-    fromDetail: options.fromDetail,
-    toCreatePayload: (values) => options.toCreatePayload?.(normalizeBestValues(values, normalize)) ?? normalizeBestValues(values, normalize),
-    toUpdatePayload: (values, record) => options.toUpdatePayload?.(normalizeBestValues(values, normalize), record) ?? normalizeBestValues(values, normalize)
-  };
-}
 export {
   BestBatchInput,
   BestCrudPage,