Skip to content

Commit a5a8773

Browse files
YunaiVgitee-org
authored andcommitted
!121 refactor: 重构MP模块
Merge pull request !121 from dhb52/dev
2 parents e9eb585 + 5f1aa86 commit a5a8773

File tree

26 files changed

+555
-838
lines changed

26 files changed

+555
-838
lines changed

.vscode/settings.json

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,15 @@
4040
"i18n-ally.displayLanguage": "zh-CN",
4141
"i18n-ally.enabledFrameworks": ["vue", "react"],
4242
"god.tsconfig": "./tsconfig.json",
43-
"vue-i18n.i18nPaths": "src/locales"
43+
"vue-i18n.i18nPaths": "src/locales",
44+
"explorer.fileNesting.enabled": true,
45+
"explorer.fileNesting.expand": false,
46+
"explorer.fileNesting.patterns": {
47+
"*.ts": "$(capture).test.ts, $(capture).test.tsx",
48+
"*.tsx": "$(capture).test.ts, $(capture).test.tsx",
49+
"*.env": "$(capture).env.*",
50+
"CHANGELOG.md": "CHANGELOG*",
51+
"package.json": "pnpm-lock.yaml,pnpm-workspace.yaml,LICENSE,.gitattributes,.gitignore,.gitpod.yml,CNAME,README*,.npmrc,.browserslistrc,vite.config.*,windi.*,tailwind.*,tsconfig.*,postcss*",
52+
".eslintrc.js": ".eslintignore,.eslintrc-*,.prettierignore,.stylelintignore,.commitlintrc.js,.prettierrc.js,.stylelint*,stylelint*,prettier.*,.editorconfig"
53+
}
4454
}

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
"@form-create/element-ui": "^3.1.17",
3333
"@iconify/iconify": "^3.1.0",
3434
"@videojs-player/vue": "^1.0.0",
35-
"@vueup/vue-quill": "^1.1.1",
3635
"@vueuse/core": "^9.13.0",
3736
"@wangeditor/editor": "^5.1.23",
3837
"@wangeditor/editor-for-vue": "^5.1.10",

src/components/Editor/src/Editor.vue

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ const props = defineProps({
2020
editorId: propTypes.string.def('wangeEditor-1'),
2121
height: propTypes.oneOfType([Number, String]).def('500px'),
2222
editorConfig: {
23-
type: Object as PropType<IEditorConfig>,
23+
type: Object as PropType<Partial<IEditorConfig>>,
2424
default: () => undefined
2525
},
2626
readonly: propTypes.bool.def(false),
@@ -147,6 +147,7 @@ const editorConfig = computed((): IEditorConfig => {
147147
props.editorConfig || {}
148148
)
149149
})
150+
150151
const editorStyle = computed(() => {
151152
return {
152153
height: isNumber(props.height) ? `${props.height}px` : props.height

src/components/bpmnProcessDesigner/package/penal/form/ElementForm.vue

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,8 @@
111111
>
112112
<el-divider direction="vertical" />
113113
<el-button
114-
type="text"
114+
type="primary"
115+
link
115116
style="color: #ff4d4f"
116117
@click="removeFieldOptionItem(scope, scope.$index, 'enum')"
117118
>移除</el-button
@@ -143,7 +144,8 @@
143144
>
144145
<el-divider direction="vertical" />
145146
<el-button
146-
type="text"
147+
type="primary"
148+
link
147149
style="color: #ff4d4f"
148150
@click="removeFieldOptionItem(scope, scope.$index, 'constraint')"
149151
>移除</el-button
@@ -174,7 +176,8 @@
174176
>
175177
<el-divider direction="vertical" />
176178
<el-button
177-
type="text"
179+
type="primary"
180+
link
178181
style="color: #ff4d4f"
179182
@click="removeFieldOptionItem(scope, scope.$index, 'property')"
180183
>移除</el-button

src/types/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
auto-*.d.ts

src/types/auto-components.d.ts

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

src/types/auto-imports.d.ts

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

src/views/Login/components/LoginForm.vue

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818
<el-col :span="24" style="padding-left: 10px; padding-right: 10px">
1919
<el-form-item prop="tenantName" v-if="loginData.tenantEnable === 'true'">
2020
<el-input
21-
type="text"
21+
type="primary"
22+
link
2223
v-model="loginData.loginForm.tenantName"
2324
:placeholder="t('login.tenantNamePlaceholder')"
2425
:prefix-icon="iconHouse"

src/views/Login/components/MobileForm.vue

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919
<el-col :span="24" style="padding-left: 10px; padding-right: 10px">
2020
<el-form-item prop="tenantName" v-if="loginData.tenantEnable === 'true'">
2121
<el-input
22-
type="text"
22+
type="primary"
23+
link
2324
v-model="loginData.loginForm.tenantName"
2425
:placeholder="t('login.tenantNamePlaceholder')"
2526
:prefix-icon="iconHouse"

src/views/bpm/definition/index.vue

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818
<template #default="scope">
1919
<el-button
2020
v-if="scope.row.formType === 10"
21-
type="text"
21+
type="primary"
22+
link
2223
@click="handleFormDetail(scope.row)"
2324
>
2425
<span>{{ scope.row.formName }}</span>

0 commit comments

Comments
 (0)