diff --git a/jeecgboot-vue3/src/components/Form/index.ts b/jeecgboot-vue3/src/components/Form/index.ts index b18d36d05..f9f47b4d4 100644 --- a/jeecgboot-vue3/src/components/Form/index.ts +++ b/jeecgboot-vue3/src/components/Form/index.ts @@ -27,6 +27,7 @@ export { default as JDictSelectTag } from './src/jeecg/components/JDictSelectTag export { default as JTreeSelect } from './src/jeecg/components/JTreeSelect.vue'; export { default as JSearchSelect } from './src/jeecg/components/JSearchSelect.vue'; export { default as JSelectUserByDept } from './src/jeecg/components/JSelectUserByDept.vue'; +export { default as JSelectUserByDepartment } from './src/jeecg/components/JSelectUserByDepartment.vue'; export { default as JEditor } from './src/jeecg/components/JEditor.vue'; export { default as JImageUpload } from './src/jeecg/components/JImageUpload.vue'; // Jeecg自定义校验 diff --git a/jeecgboot-vue3/src/components/Form/src/componentMap.ts b/jeecgboot-vue3/src/components/Form/src/componentMap.ts index 2e17b624c..dc098c48a 100644 --- a/jeecgboot-vue3/src/components/Form/src/componentMap.ts +++ b/jeecgboot-vue3/src/components/Form/src/componentMap.ts @@ -64,6 +64,7 @@ import JInput from './jeecg/components/JInput.vue'; import JTreeSelect from './jeecg/components/JTreeSelect.vue'; import JEllipsis from './jeecg/components/JEllipsis.vue'; import JSelectUserByDept from './jeecg/components/JSelectUserByDept.vue'; +import JSelectUserByDepartment from './jeecg/components/JSelectUserByDepartment.vue'; import JUpload from './jeecg/components/JUpload/JUpload.vue'; import JSearchSelect from './jeecg/components/JSearchSelect.vue'; import JAddInput from './jeecg/components/JAddInput.vue'; @@ -159,6 +160,7 @@ componentMap.set('JInput', JInput); componentMap.set('JTreeSelect', JTreeSelect); componentMap.set('JEllipsis', JEllipsis); componentMap.set('JSelectUserByDept', JSelectUserByDept); +componentMap.set('JSelectUserByDepartment', JSelectUserByDepartment); componentMap.set('JUpload', JUpload); componentMap.set('JSearchSelect', JSearchSelect); componentMap.set('JAddInput', JAddInput); diff --git a/jeecgboot-vue3/src/components/Form/src/jeecg/components/JSelectUserByDepartment.vue b/jeecgboot-vue3/src/components/Form/src/jeecg/components/JSelectUserByDepartment.vue new file mode 100644 index 000000000..1fdd5d3a7 --- /dev/null +++ b/jeecgboot-vue3/src/components/Form/src/jeecg/components/JSelectUserByDepartment.vue @@ -0,0 +1,176 @@ + + + + diff --git a/jeecgboot-vue3/src/components/Form/src/jeecg/components/modal/JSelectUserByDepartmentModal.vue b/jeecgboot-vue3/src/components/Form/src/jeecg/components/modal/JSelectUserByDepartmentModal.vue new file mode 100644 index 000000000..1e533f5a6 --- /dev/null +++ b/jeecgboot-vue3/src/components/Form/src/jeecg/components/modal/JSelectUserByDepartmentModal.vue @@ -0,0 +1,833 @@ + + + + + diff --git a/jeecgboot-vue3/src/components/Form/src/types/index.ts b/jeecgboot-vue3/src/components/Form/src/types/index.ts index 560c949c4..286cbd886 100644 --- a/jeecgboot-vue3/src/components/Form/src/types/index.ts +++ b/jeecgboot-vue3/src/components/Form/src/types/index.ts @@ -139,6 +139,7 @@ export type ComponentType = | 'JTreeSelect' | 'JEllipsis' | 'JSelectUserByDept' + | 'JSelectUserByDepartment' | 'JUpload' | 'JSearchSelect' | 'JAddInput' diff --git a/jeecgboot-vue3/src/views/demo/jeecg/jeecgComponents.data.ts b/jeecgboot-vue3/src/views/demo/jeecg/jeecgComponents.data.ts index 9f5a133a5..a8dc6a030 100644 --- a/jeecgboot-vue3/src/views/demo/jeecg/jeecgComponents.data.ts +++ b/jeecgboot-vue3/src/views/demo/jeecg/jeecgComponents.data.ts @@ -258,6 +258,20 @@ export const schemas: FormSchema[] = [ label: '选中用户', colProps: { span: 12 }, }, + { + field: 'user4', + component: 'JSelectUserByDepartment', + label: '部门选择用户', + helpMessage: ['component模式'], + defaultValue: '', + componentProps: { + labelKey: 'realname', + rowKey: 'username', + }, + colProps: { + span: 12, + }, + }, { field: 'role2', component: 'JSelectRole', diff --git a/jeecgboot-vue3/src/views/system/notice/notice.data.ts b/jeecgboot-vue3/src/views/system/notice/notice.data.ts index 64ce2756d..7b4a498db 100644 --- a/jeecgboot-vue3/src/views/system/notice/notice.data.ts +++ b/jeecgboot-vue3/src/views/system/notice/notice.data.ts @@ -144,7 +144,7 @@ export const formSchema: FormSchema[] = [ { field: 'userIds', label: '指定用户', - component: 'JSelectUser', + component: 'JSelectUserByDepartment', required: true, componentProps: { rowKey: 'id',