taoge_xiaodi/maintenance_system
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!69 修复升级依赖带来的类型问题

Browse Source 
* fix 修复变量问题
* Merge remote-tracking branch 'origin/dev' into dev
* update 依赖升级
* update 依赖升级
* Merge remote-tracking branch 'origin/dev' into dev
* 升级依赖
* Merge remote-tracking branch 'origin/ts' into ts
* 升级依赖
* Merge branch 'dev' of gitee.com:JavaLionLi/plus-ui into ts
* 升级依赖
* !61 fix: 删除重复环境变量ElUploadInstance
* fix: 删除重复环境变量ElUploadInstance
This commit is contained in:
ahaos
2023-12-14 08:17:12 +00:00
parent 031d83828a
commit 1d5133b695
37 changed files with 124 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/views/tool/gen/genInfoForm.vue
View File

@ -228,16 +228,16 @@ import { propTypes } from '@/utils/propTypes';
interface MenuOptionsType {
menuId: number | string;
menuName: string;
children: MenuOptionsType[] | undefined;
children?: MenuOptionsType[];
}
const { proxy } = getCurrentInstance();
const subColumns = ref<any>([]);
const menuOptions = ref<Array<MenuOptionsType>>([]);
const { proxy } = getCurrentInstance();
const props = defineProps({
info: propTypes.any.def(null),
tables: propTypes.any.def(null)
info: propTypes.any.isRequired,
tables: propTypes.any.isRequired
});
const infoForm = computed(() => props.info);
@ -276,6 +276,7 @@ const getMenuTreeselect = async () => {
const res = await listMenu();
res.data.forEach((m) => (m.menuId = m.menuId.toString()));
const data = proxy?.handleTree<MenuOptionsType>(res.data, 'menuId');
if (data) {
menuOptions.value = data;
}