Merge branch 'sqy_dev' into 'main'

'fix:解决refreshToken问题' See merge request huang/yun-teng-iot-front!150

Merge branch 'sqy_dev' into 'main'
'fix:解决refreshToken问题' See merge request huang/yun-teng-iot-front!150
xp.Huang
2 parents c6920454 f5024fdf
Showing 8 changed files with 61 additions and 46 deletions
src/api/sys/user.ts
src/enums/pageEnum.ts
src/views/message/template/template.data.ts
src/views/sys/login/ForgetPasswordForm.vue
src/views/sys/login/Login.vue
src/views/sys/login/useLogin.ts
src/views/system/organization/OrganizationDrawer.vue
src/views/system/organization/organization.data.ts
--- a/src/api/sys/user.ts
View file @8c3f7f2
+++ b/src/api/sys/user.ts
View file @8c3f7f2
@@ -56,10 +56,15 @@ export function doLogout() {
   // return defHttp.get({ url: Api.Logout });
 }
 export function doRefreshToken(params: RefreshTokenParams) {
-  return defHttp.post<LoginResultModel>({
-    url: Api.RefreshToken,
-    params,
-  });
+  return defHttp.post<LoginResultModel>(
+    {
+      url: Api.RefreshToken,
+      params,
+    },
+    {
+      joinPrefix: false,
+    }
+  );
 }
 export function smsCodeLoginApi(params: SmsLoginParams, mode: ErrorMessageMode = 'modal') {
   return defHttp.post<LoginResultModel>(
@@ -72,3 +77,10 @@ export function smsCodeLoginApi(params: SmsLoginParams, mode: ErrorMessageMode =
     }
   );
 }
+
+export function forgetPasswordApi(params) {
+  return defHttp.post({
+    url: '',
+    params,
+  });
+}
--- a/src/enums/pageEnum.ts
View file @8c3f7f2
+++ b/src/enums/pageEnum.ts
View file @8c3f7f2
@@ -10,7 +10,7 @@ export const PageEnum = {
   // error log page path
   ERROR_LOG_PAGE: '/error-log/list',
   //消息配置
-  MESSAGE_CONFIG: '/config/message',
+  MESSAGE_CONFIG: '/message/config',
   //设备配置
   DEVICE_PROFILE: '/device/profiles',
 };
--- a/src/views/message/template/template.data.ts
View file @8c3f7f2
+++ b/src/views/message/template/template.data.ts
View file @8c3f7f2
@@ -217,7 +217,7 @@ export const formSchema: FormSchema[] = [
     label: '模板用途',
     required: true,
     component: 'ApiSelect',
-    helpMessage: ['用户登录、忘记密码模板平台只提供"code"参数', '初始密码设置平台提供"name"参数'],
+    helpMessage: ['用户登录、忘记密码模板平台只提供"code"参数'],
     componentProps: {
       api: findDictItemByCode,
       params: {
--- a/src/views/sys/login/ForgetPasswordForm.vue
View file @8c3f7f2
+++ b/src/views/sys/login/ForgetPasswordForm.vue
View file @8c3f7f2
@@ -2,24 +2,25 @@
   <template v-if="getShow">
     <LoginFormTitle class="enter-x" />
     <Form class="p-4 enter-x" :model="formData" :rules="getFormRules" ref="formRef">
-      <FormItem name="account" class="enter-x">
-        <Input
-          size="large"
-          v-model:value="formData.account"
-          :placeholder="t('sys.login.userName')"
-        />
-      </FormItem>
-
       <FormItem name="mobile" class="enter-x">
         <Input size="large" v-model:value="formData.mobile" :placeholder="t('sys.login.mobile')" />
       </FormItem>
       <FormItem name="sms" class="enter-x">
         <CountdownInput
+          :sendCodeApi="sendLoginSms"
           size="large"
           v-model:value="formData.sms"
           :placeholder="t('sys.login.smsCode')"
         />
       </FormItem>
+      <FormItem name="password" class="enter-x">
+        <InputPassword
+          size="large"
+          v-model:value="formData.password"
+          visibilityToggle
+          :placeholder="t('sys.login.password')"
+        />
+      </FormItem>
       <FormItem class="enter-x">
         <Button type="primary" size="large" block @click="handleReset" :loading="loading">
@@ -35,30 +36,46 @@
 <script lang="ts" setup>
   import { reactive, ref, computed, unref } from 'vue';
   import LoginFormTitle from './LoginFormTitle.vue';
-  import { Form, Input, Button } from 'ant-design-vue';
+  import { Form, Input, Button, message } from 'ant-design-vue';
   import { CountdownInput } from '/@/components/CountDown';
   import { useI18n } from '/@/hooks/web/useI18n';
   import { useLoginState, useFormRules, LoginStateEnum } from './useLogin';
-
+  import { forgetPasswordApi } from '/@/api/sys/user';
   const FormItem = Form.Item;
   const { t } = useI18n();
-  const { handleBackLogin, getLoginState } = useLoginState();
+  const { handleBackLogin, getLoginState, setLoginState } = useLoginState();
   const { getFormRules } = useFormRules();
   const formRef = ref();
   const loading = ref(false);
-
+  const InputPassword = Input.Password;
   const formData = reactive({
-    account: '',
     mobile: '',
     sms: '',
+    password: '',
   });
   const getShow = computed(() => unref(getLoginState) === LoginStateEnum.RESET_PASSWORD);
   async function handleReset() {
+    setLoginState(LoginStateEnum.LOGIN);
     const form = unref(formRef);
     if (!form) return;
     await form.resetFields();
   }
+
+  async function sendLoginSms() {
+    const reg =
+      /^[1](([3][0-9])|([4][0,1,4-9])|([5][0-3,5-9])|([6][2,5,6,7])|([7][0-8])|([8][0-9])|([9][0-3,5-9]))[0-9]{8}$/;
+    if (reg.test(formData.mobile)) {
+      const sendRes = await forgetPasswordApi(formData.mobile);
+      if (!sendRes) {
+        message.error('发送失败');
+        return false;
+      }
+      return true;
+    } else {
+      message.error('请输入正确手机号码');
+    }
+  }
 </script>
--- a/src/views/sys/login/Login.vue
View file @8c3f7f2
+++ b/src/views/sys/login/Login.vue
View file @8c3f7f2
@@ -56,7 +56,6 @@
   import { useI18n } from '/@/hooks/web/useI18n';
   import { useDesign } from '/@/hooks/web/useDesign';
   import { useLocaleStore } from '/@/store/modules/locale';
-  import { useUserStore } from '/@/store/modules/user';
   defineProps({
     sessionTimeout: {
       type: Boolean,
--- a/src/views/sys/login/useLogin.ts
View file @8c3f7f2
+++ b/src/views/sys/login/useLogin.ts
View file @8c3f7f2
@@ -88,7 +88,7 @@ export function useFormRules(formData?: Recordable) {
       // reset password form rules
       case LoginStateEnum.RESET_PASSWORD:
         return {
-          account: accountFormRule,
+          password: passwordFormRule,
           ...mobileRule,
         };
--- a/src/views/system/organization/OrganizationDrawer.vue
View file @8c3f7f2
+++ b/src/views/system/organization/OrganizationDrawer.vue
View file @8c3f7f2
@@ -37,39 +37,25 @@
         await resetFields();
         setDrawerProps({ confirmLoading: false });
         isUpdate.value = !!data?.isUpdate;
+        let treeData: any[] = await getOrganizationList();
         //如果是编辑操作，设置页面数据
         if (unref(isUpdate)) {
           //为表单赋值
-          await setFieldsValue({
-            ...data.record,
-          });
-          organizationId = Reflect.get(data.record, 'id');
-          let treeData: any = await getOrganizationList();
-
+          await setFieldsValue(data.record);
+          const organizationId = Reflect.get(data.record, 'id');
           // 过滤当前选中的组织，
-          function filterTransFun(treeData: any[]) {
+          (function filterTransFun(treeData: any[]) {
             treeData.forEach((item, index, arr) => {
-              if (item.id === organizationId) {
-                arr.splice(index, 1);
-              }
-              if (item.children.length) {
-                filterTransFun(item.children);
-              }
+              if (item.id === organizationId) arr.splice(index, 1);
+              if (item.children.length) filterTransFun(item.children);
             });
-          }
-          filterTransFun(treeData);
-          await updateSchema({
-            field: 'parentId',
-            componentProps: { treeData },
-          });
-        } else {
-          let treeData = await getOrganizationList();
-          await updateSchema({
-            field: 'parentId',
-            componentProps: { treeData },
-          });
+          })(treeData);
         }
+        await updateSchema({
+          field: 'parentId',
+          componentProps: { treeData },
+        });
       });
       //得到页面标题
--- a/src/views/system/organization/organization.data.ts
View file @8c3f7f2
+++ b/src/views/system/organization/organization.data.ts
View file @8c3f7f2
@@ -37,6 +37,7 @@ export const formSchema: FormSchema[] = [
         key: 'id',
         value: 'id',
       },
+      maxTagCount: 10,
       getPopupContainer: () => document.body,
     },
   },