diff --git a/package.json b/package.json index 7995d93..f1c8084 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ruoyi-vue-plus", - "version": "5.2.0", + "version": "5.2.1", "description": "RuoYi-Vue-Plus多租户管理系统", "author": "LionLi", "license": "MIT", diff --git a/src/api/workflow/formManage/index.ts b/src/api/workflow/formManage/index.ts index c2930cf..6c5ec60 100644 --- a/src/api/workflow/formManage/index.ts +++ b/src/api/workflow/formManage/index.ts @@ -25,7 +25,7 @@ export const listFormManage = (query?: FormManageQuery): AxiosPromise => { return request({ url: '/workflow/formManage/list/selectList', - method: 'get', + method: 'get' }); }; diff --git a/src/api/workflow/formManage/types.ts b/src/api/workflow/formManage/types.ts index 6554f55..b9dc1d8 100644 --- a/src/api/workflow/formManage/types.ts +++ b/src/api/workflow/formManage/types.ts @@ -26,7 +26,7 @@ export interface FormManageVO { /** * 备注 */ - remork: string; + remark: string; } export interface FormManageForm extends BaseEntity { @@ -53,7 +53,7 @@ export interface FormManageForm extends BaseEntity { /** * 备注 */ - remork?: string; + remark?: string; } export interface FormManageQuery extends PageQuery { diff --git a/src/api/workflow/model/index.ts b/src/api/workflow/model/index.ts index 56f7fed..1ca8b19 100644 --- a/src/api/workflow/model/index.ts +++ b/src/api/workflow/model/index.ts @@ -22,7 +22,7 @@ export const listModel = (query: ModelQuery): AxiosPromise => { */ export const getInfo = (id: string): AxiosPromise => { return request({ - url: '/workflow/model/getInfo/'+id, + url: '/workflow/model/getInfo/' + id, method: 'get' }); }; @@ -101,4 +101,4 @@ export const copyModel = (data: ModelForm): AxiosPromise => { method: 'post', data: data }); -}; \ No newline at end of file +}; diff --git a/src/api/workflow/model/types.ts b/src/api/workflow/model/types.ts index 40a0faa..77f947d 100644 --- a/src/api/workflow/model/types.ts +++ b/src/api/workflow/model/types.ts @@ -1,10 +1,10 @@ export interface ModelForm { - id: string, + id: string; name: string; key: string; categoryCode: string; - xml:string, - svg:string, + xml: string; + svg: string; description: string; } diff --git a/src/api/workflow/nodeConfig/types.ts b/src/api/workflow/nodeConfig/types.ts index 4e3a60b..a55fc91 100644 --- a/src/api/workflow/nodeConfig/types.ts +++ b/src/api/workflow/nodeConfig/types.ts @@ -35,9 +35,4 @@ export interface NodeConfigVO { * 表单管理 */ wfFormManageVo: FormManageVO; - } - - - - diff --git a/src/bpmn/assets/module/ContextPad/CustomContextPadProvider.ts b/src/bpmn/assets/module/ContextPad/CustomContextPadProvider.ts index 9f12ff2..13ccf50 100644 --- a/src/bpmn/assets/module/ContextPad/CustomContextPadProvider.ts +++ b/src/bpmn/assets/module/ContextPad/CustomContextPadProvider.ts @@ -40,7 +40,7 @@ class CustomContextPadProvider extends ContextPadProvider { rules: Rules, translate ) { - // @ts-ignore + // @ts-expect-error 忽略异常 super(config, injector, eventBus, contextPad, modeling, elementFactory, connect, create, popupMenu, canvas, rules, translate); this._contextPad = contextPad; diff --git a/src/components/Editor/index.vue b/src/components/Editor/index.vue index fc30c85..ba70fbb 100644 --- a/src/components/Editor/index.vue +++ b/src/components/Editor/index.vue @@ -110,7 +110,7 @@ watch( () => props.modelValue, (v: string) => { if (v !== content.value) { - content.value = v === undefined ? '

' : v; + content.value = v || '

'; } }, { immediate: true } diff --git a/src/components/ImagePreview/index.vue b/src/components/ImagePreview/index.vue index 349f729..98e6479 100644 --- a/src/components/ImagePreview/index.vue +++ b/src/components/ImagePreview/index.vue @@ -38,7 +38,7 @@ const realSrcList = computed(() => { let real_src_list = props.src.split(','); let srcList: string[] = []; real_src_list.forEach((item: string) => { - if(item.trim() === '') { + if (item.trim() === '') { return; } return srcList.push(item); diff --git a/src/components/Process/multiInstanceUser.vue b/src/components/Process/multiInstanceUser.vue index 292b1b7..d19fb5f 100644 --- a/src/components/Process/multiInstanceUser.vue +++ b/src/components/Process/multiInstanceUser.vue @@ -128,7 +128,7 @@ const props = defineProps({ //回显用户id userIdList: { type: Array, - default: [] + default: () => [] } }); const deptTreeRef = ref(ElTree); diff --git a/src/components/Process/submitVerify.vue b/src/components/Process/submitVerify.vue index bcbc657..09fc82e 100644 --- a/src/components/Process/submitVerify.vue +++ b/src/components/Process/submitVerify.vue @@ -106,7 +106,7 @@ const multiInstanceUserRef = ref>(); const props = defineProps({ taskVariables: { type: Object as () => Record, - default: {} + default: () => {} } }); //遮罩层 diff --git a/src/components/UserSelect/index.vue b/src/components/UserSelect/index.vue index f6e552e..e9865e5 100644 --- a/src/components/UserSelect/index.vue +++ b/src/components/UserSelect/index.vue @@ -29,16 +29,11 @@ - + 搜索 - 重置 + 重置 @@ -223,13 +218,13 @@ const handleQuery = () => { getList(); }; /** 重置按钮操作 */ -const resetQuery = () => { +const resetQuery = (refresh = true) => { dateRange.value = ['', '']; queryFormRef.value?.resetFields(); queryParams.value.pageNum = 1; queryParams.value.deptId = undefined; deptTreeRef.value?.setCurrentKey(undefined); - handleQuery(); + refresh && handleQuery(); }; const handleCheckboxChange = (checked) => { @@ -288,23 +283,20 @@ const close = () => { watch( () => userDialog.visible.value, - (newValue: boolean) => { + async (newValue: boolean) => { if (newValue) { - initSelectUser(); + await getTreeSelect(); // 初始化部门数据 + await getList(); // 初始化列表数据 + await initSelectUser(); } else { tableRef.value.clearCheckboxReserve(); tableRef.value.clearCheckboxRow(); - resetQuery(); + resetQuery(false); selectUserList.value = []; } } ); -onMounted(() => { - getTreeSelect(); // 初始化部门数据 - getList(); // 初始化列表数据 -}); - defineExpose({ open: userDialog.openDialog, close: userDialog.closeDialog diff --git a/src/hooks/useDialog.ts b/src/hooks/useDialog.ts index 68440bf..547f199 100644 --- a/src/hooks/useDialog.ts +++ b/src/hooks/useDialog.ts @@ -28,4 +28,4 @@ export default (ops?: Options): Return => { openDialog, closeDialog }; -}; \ No newline at end of file +}; diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue index d634935..7f86ef4 100644 --- a/src/layout/components/AppMain.vue +++ b/src/layout/components/AppMain.vue @@ -1,13 +1,13 @@