refactor ts

LiuHao

2023-04-02 251d2411f235e23209d57173857e05b637729ce8

 src/views/register.vue

@@ -1,99 +1,12 @@
<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">
        <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 ruoyi.vip All Rights Reserved.</span>
    </div>
  </div>
</template>

<script setup>
import { ElMessageBox } from "element-plus";
import { getCodeImg, register, getTenantList } from "@/api/login";
<script setup lang="ts">
import { getCodeImg, register, getTenantList } from '@/api/login';
import { RegisterForm, TenantVO } from '@/api/types';
import { FormRules } from 'element-plus';
import { to } from 'await-to-js';

const router = useRouter();
const { proxy } = getCurrentInstance();

const registerForm = ref({
const registerForm = ref<RegisterForm>({
  tenantId: "",
  username: "",
  password: "",
@@ -103,7 +16,11 @@
  userType: "sys_user"
});

const equalToPassword = (rule, value, callback) => {
// 租户开关
const tenantEnabled = ref(true);


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

const registerRules = {
const registerRules: FormRules = {
  tenantId: [
    { required: true, trigger: "blur", message: "请输入您的租户编号" }
  ],
@@ -129,59 +46,119 @@
  ],
  code: [{ required: true, trigger: "change", message: "请输入验证码" }]
};

const codeUrl = ref("");
const loading = ref(false);
const captchaEnabled = ref(true);
const registerRef = ref(ElForm);
// 租户列表
const tenantList = ref([]);
const tenantList = ref<TenantVO[]>([]);

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

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

function initTenantList() {
  getTenantList().then(res => {
    tenantList.value = res.data;
    if (tenantList.value != null && tenantList.value.length !== 0) {
      loginForm.value.tenantId = tenantList.value[0].tenantId;
const initTenantList = async () => {
  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;
      }
    }
  });
}

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

<style lang='scss' scoped>
<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 ruoyi.vip All Rights Reserved.</span>
      </div>
   </div>
</template>

<style lang="scss" scoped>
.register {
  display: flex;
  justify-content: center;
@@ -190,8 +167,9 @@
  background-image: url("../assets/images/login-background.jpg");
  background-size: cover;
}

.title {
  margin: 0px auto 30px auto;
  margin: 0 auto 30px auto;
  text-align: center;
  color: #707070;
}
@@ -201,32 +179,39 @@
  background: #ffffff;
  width: 400px;
  padding: 25px 25px 5px 25px;

  .el-input {
    height: 40px;

    input {
      height: 40px;
    }
  }

  .input-icon {
    height: 39px;
    width: 14px;
    margin-left: 0px;
    margin-left: 0;
  }
}

.register-tip {
  font-size: 13px;
  text-align: center;
  color: #bfbfbf;
}

.register-code {
  width: 33%;
  height: 40px;
  float: right;

  img {
    cursor: pointer;
    vertical-align: middle;
  }
}

.el-register-footer {
  height: 40px;
  line-height: 40px;
@@ -235,10 +220,11 @@
  width: 100%;
  text-align: center;
  color: #fff;
  font-family: Arial;
  font-family: Arial, serif;
  font-size: 12px;
  letter-spacing: 1px;
}

.register-code-img {
  height: 40px;
  padding-left: 12px;