@gm-pc/business 1.25.1-beta.1 → 1.26.0-beta.0

package/src/data_category_tree/util.ts

@@ -1,109 +1,109 @@
-import {
-  GetCategoryTree,
-  ListSku,
-  Category,
-  Spu,
-  Sku,
-  ListSkuRequest,
-} from 'gm_api/src/merchandise'
-import { PagingMaxLimit } from 'gm_api'
-import _ from 'lodash'
-import { ListSkuResponse_SkuInfo } from 'gm_api/src/merchandise/types'
-import { filterGroupListLeaf } from '@gm-common/tool'
-
-interface CategoryItem {
-  value: string
-  text: string
-  children: CategoryItem[] | SpuItem[]
-  original: Category
-}
-
-interface SpuItem {
-  value: string
-  text: string
-  // needSku 才有 children
-  children?: SkuItem[]
-  original: Spu
-}
-
-interface SkuItem {
-  value: string
-  text: string
-  original: Sku
-}
-
-async function getCategoryTree(params?: {
-  needSku?: boolean
-  skuParams?: ListSkuRequest
-}) {
-  const { needSku, skuParams } = params || {}
-  const res = await GetCategoryTree({})
-
-  const { categories, spus } = res.response
-
-  const map: { [key: string]: any } = {}
-
-  const tree: CategoryItem[] = []
-
-  _.each(categories, (category: Category) => {
-    const newCategory: CategoryItem = {
-      value: category.category_id,
-      text: category.name,
-      children: [],
-      original: category,
-    }
-
-    map[newCategory.value] = newCategory
-
-    // 一级
-    if (category.parent_id === '0') {
-      tree.push(newCategory)
-    } else {
-      if (map[category.parent_id]) {
-        map[category.parent_id].children.push(newCategory)
-      }
-    }
-  })
-
-  _.each(spus, (spu: Spu) => {
-    const newSpu: SpuItem = {
-      value: spu.spu_id,
-      text: spu.name,
-      children: needSku ? [] : undefined,
-      original: spu,
-    }
-
-    map[spu.spu_id] = newSpu
-
-    if (map[spu.parent_id]) {
-      map[spu.parent_id].children.push(newSpu)
-    }
-  })
-
-  if (needSku) {
-    const skuRes = await ListSku({
-      paging: { limit: PagingMaxLimit },
-      ...(skuParams || {}),
-    })
-
-    _.each(skuRes.response.sku_infos, (skuInfo: ListSkuResponse_SkuInfo) => {
-      const sku: Sku = skuInfo.sku!
-
-      const newSku: SkuItem = {
-        value: sku.sku_id,
-        text: sku.name,
-        original: sku,
-      }
-
-      if (map[sku.spu_id]) {
-        map[sku.spu_id].children.push(newSku)
-      }
-    })
-  }
-
-  // 过滤掉没有子的数据
-  return filterGroupListLeaf(tree as any, () => true) as CategoryItem[]
-}
-
-export { getCategoryTree }
-export type { CategoryItem, SpuItem, SkuItem }
+import {
+  GetCategoryTree,
+  ListSku,
+  Category,
+  Spu,
+  Sku,
+  ListSkuRequest,
+} from 'gm_api/src/merchandise'
+import { PagingMaxLimit } from 'gm_api'
+import _ from 'lodash'
+import { ListSkuResponse_SkuInfo } from 'gm_api/src/merchandise/types'
+import { filterGroupListLeaf } from '@gm-common/tool'
+
+interface CategoryItem {
+  value: string
+  text: string
+  children: CategoryItem[] | SpuItem[]
+  original: Category
+}
+
+interface SpuItem {
+  value: string
+  text: string
+  // needSku 才有 children
+  children?: SkuItem[]
+  original: Spu
+}
+
+interface SkuItem {
+  value: string
+  text: string
+  original: Sku
+}
+
+async function getCategoryTree(params?: {
+  needSku?: boolean
+  skuParams?: ListSkuRequest
+}) {
+  const { needSku, skuParams } = params || {}
+  const res = await GetCategoryTree({})
+
+  const { categories, spus } = res.response
+
+  const map: { [key: string]: any } = {}
+
+  const tree: CategoryItem[] = []
+
+  _.each(categories, (category: Category) => {
+    const newCategory: CategoryItem = {
+      value: category.category_id,
+      text: category.name,
+      children: [],
+      original: category,
+    }
+
+    map[newCategory.value] = newCategory
+
+    // 一级
+    if (category.parent_id === '0') {
+      tree.push(newCategory)
+    } else {
+      if (map[category.parent_id]) {
+        map[category.parent_id].children.push(newCategory)
+      }
+    }
+  })
+
+  _.each(spus, (spu: Spu) => {
+    const newSpu: SpuItem = {
+      value: spu.spu_id,
+      text: spu.name,
+      children: needSku ? [] : undefined,
+      original: spu,
+    }
+
+    map[spu.spu_id] = newSpu
+
+    if (map[spu.parent_id]) {
+      map[spu.parent_id].children.push(newSpu)
+    }
+  })
+
+  if (needSku) {
+    const skuRes = await ListSku({
+      paging: { limit: PagingMaxLimit },
+      ...(skuParams || {}),
+    })
+
+    _.each(skuRes.response.sku_infos, (skuInfo: ListSkuResponse_SkuInfo) => {
+      const sku: Sku = skuInfo.sku!
+
+      const newSku: SkuItem = {
+        value: sku.sku_id,
+        text: sku.name,
+        original: sku,
+      }
+
+      if (map[sku.spu_id]) {
+        map[sku.spu_id].children.push(newSku)
+      }
+    })
+  }
+
+  // 过滤掉没有子的数据
+  return filterGroupListLeaf(tree as any, () => true) as CategoryItem[]
+}
+
+export { getCategoryTree }
+export type { CategoryItem, SpuItem, SkuItem }

package/src/data_gegraphic_label/data_address.tsx

@@ -1,46 +1,46 @@
-import React, { FC } from 'react'
-import { useAsync } from '@gm-common/hooks'
-import { fetchCityDistrictStreetTree } from './util'
-import { LevelSelect } from '@gm-pc/react'
-import { DataAddressProps } from './types'
-import _ from 'lodash'
-
-const DataAddress: FC<DataAddressProps> = ({
-  selected,
-  onSelect,
-  city_ids,
-  onlySelectLeaf,
-  placeholder,
-}) => {
-  const { data } = useAsync(fetchCityDistrictStreetTree, {
-    manual: false,
-    defaultParams: {
-      city_ids,
-    },
-  })
-
-  const oSelected = _.remove(
-    [selected.city_id, selected.district_id, selected.street_id],
-    (v?: string) => !!v
-  )
-
-  const handleSelect = (selected: string[]) => {
-    onSelect({
-      city_id: selected[0],
-      district_id: selected[1],
-      street_id: selected[2],
-    })
-  }
-
-  return (
-    <LevelSelect
-      placeholder={placeholder}
-      data={data || []}
-      selected={data ? oSelected : []}
-      onSelect={handleSelect}
-      onlySelectLeaf={onlySelectLeaf}
-    />
-  )
-}
-
-export default DataAddress
+import React, { FC } from 'react'
+import { useAsync } from '@gm-common/hooks'
+import { fetchCityDistrictStreetTree } from './util'
+import { LevelSelect } from '@gm-pc/react'
+import { DataAddressProps } from './types'
+import _ from 'lodash'
+
+const DataAddress: FC<DataAddressProps> = ({
+  selected,
+  onSelect,
+  city_ids,
+  onlySelectLeaf,
+  placeholder,
+}) => {
+  const { data } = useAsync(fetchCityDistrictStreetTree, {
+    manual: false,
+    defaultParams: {
+      city_ids,
+    },
+  })
+
+  const oSelected = _.remove(
+    [selected.city_id, selected.district_id, selected.street_id],
+    (v?: string) => !!v
+  )
+
+  const handleSelect = (selected: string[]) => {
+    onSelect({
+      city_id: selected[0],
+      district_id: selected[1],
+      street_id: selected[2],
+    })
+  }
+
+  return (
+    <LevelSelect
+      placeholder={placeholder}
+      data={data || []}
+      selected={data ? oSelected : []}
+      onSelect={handleSelect}
+      onlySelectLeaf={onlySelectLeaf}
+    />
+  )
+}
+
+export default DataAddress

package/src/data_gegraphic_label/data_address_name.tsx

@@ -14,13 +14,12 @@ const DataAddressName: FC<DataAddressNameProps> = ({
             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 && '/'}
+          <MapId_District id={district_id} getName={(item) => item.local_name} />/
         </>
       )}
       {street_id && <MapId_Street id={street_id} getName={(item) => item.local_name} />}

package/src/data_gegraphic_label/index.ts

@@ -1,2 +1,2 @@
-export { default as DataAddress } from './data_address'
-export { default as DataAddressName } from './data_address_name'
+export { default as DataAddress } from './data_address'
+export { default as DataAddressName } from './data_address_name'

package/src/data_gegraphic_label/stories.tsx

@@ -1,36 +1,36 @@
-import React from 'react'
-import { DataAddress, DataAddressName } from './index'
-import { observable } from 'mobx'
-
-const store = observable({
-  selected: {},
-  setSelected(selected: any) {
-    this.selected = selected
-  },
-})
-
-export const ComDataCityDistrict = () => {
-  return (
-    <div style={{ width: '300px' }}>
-      <DataAddress
-        city_ids={['4401', '4403']}
-        selected={store.selected}
-        onSelect={(selected) => {
-          store.setSelected(selected)
-        }}
-      />
-    </div>
-  )
-}
-
-export const ComDataAddressCityDistrict = () => {
-  return (
-    <DataAddressName
-      address={{ city_id: '4403', district_id: '440307', street_id: '440103001' }}
-    />
-  )
-}
-
-export default {
-  title: 'Business/DataGegraphicLabel',
-}
+import React from 'react'
+import { DataAddress, DataAddressName } from './index'
+import { observable } from 'mobx'
+
+const store = observable({
+  selected: {},
+  setSelected(selected: any) {
+    this.selected = selected
+  },
+})
+
+export const ComDataCityDistrict = () => {
+  return (
+    <div style={{ width: '300px' }}>
+      <DataAddress
+        city_ids={['4401', '4403']}
+        selected={store.selected}
+        onSelect={(selected) => {
+          store.setSelected(selected)
+        }}
+      />
+    </div>
+  )
+}
+
+export const ComDataAddressCityDistrict = () => {
+  return (
+    <DataAddressName
+      address={{ city_id: '4403', district_id: '440307', street_id: '440103001' }}
+    />
+  )
+}
+
+export default {
+  title: 'Business/DataGegraphicLabel',
+}

package/src/data_gegraphic_label/types.ts

@@ -1,44 +1,44 @@
-import { City, District, Street, Address } from 'gm_api/src/enterprise'
-
-interface CityItem {
-  value: string
-  text: string
-  original: City
-  children: DistrictItem[]
-}
-
-interface DistrictItem {
-  value: string
-  text: string
-  original: District
-  children: StreetItem[]
-}
-
-interface StreetItem {
-  value: string
-  text: string
-  original: Street
-}
-
-type DataAddress = Pick<Address, 'city_id' | 'district_id' | 'street_id'>
-
-interface DataAddressProps {
-  city_ids: string[]
-  selected: DataAddress
-  onSelect(selected: DataAddress): void
-  onlySelectLeaf?: boolean
-  placeholder?: string
-}
-
-interface DataAddressNameProps {
-  address: DataAddress
-}
-
-export type {
-  CityItem,
-  DistrictItem,
-  StreetItem,
-  DataAddress,
-  DataAddressProps,
-  DataAddressNameProps,
-}
+import { City, District, Street, Address } from 'gm_api/src/enterprise'
+
+interface CityItem {
+  value: string
+  text: string
+  original: City
+  children: DistrictItem[]
+}
+
+interface DistrictItem {
+  value: string
+  text: string
+  original: District
+  children: StreetItem[]
+}
+
+interface StreetItem {
+  value: string
+  text: string
+  original: Street
+}
+
+type DataAddress = Pick<Address, 'city_id' | 'district_id' | 'street_id'>
+
+interface DataAddressProps {
+  city_ids: string[]
+  selected: DataAddress
+  onSelect(selected: DataAddress): void
+  onlySelectLeaf?: boolean
+  placeholder?: string
+}
+
+interface DataAddressNameProps {
+  address: DataAddress
+}
+
+export type {
+  CityItem,
+  DistrictItem,
+  StreetItem,
+  DataAddress,
+  DataAddressProps,
+  DataAddressNameProps,
+}

package/src/data_gegraphic_label/util.ts

@@ -24,7 +24,7 @@ async function fetchCityDistrictStreetTree(params: {
     const cityItem = {
       value: city.city_id,
       text: city.local_name,
-      // children: [], // 不一定有下一级
+      children: [],
       original: city,
     }
     cityDistrictTree.push(cityItem)
@@ -36,17 +36,13 @@ async function fetchCityDistrictStreetTree(params: {
       original: district,
       value: district.district_id,
       text: district.local_name,
-      // children: [], // 不一定有下一级
+      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]
-      }
+      p.children.push(districtItem)
     }
   })
 
@@ -54,10 +50,6 @@ async function fetchCityDistrictStreetTree(params: {
     districtRes.response.districts,
     (district: District) => district.district_id
   )
-
-  // 空数组会报错阻塞后续执行，后端不改，所以判断一下
-  if (!district_ids.length) return cityDistrictTree
-
   const streetRes = await ListStreet({
     district_ids,
   })
@@ -71,11 +63,7 @@ async function fetchCityDistrictStreetTree(params: {
 
     const p = districtMap[street.district_id]
     if (p) {
-      if (Array.isArray(p.children)) {
-        p.children.push(streetItem)
-      } else {
-        p.children = [streetItem]
-      }
+      p.children.push(streetItem)
     }
   })
 

package/src/index.ts

@@ -1,4 +1,4 @@
-export * from './data_category_tree'
-export * from './data_gegraphic_label'
-export * from './code_input'
-export * from './table_list'
+export * from './data_category_tree'
+export * from './data_gegraphic_label'
+export * from './code_input'
+export * from './table_list'

package/src/stories.tsx

@@ -1,27 +1,27 @@
-import React from 'react'
-import sha256 from 'crypto-js/sha256'
-import { Token } from 'gm_api/src/oauth'
-
-export const ComLogin = () => {
-  return (
-    <div>
-      <button
-        onClick={() => {
-          Token({
-            grant_type: 'password',
-            username: 'admin',
-            group_id: '328775773546610712',
-            password: sha256('123456').toString(),
-            client_id: '1',
-          })
-        }}
-      >
-        login
-      </button>
-    </div>
-  )
-}
-
-export default {
-  title: 'Business/ceres login',
-}
+import React from 'react'
+import sha256 from 'crypto-js/sha256'
+import { Token } from 'gm_api/src/oauth'
+
+export const ComLogin = () => {
+  return (
+    <div>
+      <button
+        onClick={() => {
+          Token({
+            grant_type: 'password',
+            username: 'admin',
+            group_id: '328775773546610712',
+            password: sha256('123456').toString(),
+            client_id: '1',
+          })
+        }}
+      >
+        login
+      </button>
+    </div>
+  )
+}
+
+export default {
+  title: 'Business/ceres login',
+}

package/src/table_list/index.ts

@@ -1,2 +1,2 @@
-export * from './table_list'
-export * from './types'
+export * from './table_list'
+export * from './types'