diff --git a/apps/web-antd/src/components/shortcut-date-range-picker/shortcut-date-range-picker.vue b/apps/web-antd/src/components/shortcut-date-range-picker/shortcut-date-range-picker.vue index 95e90c6ae..f6a010187 100644 --- a/apps/web-antd/src/components/shortcut-date-range-picker/shortcut-date-range-picker.vue +++ b/apps/web-antd/src/components/shortcut-date-range-picker/shortcut-date-range-picker.vue @@ -81,7 +81,7 @@ onMounted(() => { :value-format="rangePickerProps.valueFormat" :placeholder="rangePickerProps.placeholder" :presets="rangePickerProps.presets" - class="!w-[240px]" + class="!w-[235px]" @change="handleDateRangeChange" /> diff --git a/apps/web-antd/src/views/mall/statistics/product/index.vue b/apps/web-antd/src/views/mall/statistics/product/index.vue index 6e6001454..f2caa8862 100644 --- a/apps/web-antd/src/views/mall/statistics/product/index.vue +++ b/apps/web-antd/src/views/mall/statistics/product/index.vue @@ -1,8 +1,8 @@ - - diff --git a/apps/web-antd/src/views/mall/statistics/product/modules/rank-card.vue b/apps/web-antd/src/views/mall/statistics/product/modules/rank-card.vue new file mode 100644 index 000000000..af7da2583 --- /dev/null +++ b/apps/web-antd/src/views/mall/statistics/product/modules/rank-card.vue @@ -0,0 +1,135 @@ + + + diff --git a/apps/web-ele/src/components/shortcut-date-range-picker/shortcut-date-range-picker.vue b/apps/web-ele/src/components/shortcut-date-range-picker/shortcut-date-range-picker.vue index 9cf485483..fc5028c2c 100644 --- a/apps/web-ele/src/components/shortcut-date-range-picker/shortcut-date-range-picker.vue +++ b/apps/web-ele/src/components/shortcut-date-range-picker/shortcut-date-range-picker.vue @@ -102,7 +102,7 @@ onMounted(() => { :start-placeholder="rangePickerProps.startPlaceholder" :end-placeholder="rangePickerProps.endPlaceholder" :default-time="rangePickerProps.defaultTime as any" - class="!w-[360px]" + class="!w-[215px]" @change="handleDateRangeChange" /> diff --git a/packages/@core/base/shared/src/utils/index.ts b/packages/@core/base/shared/src/utils/index.ts index 65aadb015..e24456f91 100644 --- a/packages/@core/base/shared/src/utils/index.ts +++ b/packages/@core/base/shared/src/utils/index.ts @@ -23,19 +23,4 @@ export * from './window'; export { default as cloneDeep } from 'lodash.clonedeep'; export { default as get } from 'lodash.get'; export { default as isEqual } from 'lodash.isequal'; -export { default as set } from 'lodash.set'; - -/** - * 构建排序字段 - * @param prop 字段名称 - * @param order 顺序 - */ -export const buildSortingField = ({ - prop, - order, -}: { - order: 'ascending' | 'descending'; - prop: string; -}) => { - return { field: prop, order: order === 'ascending' ? 'asc' : 'desc' }; -}; +export { default as set } from 'lodash.set'; \ No newline at end of file diff --git a/packages/effects/request/src/request-client/request-client.ts b/packages/effects/request/src/request-client/request-client.ts index 0c7bcfba2..c764dda68 100644 --- a/packages/effects/request/src/request-client/request-client.ts +++ b/packages/effects/request/src/request-client/request-client.ts @@ -162,4 +162,21 @@ class RequestClient { } } +/** + * 构建排序字段,处理 vxe 排序条件 + * + * add by 芋艿 + */ +export const buildSortingField = (sorts: any[]) => { + if (!sorts || sorts.length === 0) { + return {}; + } + const result: Record = {}; + sorts.forEach((sort: any, index: number) => { + result[`sortingFields[${index}].field`] = sort.field; + result[`sortingFields[${index}].order`] = sort.order; + }); + return result; +}; + export { RequestClient };