Skip to content

Commit 79413e0

Browse files
author
puhui999
committed
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
2 parents 4947716 + 7c87f94 commit 79413e0

File tree

45 files changed

+1255
-383
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+1255
-383
lines changed

‎.env.dev

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@ VITE_DROP_CONSOLE=false
2828
VITE_SOURCEMAP=false
2929

3030
# 输出路径
31-
VITE_OUT_DIR=dist-dev
31+
VITE_OUT_DIR=dist

‎.env.test

Lines changed: 0 additions & 31 deletions
This file was deleted.

‎.eslintrc.js

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
module.exports = {
1+
// @ts-check
2+
const { defineConfig } = require('eslint-define-config')
3+
module.exports = defineConfig({
24
root: true,
35
env: {
46
browser: true,
@@ -16,9 +18,16 @@ module.exports = {
1618
jsx: true
1719
}
1820
},
19-
extends: ['plugin:vue/vue3-recommended', 'prettier', 'plugin:@typescript-eslint/recommended', 'plugin:prettier/recommended'],
21+
extends: [
22+
'plugin:vue/vue3-recommended',
23+
'plugin:@typescript-eslint/recommended',
24+
'prettier',
25+
'plugin:prettier/recommended'
26+
],
2027
rules: {
2128
'vue/script-setup-uses-vars': 'error',
29+
'vue/no-reserved-component-names': 'off',
30+
'vue/no-setup-props-destructure': 'off',
2231
'@typescript-eslint/ban-ts-ignore': 'off',
2332
'@typescript-eslint/explicit-function-return-type': 'off',
2433
'@typescript-eslint/no-explicit-any': 'off',
@@ -31,20 +40,8 @@ module.exports = {
3140
'@typescript-eslint/ban-types': 'off',
3241
'@typescript-eslint/no-non-null-assertion': 'off',
3342
'@typescript-eslint/explicit-module-boundary-types': 'off',
34-
'@typescript-eslint/no-unused-vars': [
35-
'error',
36-
{
37-
argsIgnorePattern: '^_',
38-
varsIgnorePattern: '^_'
39-
}
40-
],
41-
'no-unused-vars': [
42-
'error',
43-
{
44-
argsIgnorePattern: '^_',
45-
varsIgnorePattern: '^_'
46-
}
47-
],
43+
'@typescript-eslint/no-unused-vars': 'off',
44+
'no-unused-vars': 'off',
4845
'space-before-function-paren': 'off',
4946

5047
'vue/attributes-order': 'off',
@@ -68,6 +65,7 @@ module.exports = {
6865
math: 'always'
6966
}
7067
],
71-
'vue/multi-word-component-names': 'off'
68+
'vue/multi-word-component-names': 'off',
69+
'vue/no-v-html': 'off'
7270
}
73-
}
71+
})

‎README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,14 @@
3939
| 框架 | 说明 | 版本 |
4040
|----------------------------------------------------------------------|------------------|--------|
4141
| [Vue](https://staging-cn.vuejs.org/) | Vue 框架 | 3.3.4 |
42-
| [Vite](https://cn.vitejs.dev//) | 开发与构建工具 | 4.4.7 |
43-
| [Element Plus](https://element-plus.org/zh-CN/) | Element Plus | 2.3.8 |
42+
| [Vite](https://cn.vitejs.dev//) | 开发与构建工具 | 4.4.8 |
43+
| [Element Plus](https://element-plus.org/zh-CN/) | Element Plus | 2.3.9 |
4444
| [TypeScript](https://www.typescriptlang.org/docs/) | JavaScript 的超集 | 5.1.6 |
4545
| [pinia](https://pinia.vuejs.org/) | Vue 存储库 替代 vuex5 | 2.1.6 |
46-
| [vueuse](https://vueuse.org/) | 常用工具集 | 10.2.1 |
46+
| [vueuse](https://vueuse.org/) | 常用工具集 | 10.3.0 |
4747
| [vue-i18n](https://kazupon.github.io/vue-i18n/zh/introduction.html/) | 国际化 | 9.2.2 |
4848
| [vue-router](https://router.vuejs.org/) | Vue 路由 | 4.2.4 |
49-
| [unocss](https://uno.antfu.me/) | 原子 css | 0.54.0 |
49+
| [unocss](https://uno.antfu.me/) | 原子 css | 0.54.1 |
5050
| [iconify](https://icon-sets.iconify.design/) | 在线图标库 | 3.1.1 |
5151
| [wangeditor](https://www.wangeditor.com/) | 富文本编辑器 | 5.1.23 |
5252

‎package.json

Lines changed: 21 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -11,30 +11,27 @@
1111
"ts:check": "vue-tsc --noEmit",
1212
"build:pro": "node --max_old_space_size=8192 ./node_modules/vite/bin/vite.js build --mode pro",
1313
"build:dev": "node --max_old_space_size=8192 ./node_modules/vite/bin/vite.js build --mode dev",
14+
"build:base": "node --max_old_space_size=8192 ./node_modules/vite/bin/vite.js build --mode base",
1415
"build:stage": "node --max_old_space_size=8192 ./node_modules/vite/bin/vite.js build --mode stage",
15-
"build:test": "node --max_old_space_size=8192 ./node_modules/vite/bin/vite.js build --mode test",
1616
"build:static": "node --max_old_space_size=8192 ./node_modules/vite/bin/vite.js build --mode static",
1717
"build:front": "node --max_old_space_size=8192 ./node_modules/vite/bin/vite.js build --mode front",
1818
"serve:pro": "vite preview --mode pro",
1919
"serve:dev": "vite preview --mode dev",
20-
"serve:test": "vite preview --mode test",
21-
"preview": "pnpm build && vite preview",
22-
"npm:check": "npx npm-check-updates",
20+
"preview": "pnpm build:base && vite preview",
2321
"clean": "npx rimraf node_modules",
2422
"clean:cache": "npx rimraf node_modules/.cache",
2523
"lint:eslint": "eslint --fix --ext .js,.ts,.vue ./src",
2624
"lint:format": "prettier --write --loglevel warn \"src/**/*.{js,ts,json,tsx,css,less,scss,vue,html,md}\"",
2725
"lint:style": "stylelint --fix \"**/*.{vue,less,postcss,css,scss}\" --cache --cache-location node_modules/.cache/stylelint/",
28-
"lint:lint-staged": "lint-staged -c ",
29-
"lint:pretty": "pretty-quick --staged"
26+
"lint:lint-staged": "lint-staged -c "
3027
},
3128
"dependencies": {
3229
"@element-plus/icons-vue": "^2.1.0",
3330
"@form-create/designer": "^3.1.0",
3431
"@form-create/element-ui": "^3.1.17",
3532
"@iconify/iconify": "^3.1.1",
3633
"@videojs-player/vue": "^1.0.0",
37-
"@vueuse/core": "^10.2.1",
34+
"@vueuse/core": "^10.3.0",
3835
"@wangeditor/editor": "^5.1.23",
3936
"@wangeditor/editor-for-vue": "^5.1.10",
4037
"@zxcvbn-ts/core": "^3.0.3",
@@ -49,8 +46,8 @@
4946
"diagram-js": "^11.6.0",
5047
"echarts": "^5.4.3",
5148
"echarts-wordcloud": "^2.1.0",
52-
"element-plus": "2.3.8",
53-
"fast-xml-parser": "^4.2.6",
49+
"element-plus": "2.3.9",
50+
"fast-xml-parser": "^4.2.7",
5451
"highlight.js": "^11.8.0",
5552
"intro.js": "^7.0.1",
5653
"jsencrypt": "^3.3.2",
@@ -76,7 +73,7 @@
7673
"devDependencies": {
7774
"@commitlint/cli": "^17.6.7",
7875
"@commitlint/config-conventional": "^17.6.7",
79-
"@iconify/json": "^2.2.95",
76+
"@iconify/json": "^2.2.98",
8077
"@intlify/unplugin-vue-i18n": "^0.12.2",
8178
"@purge-icons/generated": "^0.9.0",
8279
"@types/intro.js": "^5.1.1",
@@ -85,42 +82,42 @@
8582
"@types/nprogress": "^0.2.0",
8683
"@types/qrcode": "^1.5.1",
8784
"@types/qs": "^6.9.7",
88-
"@typescript-eslint/eslint-plugin": "^6.2.0",
89-
"@typescript-eslint/parser": "^6.2.0",
90-
"@unocss/transformer-variant-group": "^0.51.4",
85+
"@typescript-eslint/eslint-plugin": "^6.2.1",
86+
"@typescript-eslint/parser": "^6.2.1",
87+
"@unocss/transformer-variant-group": "^0.54.1",
9188
"@vitejs/plugin-legacy": "^4.1.1",
9289
"@vitejs/plugin-vue": "^4.2.3",
9390
"@vitejs/plugin-vue-jsx": "^3.0.1",
94-
"@vue-macros/volar": "^0.12.3",
91+
"@vue-macros/volar": "^0.13.2",
9592
"autoprefixer": "^10.4.14",
9693
"bpmn-js": "^8.9.0",
9794
"bpmn-js-properties-panel": "^0.46.0",
9895
"consola": "^3.2.3",
9996
"eslint": "^8.46.0",
100-
"eslint-config-prettier": "^8.9.0",
101-
"eslint-define-config": "^1.21.0",
97+
"eslint-config-prettier": "^8.10.0",
98+
"eslint-define-config": "^1.22.0",
10299
"eslint-plugin-prettier": "^5.0.0",
103-
"eslint-plugin-vue": "^9.15.1",
100+
"eslint-plugin-vue": "^9.16.1",
104101
"lint-staged": "^13.2.3",
105102
"postcss": "^8.4.27",
106103
"postcss-html": "^1.5.0",
107104
"postcss-scss": "^4.0.6",
108-
"prettier": "^3.0.0",
105+
"prettier": "^3.0.1",
109106
"rimraf": "^5.0.1",
110-
"rollup": "^3.27.0",
111-
"sass": "^1.64.1",
107+
"rollup": "^3.27.2",
108+
"sass": "^1.64.2",
112109
"stylelint": "^15.10.2",
110+
"stylelint-config-html": "^1.1.0",
113111
"stylelint-config-recommended": "^13.0.0",
114-
"stylelint-config-recommended-vue": "^1.5.0",
115112
"stylelint-config-standard": "^34.0.0",
116113
"stylelint-order": "^6.0.3",
117114
"terser": "^5.19.2",
118115
"typescript": "5.1.6",
119-
"unocss": "^0.54.0",
116+
"unocss": "^0.54.1",
120117
"unplugin-auto-import": "^0.16.6",
121-
"unplugin-element-plus": "^0.7.2",
118+
"unplugin-element-plus": "^0.8.0",
122119
"unplugin-vue-components": "^0.25.1",
123-
"vite": "4.4.7",
120+
"vite": "4.4.8",
124121
"vite-plugin-compression": "^0.5.1",
125122
"vite-plugin-ejs": "^1.6.4",
126123
"vite-plugin-eslint": "^1.8.1",

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ export interface ChannelVO {
77
status: number
88
remark: string
99
feeRate: number
10-
merchantId: number
1110
appId: number
1211
createTime: Date
1312
}
@@ -18,13 +17,12 @@ export const getChannelPage = (params: PageParam) => {
1817
}
1918

2019
// 查询详情支付渠道
21-
export const getChannel = (merchantId: number, appId: string, code: string) => {
20+
export const getChannel = (appId: string, code: string) => {
2221
const params = {
23-
merchantId: merchantId,
2422
appId: appId,
2523
code: code
2624
}
27-
return request.get({ url: '/pay/channel/get-channel', params: params })
25+
return request.get({ url: '/pay/channel/get', params: params })
2826
}
2927

3028
// 新增支付渠道

‎src/components/Dialog/src/Dialog.vue

Lines changed: 39 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
<script lang="ts" setup>
22
import { propTypes } from '@/utils/propTypes'
33
import { isNumber } from '@/utils/is'
4-
5-
// eslint-disable-next-line vue/no-reserved-component-names
64
defineOptions({ name: 'Dialog' })
75
86
const slots = useSlots()
@@ -13,7 +11,7 @@ const props = defineProps({
1311
fullscreen: propTypes.bool.def(true),
1412
width: propTypes.oneOfType([String, Number]).def('40%'),
1513
scroll: propTypes.bool.def(false), // 是否开启滚动条。如果是的话，按照 maxHeight 设置最大高度
16-
maxHeight: propTypes.oneOfType([String, Number]).def('300px')
14+
maxHeight: propTypes.oneOfType([String, Number]).def('400px')
1715
})
1816
1917
const getBindValue = computed(() => {
@@ -39,7 +37,6 @@ const dialogHeight = ref(isNumber(props.maxHeight) ? `${props.maxHeight}px` : pr
3937
watch(
4038
() => isFullscreen.value,
4139
async (val: boolean) => {
42-
// 计算最大高度
4340
await nextTick()
4441
if (val) {
4542
const windowHeight = document.documentElement.offsetHeight
@@ -62,61 +59,80 @@ const dialogStyle = computed(() => {
6259

6360
<template>
6461
<ElDialog
62+
v-bind="getBindValue"
6563
:close-on-click-modal="true"
6664
:fullscreen="isFullscreen"
6765
:width="width"
6866
destroy-on-close
69-
draggable
7067
lock-scroll
71-
v-bind="getBindValue"
68+
draggable
69+
top="0"
70+
:show-close="false"
7271
>
73-
<template #header>
74-
<div class="flex justify-between">
72+
<template #header="{ close }">
73+
<div class="flex justify-between items-center h-54px pl-15px pr-15px relative">
7574
<slot name="title">
7675
{{ title }}
7776
</slot>
78-
<Icon
79-
v-if="fullscreen"
80-
:icon="isFullscreen ? 'zmdi:fullscreen-exit' : 'zmdi:fullscreen'"
81-
class="mr-22px cursor-pointer is-hover mt-2px z-10"
82-
color="var(--el-color-info)"
83-
@click="toggleFull"
84-
/>
77+
<div
78+
class="h-54px flex justify-between items-center absolute top-[50%] right-15px translate-y-[-50%]"
79+
>
80+
<Icon
81+
v-if="fullscreen"
82+
class="cursor-pointer is-hover mr-10px"
83+
:icon="isFullscreen ? 'radix-icons:exit-full-screen' : 'radix-icons:enter-full-screen'"
84+
color="var(--el-color-info)"
85+
hover-color="var(--el-color-primary)"
86+
@click="toggleFull"
87+
/>
88+
<Icon
89+
class="cursor-pointer is-hover"
90+
icon="ep:close"
91+
hover-color="var(--el-color-primary)"
92+
color="var(--el-color-info)"
93+
@click="close"
94+
/>
95+
</div>
8596
</div>
8697
</template>
8798

88-
<!-- 情况一：如果 scroll 为 true，说明开启滚动条 -->
8999
<ElScrollbar v-if="scroll" :style="dialogStyle">
90100
<slot></slot>
91101
</ElScrollbar>
92-
<!-- 情况二：如果 scroll 为 false，说明关闭滚动条滚动条 -->
93102
<slot v-else></slot>
94-
95103
<template v-if="slots.footer" #footer>
96104
<slot name="footer"></slot>
97105
</template>
98106
</ElDialog>
99107
</template>
100108

101109
<style lang="scss">
110+
.#{$elNamespace}-overlay-dialog {
111+
display: flex;
112+
justify-content: center;
113+
align-items: center;
114+
}
115+
102116
.#{$elNamespace}-dialog {
117+
margin: 0 !important;
118+
103119
&__header {
120+
height: 54px;
121+
padding: 0;
104122
margin-right: 0 !important;
105123
border-bottom: 1px solid var(--el-border-color);
106124
}
107125
108126
&__body {
109-
padding: 0 !important;
127+
padding: 15px !important;
110128
}
111129
112130
&__footer {
113131
border-top: 1px solid var(--el-border-color);
114132
}
115-
}
116133
117-
.is-hover {
118-
&:hover {
119-
color: var(--el-color-primary) !important;
134+
&__headerbtn {
135+
top: 0;
120136
}
121137
}
122138
</style>

‎src/components/Table/src/Table.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -300,12 +300,12 @@ export default defineComponent({
300300
</script>
301301
<style lang="scss" scoped>
302302
:deep(.el-button.is-text) {
303-
margin-left: 0;
304303
padding: 8px 4px;
304+
margin-left: 0;
305305
}
306306
307307
:deep(.el-button.is-link) {
308-
margin-left: 0;
309308
padding: 8px 4px;
309+
margin-left: 0;
310310
}
311311
</style>

0 commit comments

Comments
 (0)