Skip to content

Commit ba24afc

Browse files
JavaLionLigitee-org
authored andcommitted
!131 ♥️发布 vue 版本 5.2.1 与 cloud 版本 2.2.0
Merge pull request !131 from 疯狂的狮子Li/dev
2 parents abb4f54 + 93d3371 commit ba24afc

File tree

32 files changed

+145
-73
lines changed

32 files changed

+145
-73
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ruoyi-vue-plus",
3-
"version": "5.2.0",
3+
"version": "5.2.1",
44
"description": "RuoYi-Vue-Plus多租户管理系统",
55
"author": "LionLi",
66
"license": "MIT",

src/api/workflow/formManage/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ export const listFormManage = (query?: FormManageQuery): AxiosPromise<FormManage
2525
export const selectListFormManage = (): AxiosPromise<FormManageVO[]> => {
2626
return request({
2727
url: '/workflow/formManage/list/selectList',
28-
method: 'get',
28+
method: 'get'
2929
});
3030
};
3131

src/api/workflow/formManage/types.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ export interface FormManageVO {
2626
/**
2727
* 备注
2828
*/
29-
remork: string;
29+
remark: string;
3030
}
3131

3232
export interface FormManageForm extends BaseEntity {
@@ -53,7 +53,7 @@ export interface FormManageForm extends BaseEntity {
5353
/**
5454
* 备注
5555
*/
56-
remork?: string;
56+
remark?: string;
5757
}
5858

5959
export interface FormManageQuery extends PageQuery {

src/api/workflow/model/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ export const listModel = (query: ModelQuery): AxiosPromise<ModelVO[]> => {
2222
*/
2323
export const getInfo = (id: string): AxiosPromise<ModelForm> => {
2424
return request({
25-
url: '/workflow/model/getInfo/'+id,
25+
url: '/workflow/model/getInfo/' + id,
2626
method: 'get'
2727
});
2828
};
@@ -101,4 +101,4 @@ export const copyModel = (data: ModelForm): AxiosPromise<void> => {
101101
method: 'post',
102102
data: data
103103
});
104-
};
104+
};

src/api/workflow/model/types.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
export interface ModelForm {
2-
id: string,
2+
id: string;
33
name: string;
44
key: string;
55
categoryCode: string;
6-
xml:string,
7-
svg:string,
6+
xml: string;
7+
svg: string;
88
description: string;
99
}
1010

src/api/workflow/nodeConfig/types.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,4 @@ export interface NodeConfigVO {
3535
* 表单管理
3636
*/
3737
wfFormManageVo: FormManageVO;
38-
3938
}
40-
41-
42-
43-

src/bpmn/assets/module/ContextPad/CustomContextPadProvider.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class CustomContextPadProvider extends ContextPadProvider {
4040
rules: Rules,
4141
translate
4242
) {
43-
// @ts-ignore
43+
// @ts-expect-error 忽略异常
4444
super(config, injector, eventBus, contextPad, modeling, elementFactory, connect, create, popupMenu, canvas, rules, translate);
4545

4646
this._contextPad = contextPad;

src/components/Editor/index.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ watch(
110110
() => props.modelValue,
111111
(v: string) => {
112112
if (v !== content.value) {
113-
content.value = v === undefined ? '<p></p>' : v;
113+
content.value = v || '<p></p>';
114114
}
115115
},
116116
{ immediate: true }

src/components/ImagePreview/index.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ const realSrcList = computed(() => {
3838
let real_src_list = props.src.split(',');
3939
let srcList: string[] = [];
4040
real_src_list.forEach((item: string) => {
41-
if(item.trim() === '') {
41+
if (item.trim() === '') {
4242
return;
4343
}
4444
return srcList.push(item);

src/components/Process/multiInstanceUser.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ const props = defineProps({
128128
//回显用户id
129129
userIdList: {
130130
type: Array,
131-
default: []
131+
default: () => []
132132
}
133133
});
134134
const deptTreeRef = ref(ElTree);

0 commit comments

Comments
 (0)