openxiangda 1.0.129 → 1.0.131

package/packages/sdk/dist/runtime/index.cjs

@@ -13556,7 +13556,42 @@ var modeDepth = (mode) => {
   return 3;
 };
 var activeLevels = (mode) => LEVELS.slice(0, modeDepth(mode));
-var valueToPath = (value) => LEVELS.map((level) => value?.[level]?.value).filter(Boolean);
+var stringifyValue = (value) => {
+  if (value === void 0 || value === null || value === "") return void 0;
+  return String(value);
+};
+var normalizeAddressPart = (part) => {
+  if (part === void 0 || part === null || part === "") return void 0;
+  if (typeof part === "object") {
+    const value2 = stringifyValue(part.value ?? part.adcode ?? part.code ?? part.id ?? part.label);
+    if (!value2) return void 0;
+    const label = stringifyValue(part.label ?? part.name ?? part.title) ?? "";
+    return { label, value: value2 };
+  }
+  const value = stringifyValue(part);
+  return value ? { label: "", value } : void 0;
+};
+var normalizeAddressValue = (raw) => {
+  if (!raw || typeof raw !== "object") return void 0;
+  const next = {};
+  LEVELS.forEach((level) => {
+    const part = normalizeAddressPart(raw[level]);
+    if (part) next[level] = part;
+  });
+  if (raw.detail !== void 0 && raw.detail !== null) {
+    next.detail = String(raw.detail);
+  }
+  if (typeof raw.fullAddress === "string" && raw.fullAddress) {
+    next.fullAddress = raw.fullAddress;
+  }
+  return Object.keys(next).length > 0 ? next : void 0;
+};
+var getDisplayLabel = (part) => {
+  const label = part?.label?.trim();
+  if (!label) return void 0;
+  return label === part?.value ? void 0 : label;
+};
+var valueToPath = (value, levels) => levels.map((level) => value?.[level]?.value).filter(Boolean);
 var normalizeDivision = (item, level, depth, index) => ({
   label: String(item.name || item.label || item.adcode || item.value),
   value: String(item.adcode || item.value || item.id),
@@ -13565,7 +13600,66 @@ var normalizeDivision = (item, level, depth, index) => ({
 });
 var composeFullAddress = (value, levels = LEVELS) => {
   if (!value) return "";
-  return [...levels.map((level) => value[level]?.label), value.detail].filter(Boolean).join("");
+  return [...levels.map((level) => getDisplayLabel(value[level])), value.detail].filter(Boolean).join("");
+};
+var mergeValuePathIntoOptions = (source, value, levels, depth) => {
+  if (!value) return source;
+  const mergeAt = (items, index) => {
+    const level = levels[index];
+    const part = level ? value[level] : void 0;
+    if (!level || !part?.value) return items;
+    let matched = false;
+    const nextItems = items.map((item) => {
+      if (String(item.value) !== part.value) return item;
+      matched = true;
+      const label = getDisplayLabel(part) ?? getDisplayLabel(item) ?? "\u5730\u5740\u52A0\u8F7D\u4E2D";
+      const hasNextPath = Boolean(levels[index + 1] && value[levels[index + 1]]?.value);
+      return {
+        ...item,
+        label,
+        level: item.level ?? level,
+        isLeaf: index + 1 >= depth || !hasNextPath && item.isLeaf === true,
+        children: hasNextPath ? mergeAt(item.children ?? [], index + 1) : item.children
+      };
+    });
+    if (!matched) {
+      const hasNextPath = Boolean(levels[index + 1] && value[levels[index + 1]]?.value);
+      const option = {
+        label: getDisplayLabel(part) ?? "\u5730\u5740\u52A0\u8F7D\u4E2D",
+        value: part.value,
+        level,
+        isLeaf: index + 1 >= depth
+      };
+      if (hasNextPath) option.children = mergeAt([], index + 1);
+      nextItems.push(option);
+    }
+    return nextItems;
+  };
+  return mergeAt(source, 0);
+};
+var setNestedChildren = (source, selectedOptions, children) => {
+  const [current, ...rest] = selectedOptions;
+  if (!current) return source;
+  const currentValue = String(current.value);
+  let matched = false;
+  const next = source.map((item) => {
+    if (String(item.value) !== currentValue) return item;
+    matched = true;
+    return {
+      ...item,
+      children: rest.length ? setNestedChildren(item.children ?? [], rest, children) : children
+    };
+  });
+  if (!matched) {
+    next.push({
+      label: String(current.label || current.value),
+      value: currentValue,
+      level: current.level,
+      isLeaf: false,
+      children: rest.length ? setNestedChildren([], rest, children) : children
+    });
+  }
+  return next;
 };
 function AddressField(props) {
   const {
@@ -13587,7 +13681,8 @@ function AddressField(props) {
   const { formData, fieldBehaviors, setFieldValue, registerField, unregisterField, api } = useFormContext();
   const { isMobile } = useDeviceDetect();
   const behavior = propBehavior ?? fieldBehaviors[fieldId] ?? "NORMAL";
-  const value = formData[fieldId];
+  const rawValue = formData[fieldId];
+  const value = (0, import_react55.useMemo)(() => normalizeAddressValue(rawValue), [rawValue]);
   const [options, setOptions] = (0, import_react55.useState)([]);
   const [loadingRoots, setLoadingRoots] = (0, import_react55.useState)(false);
   const [mobileOpen, setMobileOpen] = (0, import_react55.useState)(false);
@@ -13597,24 +13692,78 @@ function AddressField(props) {
   const [tempValue, setTempValue] = (0, import_react55.useState)();
   const depth = modeDepth(mode);
   const levels = (0, import_react55.useMemo)(() => activeLevels(mode), [mode]);
+  const valuePath = (0, import_react55.useMemo)(() => valueToPath(value, levels), [levels, value]);
+  const displayOptions = (0, import_react55.useMemo)(
+    () => mergeValuePathIntoOptions(options, value, levels, depth),
+    [depth, levels, options, value]
+  );
   const detailEnabled = mode === "province-city-district-street-detail";
   const disabled = behavior === "DISABLED";
   const MobilePopup = getMobileComponent3("Popup");
   (0, import_react55.useEffect)(() => {
     registerField(fieldId);
-    if (defaultValue !== void 0 && formData[fieldId] === void 0) {
+    return () => unregisterField(fieldId);
+  }, [fieldId, registerField, unregisterField]);
+  (0, import_react55.useEffect)(() => {
+    if (defaultValue !== void 0 && rawValue === void 0) {
       setFieldValue(fieldId, defaultValue);
     }
-    return () => unregisterField(fieldId);
-  }, [fieldId]);
-  const loadDivisions = async (parentAdcode, level, index) => {
-    const list = await api.getChinaDivisions(parentAdcode);
-    return list.map((item) => normalizeDivision(item, level, depth, index));
-  };
+  }, [defaultValue, fieldId, rawValue, setFieldValue]);
+  const loadDivisions = (0, import_react55.useCallback)(
+    async (parentAdcode, level, index) => {
+      const list = await api.getChinaDivisions(parentAdcode);
+      return list.map((item) => normalizeDivision(item, level, depth, index));
+    },
+    [api, depth]
+  );
   (0, import_react55.useEffect)(() => {
+    let mounted = true;
     setLoadingRoots(true);
-    loadDivisions(void 0, "province", 0).then(setOptions).finally(() => setLoadingRoots(false));
-  }, [api, depth]);
+    loadDivisions(void 0, "province", 0).then((nextOptions) => {
+      if (mounted) setOptions(nextOptions);
+    }).finally(() => {
+      if (mounted) setLoadingRoots(false);
+    });
+    return () => {
+      mounted = false;
+    };
+  }, [loadDivisions]);
+  (0, import_react55.useEffect)(() => {
+    if (!value) return;
+    let cancelled = false;
+    const hydrateMissingLabels = async () => {
+      let nextValue = { ...value };
+      let changed = false;
+      let parentAdcode;
+      for (let index = 0; index < levels.length; index += 1) {
+        const level = levels[index];
+        const part = nextValue[level];
+        if (!part?.value) break;
+        if (!getDisplayLabel(part)) {
+          const divisions = await loadDivisions(parentAdcode, level, index);
+          const matched = divisions.find((option) => option.value === part.value);
+          if (matched) {
+            nextValue = { ...nextValue, [level]: { label: matched.label, value: matched.value } };
+            changed = true;
+          }
+        }
+        parentAdcode = part.value;
+      }
+      const fullAddress = composeFullAddress(nextValue, levels);
+      if (fullAddress && nextValue.fullAddress !== fullAddress) {
+        nextValue = { ...nextValue, fullAddress };
+        changed = true;
+      }
+      if (!cancelled && changed) {
+        setFieldValue(fieldId, nextValue);
+      }
+    };
+    hydrateMissingLabels().catch(() => {
+    });
+    return () => {
+      cancelled = true;
+    };
+  }, [fieldId, levels, loadDivisions, setFieldValue, value]);
   (0, import_react55.useEffect)(() => {
     if (!mobileOpen) return;
     const level = levels[mobileLevelIndex] || "province";
@@ -13622,7 +13771,7 @@ function AddressField(props) {
     const parentAdcode = parentLevel ? tempValue?.[parentLevel]?.value : void 0;
     setMobileLoading(true);
     loadDivisions(parentAdcode, level, mobileLevelIndex).then(setMobileOptions).finally(() => setMobileLoading(false));
-  }, [mobileOpen, mobileLevelIndex, tempValue, levels]);
+  }, [loadDivisions, mobileOpen, mobileLevelIndex, tempValue, levels]);
   if (behavior === "HIDDEN") return null;
   const setAddressValue = (next) => {
     const normalized = next ? { ...next, fullAddress: composeFullAddress(next, levels) } : void 0;
@@ -13758,18 +13907,20 @@ function AddressField(props) {
           import_antd24.Cascader,
           {
             style: { width: "100%" },
-            options,
+            options: displayOptions,
             allowClear,
             disabled,
-            value: valueToPath(value),
+            value: valuePath,
             placeholder: props.placeholder || "\u8BF7\u9009\u62E9\u5730\u5740",
             loading: loadingRoots,
+            displayRender: (labels) => labels.filter(Boolean).join(" / ") || (valuePath.length ? "\u5730\u5740\u52A0\u8F7D\u4E2D" : ""),
             loadData: async (selectedOptions) => {
               const target = selectedOptions[selectedOptions.length - 1];
               const nextLevel = levels[selectedOptions.length] ?? "street";
               const children = await loadDivisions(target.value, nextLevel, selectedOptions.length);
-              target.children = children;
-              setOptions([...options]);
+              setOptions(
+                (currentOptions) => setNestedChildren(currentOptions, selectedOptions, children)
+              );
             },
             onChange: (_path, selectedOptions) => {
               if (!selectedOptions?.length) {