Commit ed26a1b3117d5be73bbd8d967224a7b189bb3f22

Authored by xp.Huang
2 parents 8c0f3fe9 585d9d55

Merge branch 'fix/account-manage' into 'main'

fix: 修复账号管理新增账号组织选择未级联选中

See merge request yunteng/thingskit-front!1323
@@ -110,7 +110,7 @@ export const formSchema: FormSchema[] = [ @@ -110,7 +110,7 @@ export const formSchema: FormSchema[] = [
110 component: 'Input', 110 component: 'Input',
111 helpMessage: '企业微信通知电话,须在对应企业微信绑定,否则不能收到告警通知。', 111 helpMessage: '企业微信通知电话,须在对应企业微信绑定,否则不能收到告警通知。',
112 componentProps: { 112 componentProps: {
113 - placeholder: '请输入企业微信号', 113 + placeholder: '不填默认为手机号码',
114 maxLength: 255, 114 maxLength: 255,
115 }, 115 },
116 }, 116 },
@@ -102,7 +102,6 @@ @@ -102,7 +102,6 @@
102 ...unref(getProps), 102 ...unref(getProps),
103 onSelect: (keys: string[]) => { 103 onSelect: (keys: string[]) => {
104 handleSelect(keys); 104 handleSelect(keys);
105 - unref(getProps)?.onSelect?.(keys?.[0]);  
106 }, 105 },
107 } as BasicTreePropsType; 106 } as BasicTreePropsType;
108 }); 107 });
@@ -158,7 +158,7 @@ @@ -158,7 +158,7 @@
158 } 158 }
159 159
160 const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => { 160 const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
161 - checkStrictly.value = true; 161 + checkStrictly.value = !!data?.isUpdate;
162 await resetFields(); 162 await resetFields();
163 setModalProps({ confirmLoading: false }); 163 setModalProps({ confirmLoading: false });
164 isUpdate.value = !!data?.isUpdate; 164 isUpdate.value = !!data?.isUpdate;
@@ -163,7 +163,7 @@ @@ -163,7 +163,7 @@
163 163
164 const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => { 164 const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
165 await resetFields(); 165 await resetFields();
166 - checkStrictly.value = true; 166 + checkStrictly.value = !data?.isAdd;
167 setModalProps({ confirmLoading: false }); 167 setModalProps({ confirmLoading: false });
168 isAdd.value = !!data?.isAdd; 168 isAdd.value = !!data?.isAdd;
169 const groupListModel = await findCurrentUserGroups(); 169 const groupListModel = await findCurrentUserGroups();