@gm-pc/business 1.25.0 → 1.25.1-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gm-pc/business",
-  "version": "1.25.0",
+  "version": "1.25.1-beta.1",
   "description": "观麦科技业务组件库",
   "author": "liyatang <liyatang@qq.com>",
   "homepage": "https://github.com/gmfe/gm-pc#readme",
@@ -28,8 +28,8 @@
   "dependencies": {
     "@gm-common/hooks": "^2.10.0",
     "@gm-common/tool": "^2.10.0",
-    "@gm-pc/react": "^1.25.0",
-    "@gm-pc/table-x": "^1.25.0"
+    "@gm-pc/react": "^1.25.1-beta.1",
+    "@gm-pc/table-x": "^1.25.1-beta.1"
   },
-  "gitHead": "807f3c85b9645ce15d6ee00818c04aea936a5880"
+  "gitHead": "5dd0c3577285d50f79d819477ca636ab6839d276"
 }

package/src/data_gegraphic_label/data_address_name.tsx

@@ -1,30 +1,31 @@
-import React, { FC } from 'react'
-import { DataAddressNameProps } from './types'
-import { MapId_City, MapId_District, MapId_Street } from 'gm_api/src/enterprise/pc'
-
-const DataAddressName: FC<DataAddressNameProps> = ({
-  address: { city_id, district_id, street_id },
-}) => {
-  return (
-    <>
-      {city_id && (
-        <>
-          <MapId_City
-            id={city_id}
-            getName={(item) => item.local_name}
-            getResponseData={(response) => response.cities}
-          />
-          /
-        </>
-      )}
-      {district_id && (
-        <>
-          <MapId_District id={district_id} getName={(item) => item.local_name} />/
-        </>
-      )}
-      {street_id && <MapId_Street id={street_id} getName={(item) => item.local_name} />}
-    </>
-  )
-}
-
-export default DataAddressName
+import React, { FC } from 'react'
+import { DataAddressNameProps } from './types'
+import { MapId_City, MapId_District, MapId_Street } from 'gm_api/src/enterprise/pc'
+
+const DataAddressName: FC<DataAddressNameProps> = ({
+  address: { city_id, district_id, street_id },
+}) => {
+  return (
+    <>
+      {city_id && (
+        <>
+          <MapId_City
+            id={city_id}
+            getName={(item) => item.local_name}
+            getResponseData={(response) => response.cities}
+          />
+          {(district_id || street_id) && '/'}
+        </>
+      )}
+      {district_id && (
+        <>
+          <MapId_District id={district_id} getName={(item) => item.local_name} />
+          {street_id && '/'}
+        </>
+      )}
+      {street_id && <MapId_Street id={street_id} getName={(item) => item.local_name} />}
+    </>
+  )
+}
+
+export default DataAddressName

package/src/data_gegraphic_label/util.ts

@@ -1,81 +1,85 @@
-import _ from 'lodash'
-import { ListCity, ListDistrict, ListStreet, District } from 'gm_api/src/enterprise'
-import { CityItem, DistrictItem } from './types'
-
-async function fetchCityDistrictStreetTree(params: {
-  city_ids: string[]
-}): Promise<CityItem[]> {
-  const { city_ids } = params
-
-  const [cityRes, districtRes] = await Promise.all([
-    ListCity({
-      city_ids,
-    }),
-    ListDistrict({
-      city_ids,
-    }),
-  ])
-
-  const cityDistrictTree: CityItem[] = []
-  const cityMap: { [key: string]: CityItem } = {}
-  const districtMap: { [key: string]: DistrictItem } = {}
-
-  _.each(cityRes.response.cities, (city) => {
-    const cityItem = {
-      value: city.city_id,
-      text: city.local_name,
-      // children: [], // 不一定有下一级
-      original: city,
-    }
-    cityDistrictTree.push(cityItem)
-    cityMap[city.city_id] = cityItem
-  })
-
-  _.each(districtRes.response.districts, (district) => {
-    const districtItem = {
-      original: district,
-      value: district.district_id,
-      text: district.local_name,
-      // children: [], // 不一定有下一级
-    }
-    districtMap[district.district_id] = districtItem
-
-    const p = cityMap[district.city_id]
-    if (p) {
-      if (Array.isArray(p.children)) {
-        p.children.push(districtItem)
-      } else {
-        p.children = [districtItem]
-      }
-    }
-  })
-
-  const district_ids = _.map(
-    districtRes.response.districts,
-    (district: District) => district.district_id
-  )
-  const streetRes = await ListStreet({
-    district_ids,
-  })
-
-  _.each(streetRes.response.streets, (street) => {
-    const streetItem = {
-      original: street,
-      value: street.street_id,
-      text: street.local_name,
-    }
-
-    const p = districtMap[street.district_id]
-    if (p) {
-      if (Array.isArray(p.children)) {
-        p.children.push(streetItem)
-      } else {
-        p.children = [streetItem]
-      }
-    }
-  })
-
-  return cityDistrictTree
-}
-
-export { fetchCityDistrictStreetTree }
+import _ from 'lodash'
+import { ListCity, ListDistrict, ListStreet, District } from 'gm_api/src/enterprise'
+import { CityItem, DistrictItem } from './types'
+
+async function fetchCityDistrictStreetTree(params: {
+  city_ids: string[]
+}): Promise<CityItem[]> {
+  const { city_ids } = params
+
+  const [cityRes, districtRes] = await Promise.all([
+    ListCity({
+      city_ids,
+    }),
+    ListDistrict({
+      city_ids,
+    }),
+  ])
+
+  const cityDistrictTree: CityItem[] = []
+  const cityMap: { [key: string]: CityItem } = {}
+  const districtMap: { [key: string]: DistrictItem } = {}
+
+  _.each(cityRes.response.cities, (city) => {
+    const cityItem = {
+      value: city.city_id,
+      text: city.local_name,
+      // children: [], // 不一定有下一级
+      original: city,
+    }
+    cityDistrictTree.push(cityItem)
+    cityMap[city.city_id] = cityItem
+  })
+
+  _.each(districtRes.response.districts, (district) => {
+    const districtItem = {
+      original: district,
+      value: district.district_id,
+      text: district.local_name,
+      // children: [], // 不一定有下一级
+    }
+    districtMap[district.district_id] = districtItem
+
+    const p = cityMap[district.city_id]
+    if (p) {
+      if (Array.isArray(p.children)) {
+        p.children.push(districtItem)
+      } else {
+        p.children = [districtItem]
+      }
+    }
+  })
+
+  const district_ids = _.map(
+    districtRes.response.districts,
+    (district: District) => district.district_id
+  )
+
+  // 空数组会报错阻塞后续执行，后端不改，所以判断一下
+  if (!district_ids.length) return cityDistrictTree
+
+  const streetRes = await ListStreet({
+    district_ids,
+  })
+
+  _.each(streetRes.response.streets, (street) => {
+    const streetItem = {
+      original: street,
+      value: street.street_id,
+      text: street.local_name,
+    }
+
+    const p = districtMap[street.district_id]
+    if (p) {
+      if (Array.isArray(p.children)) {
+        p.children.push(streetItem)
+      } else {
+        p.children = [streetItem]
+      }
+    }
+  })
+
+  return cityDistrictTree
+}
+
+export { fetchCityDistrictStreetTree }