diff --git a/package.json b/package.json index 7995d9316418a0fffae0610d5ae97d3f14790e85..f1c8084557d0138cf978a077901197a8118f1208 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 c2930cfec1d41e5d00a47f064651a2d66844a323..6c5ec60a7365ed3383860df65451192f2245931a 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 6554f5529798483f7ad0860672951fe25ab92ac4..b9dc1d874cfdf108f31a8e4c1e9d55ff5d5caf4b 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 56f7fedbc5a324274915b50546b1bc99c505fc57..1ca8b19c9156ad5097b2773b012b4bc5560f1866 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 40a0faa1fe461f8675815eba9eae723c0cfa0f51..77f947d4b476240d180c538ce9e04f746ae72e93 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 4e3a60b33d3bc5da962a1c28e1a5fafdb5b7886c..a55fc914097b1959aa31147558b6952476cb26f3 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 9f12ff24d1cf4c2a155faada59795abf4a4cc8a3..13ccf50df6c29275ff8c677850b7c26d8e096672 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 fc30c85ed2062b314cabbb0b07e54fc1beaccc25..ba70fbba0c072d5b5b534bd92796fb653898170b 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 349f72909cce60f5ccdf45ffb7a40325f98d1930..98e6479106d46e683f4294467e0348298fe5b79b 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 292b1b7d6eb6c80942203b6bfdc020bffc765065..d19fb5fd8199f2762d8d1f1bf0f23d1b02eb0a88 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 bcbc657dfca3c660f2bde666fdea8a8c8c0ae0e1..09fc82e4a2a10860d1e8873a85284b2edadc7b6b 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 f6e552e41d3ed389d8dcdfa4582d50ba402e9cf7..e9865e577bf8de7e3b2da842e135f26039ced139 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 68440bf2eca51b6d82e67ee4428f7981ea86eb10..547f199766d142e66f41b07eda589cf535e39582 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 d634935a145b57db5515b958109b0cb5f01509cf..7f86ef4c75f281f46a56c151c92f2ee2319bc0a2 100644 --- a/src/layout/components/AppMain.vue +++ b/src/layout/components/AppMain.vue @@ -1,13 +1,13 @@