@hzab/form-render 0.5.0 → 0.5.2

package/src/components/DatePicker/index.tsx

@@ -1,59 +1,68 @@
-import { useField, useFieldSchema, observer } from "@formily/react";
-import { DatePicker as AntdDatePicker } from "antd";
-import type { DatePickerProps, RangePickerProps } from 'antd/es/date-picker';
-import { connect, mapProps } from "@formily/react";
+import { useField, useFieldSchema, connect, mapProps } from "@formily/react";
+import { DatePicker as AntdDatePicker } from "@formily/antd";
 
-const { RangePicker } = AntdDatePicker
+import { DatePickerProps, RangePickerProps } from "antd/lib/date-picker";
 
+import { getParentValue } from "../../common/formily-utils";
+import { dateable } from "../../common/date-utils";
 
-
-/**
- * 获取父级的数据对象（包括当前项的对象）
- * { 当详情: xxx, 其他项: lll }
- * @param field
- * @returns
- */
-export function getParentValue(field) {
-  let form = field?.parent?.value || field?.value;
-  if (Array.isArray(form)) {
-    form = form[field.index];
-  }
-  return form;
-}
+const { RangePicker } = AntdDatePicker;
 
 type DatePickerT = React.FC<any> & {
   RangePicker?: React.FC<any>;
 };
 
-export const  DatePicker: DatePickerT = observer((props: any) => {
-  return <AntdDatePicker
-    {...props}
-  />
-});
+const handleProps = (props: DatePickerProps) => {
+  const getDefaultFormat = (props: DatePickerProps) => {
+    if (props["picker"] === "month") {
+      return "YYYY-MM";
+    } else if (props["picker"] === "quarter") {
+      return "YYYY-\\QQ";
+    } else if (props["picker"] === "year") {
+      return "YYYY";
+    } else if (props["picker"] === "week") {
+      return "gggg-wo";
+    }
+    return props["showTime"] ? "YYYY-MM-DD HH:mm:ss" : "YYYY-MM-DD";
+  };
+  const format = props["format"] || (getDefaultFormat(props) as any);
 
+  return {
+    ...props,
+    format,
+    value: dateable(props.value, format === "gggg-wo" ? "gggg-ww" : format),
+  };
+};
 
-DatePicker.RangePicker = observer((props:any) => {
+export const DatePicker: DatePickerT = connect(
+  AntdDatePicker,
+  mapProps((props: any) => {
+    const datePickerProps = handleProps(props);
+    return datePickerProps;
+  }),
+);
 
-  const field: any = useField();
-  const fieldSchema = useFieldSchema();
-  const {
-    /**
+DatePicker.RangePicker = connect(
+  (props: any) => {
+    const field: any = useField();
+    const fieldSchema = useFieldSchema();
+    const {
+      /**
      *
     isSplitTimes
       true: 拆分为 startKey和 endKey 两个字段
       false: 不做拆分
      */
-    isSplitTimes = false,
-    startKey = "startTime",
-    endKey = "endTime",
-  } = props;
-
+      isSplitTimes = false,
+      startKey = "startTime",
+      endKey = "endTime",
+    } = props;
 
-  const handleOnConfirm = (startTime, endTime) => {
-    const res = {
-      [startKey]: startTime,
-      [endKey]: endTime,
-    };
+    const handleOnConfirm = (startTime, endTime) => {
+      const res = {
+        [startKey]: startTime,
+        [endKey]: endTime,
+      };
 
       if (!field.parent) {
         field.form.setValues(res);
@@ -64,26 +73,31 @@ DatePicker.RangePicker = observer((props:any) => {
           parentVal[key] = res[key];
         });
       }
-  }
-
-  const handleOnChange = (dates, dateStrings) => {
-    const startTime = dateStrings[0]
-    const endTime = dateStrings[1]
-    props.onChange && props.onChange(dates);
-    if(!isSplitTimes) return
-    if ((props.pick === 'date' || !props.pick) && !props.showTime) {
-      handleOnConfirm(startTime + " 00:00:00", endTime + " 23:59:59")
-      return
-    }
-    handleOnConfirm(startTime, endTime)
-  };
+    };
 
-  return <RangePicker
-    {...props}
-    onChange={(
-      value: DatePickerProps['value'] | RangePickerProps['value'],
-      dateString: [string, string] | string,
-    ) => handleOnChange(value, dateString)}
-  />
-});
+    const handleOnChange = (dates, dateStrings) => {
+      const startTime = dates[0];
+      const endTime = dates[1];
+      props.onChange && props.onChange(dates);
+      if (!isSplitTimes) return;
+      if ((props.pick === "date" || !props.pick) && !props.showTime) {
+        handleOnConfirm(startTime + " 00:00:00", endTime + " 23:59:59");
+        return;
+      }
+      handleOnConfirm(startTime, endTime);
+    };
 
+    return (
+      <RangePicker
+        {...props}
+        onChange={(
+          value: DatePickerProps["value"] | RangePickerProps["value"],
+          dateString: [string, string] | string,
+        ) => handleOnChange(value, dateString)}
+      />
+    );
+  },
+  mapProps((props: any) => {
+    return handleProps(props);
+  }),
+);

package/src/components/LocationPicker/Map/AMap/common/utils.ts

@@ -1,4 +1,5 @@
 import AMapLoader from "./loader";
+import { markerIconBase64 } from "../../../assets/svg-icon";
 
 if (!window._AMapLoaderTemp) {
   window._AMapLoaderTemp = {};
@@ -104,7 +105,7 @@ export class MapUtils {
 
     const icon = new AMap.Icon({
       size: new AMap.Size(34, 34), //图标尺寸
-      image: `data:image/svg+xml;charset=utf-8;base64,ICA8c3ZnCiAgICB0PSIxNzA4NDk3MTY0NjU0IgogICAgY2xhc3M9Imljb24iCiAgICB2aWV3Qm94PSIwIDAgMTAyNCAxMDI0IgogICAgdmVyc2lvbj0iMS4xIgogICAgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIgogICAgcC1pZD0iODQ4OSIKICAgIHdpZHRoPSIyMDAiCiAgICBoZWlnaHQ9IjIwMCIKICA+CiAgICA8cGF0aAogICAgICBkPSJNNTEyIDEwMjRjLTIwNS43Ni0yNDEuNDcyLTMyNi4yNzItNDExLjcxMi0zNjEuNjY0LTUxMC43MmEzODQgMzg0IDAgMSAxIDcyMy4wNzIgMC44MzJDODM3Ljc2IDYxMi45MjggNzE3LjMxMiA3ODIuODQ4IDUxMiAxMDI0LjA2NHogbTAtNTEyYTEyOCAxMjggMCAxIDAgMC0yNTYgMTI4IDEyOCAwIDAgMCAwIDI1NnoiCiAgICAgIGZpbGw9IiMxNjc3ZmYiCiAgICAgIHAtaWQ9Ijg0OTAiCiAgICA+PC9wYXRoPgogIDwvc3ZnPg==`, // Icon 的图像
+      image: markerIconBase64, // Icon 的图像
       imageSize: new AMap.Size(34, 34), // 根据所设置的大小拉伸或压缩图片
       ...this.markerIconConf,
       ...markerIconConf,

package/src/components/LocationPicker/README.md

@@ -5,6 +5,7 @@ npm install @amap/amap-jsapi-loader
 ## 注意事项
 
 - isObjectRes 在 @hzab/form-render0.5.0 版本中去除，结果全部存放在对象中
+- changeMode 在 @hzab/form-render0.5.1 版本中去除，仅允许点击地图选点
 
 ## 引入
 
@@ -18,26 +19,25 @@ export default function AMap(props) {
 
 ### InfoPanel Attributes
 
-| 参数               | 类型    | 必填 | 默认值    | 说明                                                        |
-| ------------------ | ------- | ---- | --------- | ----------------------------------------------------------- |
-| mode               | string  | 否   | dialog    | 地图显示的类型， dialog 弹窗显示、 show 直接显示            |
-| layout             | string  | 否   | ver       | 选择器和地图的布局 hor 水平、 ver 垂直                      |
-| hasSearch          | boolean | 否   | true      | 是否允许搜索                                                |
-| isAutoFixAddr      | boolean | 否   | false     | 打开地图时是否根据经纬度自动修正已填的地址                  |
-| changeMode         | string  | 否   | move      | 改变经纬度等数据的触发模式；移动地图：move，点击地图：click |
-| lonKey             | string  | 否   | longitude | 经度字段 key                                                |
-| latKey             | string  | 否   | latitude  | 维度字段 key                                                |
-| addrKey            | string  | 否   | address   | 地址字段 key                                                |
-| isAutoSearch       | boolean | 否   | false     | 搜索框是否自动搜索                                          |
-| markerIconConf     | Object  | 否   | -         | markerIcon 配置对象                                         |
-| icons              | Object  | 否   | -         | icon 图片                                                   |
-| getCurPositionConf | Object  | 否   | -         | getCurrentPosition Config                                   |
+| 参数               | 类型    | 必填 | 默认值    | 说明                                             |
+| ------------------ | ------- | ---- | --------- | ------------------------------------------------ |
+| mode               | string  | 否   | dialog    | 地图显示的类型， dialog 弹窗显示、 show 直接显示 |
+| layout             | string  | 否   | ver       | 选择器和地图的布局 hor 水平、 ver 垂直           |
+| hasSearch          | boolean | 否   | true      | 是否允许搜索                                     |
+| isAutoFixAddr      | boolean | 否   | false     | 打开地图时是否根据经纬度自动修正已填的地址       |
+| lonKey             | string  | 否   | longitude | 经度字段 key                                     |
+| latKey             | string  | 否   | latitude  | 维度字段 key                                     |
+| addrKey            | string  | 否   | address   | 地址字段 key                                     |
+| isAutoSearch       | boolean | 否   | false     | 搜索框是否自动搜索                               |
+| markerIconConf     | Object  | 否   | -         | markerIcon 配置对象                              |
+| icons              | Object  | 否   | -         | icon 图片配置                                    |
+| getCurPositionConf | Object  | 否   | -         | getCurrentPosition Config                        |
 
 #### icons
 
-| 参数         | 类型   | 必填 | 默认值 | 说明             |
-| ------------ | ------ | ---- | ------ | ---------------- |
-| markerIcon   | string | 否   | dialog | marker icon 图片 |
-| pickerIcon   | string | 否   | dialog | 选点 icon 图片   |
-| positionIcon | string | 否   | dialog | 定位 icon 图片   |
-| resetIcon    | string | 否   | dialog | 重置 icon 图片   |
+| 参数         | 类型   | 必填 | 默认值 | 说明                     |
+| ------------ | ------ | ---- | ------ | ------------------------ |
+| markerIcon   | string | 否   | dialog | marker icon 图片地址     |
+| pickerIcon   | string | 否   | dialog | 选点 icon 图片地址或元素 |
+| positionIcon | string | 否   | dialog | 定位 icon 图片地址或元素 |
+| resetIcon    | string | 否   | dialog | 重置 icon 图片地址或元素 |

package/src/components/LocationPicker/assets/svg-icon.js

@@ -17,6 +17,8 @@ export const markerIcon = (
   </svg>
 );
 
+export const markerIconBase64 = `data:image/svg+xml;charset=utf-8;base64,ICA8c3ZnCiAgICB0PSIxNzA4NDk3MTY0NjU0IgogICAgY2xhc3M9Imljb24iCiAgICB2aWV3Qm94PSIwIDAgMTAyNCAxMDI0IgogICAgdmVyc2lvbj0iMS4xIgogICAgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIgogICAgcC1pZD0iODQ4OSIKICAgIHdpZHRoPSIyMDAiCiAgICBoZWlnaHQ9IjIwMCIKICA+CiAgICA8cGF0aAogICAgICBkPSJNNTEyIDEwMjRjLTIwNS43Ni0yNDEuNDcyLTMyNi4yNzItNDExLjcxMi0zNjEuNjY0LTUxMC43MmEzODQgMzg0IDAgMSAxIDcyMy4wNzIgMC44MzJDODM3Ljc2IDYxMi45MjggNzE3LjMxMiA3ODIuODQ4IDUxMiAxMDI0LjA2NHogbTAtNTEyYTEyOCAxMjggMCAxIDAgMC0yNTYgMTI4IDEyOCAwIDAgMCAwIDI1NnoiCiAgICAgIGZpbGw9IiMxNjc3ZmYiCiAgICAgIHAtaWQ9Ijg0OTAiCiAgICA+PC9wYXRoPgogIDwvc3ZnPg==`;
+
 export const pickerIcon = (
   <svg
     t="1708305242338"

package/src/components/LocationPicker/common/utils.ts

@@ -23,17 +23,3 @@ export function getPropsValue(value = {}, opt) {
   };
   return res;
 }
-
-/**
- * 获取父级的数据对象（包括当前项的对象）
- * { 当详情: xxx, 其他项: lll }
- * @param field
- * @returns
- */
-export function getParentValue(field) {
-  let form = field?.parent?.value || field?.value;
-  if (Array.isArray(form)) {
-    form = form[field.index];
-  }
-  return form;
-}

package/src/components/LocationPicker/components/ModalContent/index.less

@@ -26,10 +26,12 @@
       height: 34px;
       transform: translate(-50%, -100%);
       color: #1677ff;
+      pointer-events: none;
       img,
       svg {
         width: 34px;
         height: 34px;
+        pointer-events: none;
       }
     }
 
@@ -37,12 +39,14 @@
       position: absolute;
       right: 20px;
       bottom: 20px;
-      & > img,
-      & > svg {
+      .actions-icon-box {
+        margin-bottom: 8px;
+      }
+      img,
+      svg {
         display: block;
         width: 32px;
         height: 32px;
-        margin-bottom: 8px;
         padding: 4px;
         background-color: #fff;
         border-radius: 8px;

package/src/components/LocationPicker/components/ModalContent/index.tsx

@@ -38,12 +38,6 @@ export const ModalContent = observer((props: any) => {
      * 打开地图时是否根据经纬度自动修正已填的地址
      */
     isAutoFixAddr = false,
-    /**
-     * 改变经纬度等数据的触发模式
-     * 移动地图：move
-     * 点击地图：click
-     */
-    changeMode = "click",
     lonKey = "longitude",
     latKey = "latitude",
     addrKey = "address",
@@ -132,27 +126,12 @@ export const ModalContent = observer((props: any) => {
     setLoading(props.loading || false);
 
     if (!(disabled || readOnly)) {
-      if (changeMode === "click") {
-        mapUtilsRef.current?.setPickerMarker(_lon, _lat);
-        // 点击选中点位的情况
-        mapUtilsRef.current.on("click", function (ev) {
-          const { lng: evLon, lat: evLat } = ev.lnglat || {};
-          setPickPoint(evLon, evLat, { changeCenter: true });
-        });
-      } else {
-        const handleMove = debounce(function (ev) {
-          let currentCenter = mapUtilsRef.current?.getCenter();
-          const { lng: centerLon, lat: centerLat } = currentCenter || {};
-          // 移动选中点位的情况
-          let _lon = centerLon;
-          let _lat = centerLat;
-          setPickPoint(_lon, _lat);
-        }, 1000);
-        // 移动地图
-        mapUtilsRef.current.on("mouseup", handleMove);
-        // PC 端需要额外监听地图缩放事件
-        mapUtilsRef.current.on("zoomend", handleMove);
-      }
+      mapUtilsRef.current?.setPickerMarker(_lon, _lat);
+      // 点击选中点位的情况
+      mapUtilsRef.current.on("click", function (ev) {
+        const { lng: evLon, lat: evLat } = ev.lnglat || {};
+        setPickPoint(evLon, evLat, { changeCenter: true });
+      });
     } else {
       // 禁用、只读情况使用 marker 展示点位
       mapUtilsRef.current?.setPickerMarker(_lon, _lat);
@@ -173,10 +152,7 @@ export const ModalContent = observer((props: any) => {
     const lon = _lon || pickInfo.lon;
     const lat = _lat || pickInfo.lat;
     let addr = _addr;
-    // 禁用、只读情况使用 marker 展示点位
-    if (changeMode === "click" || disabled || readOnly) {
-      mapUtilsRef.current?.setPickerMarker(_lon, _lat);
-    }
+    mapUtilsRef.current?.setPickerMarker(_lon, _lat);
     if (changeCenter) {
       setMapCenter(_lon, _lat);
     }
@@ -236,8 +212,6 @@ export const ModalContent = observer((props: any) => {
       });
   }
 
-  // 展示已选点位恢复居中按钮:changeMode !== 'move' 或 禁用、只读模式。用于详情等只读情况恢复点位居中
-  const showResetCenter = changeMode !== "move" || disabled || readOnly;
   // 展示获取当前定位按钮 props.showGetPositionBtn !== false 且非禁用、只读模式
   const showGetPositionBtn = props.showGetPositionBtn !== false && !(disabled || readOnly);
 
@@ -268,33 +242,26 @@ export const ModalContent = observer((props: any) => {
           <AMapCom init={mapInit} loading={loading} markerIconConf={markerIconConf} />
           <div className="set-map-actions">
             {/* 已选的点位居中 */}
-            {showResetCenter ? (
-              typeof resetIcon === "string" ? (
-                <img className="reset-icon" src={resetIcon} onClick={resetCenter} />
+            <div className="actions-icon-box reset-icon-box" onClick={resetCenter}>
+              {typeof resetIcon === "string" ? (
+                <img className="reset-icon" src={resetIcon} />
               ) : (
                 resetIcon || resetIconDef
-              )
-            ) : null}
+              )}
+            </div>
             {/* 获取当前经纬度 */}
             {showGetPositionBtn ? (
-              typeof positionIcon === "string" ? (
-                <img className="center-icon" src={positionIcon} onClick={getPosition} />
-              ) : (
-                positionIcon || positionIconDef
-              )
+              <div className="actions-icon-box center-icon-box" onClick={getPosition}>
+                {typeof positionIcon === "string" ? (
+                  <img className="center-icon" src={positionIcon} />
+                ) : (
+                  positionIcon || positionIconDef
+                )}
+              </div>
             ) : null}
           </div>
-          {changeMode !== "click" && !(disabled || readOnly) && (
-            <div className="location-picker-center-icon-box">
-              {typeof positionIcon === "string" ? (
-                <img className="location-picker-center-icon" src={markerIcon} />
-              ) : (
-                markerIcon || markerIconDef
-              )}
-            </div>
-          )}
         </div>
-        {disabled || readOnly ? null : <Notice changeMode={changeMode} />}
+        {disabled || readOnly ? null : <Notice />}
       </div>
       {loading && (
         <div className="spin-loading-wrap">

package/src/components/LocationPicker/components/Notice/index.tsx

@@ -2,12 +2,7 @@ import { Alert } from "antd";
 
 export const Notice = (props) => {
   return (
-    <Alert
-      className="location-picker-notice-bar"
-      message={props.changeMode === "click" ? "点击地图上的位置，选择目标地址" : "拖拽移动地图，中心标点为目标地址"}
-      type="info"
-      showIcon
-    />
+    <Alert className="location-picker-notice-bar" message={"点击地图上的位置，选择目标地址"} type="info" showIcon />
   );
 };
 

package/src/components/LocationPicker/index.tsx

@@ -9,6 +9,7 @@ import { MapUtils } from "./Map/AMap/common/utils";
 import { getCurrentPosition } from "../../common/location-utils";
 
 import { getPropsValue } from "./common/utils";
+import { getAddress } from "./servers";
 
 import "./index.less";
 
@@ -32,12 +33,6 @@ export const LocationPicker = observer(function (props: any) {
      * 打开地图时是否根据经纬度自动修正已填的地址
      */
     isAutoFixAddr = false,
-    /**
-     * 改变经纬度等数据的触发模式
-     * 移动地图 move
-     * 点击地图 click
-     */
-    changeMode = "click",
     lonKey = "longitude",
     latKey = "latitude",
     addrKey = "address",
@@ -45,6 +40,7 @@ export const LocationPicker = observer(function (props: any) {
     // 搜索框是否自动搜索
     isAutoSearch = true,
     modalConf = {},
+    icons = {},
     getCurPositionConf,
   } = props;
 
@@ -70,12 +66,17 @@ export const LocationPicker = observer(function (props: any) {
       // 如果没有传入的经纬度，获取当前实际的经纬度数据
       // 获取当前经纬度
       getCurrentPosition(getCurPositionConf)
-        .then((res) => {
+        .then(async (res) => {
           const { coords = {} } = res;
+          const lon = coords.longitude;
+          const lat = coords.latitude;
+          const addr: string = await getAddress(lon, lat).then((addr) => {
+            return addr;
+          });
           pickInfoRef.current = {
-            lon: coords.longitude,
-            lat: coords.latitude,
-            addr: "",
+            lon,
+            lat,
+            addr,
           };
           setDefaultLocation(pickInfoRef.current);
           setLoading(false);
@@ -139,12 +140,6 @@ export const LocationPicker = observer(function (props: any) {
      * 打开地图时是否根据经纬度自动修正已填的地址
      */
     isAutoFixAddr: isAutoFixAddr ?? false,
-    /**
-     * 改变经纬度等数据的触发模式
-     * 移动地图：move
-     * 点击地图：click
-     */
-    changeMode: changeMode ?? "click",
     lonKey: lonKey ?? "longitude",
     latKey: latKey ?? "latitude",
     addrKey: addrKey ?? "address",
@@ -165,7 +160,7 @@ export const LocationPicker = observer(function (props: any) {
         <>
           {/* 弹窗 */}
           {/* 有弹窗时，显示表单选中的结果 */}
-          <ResInfo {..._props} onShow={onShow} />
+          <ResInfo {..._props} onShow={onShow} pickerIcon={icons.pickerIcon} />
           <Modal
             className="location-picker-modal"
             title="地图选点"

package/src/components/LocationPicker/servers/index.ts

@@ -1,13 +1,33 @@
+export interface addressErrorI extends Error {
+  result?: string;
+}
+
 /**
  * 根据经纬度获取定义的地址
  * @param lon
  * @param lat
  * @returns
  */
-export function getAddress(lon, lat) {
+export function getAddress(lon, lat): Promise<string> {
+  return new Promise((resolve, reject) => {
+    getAddressByAMap(lon, lat)
+      .then(resolve)
+      .catch((err) => {
+        if (err.result === "USER_DAILY_QUERY_OVER_LIMIT" || err.result === "A_MAP_IS_NOT_DEFINED") {
+          getAddressByFetch(lon, lat).then(resolve).catch(reject);
+        } else {
+          reject(err);
+        }
+      });
+  });
+}
+
+export const getAddressByAMap = function (lon, lat): Promise<string> {
   return new Promise((resolve, reject) => {
     if (!window.AMap) {
-      reject(Error("Error getAddress window.AMap is not defined."));
+      const error: addressErrorI = Error("Error getAddress window.AMap is not defined.");
+      error.result = "A_MAP_IS_NOT_DEFINED";
+      reject(error);
       return;
     }
     const geocoder = new window.AMap.Geocoder({});
@@ -17,35 +37,43 @@ export function getAddress(lon, lat) {
         resolve(formattedAddress);
         return formattedAddress;
       } else if (result === "USER_DAILY_QUERY_OVER_LIMIT") {
-        // 超出限制，使用 webServer 进行请求
-        if (!window._AMapLoaderTemp.serverKey) {
-          reject(new Error("超出使用限制，请联系管理员"));
-          return;
-        }
-        fetch(
-          `https://restapi.amap.com/v3/geocode/regeo?location=${lon?.toFixed(6)},${lat?.toFixed(6)}&key=${
-            window._AMapLoaderTemp.serverKey
-          }`,
-          {
-            mode: "cors",
-          },
-        )
-          .then((res) => res.json())
-          .then((res) => {
-            if (res.status === "1") {
-              resolve(res.regeocode?.formatted_address);
-            } else {
-              console.warn("Warn getAddress fetch: ", res);
-              reject(new Error(res.info));
-            }
-          })
-          .catch(reject);
+        const error: addressErrorI = new Error("超出使用限制，请联系管理员");
+        error.result = result;
+        reject(error);
       } else {
         reject(result);
       }
     });
   });
-}
+};
+
+export const getAddressByFetch = function (lon, lat): Promise<string> {
+  return new Promise((resolve, reject) => {
+    // 超出限制，使用 webServer 进行请求
+    if (!window._AMapLoaderTemp.serverKey) {
+      reject(new Error("请配置 serverKey"));
+      return;
+    }
+    fetch(
+      `https://restapi.amap.com/v3/geocode/regeo?location=${lon?.toFixed(6)},${lat?.toFixed(6)}&key=${
+        window._AMapLoaderTemp.serverKey
+      }`,
+      {
+        mode: "cors",
+      },
+    )
+      .then((res) => res.json())
+      .then((res) => {
+        if (res.status === "1") {
+          resolve(res.regeocode?.formatted_address);
+        } else {
+          console.warn("Warn getAddressByFetch: ", res);
+          reject(new Error(res.info));
+        }
+      })
+      .catch(reject);
+  });
+};
 
 /**
  * 获取搜索提示

package/src/components/TreeCheckbox/README.md

@@ -1,11 +1,10 @@
 ### InfoPanel Attributes
 
-| 参数        | 类型    | 必填 | 默认值   | 说明                         |
-| ----------- | ------- | ---- | -------- | ---------------------------- |
-| dataSource  | Array   | 是   | -        | 树数据                       |
-| mergeLast   | boolean | 否   | true     | 最后一列是否合并到一个单元格 |
-| labelKey    | string  | 否   | label    | label key                    |
-| valueKey    | string  | 否   | value    | value key                    |
-| childrenKey | string  | 否   | children | children key                 |
-| disabled    | boolean | 否   | -        | 禁用状态                     |
-| readOnly    | boolean | 否   | -        | 只读状态                     |
+| 参数       | 类型    | 必填 | 默认值                                             | 说明                                          |
+| ---------- | ------- | ---- | -------------------------------------------------- | --------------------------------------------- |
+| dataSource | Array   | 是   | -                                                  | 树数据                                        |
+| mergeLast  | boolean | 否   | true                                               | 最后一列是否合并到一个单元格                  |
+| fieldNames | Object  | 否   | { label: label, value: value, children: children } | 自定义 options 中 label value children 的字段 |
+| disabled   | boolean | 否   | false                                              | 禁用状态                                      |
+| readOnly   | boolean | 否   | false                                              | 只读状态                                      |
+| tabBox     | boolean | 否   | false                                              | 最外层使用 tab                                |