lw-cdp-ui 1.4.13 → 1.4.14

package/dist/components/lwLogin/index.vue

@@ -66,6 +66,49 @@
           </el-form>
         </div>
       </template>
+      <!-- 修改密码&忘记密码 -->
+      <template v-else-if="isPassword">
+        <div class="login_registered">
+          <el-button type="primary" link @click="isPassword = false">
+            <i class="iconfont icon-quit"></i>
+          </el-button>
+        </div>
+        <div class="login-form">
+          <el-form ref="passwordForm" class="form-body" :model="passwordForm" :rules="rules" label-width="0"
+            size="large">
+            <el-form-item>
+              <!-- 系统注册名称插槽 -->
+              <div class="title-name">
+                <slot name="titleRegister">
+                  {{ $t('loginPage.passwordRequest') }}
+                </slot>
+              </div>
+
+            </el-form-item>
+            <el-form-item prop="oldPassword">
+              <el-input v-model="passwordForm.oldPassword" prefix-icon="el-icon-lock" clearable show-password
+                :placeholder="$t('loginPage.oldPassword')">
+              </el-input>
+            </el-form-item>
+            <el-form-item prop="newPassword">
+              <el-input v-model="passwordForm.newPassword" prefix-icon="el-icon-lock" clearable show-password
+                :placeholder="$t('loginPage.newPassword')">
+              </el-input>
+            </el-form-item>
+            <el-form-item prop="confirmPassword">
+              <el-input v-model="passwordForm.confirmPassword" prefix-icon="el-icon-lock" clearable show-password
+                :placeholder="$t('loginPage.confirmPassword')">
+              </el-input>
+            </el-form-item>
+
+            <el-form-item>
+              <el-button type="primary" style="width: 100%" :loading="islogin" @click="submitPassword">{{
+                $t('loginPage.passwordEmail') }}</el-button>
+            </el-form-item>
+          </el-form>
+        </div>
+      </template>
+
       <template v-else>
         <div class="login_config">
           <Lang />
@@ -89,16 +132,12 @@
                 :placeholder="$t('loginPage.PWPlaceholder')">
               </el-input>
             </el-form-item>
-            <el-form-item style="margin-bottom: 10px">
-              <el-row>
-                <el-col :span="12">
-                  <el-checkbox :label="$t('loginPage.rememberMe')" v-model="ruleForm.autologin"></el-checkbox>
-                </el-col>
-                <el-col :span="12" style="text-align: right">
-                  <el-button type="primary" text>{{ $t("loginPage.forgetPassword") }}？
-                  </el-button>
-                </el-col>
-              </el-row>
+            <el-form-item>
+              <div class="login-remember">
+                <el-checkbox :label="$t('loginPage.rememberMe')" v-model="ruleForm.autologin"></el-checkbox>
+                <el-button type="primary" @click="isPassword = true" link>{{ $t("loginPage.forgetPassword") }}？
+                </el-button>
+              </div>
             </el-form-item>
             <el-form-item>
               <el-button type="primary" style="width: 100%" :loading="islogin" @click="login">{{ $t("loginPage.signIn")
@@ -139,6 +178,7 @@ export default {
   data() {
     return {
       isRegistered: false,
+      isPassword: false,
       ruleForm: {
         user: '',
         password: '',
@@ -146,6 +186,7 @@ export default {
         autologin: false
       },
       registForm: {},
+      passwordForm: {},
       rules: {
         user: [
           {
@@ -161,6 +202,44 @@ export default {
             trigger: 'blur'
           }
         ],
+        email: [
+          {
+            required: true,
+            message: this.t('loginPage.enterEmail'),
+            trigger: 'blur'
+          }
+        ],
+        oldPassword: [
+          {
+            required: true,
+            message: this.t('loginPage.oldPassword'),
+            trigger: 'blur'
+          }
+        ],
+        newPassword: [
+          {
+            required: true,
+            message: this.t('loginPage.newPassword'),
+            trigger: 'blur'
+          }
+        ],
+        confirmPassword: [
+          {
+            required: true,
+            message: this.t('loginPage.confirmPassword'),
+            trigger: 'blur'
+          },
+          {
+            validator: (rule, value, callback) => {
+              if (value !== this.passwordForm.newPassword) {
+                callback(new Error(this.t('loginPage.confirmPasswordError')))
+              } else {
+                callback()
+              }
+            },
+            trigger: 'blur'
+          }
+        ],
         name: [
           {
             required: true,
@@ -260,10 +339,7 @@ export default {
       return encryptor.encrypt(txt) // 对数据进行加密
     },
     async login() {
-      let validate = await this.$refs.loginForm.validate().catch(() => { })
-      if (!validate) {
-        return false
-      }
+      await this.$refs.loginForm.validate()
 
       let data = {
         username: this.ruleForm.user,
@@ -352,13 +428,17 @@ export default {
     },
     // 申请试用
     async apply() {
-      let validate = await this.$refs.registForm.validate().catch(() => { })
-      if (!validate) {
-        return false
-      }
+      await this.$refs.registForm.validate()
       await this.$api.auth.apply(this.registForm)
       this.$message.success(this.t('loginPage.applySuccess'))
     },
+    // 修改密码
+    async submitPassword() {
+      await this.$refs.passwordForm.validate()
+      await this.$api.auth.password(this.passwordForm)
+      this.$message.success(this.t('loginPage.passwordSuccess'))
+      this.isPassword = false
+    },
     // 处理动态菜单
     exportMenu(originData) {
       // 主处理函数
@@ -486,4 +566,11 @@ export default {
   top: 20px;
   right: 20px;
 }
+
+.login-remember {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  width: 100%;
+}
 </style>

package/dist/components/lwLogin/locale/en-us.js

@@ -1,37 +1,40 @@
 export default {
-	loginPage: {
-		accountLoginNologo:'Marketing Cloud',
-		accountLogin: 'Lianwei Marketing Cloud',
-		rememberMe: 'Keep me logged in',
-		forgetPassword: 'Forgot password',
-		signIn: 'Account verification',
-		userPlaceholder: 'Username / Mobile / Email',
-		userError: 'Please enter your username',
-		PWPlaceholder: 'Please enter your password',
-		PWError: 'Please enter your password',
-		mobileError: 'Please enter your mobile number',
-		trialRequest: 'Request a trial',
-		enterTitle: 'Please enter your title',
-		enterPhone: 'Please enter your phone number',
-		correctPhone: 'Please enter a valid phone number format',
-		enterCompany: 'Please enter your company name',
-		selectPosition: 'Please select your position',
-		selectPurpose: 'Please select your purpose',
-		noAccount: 'Don’t have an account?',
-		applySuccess: 'You have applied for a trial, please check your SMS for a prompt.',
-		loginSuccess: 'Login successful'
-	},
-	positions: {
-		techStaff: 'Technical staff',
-		businessStaff: 'Business staff',
-		researchStaff: 'Research and development staff',
-		marketingStaff: 'Marketing staff',
-		operationStaff: 'Operations staff',
-		otherStaff: 'Other professional staff'
-	},
-	purposes: {
-		findSolution: 'Looking for suitable products to solve data, marketing, and other issues',
-		compareProducts: 'Comparing other products, want to learn more',
-		other: 'Other'
-	}
+  loginPage: {
+    accountLoginNologo: 'Marketing Cloud',
+    accountLogin: 'Lenwee Marketing Cloud',
+    rememberMe: 'Stay logged in',
+    forgetPassword: 'Change Password',
+    signIn: 'Account Verification',
+    userPlaceholder: 'Username / Phone / Email',
+    userError: 'Please enter username',
+    PWPlaceholder: 'Please enter password',
+    PWError: 'Please enter password',
+    mobileError: 'Please enter phone number',
+    trialRequest: 'Request Trial',
+    passwordRequest: 'Change Password',
+    passwordEmail: 'Send Email',
+    enterTitle: 'Please enter your title',
+    enterPhone: 'Please enter phone number',
+    enterEmail: 'Please enter email',
+    correctPhone: 'Please enter correct phone number format',
+    enterCompany: 'Please enter your company name',
+    selectPosition: 'Please select your position',
+    selectPurpose: 'Please select your purpose',
+    noAccount: 'No account yet?',
+    applySuccess: 'Your trial request has been submitted. Please check your SMS notification.',
+    loginSuccess: 'Login successful'
+  },
+  positions: {
+    techStaff: 'Technical Staff',
+    businessStaff: 'Business Staff',
+    researchStaff: 'R&D Staff',
+    marketingStaff: 'Marketing Staff',
+    operationStaff: 'Operations Staff',
+    otherStaff: 'Other Professionals'
+  },
+  purposes: {
+    findSolution: 'Looking for suitable products to solve data, marketing, etc. issues',
+    compareProducts: 'Comparing with other products, interested in learning more',
+    other: 'Others'
+  }
 }

package/dist/components/lwLogin/locale/zh-cn.js

@@ -1,37 +1,45 @@
 export default {
-	loginPage: {
-		accountLoginNologo:'营销云',
-		accountLogin: '联蔚营销云',
-		rememberMe: '保持登录状态',
-		forgetPassword: '忘记密码',
-		signIn: '账号验证',
-		userPlaceholder: '用户名 / 手机 / 邮箱',
-		userError: '请输入用户名',
-		PWPlaceholder: '请输入密码',
-		PWError: '请输入密码',
-		mobileError: '请输入手机号码',
-		trialRequest: '申请试用',
-		enterTitle: '请输入您的称谓',
-		enterPhone: '请输入手机号',
-		correctPhone: '请输入正确的手机号格式',
-		enterCompany: '请输入您的公司名称',
-		selectPosition: '请选择您的职位',
-		selectPurpose: '请选择您的用途',
-		noAccount: '还没有账号 ?',
-		applySuccess: '您已申请试用，请注意查收短信提示。',
-		loginSuccess: '登录成功'
-	},
-	positions: {
-		techStaff: '技术人员',
-		businessStaff: '业务人员',
-		researchStaff: '研发人员',
-		marketingStaff: '市场人员',
-		operationStaff: '运营人员',
-		otherStaff: '其他专业人员'
-	},
-	purposes: {
-		findSolution: '寻找合适的产品来解决数据，营销等问题',
-		compareProducts: '正在对比其他产品，想了解',
-		other: '其他'
-	}
+  loginPage: {
+    accountLoginNologo: '营销云',
+    accountLogin: '联蔚营销云',
+    rememberMe: '保持登录状态',
+    forgetPassword: '修改密码',
+    signIn: '账号验证',
+    userPlaceholder: '用户名 / 手机 / 邮箱',
+    userError: '请输入用户名',
+    PWPlaceholder: '请输入密码',
+    PWError: '请输入密码',
+    mobileError: '请输入手机号码',
+    trialRequest: '申请试用',
+    passwordRequest: '修改密码',
+    oldPassword: '旧的密码',
+    newPassword: '新的密码',
+    confirmPassword: '确认密码',
+    confirmPasswordError: '两次密码不一致，请确认！',
+    passwordSuccess: '修改成功，请重新登录！',
+    passwordEmail: '确认修改',
+    enterTitle: '请输入您的称谓',
+    enterPhone: '请输入手机号',
+    enterEmail: '请输入邮箱',
+    correctPhone: '请输入正确的手机号格式',
+    enterCompany: '请输入您的公司名称',
+    selectPosition: '请选择您的职位',
+    selectPurpose: '请选择您的用途',
+    noAccount: '还没有账号 ?',
+    applySuccess: '您已申请试用，请注意查收短信提示。',
+    loginSuccess: '登录成功'
+  },
+  positions: {
+    techStaff: '技术人员',
+    businessStaff: '业务人员',
+    researchStaff: '研发人员',
+    marketingStaff: '市场人员',
+    operationStaff: '运营人员',
+    otherStaff: '其他专业人员'
+  },
+  purposes: {
+    findSolution: '寻找合适的产品来解决数据，营销等问题',
+    compareProducts: '正在对比其他产品，想了解',
+    other: '其他'
+  }
 }

package/dist/components/lwTour/index.vue

@@ -1,90 +1,90 @@
-<template>
-  <el-tour v-model="isOpen" :current="currentStep">
-    <el-tour-step v-for="(step, index) in formattedSteps" :key="index" :target="step.target" :title="step.title"
-      :description="step.description" />
-  </el-tour>
-</template>
-
-<script>
-import { ref, getCurrentInstance, onMounted, nextTick, onUnmounted } from 'vue'
-
-export default {
-  name: 'LwTour',
-  props: {
-    steps: {
-      type: Array,
-      required: true,
-      validator: (value) => {
-        return value.every(step => {
-          return step.css && step.title && step.description
-        })
-      }
-    },
-    // 是否在组件挂载后自动开始引导
-    autoStart: {
-      type: Boolean,
-      default: false
-    }
-  },
-  setup(props, { emit }) {
-    const {
-      proxy: { $api, $expression, t, $tool, $bus }
-    } = getCurrentInstance()
-    $bus.$emit(`lwTourOpen`, true)
-    $bus.$on(`lwTourChange`, () => {
-      startTour()
-    })
-
-    onUnmounted(() => {
-      $bus.$emit(`lwTourOpen`, false)
-    })
-
-    const currentStep = ref(0)
-    const isOpen = ref(false)
-    const formattedSteps = ref([])
-
-    // 开始引导
-    const startTour = () => {
-      const allElementsExist = props.steps.every(step => {
-        return document.querySelector(step.css)
-      })
-
-      if (!allElementsExist) {
-        console.warn('元素未加载完成')
-        startTour()
-        return
-      }
-
-      formattedSteps.value = props.steps.map(step => {
-        const targetElement = document.querySelector(step.css)
-        return {
-          target: targetElement || undefined,
-          title: step.title,
-          description: step.description,
-          // 可以添加更多el-tour支持的配置项
-          placement: 'bottom'
-        }
-      })
-      currentStep.value = 0
-      isOpen.value = true
-    }
-
-
-    // 组件挂载后自动开始引导
-    onMounted(() => {
-      if (props.autoStart) {
-        nextTick(() => {
-          startTour()
-        })
-      }
-    })
-
-    return {
-      currentStep,
-      formattedSteps,
-      isOpen,
-      startTour
-    }
-  }
-}
-</script>
+<template>
+  <el-tour v-model="isOpen" :current="currentStep">
+    <el-tour-step v-for="(step, index) in formattedSteps" :key="index" :target="step.target" :title="step.title"
+      :description="step.description" />
+  </el-tour>
+</template>
+
+<script>
+import { ref, getCurrentInstance, onMounted, nextTick, onUnmounted } from 'vue'
+
+export default {
+  name: 'LwTour',
+  props: {
+    steps: {
+      type: Array,
+      required: true,
+      validator: (value) => {
+        return value.every(step => {
+          return step.css && step.title && step.description
+        })
+      }
+    },
+    // 是否在组件挂载后自动开始引导
+    autoStart: {
+      type: Boolean,
+      default: false
+    }
+  },
+  setup(props, { emit }) {
+    const {
+      proxy: { $api, $expression, t, $tool, $bus }
+    } = getCurrentInstance()
+    $bus.$emit(`lwTourOpen`, true)
+    $bus.$on(`lwTourChange`, () => {
+      startTour()
+    })
+
+    onUnmounted(() => {
+      $bus.$emit(`lwTourOpen`, false)
+    })
+
+    const currentStep = ref(0)
+    const isOpen = ref(false)
+    const formattedSteps = ref([])
+
+    // 开始引导
+    const startTour = () => {
+      const allElementsExist = props.steps.every(step => {
+        return document.querySelector(step.css)
+      })
+
+      if (!allElementsExist) {
+        console.warn('元素未加载完成')
+        startTour()
+        return
+      }
+
+      formattedSteps.value = props.steps.map(step => {
+        const targetElement = document.querySelector(step.css)
+        return {
+          target: targetElement || undefined,
+          title: step.title,
+          description: step.description,
+          // 可以添加更多el-tour支持的配置项
+          placement: 'bottom'
+        }
+      })
+      currentStep.value = 0
+      isOpen.value = true
+    }
+
+
+    // 组件挂载后自动开始引导
+    onMounted(() => {
+      if (props.autoStart) {
+        nextTick(() => {
+          startTour()
+        })
+      }
+    })
+
+    return {
+      currentStep,
+      formattedSteps,
+      isOpen,
+      startTour
+    }
+  }
+}
+</script>