Skip to content

Commit c7bd9f7

Browse files
YunaiVYunaiV
committed
Merge branch 'dev' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into feature/bpm
# Conflicts: # pnpm-lock.yaml # src/router/modules/remaining.ts
2 parents 3a9197d + 1d01955 commit c7bd9f7

File tree

19 files changed

+1228
-81
lines changed

19 files changed

+1228
-81
lines changed

‎package.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "yudao-ui-admin-vue3",
3-
"version": "2.2.0-snapshot",
3+
"version": "2.3.0-snapshot",
44
"description": "基于vue3、vite4、element-plus、typesScript",
55
"author": "xingyu",
66
"private": false,
@@ -9,11 +9,11 @@
99
"dev": "vite --mode env.local",
1010
"dev-server": "vite --mode dev",
1111
"ts:check": "vue-tsc --noEmit",
12-
"build:local": "node --max_old_space_size=8192 ./node_modules/vite/bin/vite.js build",
13-
"build:dev": "node --max_old_space_size=8192 ./node_modules/vite/bin/vite.js build --mode dev",
14-
"build:test": "node --max_old_space_size=8192 ./node_modules/vite/bin/vite.js build --mode test",
15-
"build:stage": "node --max_old_space_size=8192 ./node_modules/vite/bin/vite.js build --mode stage",
16-
"build:prod": "node --max_old_space_size=8192 ./node_modules/vite/bin/vite.js build --mode prod",
12+
"build:local": "node ./node_modules/vite/bin/vite.js build",
13+
"build:dev": "node ./node_modules/vite/bin/vite.js build --mode dev",
14+
"build:test": "node ./node_modules/vite/bin/vite.js build --mode test",
15+
"build:stage": "node ./node_modules/vite/bin/vite.js build --mode stage",
16+
"build:prod": "node ./node_modules/vite/bin/vite.js build --mode prod",
1717
"serve:dev": "vite preview --mode dev",
1818
"serve:prod": "vite preview --mode prod",
1919
"preview": "pnpm build:local && vite preview",
@@ -26,8 +26,8 @@
2626
},
2727
"dependencies": {
2828
"@element-plus/icons-vue": "^2.1.0",
29-
"@form-create/designer": "^3.1.3",
30-
"@form-create/element-ui": "^3.1.24",
29+
"@form-create/designer": "^3.2.6",
30+
"@form-create/element-ui": "^3.2.11",
3131
"@iconify/iconify": "^3.1.1",
3232
"@microsoft/fetch-event-source": "^2.0.1",
3333
"@videojs-player/vue": "^1.0.0",
@@ -47,7 +47,7 @@
4747
"driver.js": "^1.3.1",
4848
"echarts": "^5.5.0",
4949
"echarts-wordcloud": "^2.1.0",
50-
"element-plus": "2.8.0",
50+
"element-plus": "2.8.4",
5151
"fast-xml-parser": "^4.3.2",
5252
"highlight.js": "^11.9.0",
5353
"jsencrypt": "^3.3.2",
@@ -67,7 +67,7 @@
6767
"steady-xml": "^0.1.0",
6868
"url": "^0.11.3",
6969
"video.js": "^7.21.5",
70-
"vue": "3.4.21",
70+
"vue": "3.5.12",
7171
"vue-dompurify-html": "^4.1.4",
7272
"vue-i18n": "9.10.2",
7373
"vue-router": "^4.3.0",

‎src/api/mall/trade/delivery/pickUpStore/index.ts

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,11 @@ export interface DeliveryPickUpStoreVO {
1313
latitude: number
1414
longitude: number
1515
status: number
16+
verifyUserIds: number[] // 绑定用户编号组数
1617
}
1718

1819
// 查询自提门店列表
19-
export const getDeliveryPickUpStorePage = async (params) => {
20+
export const getDeliveryPickUpStorePage = async (params: any) => {
2021
return await request.get({ url: '/trade/delivery/pick-up-store/page', params })
2122
}
2223

@@ -26,8 +27,8 @@ export const getDeliveryPickUpStore = async (id: number) => {
2627
}
2728

2829
// 查询自提门店精简列表
29-
export const getListAllSimple = async (): Promise<DeliveryPickUpStoreVO[]> => {
30-
return await request.get({ url: '/trade/delivery/pick-up-store/list-all-simple' })
30+
export const getSimpleDeliveryPickUpStoreList = async (): Promise<DeliveryPickUpStoreVO[]> => {
31+
return await request.get({ url: '/trade/delivery/pick-up-store/simple-list' })
3132
}
3233

3334
// 新增自提门店
@@ -44,3 +45,8 @@ export const updateDeliveryPickUpStore = async (data: DeliveryPickUpStoreVO) =>
4445
export const deleteDeliveryPickUpStore = async (id: number) => {
4546
return await request.delete({ url: '/trade/delivery/pick-up-store/delete?id=' + id })
4647
}
48+
49+
// 绑定自提店员
50+
export const bindStoreStaffId = async (data: any) => {
51+
return await request.post({ url: '/trade/delivery/pick-up-store/bind', data })
52+
}

‎src/api/pay/app/index.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ export interface AppVO {
88
remark: string
99
payNotifyUrl: string
1010
refundNotifyUrl: string
11+
transferNotifyUrl: string
1112
merchantId: number
1213
merchantName: string
1314
createTime: Date
@@ -19,6 +20,7 @@ export interface AppPageReqVO extends PageParam {
1920
remark?: string
2021
payNotifyUrl?: string
2122
refundNotifyUrl?: string
23+
transferNotifyUrl?: string
2224
merchantName?: string
2325
createTime?: Date[]
2426
}

‎src/components/RouterSearch/index.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
<div v-else class="custom-hover" @click.stop="showTopSearch = !showTopSearch">
2121
<Icon icon="ep:search" />
2222
<el-select
23+
@click.stop
2324
filterable
2425
:reserve-keyword="false"
2526
remote

‎src/plugins/formCreate/index.ts

Lines changed: 60 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,37 @@
11
import type { App } from 'vue'
22
// 👇使用 form-create 需额外全局引入 element plus 组件
33
import {
4+
// ElAutocomplete,
5+
// ElButton,
6+
// ElCascader,
7+
// ElCheckbox,
8+
// ElCheckboxButton,
9+
// ElCheckboxGroup,
10+
// ElCol,
11+
// ElColorPicker,
12+
// ElDatePicker,
13+
// ElDialog,
14+
// ElForm,
15+
// ElInput,
16+
// ElInputNumber,
17+
// ElPopover,
18+
// ElRadio,
19+
// ElRadioButton,
20+
// ElRadioGroup,
21+
// ElRate,
22+
// ElRow,
23+
// ElSelect,
24+
// ElSlider,
25+
// ElSwitch,
26+
// ElTimePicker,
27+
// ElTooltip,
28+
// ElTree,
29+
// ElUpload,
30+
// ElIcon,
31+
// ElProgress,
32+
// 以上会由 @form-create/element-ui/auto-import 自动引入
433
ElAlert,
34+
ElTransfer,
535
ElAside,
636
ElContainer,
737
ElDivider,
@@ -12,7 +42,18 @@ import {
1242
ElTableColumn,
1343
ElTabPane,
1444
ElTabs,
15-
ElTransfer
45+
ElDropdown,
46+
ElDropdownMenu,
47+
ElDropdownItem,
48+
ElBadge,
49+
ElTag,
50+
ElText,
51+
ElMenu,
52+
ElMenuItem,
53+
ElFooter,
54+
ElMessage
55+
// ElFormItem,
56+
// ElOption
1657
} from 'element-plus'
1758
import FcDesigner from '@form-create/designer'
1859
import formCreate from '@form-create/element-ui'
@@ -41,18 +82,30 @@ const ApiSelect = useApiSelect({
4182
})
4283

4384
const components = [
85+
ElAlert,
86+
ElTransfer,
4487
ElAside,
45-
ElPopconfirm,
46-
ElHeader,
47-
ElMain,
4888
ElContainer,
4989
ElDivider,
50-
ElTransfer,
51-
ElAlert,
52-
ElTabs,
90+
ElHeader,
91+
ElMain,
92+
ElPopconfirm,
5393
ElTable,
5494
ElTableColumn,
5595
ElTabPane,
96+
ElTabs,
97+
ElDropdown,
98+
ElDropdownMenu,
99+
ElDropdownItem,
100+
ElBadge,
101+
ElTag,
102+
ElText,
103+
ElMenu,
104+
ElMenuItem,
105+
ElFooter,
106+
ElMessage,
107+
// ElFormItem,
108+
// ElOption,
56109
UploadImg,
57110
UploadImgs,
58111
UploadFile,

‎src/views/bpm/form/editor/index.vue

Lines changed: 48 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
11
<template>
2-
<ContentWrap>
2+
<ContentWrap :body-style="{ padding: '0px' }" class="!mb-0">
33
<!-- 表单设计器 -->
4-
<FcDesigner ref="designer" height="780px">
5-
<template #handle>
6-
<el-button round size="small" type="primary" @click="handleSave">
7-
<Icon class="mr-5px" icon="ep:plus" />
8-
保存
9-
</el-button>
10-
</template>
11-
</FcDesigner>
4+
<div
5+
class="h-[calc(100vh-var(--top-tool-height)-var(--tags-view-height)-var(--app-content-padding)-var(--app-content-padding)-2px)]"
6+
>
7+
<fc-designer class="my-designer" ref="designer" :config="designerConfig">
8+
<template #handle>
9+
<el-button size="small" type="success" plain @click="handleSave">
10+
<Icon class="mr-5px" icon="ep:plus" />
11+
保存
12+
</el-button>
13+
</template>
14+
</fc-designer>
15+
</div>
1216
</ContentWrap>
1317

1418
<!-- 表单保存的弹窗 -->
@@ -55,6 +59,31 @@ const { push, currentRoute } = useRouter() // 路由
5559
const { query } = useRoute() // 路由信息
5660
const { delView } = useTagsViewStore() // 视图操作
5761
62+
// 表单设计器配置
63+
const designerConfig = ref({
64+
switchType: [], // 是否可以切换组件类型,或者可以相互切换的字段
65+
autoActive: true, // 是否自动选中拖入的组件
66+
useTemplate: false, // 是否生成vue2语法的模板组件
67+
formOptions: {}, // 定义表单配置默认值
68+
fieldReadonly: false, // 配置field是否可以编辑
69+
hiddenDragMenu: false, // 隐藏拖拽操作按钮
70+
hiddenDragBtn: false, // 隐藏拖拽按钮
71+
hiddenMenu: [], // 隐藏部分菜单
72+
hiddenItem: [], // 隐藏部分组件
73+
hiddenItemConfig: {}, // 隐藏组件的部分配置项
74+
disabledItemConfig: {}, // 禁用组件的部分配置项
75+
showSaveBtn: false, // 是否显示保存按钮
76+
showConfig: true, // 是否显示右侧的配置界面
77+
showBaseForm: true, // 是否显示组件的基础配置表单
78+
showControl: true, // 是否显示组件联动
79+
showPropsForm: true, // 是否显示组件的属性配置表单
80+
showEventForm: true, // 是否显示组件的事件配置表单
81+
showValidateForm: true, // 是否显示组件的验证配置表单
82+
showFormConfig: true, // 是否显示表单配置
83+
showInputData: true, // 是否显示录入按钮
84+
showDevice: true, // 是否显示多端适配选项
85+
appendConfigData: [] // 定义渲染规则所需的formData
86+
})
5887
const designer = ref() // 表单设计器
5988
useFormCreateDesigner(designer) // 表单设计器增强
6089
const dialogVisible = ref(false) // 弹窗是否展示
@@ -119,3 +148,13 @@ onMounted(async () => {
119148
setConfAndFields(designer, data.conf, data.fields)
120149
})
121150
</script>
151+
152+
<style>
153+
.my-designer {
154+
._fc-l,
155+
._fc-m,
156+
._fc-r {
157+
border-top: none;
158+
}
159+
}
160+
</style>

0 commit comments

Comments
 (0)