소스 검색

refactor: 子组件 ref() 改为 ref<>()

许俊杰 3 년 전
부모
커밋
e245ccd1ca

+ 5 - 5
Web/src/views/system/codeGen/index.vue

@@ -67,8 +67,8 @@ import { getAPI } from '/@/utils/axios-utils';
 import { SysCodeGenApi } from '/@/api-services/api';
 import { SysCodeGenApi } from '/@/api-services/api';
 import { SysCodeGen } from '/@/api-services/models';
 import { SysCodeGen } from '/@/api-services/models';
 
 
-const EditCodeGenRef = ref();
-const CodeConfigRef = ref();
+const EditCodeGenRef = ref<InstanceType<typeof EditCodeGenDialog>>();
+const CodeConfigRef = ref<InstanceType<typeof CodeConfigDialog>>();
 const state = reactive({
 const state = reactive({
 	loading: false,
 	loading: false,
 	loading1: false,
 	loading1: false,
@@ -107,7 +107,7 @@ onUnmounted(() => {
 });
 });
 
 
 const openConfigDialog = (row: any) => {
 const openConfigDialog = (row: any) => {
-	CodeConfigRef.value.openDialog(row);
+	CodeConfigRef.value?.openDialog(row);
 };
 };
 
 
 // 重置操作
 // 重置操作
@@ -159,13 +159,13 @@ const handleCurrentChange = (val: number) => {
 // 打开表增加页面
 // 打开表增加页面
 const openAddDialog = () => {
 const openAddDialog = () => {
 	state.editMenuTitle = '增加';
 	state.editMenuTitle = '增加';
-	EditCodeGenRef.value.openDialog({ nameSpace: 'Admin.NET.Application', authorName: 'Admin.NET', generateType: '2' });
+	EditCodeGenRef.value?.openDialog({ nameSpace: 'Admin.NET.Application', authorName: 'Admin.NET', generateType: '2' });
 };
 };
 
 
 // 打开表编辑页面
 // 打开表编辑页面
 const openEditDialog = (row: any) => {
 const openEditDialog = (row: any) => {
 	state.editMenuTitle = '编辑';
 	state.editMenuTitle = '编辑';
-	EditCodeGenRef.value.openDialog(row);
+	EditCodeGenRef.value?.openDialog(row);
 };
 };
 
 
 // 删除表
 // 删除表

+ 3 - 3
Web/src/views/system/config/index.vue

@@ -68,7 +68,7 @@ import { getAPI } from '/@/utils/axios-utils';
 import { SysConfigApi } from '/@/api-services/api';
 import { SysConfigApi } from '/@/api-services/api';
 import { SysConfig } from '/@/api-services/models';
 import { SysConfig } from '/@/api-services/models';
 
 
-const editConfigRef = ref();
+const editConfigRef = ref<InstanceType<typeof EditConfig>>();
 const state = reactive({
 const state = reactive({
 	loading: false,
 	loading: false,
 	configData: [] as Array<SysConfig>,
 	configData: [] as Array<SysConfig>,
@@ -117,13 +117,13 @@ const resetQuery = () => {
 // 打开新增页面
 // 打开新增页面
 const openAddConfig = () => {
 const openAddConfig = () => {
 	state.editConfigTitle = '添加配置';
 	state.editConfigTitle = '添加配置';
-	editConfigRef.value.openDialog({});
+	editConfigRef.value?.openDialog({});
 };
 };
 
 
 // 打开编辑页面
 // 打开编辑页面
 const openEditConfig = (row: any) => {
 const openEditConfig = (row: any) => {
 	state.editConfigTitle = '编辑配置';
 	state.editConfigTitle = '编辑配置';
-	editConfigRef.value.openDialog(row);
+	editConfigRef.value?.openDialog(row);
 };
 };
 
 
 // 删除
 // 删除

+ 10 - 10
Web/src/views/system/database/index.vue

@@ -80,11 +80,11 @@ import { getAPI } from '/@/utils/axios-utils';
 import { SysDatabaseApi } from '/@/api-services/api';
 import { SysDatabaseApi } from '/@/api-services/api';
 import { DbColumnOutput, DbTableInfo, DbColumnInput, DeleteDbTableInput, DeleteDbColumnInput } from '/@/api-services/models';
 import { DbColumnOutput, DbTableInfo, DbColumnInput, DeleteDbTableInput, DeleteDbColumnInput } from '/@/api-services/models';
 
 
-const editTableRef = ref();
-const editColumnRef = ref();
-const addTableRef = ref();
-const addColumnRef = ref();
-const genEntityRef = ref();
+const editTableRef = ref<InstanceType<typeof EditTable>>();
+const editColumnRef = ref<InstanceType<typeof EditColumn>>();
+const addTableRef = ref<InstanceType<typeof AddTable>>();
+const addColumnRef = ref<InstanceType<typeof AddColumn>>();
+const genEntityRef = ref<InstanceType<typeof GenEntity>>();
 const state = reactive({
 const state = reactive({
 	loading: false,
 	loading: false,
 	loading1: false,
 	loading1: false,
@@ -158,7 +158,7 @@ const openEditTable = () => {
 		oldTableName: state.tableName,
 		oldTableName: state.tableName,
 		description: res[0].description,
 		description: res[0].description,
 	};
 	};
-	editTableRef.value.openDialog(table);
+	editTableRef.value?.openDialog(table);
 };
 };
 
 
 // 打开实体生成页面
 // 打开实体生成页面
@@ -170,7 +170,7 @@ const openGenDialog = () => {
 		configId: state.configId,
 		configId: state.configId,
 		tableName: state.tableName,
 		tableName: state.tableName,
 	};
 	};
-	genEntityRef.value.openDialog(table);
+	genEntityRef.value?.openDialog(table);
 };
 };
 
 
 // 打开表增加页面
 // 打开表增加页面
@@ -189,7 +189,7 @@ const openAddTable = () => {
 		oldTableName: '',
 		oldTableName: '',
 		description: '',
 		description: '',
 	};
 	};
-	addTableRef.value.openDialog(table);
+	addTableRef.value?.openDialog(table);
 };
 };
 
 
 // 打开列编辑页面
 // 打开列编辑页面
@@ -201,7 +201,7 @@ const openEditColumn = (row: any) => {
 		oldColumnName: row.dbColumnName,
 		oldColumnName: row.dbColumnName,
 		description: row.columnDescription,
 		description: row.columnDescription,
 	};
 	};
-	editColumnRef.value.openDialog(column);
+	editColumnRef.value?.openDialog(column);
 };
 };
 
 
 // 打开列增加页面
 // 打开列增加页面
@@ -228,7 +228,7 @@ const openAddColumn = () => {
 		// editable: true,
 		// editable: true,
 		// isNew: true,
 		// isNew: true,
 	};
 	};
-	addColumnRef.value.openDialog(addRow);
+	addColumnRef.value?.openDialog(addRow);
 };
 };
 
 
 // 删除表
 // 删除表

+ 7 - 7
Web/src/views/system/dict/index.vue

@@ -50,7 +50,7 @@
 				layout="total, sizes, prev, pager, next, jumper"
 				layout="total, sizes, prev, pager, next, jumper"
 			/>
 			/>
 		</el-card>
 		</el-card>
-		<EditDictTpye ref="editDictTypeRef" :title="state.editDictTypeTitle" />
+		<EditDictType ref="editDictTypeRef" :title="state.editDictTypeTitle" />
 		<DictDataDialog ref="dictDataDialogRef" />
 		<DictDataDialog ref="dictDataDialogRef" />
 	</div>
 	</div>
 </template>
 </template>
@@ -59,15 +59,15 @@
 import { onMounted, onUnmounted, reactive, ref } from 'vue';
 import { onMounted, onUnmounted, reactive, ref } from 'vue';
 import { ElMessageBox, ElMessage } from 'element-plus';
 import { ElMessageBox, ElMessage } from 'element-plus';
 import mittBus from '/@/utils/mitt';
 import mittBus from '/@/utils/mitt';
-import EditDictTpye from '/@/views/system/dict/component/editDictType.vue';
+import EditDictType from '/@/views/system/dict/component/editDictType.vue';
 import DictDataDialog from '/@/views/system/dict/component/dictDataDialog.vue';
 import DictDataDialog from '/@/views/system/dict/component/dictDataDialog.vue';
 
 
 import { getAPI } from '/@/utils/axios-utils';
 import { getAPI } from '/@/utils/axios-utils';
 import { SysDictTypeApi } from '/@/api-services/api';
 import { SysDictTypeApi } from '/@/api-services/api';
 import { SysDictType } from '/@/api-services/models';
 import { SysDictType } from '/@/api-services/models';
 
 
-const editDictTypeRef = ref();
-const dictDataDialogRef = ref();
+const editDictTypeRef = ref<InstanceType<typeof EditDictType>>();
+const dictDataDialogRef = ref<InstanceType<typeof DictDataDialog>>();
 const state = reactive({
 const state = reactive({
 	loading: false,
 	loading: false,
 	dictTypeData: [] as Array<SysDictType>,
 	dictTypeData: [] as Array<SysDictType>,
@@ -114,18 +114,18 @@ const resetQuery = () => {
 // 打开新增页面
 // 打开新增页面
 const openAddDictType = () => {
 const openAddDictType = () => {
 	state.editDictTypeTitle = '添加字典';
 	state.editDictTypeTitle = '添加字典';
-	editDictTypeRef.value.openDialog({});
+	editDictTypeRef.value?.openDialog({});
 };
 };
 
 
 // 打开编辑页面
 // 打开编辑页面
 const openEditDictType = (row: any) => {
 const openEditDictType = (row: any) => {
 	state.editDictTypeTitle = '编辑字典';
 	state.editDictTypeTitle = '编辑字典';
-	editDictTypeRef.value.openDialog(row);
+	editDictTypeRef.value?.openDialog(row);
 };
 };
 
 
 // 打开字典值页面
 // 打开字典值页面
 const openDictDataDialog = (row: any) => {
 const openDictDataDialog = (row: any) => {
-	dictDataDialogRef.value.openDialog(row);
+	dictDataDialogRef.value?.openDialog(row);
 };
 };
 
 
 // 删除
 // 删除

+ 8 - 8
Web/src/views/system/job/index.vue

@@ -192,9 +192,9 @@ import { SysJobApi } from '/@/api-services/api';
 import { JobOutput } from '/@/api-services/models';
 import { JobOutput } from '/@/api-services/models';
 
 
 const router = useRouter();
 const router = useRouter();
-const editJobDetailRef = ref();
-const editJobTriggerRef = ref();
-const editJobClusterRef = ref();
+const editJobDetailRef = ref<InstanceType<typeof EditJobDetail>>();
+const editJobTriggerRef = ref<InstanceType<typeof EditJobTrigger>>();
+const editJobClusterRef = ref<InstanceType<typeof JobCluster>>();
 const state = reactive({
 const state = reactive({
 	loading: false,
 	loading: false,
 	jobData: [] as Array<JobOutput>,
 	jobData: [] as Array<JobOutput>,
@@ -242,13 +242,13 @@ const resetQuery = () => {
 // 打开新增作业页面
 // 打开新增作业页面
 const openAddJobDetail = () => {
 const openAddJobDetail = () => {
 	state.editJobDetailTitle = '添加作业';
 	state.editJobDetailTitle = '添加作业';
-	editJobDetailRef.value.openDialog({ concurrent: true, includeAnnotations: true, groupName: 'default' });
+	editJobDetailRef.value?.openDialog({ concurrent: true, includeAnnotations: true, groupName: 'default' });
 };
 };
 
 
 // 打开编辑作业页面
 // 打开编辑作业页面
 const openEditJobDetail = (row: any) => {
 const openEditJobDetail = (row: any) => {
 	state.editJobDetailTitle = '编辑作业';
 	state.editJobDetailTitle = '编辑作业';
-	editJobDetailRef.value.openDialog(row.jobDetail);
+	editJobDetailRef.value?.openDialog(row.jobDetail);
 };
 };
 
 
 // 删除作业
 // 删除作业
@@ -269,13 +269,13 @@ const delJobDetail = (row: any) => {
 // 打开新增触发器页面
 // 打开新增触发器页面
 const openAddJobTrigger = (row: any) => {
 const openAddJobTrigger = (row: any) => {
 	state.editJobTriggerTitle = '添加触发器';
 	state.editJobTriggerTitle = '添加触发器';
-	editJobTriggerRef.value.openDialog({ jobId: row.jobDetail.jobId, retryTimeout: 1000, startNow: true, runOnStart: true, resetOnlyOnce: true, triggerType: 'Furion.Schedule.PeriodTrigger' });
+	editJobTriggerRef.value?.openDialog({ jobId: row.jobDetail.jobId, retryTimeout: 1000, startNow: true, runOnStart: true, resetOnlyOnce: true, triggerType: 'Furion.Schedule.PeriodTrigger' });
 };
 };
 
 
 // 打开编辑触发器页面
 // 打开编辑触发器页面
 const openEditJobTrigger = (row: any) => {
 const openEditJobTrigger = (row: any) => {
 	state.editJobTriggerTitle = '编辑触发器';
 	state.editJobTriggerTitle = '编辑触发器';
-	editJobTriggerRef.value.openDialog(row);
+	editJobTriggerRef.value?.openDialog(row);
 };
 };
 
 
 // 删除触发器
 // 删除触发器
@@ -355,7 +355,7 @@ const persistAll = async () => {
 
 
 // 打开集群控制页面
 // 打开集群控制页面
 const openJobCluster = () => {
 const openJobCluster = () => {
-	editJobClusterRef.value.openDrawer();
+	editJobClusterRef.value?.openDrawer();
 };
 };
 
 
 // 打开任务看板
 // 打开任务看板

+ 3 - 3
Web/src/views/system/menu/index.vue

@@ -68,7 +68,7 @@ import { getAPI } from '/@/utils/axios-utils';
 import { SysMenuApi } from '/@/api-services/api';
 import { SysMenuApi } from '/@/api-services/api';
 import { SysMenu } from '/@/api-services/models';
 import { SysMenu } from '/@/api-services/models';
 
 
-const editMenuRef = ref();
+const editMenuRef = ref<InstanceType<typeof EditMenu>>();
 const state = reactive({
 const state = reactive({
 	loading: false,
 	loading: false,
 	menuData: [] as Array<SysMenu>,
 	menuData: [] as Array<SysMenu>,
@@ -109,13 +109,13 @@ const resetQuery = () => {
 // 打开新增页面
 // 打开新增页面
 const openAddMenu = () => {
 const openAddMenu = () => {
 	state.editMenuTitle = '添加菜单';
 	state.editMenuTitle = '添加菜单';
-	editMenuRef.value.openDialog({ type: 2 });
+	editMenuRef.value?.openDialog({ type: 2 });
 };
 };
 
 
 // 打开编辑页面
 // 打开编辑页面
 const openEditMenu = (row: any) => {
 const openEditMenu = (row: any) => {
 	state.editMenuTitle = '编辑菜单';
 	state.editMenuTitle = '编辑菜单';
-	editMenuRef.value.openDialog(row);
+	editMenuRef.value?.openDialog(row);
 };
 };
 
 
 // 删除当前行
 // 删除当前行

+ 3 - 3
Web/src/views/system/notice/index.vue

@@ -76,7 +76,7 @@ import { getAPI } from '/@/utils/axios-utils';
 import { SysNoticeApi } from '/@/api-services/api';
 import { SysNoticeApi } from '/@/api-services/api';
 import { SysNotice } from '/@/api-services/models';
 import { SysNotice } from '/@/api-services/models';
 
 
-const editNoticeRef = ref();
+const editNoticeRef = ref<InstanceType<typeof EditNotice>>();
 const { removeHtml } = commonFunction();
 const { removeHtml } = commonFunction();
 const state = reactive({
 const state = reactive({
 	loading: false,
 	loading: false,
@@ -124,13 +124,13 @@ const resetQuery = () => {
 // 打开新增页面
 // 打开新增页面
 const openAddNotice = () => {
 const openAddNotice = () => {
 	state.editNoticeTitle = '添加通知公告';
 	state.editNoticeTitle = '添加通知公告';
-	editNoticeRef.value.openDialog({});
+	editNoticeRef.value?.openDialog({});
 };
 };
 
 
 // 打开编辑页面
 // 打开编辑页面
 const openEditNotice = (row: any) => {
 const openEditNotice = (row: any) => {
 	state.editNoticeTitle = '编辑通知公告';
 	state.editNoticeTitle = '编辑通知公告';
-	editNoticeRef.value.openDialog(row);
+	editNoticeRef.value?.openDialog(row);
 };
 };
 
 
 // 删除
 // 删除

+ 5 - 5
Web/src/views/system/org/index.vue

@@ -60,8 +60,8 @@ import { getAPI } from '/@/utils/axios-utils';
 import { SysOrgApi } from '/@/api-services/api';
 import { SysOrgApi } from '/@/api-services/api';
 import { SysOrg } from '/@/api-services/models';
 import { SysOrg } from '/@/api-services/models';
 
 
-const editOrgRef = ref();
-const orgTreeRef = ref();
+const editOrgRef = ref<InstanceType<typeof EditOrg>>();
+const orgTreeRef = ref<InstanceType<typeof OrgTree>>();
 const state = reactive({
 const state = reactive({
 	loading: false,
 	loading: false,
 	orgData: [] as Array<SysOrg>, // 机构列表数据
 	orgData: [] as Array<SysOrg>, // 机构列表数据
@@ -81,7 +81,7 @@ onMounted(() => {
 		handleQuery();
 		handleQuery();
 
 
 		// 编辑删除后更新机构数据
 		// 编辑删除后更新机构数据
-		orgTreeRef.value.initTreeData();
+		orgTreeRef.value?.initTreeData();
 	});
 	});
 });
 });
 
 
@@ -111,13 +111,13 @@ const resetQuery = () => {
 // 打开新增页面
 // 打开新增页面
 const openAddOrg = () => {
 const openAddOrg = () => {
 	state.editOrgTitle = '添加机构';
 	state.editOrgTitle = '添加机构';
-	editOrgRef.value.openDialog({ status: 1 });
+	editOrgRef.value?.openDialog({ status: 1 });
 };
 };
 
 
 // 打开编辑页面
 // 打开编辑页面
 const openEditOrg = (row: any) => {
 const openEditOrg = (row: any) => {
 	state.editOrgTitle = '编辑机构';
 	state.editOrgTitle = '编辑机构';
-	editOrgRef.value.openDialog(row);
+	editOrgRef.value?.openDialog(row);
 };
 };
 
 
 // 删除
 // 删除

+ 3 - 3
Web/src/views/system/pos/index.vue

@@ -52,7 +52,7 @@ import { getAPI } from '/@/utils/axios-utils';
 import { SysPosApi } from '/@/api-services/api';
 import { SysPosApi } from '/@/api-services/api';
 import { SysPos } from '/@/api-services/models';
 import { SysPos } from '/@/api-services/models';
 
 
-const editPosRef = ref();
+const editPosRef = ref<InstanceType<typeof EditPos>>();
 const state = reactive({
 const state = reactive({
 	loading: false,
 	loading: false,
 	posData: [] as Array<SysPos>,
 	posData: [] as Array<SysPos>,
@@ -93,13 +93,13 @@ const resetQuery = () => {
 // 打开新增页面
 // 打开新增页面
 const openAddPos = () => {
 const openAddPos = () => {
 	state.editPosTitle = '添加职位';
 	state.editPosTitle = '添加职位';
-	editPosRef.value.openDialog({ status: 1 });
+	editPosRef.value?.openDialog({ status: 1 });
 };
 };
 
 
 // 打开编辑页面
 // 打开编辑页面
 const openEditPos = (row: any) => {
 const openEditPos = (row: any) => {
 	state.editPosTitle = '编辑职位';
 	state.editPosTitle = '编辑职位';
-	editPosRef.value.openDialog(row);
+	editPosRef.value?.openDialog(row);
 };
 };
 
 
 // 删除
 // 删除

+ 5 - 5
Web/src/views/system/region/index.vue

@@ -66,8 +66,8 @@ import { getAPI } from '/@/utils/axios-utils';
 import { SysRegionApi } from '/@/api-services/api';
 import { SysRegionApi } from '/@/api-services/api';
 import { SysRegion } from '/@/api-services/models';
 import { SysRegion } from '/@/api-services/models';
 
 
-const editRegionRef = ref();
-const regionTreeRef = ref();
+const editRegionRef = ref<InstanceType<typeof EditRegion>>();
+const regionTreeRef = ref<InstanceType<typeof RegionTree>>();
 const state = reactive({
 const state = reactive({
 	loading: false,
 	loading: false,
 	regionData: [] as Array<SysRegion>, // 列表数据
 	regionData: [] as Array<SysRegion>, // 列表数据
@@ -91,7 +91,7 @@ onMounted(() => {
 		handleQuery();
 		handleQuery();
 
 
 		// 编辑删除后更新机构数据
 		// 编辑删除后更新机构数据
-		regionTreeRef.value.initTreeData();
+		regionTreeRef.value?.initTreeData();
 	});
 	});
 });
 });
 
 
@@ -119,13 +119,13 @@ const resetQuery = () => {
 // 打开新增页面
 // 打开新增页面
 const openAddRegion = () => {
 const openAddRegion = () => {
 	state.editRegionTitle = '添加行政区域';
 	state.editRegionTitle = '添加行政区域';
-	editRegionRef.value.openDialog({});
+	editRegionRef.value?.openDialog({});
 };
 };
 
 
 // 打开编辑页面
 // 打开编辑页面
 const openEditRegion = (row: any) => {
 const openEditRegion = (row: any) => {
 	state.editRegionTitle = '编辑行政区域';
 	state.editRegionTitle = '编辑行政区域';
-	editRegionRef.value.openDialog(row);
+	editRegionRef.value?.openDialog(row);
 };
 };
 
 
 // 删除
 // 删除

+ 5 - 5
Web/src/views/system/role/index.vue

@@ -83,8 +83,8 @@ import { getAPI } from '/@/utils/axios-utils';
 import { SysRoleApi } from '/@/api-services/api';
 import { SysRoleApi } from '/@/api-services/api';
 import { SysRole } from '/@/api-services/models';
 import { SysRole } from '/@/api-services/models';
 
 
-const editRoleRef = ref();
-const grantDataRef = ref();
+const editRoleRef = ref<InstanceType<typeof EditRole>>();
+const grantDataRef = ref<InstanceType<typeof GrantData>>();
 const state = reactive({
 const state = reactive({
 	loading: false,
 	loading: false,
 	roleData: [] as Array<SysRole>,
 	roleData: [] as Array<SysRole>,
@@ -131,18 +131,18 @@ const resetQuery = () => {
 // 打开新增页面
 // 打开新增页面
 const openAddRole = () => {
 const openAddRole = () => {
 	state.editRoleTitle = '添加角色';
 	state.editRoleTitle = '添加角色';
-	editRoleRef.value.openDialog({});
+	editRoleRef.value?.openDialog({});
 };
 };
 
 
 // 打开编辑页面
 // 打开编辑页面
 const openEditRole = async (row: any) => {
 const openEditRole = async (row: any) => {
 	state.editRoleTitle = '编辑角色';
 	state.editRoleTitle = '编辑角色';
-	editRoleRef.value.openDialog(row);
+	editRoleRef.value?.openDialog(row);
 };
 };
 
 
 // 打开授权数据范围页面
 // 打开授权数据范围页面
 const openGrantData = (row: any) => {
 const openGrantData = (row: any) => {
-	grantDataRef.value.openDialog(row);
+	grantDataRef.value?.openDialog(row);
 };
 };
 
 
 // 删除
 // 删除

+ 5 - 5
Web/src/views/system/tenant/index.vue

@@ -105,8 +105,8 @@ import { getAPI } from '/@/utils/axios-utils';
 import { SysTenantApi } from '/@/api-services/api';
 import { SysTenantApi } from '/@/api-services/api';
 import { TenantOutput } from '/@/api-services/models';
 import { TenantOutput } from '/@/api-services/models';
 
 
-const editTenantRef = ref();
-const grantMenuRef = ref();
+const editTenantRef = ref<InstanceType<typeof EditTenant>>();
+const grantMenuRef = ref<InstanceType<typeof GrantMenu>>();
 const state = reactive({
 const state = reactive({
 	loading: false,
 	loading: false,
 	tenantData: [] as Array<TenantOutput>,
 	tenantData: [] as Array<TenantOutput>,
@@ -153,18 +153,18 @@ const resetQuery = () => {
 // 打开新增页面
 // 打开新增页面
 const openAddTenant = () => {
 const openAddTenant = () => {
 	state.editTenantTitle = '添加租户';
 	state.editTenantTitle = '添加租户';
-	editTenantRef.value.openDialog({ tenantType: 0 });
+	editTenantRef.value?.openDialog({ tenantType: 0 });
 };
 };
 
 
 // 打开编辑页面
 // 打开编辑页面
 const openEditTenant = (row: any) => {
 const openEditTenant = (row: any) => {
 	state.editTenantTitle = '编辑租户';
 	state.editTenantTitle = '编辑租户';
-	editTenantRef.value.openDialog(row);
+	editTenantRef.value?.openDialog(row);
 };
 };
 
 
 // 打开授权菜单页面
 // 打开授权菜单页面
 const openGrantMenu = async (row: any) => {
 const openGrantMenu = async (row: any) => {
-	grantMenuRef.value.openDialog(row);
+	grantMenuRef.value?.openDialog(row);
 };
 };
 
 
 // 重置密码
 // 重置密码

+ 4 - 4
Web/src/views/system/user/index.vue

@@ -102,8 +102,8 @@ import { getAPI } from '/@/utils/axios-utils';
 import { SysUserApi, SysOrgApi } from '/@/api-services/api';
 import { SysUserApi, SysOrgApi } from '/@/api-services/api';
 import { SysUser, SysOrg } from '/@/api-services/models';
 import { SysUser, SysOrg } from '/@/api-services/models';
 
 
-const orgTreeRef = ref();
-const editUserRef = ref();
+const orgTreeRef = ref<InstanceType<typeof OrgTree>>();
+const editUserRef = ref<InstanceType<typeof EditUser>>();
 const state = reactive({
 const state = reactive({
 	loading: false,
 	loading: false,
 	userData: [] as Array<SysUser>,
 	userData: [] as Array<SysUser>,
@@ -171,13 +171,13 @@ const resetQuery = () => {
 // 打开新增页面
 // 打开新增页面
 const openAddUser = () => {
 const openAddUser = () => {
 	state.editUserTitle = '添加账号';
 	state.editUserTitle = '添加账号';
-	editUserRef.value.openDialog({});
+	editUserRef.value?.openDialog({});
 };
 };
 
 
 // 打开编辑页面
 // 打开编辑页面
 const openEditUser = (row: any) => {
 const openEditUser = (row: any) => {
 	state.editUserTitle = '编辑账号';
 	state.editUserTitle = '编辑账号';
-	editUserRef.value.openDialog(row);
+	editUserRef.value?.openDialog(row);
 };
 };
 
 
 // 删除
 // 删除

+ 2 - 2
Web/src/views/system/weChatUser/index.vue

@@ -79,7 +79,7 @@ import { getAPI } from '/@/utils/axios-utils';
 import { SysWechatUserApi } from '/@/api-services/api';
 import { SysWechatUserApi } from '/@/api-services/api';
 import { SysWechatUser } from '/@/api-services/models';
 import { SysWechatUser } from '/@/api-services/models';
 
 
-const editWeChatUserRef = ref();
+const editWeChatUserRef = ref<InstanceType<typeof EditWeChatUser>>();
 const state = reactive({
 const state = reactive({
 	loading: false,
 	loading: false,
 	weChatUserData: [] as Array<SysWechatUser>,
 	weChatUserData: [] as Array<SysWechatUser>,
@@ -126,7 +126,7 @@ const resetQuery = () => {
 // 打开编辑页面
 // 打开编辑页面
 const openEditWeChatUser = (row: any) => {
 const openEditWeChatUser = (row: any) => {
 	state.editWeChatUserTitle = '编辑微信账号';
 	state.editWeChatUserTitle = '编辑微信账号';
-	editWeChatUserRef.value.openDialog(row);
+	editWeChatUserRef.value?.openDialog(row);
 };
 };
 
 
 // 删除
 // 删除