Skip to content

Commit af2fb4b

Browse files
committed
运费模板性能优化。区域选择使用懒加载
1 parent 855e4d3 commit af2fb4b

File tree

5 files changed

+157
-44
lines changed

5 files changed

+157
-44
lines changed

src/api/system/area/index.ts

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,16 @@
11
import request from '@/config/axios'
22

33
// 获得地区树
4-
export const getAreaTree = async (id: number) => {
5-
return await request.get({ url: '/system/area/tree?id=' + id })
4+
export const getAreaTree = async () => {
5+
return await request.get({ url: '/system/area/tree' })
6+
}
7+
8+
export const getChildrenArea = async (id: number) => {
9+
return await request.get({ url: '/system/area/getChildrenArea?id=' + id })
10+
}
11+
12+
export const getAreaListByIds = async (data) => {
13+
return await request.post({ url: '/system/area/list', data })
614
}
715

816
// 获得 IP 对应的地区名

src/utils/index.ts

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,3 +194,17 @@ export const convertToInteger = (num: number | string | undefined): number => {
194194
// TODO 分转元后还有小数则四舍五入
195195
return Math.round(parsedNumber * 100)
196196
}
197+
198+
/**
199+
* 元转分
200+
*/
201+
export const yuanToFen = (amount: string | number): number => {
202+
return Math.round(Number(amount) * 100)
203+
}
204+
205+
/**
206+
* 分转元
207+
*/
208+
export const fenToYuan = (amount: string | number): number => {
209+
return Number((Number(amount) / 100).toFixed(2))
210+
}

src/utils/tree.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ const DEFAULT_CONFIG: TreeHelperConfig = {
1111
export const defaultProps = {
1212
children: 'children',
1313
label: 'name',
14-
value: 'id'
14+
value: 'id',
15+
isLeaf: 'leaf'
1516
}
1617

1718
const getConfig = (config: Partial<TreeHelperConfig>) => Object.assign({}, DEFAULT_CONFIG, config)

src/views/mall/trade/delivery/expressTemplate/DeliveryExpressTemplateForm.vue

Lines changed: 130 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,18 @@
2121
<el-table border style="width: 100%" :data="formData.templateCharge">
2222
<el-table-column align="center" label="区域">
2323
<template #default="{ row }">
24-
<!-- @芋艿 TODO 数据多,性能有问题 , 如何解决 -->
24+
<!-- 区域数据太多,用赖加载方式,要不然性能有问题 -->
2525
<el-tree-select
2626
v-model="row.areaId"
27-
:data="areaList"
27+
lazy
28+
:load="loadChargeArea"
2829
:props="defaultProps"
2930
node-key="id"
3031
check-strictly
3132
show-checkbox
3233
check-on-click-node
3334
:render-after-expand="false"
35+
:cache-data="areaCache"
3436
/>
3537
</template>
3638
</el-table-column>
@@ -39,7 +41,6 @@
3941
<el-input-number v-model="row.startCount" :min="1" />
4042
</template>
4143
</el-table-column>
42-
<!-- TODO 元转换 分 -->
4344
<el-table-column label="运费(元)" prop="startPrice">
4445
<template #default="{ row }">
4546
<el-input-number v-model="row.startPrice" :min="1" />
@@ -73,16 +74,18 @@
7374
<el-table border style="width: 100%" :data="formData.templateFree">
7475
<el-table-column label="区域">
7576
<template #default="{ row }">
76-
<!-- @芋艿 TODO 数据多,性能有问题 , 如何解决 -->
77+
<!-- 区域数据太多,用赖加载方式,要不然性能有问题 -->
7778
<el-tree-select
7879
v-model="row.areaId"
79-
:data="areaList"
80+
lazy
81+
:load="loadFreeArea"
8082
:props="defaultProps"
8183
node-key="id"
8284
check-strictly
8385
show-checkbox
8486
check-on-click-node
8587
:render-after-expand="false"
88+
:cache-data="areaCache"
8689
/>
8790
</template>
8891
</el-table-column>
@@ -121,7 +124,9 @@
121124
<script setup lang="ts">
122125
import * as DeliveryExpressTemplateApi from '@/api/mall/trade/delivery/expressTemplate'
123126
import { defaultProps } from '@/utils/tree'
124-
import { getAreaTree } from '@/api/system/area'
127+
import { yuanToFen, fenToYuan } from '@/utils'
128+
import { getChildrenArea, getAreaListByIds } from '@/api/system/area'
129+
import { cloneDeep } from 'lodash-es'
125130
const { t } = useI18n() // 国际化
126131
const message = useMessage() // 消息弹窗
127132
@@ -137,6 +142,7 @@ const formData = ref({
137142
templateCharge: [],
138143
templateFree: []
139144
})
145+
const columnTitleMap = new Map()
140146
const columnTitle = ref({
141147
startCountTitle: '首件',
142148
extraCountTitle: '续件',
@@ -148,7 +154,8 @@ const formRules = reactive({
148154
sort: [{ required: true, message: '分类排序不能为空', trigger: 'blur' }]
149155
})
150156
const formRef = ref() // 表单 Ref
151-
const areaList = ref([]) //区域数据
157+
const areaCache = ref([]) //由于区域节点懒加载,已选区域节点需要缓存展示
158+
// let areaTree: any[]
152159
/** 打开弹窗 */
153160
const open = async (type: string, id?: number) => {
154161
dialogVisible.value = true
@@ -160,6 +167,26 @@ const open = async (type: string, id?: number) => {
160167
if (id) {
161168
formLoading.value = true
162169
formData.value = await DeliveryExpressTemplateApi.getDeliveryExpressTemplate(id)
170+
columnTitle.value = columnTitleMap.get(formData.value.chargeMode)
171+
//已选的区域节点
172+
const areaIds = []
173+
formData.value.templateCharge.forEach((item) => {
174+
//不等于全国的节点
175+
if (item.areaId !== 1) {
176+
areaIds.push(item.areaId)
177+
}
178+
//前端价格以元展示
179+
item.startPrice = fenToYuan(item.startPrice)
180+
item.extraPrice = fenToYuan(item.extraPrice)
181+
})
182+
formData.value.templateFree.forEach((item) => {
183+
if (item.areaId !== 1 && !areaIds.includes(item.areaId)) {
184+
areaIds.push(item.areaId)
185+
}
186+
item.freePrice = fenToYuan(item.freePrice)
187+
})
188+
//区域节点,懒加载方式。 已选节点需要缓存展示
189+
areaCache.value = await getAreaListByIds(areaIds)
163190
}
164191
} finally {
165192
formLoading.value = false
@@ -178,6 +205,14 @@ const submitForm = async () => {
178205
formLoading.value = true
179206
try {
180207
const data = formData.value as DeliveryExpressTemplateApi.DeliveryExpressTemplateVO
208+
data.templateCharge.forEach((item) => {
209+
//前端价格以元展示,提交到后端。用分计算
210+
item.startPrice = yuanToFen(item.startPrice)
211+
item.extraPrice = yuanToFen(item.extraPrice)
212+
})
213+
data.templateFree.forEach((item) => {
214+
item.freePrice = yuanToFen(item.freePrice)
215+
})
181216
if (formType.value === 'create') {
182217
await DeliveryExpressTemplateApi.createDeliveryExpressTemplate(data)
183218
message.success(t('common.createSuccess'))
@@ -210,46 +245,102 @@ const resetForm = () => {
210245
templateFree: [],
211246
sort: 0
212247
}
213-
columnTitle.value = {
248+
columnTitle.value = columnTitleMap.get(1)
249+
formRef.value?.resetFields()
250+
}
251+
/** 配送计费方法改变 */
252+
const changeChargeMode = (chargeMode: number) => {
253+
columnTitle.value = columnTitleMap.get(chargeMode)
254+
}
255+
const defaultArea = [{ id: 1, name: '全国', disabled: false }]
256+
257+
/** 初始化数据 */
258+
const initData = async () => {
259+
// TODO 从服务端全量加载数据, 后面看懒加载是不是可以从前端获取数据。 目前从后端获取数据
260+
// formLoading.value = true
261+
// try {
262+
// const data = await getAreaTree()
263+
// areaTree = data
264+
// console.log('areaTree', areaTree)
265+
// } finally {
266+
// formLoading.value = false
267+
// }
268+
//表头标题和计费方式的映射
269+
columnTitleMap.set(1, {
214270
startCountTitle: '首件',
215271
extraCountTitle: '续件',
216272
freeCountTitle: '包邮件数'
217-
}
218-
formRef.value?.resetFields()
273+
})
274+
columnTitleMap.set(2, {
275+
startCountTitle: '首件重量(kg)',
276+
extraCountTitle: '续件重量(kg)',
277+
freeCountTitle: '包邮重量(kg)'
278+
})
279+
columnTitleMap.set(3, {
280+
startCountTitle: '首件体积(m³)',
281+
extraCountTitle: '续件体积(m³)',
282+
freeCountTitle: '包邮体积(m³)'
283+
})
219284
}
220-
/** 配送计费方法改变 */
221-
const changeChargeMode = (chargeMod: number) => {
222-
if (chargeMod === 1) {
223-
columnTitle.value = {
224-
startCountTitle: '首件',
225-
extraCountTitle: '续件',
226-
freeCountTitle: '包邮件数'
227-
}
228-
}
229-
if (chargeMod === 2) {
230-
columnTitle.value = {
231-
startCountTitle: '首件重量(kg)',
232-
extraCountTitle: '续件重量(kg)',
233-
freeCountTitle: '包邮重量(kg)'
285+
286+
/** 懒加载运费区域树 */
287+
const loadChargeArea = async (node, resolve) => {
288+
const areaIds = []
289+
formData.value.templateCharge.forEach((item) => {
290+
if (item.areaId) {
291+
areaIds.push(item.areaId)
234292
}
235-
}
236-
if (chargeMod === 3) {
237-
columnTitle.value = {
238-
startCountTitle: '首件体积(m³)',
239-
extraCountTitle: '续件体积(m³)',
240-
freeCountTitle: '包邮体积(m³)'
293+
})
294+
if (node.isLeaf) return resolve([])
295+
const length = node.data.length
296+
if (length === 0) {
297+
const data = cloneDeep(defaultArea)
298+
const item = data[0]
299+
if (areaIds.includes(item.id)) {
300+
item.disabled = true
241301
}
302+
resolve(data)
303+
} else {
304+
const id = node.data.id
305+
const data = await getChildrenArea(id)
306+
data.forEach((item) => {
307+
if (areaIds.includes(item.id)) {
308+
item.disabled = true
309+
}
310+
})
311+
resolve(data)
242312
}
243313
}
244314
245-
/** 初始化区域数据 */
246-
const initAreaData = async () => {
247-
formLoading.value = true
248-
try {
249-
const data = await getAreaTree(1)
250-
areaList.value = data
251-
} finally {
252-
formLoading.value = false
315+
/** 懒加载包邮区域树 */
316+
const loadFreeArea = async (node, resolve) => {
317+
if (node.isLeaf) return resolve([])
318+
//已经选择的区域id
319+
const areaIds = []
320+
formData.value.templateFree.forEach((item) => {
321+
if (item.areaId) {
322+
areaIds.push(item.areaId)
323+
}
324+
})
325+
const length = node.data.length
326+
if (length === 0) {
327+
// 为空,从全国开始选择。全国 id == 1
328+
const data = cloneDeep(defaultArea)
329+
const item = data[0]
330+
if (areaIds.includes(item.id)) {
331+
item.disabled = true
332+
}
333+
resolve(data)
334+
} else {
335+
const id = node.data.id
336+
const data = await getChildrenArea(id)
337+
//已选区域需要禁止再次选择
338+
data.forEach((item) => {
339+
if (areaIds.includes(item.id)) {
340+
item.disabled = true
341+
}
342+
})
343+
resolve(data)
253344
}
254345
}
255346
/** 添加计费区域 */
@@ -285,6 +376,6 @@ const deleteFreeArea = (index) => {
285376
286377
/** 初始化 **/
287378
onMounted(() => {
288-
initAreaData()
379+
initData()
289380
})
290381
</script>

src/views/system/area/index.vue

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,7 @@ const list = ref([])
5757
* 获得数据列表
5858
*/
5959
const getList = async () => {
60-
// id == 1 中国
61-
list.value = await AreaApi.getAreaTree(1)
60+
list.value = await AreaApi.getAreaTree()
6261
}
6362
6463
/** 添加/修改操作 */

0 commit comments

Comments
 (0)