update 调整代码格式

疯狂的狮子Li

2023-04-03 1595cb282aab5399862fac6406b5de550863e3b6

 src/views/register.vue

@@ -1,3 +1,60 @@
<template>
  <div class="register">
    <el-form ref="registerRef" :model="registerForm" :rules="registerRules" class="register-form">
      <h3 class="title">RuoYi-Vue-Plus多租户管理系统</h3>
      <el-form-item prop="tenantId" v-if="tenantEnabled">
        <el-select v-model="registerForm.tenantId" filterable placeholder="请选择/输入公司名称" style="width: 100%">
          <el-option v-for="item in tenantList" :key="item.tenantId" :label="item.companyName" :value="item.tenantId"> </el-option>
          <template #prefix><svg-icon icon-class="company" class="el-input__icon input-icon" /></template>
        </el-select>
      </el-form-item>
      <el-form-item prop="username">
        <el-input v-model="registerForm.username" type="text" size="large" auto-complete="off" placeholder="账号">
          <template #prefix><svg-icon icon-class="user" class="el-input__icon input-icon" /></template>
        </el-input>
      </el-form-item>
      <el-form-item prop="password">
        <el-input v-model="registerForm.password" type="password" size="large" auto-complete="off" placeholder="密码" @keyup.enter="handleRegister">
          <template #prefix><svg-icon icon-class="password" class="el-input__icon input-icon" /></template>
        </el-input>
      </el-form-item>
      <el-form-item prop="confirmPassword">
        <el-input
          v-model="registerForm.confirmPassword"
          type="password"
          size="large"
          auto-complete="off"
          placeholder="确认密码"
          @keyup.enter="handleRegister"
        >
          <template #prefix><svg-icon icon-class="password" class="el-input__icon input-icon" /></template>
        </el-input>
      </el-form-item>
      <el-form-item prop="code" v-if="captchaEnabled">
        <el-input size="large" v-model="registerForm.code" auto-complete="off" placeholder="验证码" style="width: 63%" @keyup.enter="handleRegister">
          <template #prefix><svg-icon icon-class="validCode" class="el-input__icon input-icon" /></template>
        </el-input>
        <div class="register-code">
          <img :src="codeUrl" @click="getCode" class="register-code-img" />
        </div>
      </el-form-item>
      <el-form-item style="width:100%;">
        <el-button :loading="loading" size="large" type="primary" style="width:100%;" @click.prevent="handleRegister">
          <span v-if="!loading">注 册</span>
          <span v-else>注 册 中...</span>
        </el-button>
        <div style="float: right;">
          <router-link class="link-type" :to="'/login'">使用已有账户登录</router-link>
        </div>
      </el-form-item>
    </el-form>
    <!--  底部  -->
    <div class="el-register-footer">
      <span>Copyright © 2018-2023 疯狂的狮子Li All Rights Reserved.</span>
    </div>
  </div>
</template>

<script setup lang="ts">
import { getCodeImg, register, getTenantList } from '@/api/login';
import { RegisterForm, TenantVO } from '@/api/types';
@@ -7,13 +64,13 @@
const router = useRouter();

const registerForm = ref<RegisterForm>({
  tenantId: "",
  username: "",
  password: "",
  confirmPassword: "",
  code: "",
  uuid: "",
  userType: "sys_user"
    tenantId: "",
    username: "",
    password: "",
    confirmPassword: "",
    code: "",
    uuid: "",
    userType: "sys_user"
});

// 租户开关
@@ -21,30 +78,30 @@


const equalToPassword = (rule: any, value: string, callback: any) => {
  if (registerForm.value.password !== value) {
    callback(new Error("两次输入的密码不一致"));
  } else {
    callback();
  }
    if (registerForm.value.password !== value) {
        callback(new Error("两次输入的密码不一致"));
    } else {
        callback();
    }
};

const registerRules: FormRules = {
  tenantId: [
    { required: true, trigger: "blur", message: "请输入您的租户编号" }
  ],
  username: [
    { required: true, trigger: "blur", message: "请输入您的账号" },
    { min: 2, max: 20, message: "用户账号长度必须介于 2 和 20 之间", trigger: "blur" }
  ],
  password: [
    { required: true, trigger: "blur", message: "请输入您的密码" },
    { min: 5, max: 20, message: "用户密码长度必须介于 5 和 20 之间", trigger: "blur" }
  ],
  confirmPassword: [
    { required: true, trigger: "blur", message: "请再次输入您的密码" },
    { required: true, validator: equalToPassword, trigger: "blur" }
  ],
  code: [{ required: true, trigger: "change", message: "请输入验证码" }]
    tenantId: [
        { required: true, trigger: "blur", message: "请输入您的租户编号" }
    ],
    username: [
        { required: true, trigger: "blur", message: "请输入您的账号" },
        { min: 2, max: 20, message: "用户账号长度必须介于 2 和 20 之间", trigger: "blur" }
    ],
    password: [
        { required: true, trigger: "blur", message: "请输入您的密码" },
        { min: 5, max: 20, message: "用户密码长度必须介于 5 和 20 之间", trigger: "blur" }
    ],
    confirmPassword: [
        { required: true, trigger: "blur", message: "请再次输入您的密码" },
        { required: true, validator: equalToPassword, trigger: "blur" }
    ],
    code: [{ required: true, trigger: "change", message: "请输入验证码" }]
};
const codeUrl = ref("");
const loading = ref(false);
@@ -54,109 +111,52 @@
const tenantList = ref<TenantVO[]>([]);

const handleRegister = () => {
  registerRef.value.validate(async (valid: boolean) => {
    if (valid) {
      loading.value = true;
      const [err] = await to(register(registerForm.value));
      if (!err) {
        const username = registerForm.value.username;
        await ElMessageBox.alert("<font color='red'>恭喜你，您的账号 " + username + " 注册成功！</font>", "系统提示", {
          dangerouslyUseHTMLString: true,
          type: "success",
        });
        await router.push("/login");
      } else {
        loading.value = false;
        if (captchaEnabled) {
          getCode();
    registerRef.value.validate(async (valid: boolean) => {
        if (valid) {
            loading.value = true;
            const [err] = await to(register(registerForm.value));
            if (!err) {
                const username = registerForm.value.username;
                await ElMessageBox.alert("<font color='red'>恭喜你，您的账号 " + username + " 注册成功！</font>", "系统提示", {
                    dangerouslyUseHTMLString: true,
                    type: "success",
                });
                await router.push("/login");
            } else {
                loading.value = false;
                if (captchaEnabled) {
                    getCode();
                }
            }
        }
      }
    }
  });
    });
}

const getCode = async () => {
  const { data } = await getCodeImg();
  captchaEnabled.value = data.captchaEnabled === undefined ? true : data.captchaEnabled;
    const { data } = await getCodeImg();
    captchaEnabled.value = data.captchaEnabled === undefined ? true : data.captchaEnabled;
    if (captchaEnabled.value) {
      codeUrl.value = "data:image/gif;base64," + data.img;
      registerForm.value.uuid = data.uuid;
        codeUrl.value = "data:image/gif;base64," + data.img;
        registerForm.value.uuid = data.uuid;
    }
}

const initTenantList = async () => {
  const { data } = await getTenantList();
    const { data } = await getTenantList();
    tenantEnabled.value = data.tenantEnabled === undefined ? true : data.tenantEnabled;
    if (tenantEnabled.value) {
      tenantList.value = data.voList;
      if (tenantList.value != null && tenantList.value.length !== 0) {
          registerForm.value.tenantId = tenantList.value[0].tenantId;
      }
        tenantList.value = data.voList;
        if (tenantList.value != null && tenantList.value.length !== 0) {
            registerForm.value.tenantId = tenantList.value[0].tenantId;
        }
    }
}

onMounted(() => {
  getCode();
  initTenantList();
    getCode();
    initTenantList();
})
</script>

<template>
   <div class="register">
      <el-form ref="registerRef" :model="registerForm" :rules="registerRules" class="register-form">
         <h3 class="title">RuoYi-Vue-Plus多租户管理系统</h3>
         <el-form-item prop="tenantId" v-if="tenantEnabled">
            <el-select v-model="registerForm.tenantId" filterable placeholder="请选择/输入公司名称" style="width: 100%">
               <el-option v-for="item in tenantList" :key="item.tenantId" :label="item.companyName" :value="item.tenantId"> </el-option>
               <template #prefix><svg-icon icon-class="company" class="el-input__icon input-icon" /></template>
            </el-select>
         </el-form-item>
         <el-form-item prop="username">
            <el-input v-model="registerForm.username" type="text" size="large" auto-complete="off" placeholder="账号">
               <template #prefix><svg-icon icon-class="user" class="el-input__icon input-icon" /></template>
            </el-input>
         </el-form-item>
         <el-form-item prop="password">
            <el-input v-model="registerForm.password" type="password" size="large" auto-complete="off" placeholder="密码" @keyup.enter="handleRegister">
               <template #prefix><svg-icon icon-class="password" class="el-input__icon input-icon" /></template>
            </el-input>
         </el-form-item>
         <el-form-item prop="confirmPassword">
            <el-input
               v-model="registerForm.confirmPassword"
               type="password"
               size="large"
               auto-complete="off"
               placeholder="确认密码"
               @keyup.enter="handleRegister"
            >
               <template #prefix><svg-icon icon-class="password" class="el-input__icon input-icon" /></template>
            </el-input>
         </el-form-item>
         <el-form-item prop="code" v-if="captchaEnabled">
            <el-input size="large" v-model="registerForm.code" auto-complete="off" placeholder="验证码" style="width: 63%" @keyup.enter="handleRegister">
               <template #prefix><svg-icon icon-class="validCode" class="el-input__icon input-icon" /></template>
            </el-input>
            <div class="register-code">
               <img :src="codeUrl" @click="getCode" class="register-code-img" />
            </div>
         </el-form-item>
         <el-form-item style="width:100%;">
            <el-button :loading="loading" size="large" type="primary" style="width:100%;" @click.prevent="handleRegister">
               <span v-if="!loading">注 册</span>
               <span v-else>注 册 中...</span>
            </el-button>
            <div style="float: right;">
               <router-link class="link-type" :to="'/login'">使用已有账户登录</router-link>
            </div>
         </el-form-item>
      </el-form>
      <!--  底部  -->
      <div class="el-register-footer">
         <span>Copyright © 2018-2023 疯狂的狮子Li All Rights Reserved.</span>
      </div>
   </div>
</template>

<style lang="scss" scoped>
.register {