hhyykk/ipms-sjy-ui
1
1
Fork 0
mirror of https://gitee.com/hhyykk/ipms-sjy-ui.git synced 2025-07-16 11:55:07 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'yudao/dev' into dev

Browse Source 
# Conflicts:
#	src/views/Login/components/LoginForm.vue
#	src/views/Login/components/MobileForm.vue
#	src/views/mp/components/wx-editor/WxEditor.vue
This commit is contained in:
puhui999
2023-04-15 13:38:31 +08:00
parent b26bba9939 de5b1216cd
commit ec58321dd8
37 changed files with 577 additions and 900 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/components/Editor/src/Editor.vue
View File

@ -20,7 +20,7 @@ const props = defineProps({
editorId: propTypes.string.def('wangeEditor-1'),
height: propTypes.oneOfType([Number, String]).def('500px'),
editorConfig: {
type: Object as PropType<IEditorConfig>,
type: Object as PropType<Partial<IEditorConfig>>,
default: () => undefined
},
readonly: propTypes.bool.def(false),
@ -147,6 +147,7 @@ const editorConfig = computed((): IEditorConfig => {
props.editorConfig || {}
)
})
const editorStyle = computed(() => {
return {
height: isNumber(props.height) ? `${props.height}px` : props.height

9
src/components/bpmnProcessDesigner/package/penal/form/ElementForm.vue
View File

@ -111,7 +111,8 @@
>
<el-divider direction="vertical" />
<el-button
type="text"
type="primary"
link
style="color: #ff4d4f"
@click="removeFieldOptionItem(scope, scope.$index, 'enum')"
>移除</el-button
@ -143,7 +144,8 @@
>
<el-divider direction="vertical" />
<el-button
type="text"
type="primary"
link
style="color: #ff4d4f"
@click="removeFieldOptionItem(scope, scope.$index, 'constraint')"
>移除</el-button
@ -174,7 +176,8 @@
>
<el-divider direction="vertical" />
<el-button
type="text"
type="primary"
link
style="color: #ff4d4f"
@click="removeFieldOptionItem(scope, scope.$index, 'property')"
>移除</el-button