jiangyc/ruoyi-plus-soybean
1
0
Fork 0
mirror of https://github.com/m-xlsea/ruoyi-plus-soybean.git synced 2025-09-24 07:49:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

merge: 合并 soy 1.3.6

Browse Source
This commit is contained in:
xlsea
2024-09-27 10:28:46 +08:00
parent 6741ef6664 ce66bca1a1
commit d5479c2f68
37 changed files with 1230 additions and 1286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/custom/dict-select.vue
View File

@ -15,7 +15,7 @@ const props = withDefaults(defineProps<Props>(), {
immediate: false
});
const value = defineModel<string | null>('value', { required: true });
const value = defineModel<string | null>('value', { required: false });
const attrs: SelectProps = useAttrs();
const { options } = useDict(props.dictCode, props.immediate);

2
src/components/custom/menu-tree-select.vue
View File

@ -14,7 +14,7 @@ interface Props {
defineProps<Props>();
const value = defineModel<CommonType.IdType | null>('value', { required: true });
const value = defineModel<CommonType.IdType | null>('value', { required: false });
const attrs: TreeSelectProps = useAttrs();
const options = ref<Api.System.MenuList>([]);

6
src/components/custom/post-select.vue
View File

@ -9,13 +9,13 @@ defineOptions({
});
interface Props {
deptId?: string;
deptId?: CommonType.IdType | null;
[key: string]: any;
}
const props = defineProps<Props>();
const value = defineModel<string | null>('value', { required: true });
const value = defineModel<CommonType.IdType[] | null>('value', { required: false });
const attrs: SelectProps = useAttrs();
@ -35,7 +35,7 @@ watch(
async function getRoleOptions() {
startRoleLoading();
const { error, data } = await fetchGetPostSelect(props.deptId);
const { error, data } = await fetchGetPostSelect(props.deptId!);
if (!error) {
roleOptions.value = data.map(item => ({

2
src/components/custom/role-select.vue
View File

@ -14,7 +14,7 @@ interface Props {
defineProps<Props>();
const value = defineModel<string | null>('value', { required: true });
const value = defineModel<CommonType.IdType[] | null>('value', { required: false });
const attrs: SelectProps = useAttrs();