ylyx-cli 1.0.14 → 1.0.16

package/templates/vue-app/files/src/views/system/user/center/updateEmail.vue

@@ -1,146 +1,146 @@
-<template>
-  <div style="display: inline-block">
-    <el-dialog
-      :visible.sync="dialog"
-      :close-on-click-modal="false"
-      :before-close="cancel"
-      :title="title"
-      append-to-body
-      width="475px"
-      @close="cancel">
-      <el-form ref="form" :model="form" :rules="rules" size="small" label-width="88px">
-        <el-form-item label="新邮箱" prop="email">
-          <el-input v-model="form.email" auto-complete="on" style="width: 200px" />
-          <el-button :loading="codeLoading" :disabled="isDisabled" size="small" @click="sendCode">{{
-            buttonName
-          }}</el-button>
-        </el-form-item>
-        <el-form-item label="验证码" prop="code">
-          <el-input v-model="form.code" style="width: 320px" />
-        </el-form-item>
-        <el-form-item label="当前密码" prop="pass">
-          <el-input v-model="form.pass" type="password" style="width: 320px" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="text" @click="cancel">取消</el-button>
-        <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import store from '@/store';
-import { validEmail } from '@/utils/validate';
-import { updateEmail } from '@/api/system/user';
-import { resetEmail } from '@/api/system/code';
-export default {
-  props: {
-    email: {
-      type: String,
-      required: true,
-    },
-  },
-  data() {
-    const validMail = (rule, value, callback) => {
-      if (value === '' || value === null) {
-        callback(new Error('新邮箱不能为空'));
-      } else if (value === this.email) {
-        callback(new Error('新邮箱不能与旧邮箱相同'));
-      } else if (validEmail(value)) {
-        callback();
-      } else {
-        callback(new Error('邮箱格式错误'));
-      }
-    };
-    return {
-      loading: false,
-      dialog: false,
-      title: '修改邮箱',
-      form: { pass: '', email: '', code: '' },
-      user: { email: '', password: '' },
-      codeLoading: false,
-      buttonName: '获取验证码',
-      isDisabled: false,
-      time: 60,
-      rules: {
-        pass: [{ required: true, message: '当前密码不能为空', trigger: 'blur' }],
-        email: [{ required: true, validator: validMail, trigger: 'blur' }],
-        code: [{ required: true, message: '验证码不能为空', trigger: 'blur' }],
-      },
-    };
-  },
-  methods: {
-    cancel() {
-      this.resetForm();
-    },
-    sendCode() {
-      if (this.form.email && this.form.email !== this.email) {
-        this.codeLoading = true;
-        this.buttonName = '验证码发送中';
-        const _this = this;
-        resetEmail(this.form.email)
-          .then(res => {
-            this.$message({
-              showClose: true,
-              message: '发送成功，验证码有效期5分钟',
-              type: 'success',
-            });
-            this.codeLoading = false;
-            this.isDisabled = true;
-            this.buttonName = this.time-- + '秒后重新发送';
-            this.timer = window.setInterval(function () {
-              _this.buttonName = _this.time + '秒后重新发送';
-              --_this.time;
-              if (_this.time < 0) {
-                _this.buttonName = '重新发送';
-                _this.time = 60;
-                _this.isDisabled = false;
-                window.clearInterval(_this.timer);
-              }
-            }, 1000);
-          })
-          .catch(() => {
-            this.resetForm();
-            this.codeLoading = false;
-          });
-      }
-    },
-    doSubmit() {
-      this.$refs['form'].validate(valid => {
-        if (valid) {
-          this.loading = true;
-          updateEmail(this.form)
-            .then(res => {
-              this.loading = false;
-              this.resetForm();
-              this.$notify({
-                title: '邮箱修改成功',
-                type: 'success',
-                duration: 1500,
-              });
-              store.dispatch('GetInfo').then(() => {});
-            })
-            .catch(() => {
-              this.loading = false;
-            });
-        } else {
-          return false;
-        }
-      });
-    },
-    resetForm() {
-      this.dialog = false;
-      this.$refs['form'].resetFields();
-      window.clearInterval(this.timer);
-      this.time = 60;
-      this.buttonName = '获取验证码';
-      this.isDisabled = false;
-      this.form = { pass: '', email: '', code: '' };
-    },
-  },
-};
-</script>
-
-<style scoped></style>
+<template>
+  <div style="display: inline-block">
+    <el-dialog
+      :visible.sync="dialog"
+      :close-on-click-modal="false"
+      :before-close="cancel"
+      :title="title"
+      append-to-body
+      width="475px"
+      @close="cancel">
+      <el-form ref="form" :model="form" :rules="rules" size="small" label-width="88px">
+        <el-form-item label="新邮箱" prop="email">
+          <el-input v-model="form.email" auto-complete="on" style="width: 200px" />
+          <el-button :loading="codeLoading" :disabled="isDisabled" size="small" @click="sendCode">{{
+            buttonName
+          }}</el-button>
+        </el-form-item>
+        <el-form-item label="验证码" prop="code">
+          <el-input v-model="form.code" style="width: 320px" />
+        </el-form-item>
+        <el-form-item label="当前密码" prop="pass">
+          <el-input v-model="form.pass" type="password" style="width: 320px" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="text" @click="cancel">取消</el-button>
+        <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import store from '@/store';
+import { validEmail } from '@/utils/validate';
+import { updateEmail } from '@/api/system/user';
+import { resetEmail } from '@/api/system/code';
+export default {
+  props: {
+    email: {
+      type: String,
+      required: true,
+    },
+  },
+  data() {
+    const validMail = (rule, value, callback) => {
+      if (value === '' || value === null) {
+        callback(new Error('新邮箱不能为空'));
+      } else if (value === this.email) {
+        callback(new Error('新邮箱不能与旧邮箱相同'));
+      } else if (validEmail(value)) {
+        callback();
+      } else {
+        callback(new Error('邮箱格式错误'));
+      }
+    };
+    return {
+      loading: false,
+      dialog: false,
+      title: '修改邮箱',
+      form: { pass: '', email: '', code: '' },
+      user: { email: '', password: '' },
+      codeLoading: false,
+      buttonName: '获取验证码',
+      isDisabled: false,
+      time: 60,
+      rules: {
+        pass: [{ required: true, message: '当前密码不能为空', trigger: 'blur' }],
+        email: [{ required: true, validator: validMail, trigger: 'blur' }],
+        code: [{ required: true, message: '验证码不能为空', trigger: 'blur' }],
+      },
+    };
+  },
+  methods: {
+    cancel() {
+      this.resetForm();
+    },
+    sendCode() {
+      if (this.form.email && this.form.email !== this.email) {
+        this.codeLoading = true;
+        this.buttonName = '验证码发送中';
+        const _this = this;
+        resetEmail(this.form.email)
+          .then(res => {
+            this.$message({
+              showClose: true,
+              message: '发送成功，验证码有效期5分钟',
+              type: 'success',
+            });
+            this.codeLoading = false;
+            this.isDisabled = true;
+            this.buttonName = this.time-- + '秒后重新发送';
+            this.timer = window.setInterval(function () {
+              _this.buttonName = _this.time + '秒后重新发送';
+              --_this.time;
+              if (_this.time < 0) {
+                _this.buttonName = '重新发送';
+                _this.time = 60;
+                _this.isDisabled = false;
+                window.clearInterval(_this.timer);
+              }
+            }, 1000);
+          })
+          .catch(() => {
+            this.resetForm();
+            this.codeLoading = false;
+          });
+      }
+    },
+    doSubmit() {
+      this.$refs['form'].validate(valid => {
+        if (valid) {
+          this.loading = true;
+          updateEmail(this.form)
+            .then(res => {
+              this.loading = false;
+              this.resetForm();
+              this.$notify({
+                title: '邮箱修改成功',
+                type: 'success',
+                duration: 1500,
+              });
+              store.dispatch('GetInfo').then(() => {});
+            })
+            .catch(() => {
+              this.loading = false;
+            });
+        } else {
+          return false;
+        }
+      });
+    },
+    resetForm() {
+      this.dialog = false;
+      this.$refs['form'].resetFields();
+      window.clearInterval(this.timer);
+      this.time = 60;
+      this.buttonName = '获取验证码';
+      this.isDisabled = false;
+      this.form = { pass: '', email: '', code: '' };
+    },
+  },
+};
+</script>
+
+<style scoped></style>

package/templates/vue-app/files/src/views/system/user/center/updatePass.vue

@@ -1,168 +1,168 @@
-<template>
-  <div style="display: inline-block">
-    <el-dialog
-      :visible.sync="dialog"
-      :close-on-click-modal="false"
-      :before-close="cancel"
-      :title="title"
-      append-to-body
-      width="500px"
-      @close="cancel">
-      <el-form ref="form" :model="form" :rules="rules" size="small" label-width="88px">
-        <el-form-item label="旧密码" prop="oldPass">
-          <el-input
-            placeholder="请输入旧密码"
-            v-model="form.oldPass"
-            type="password"
-            auto-complete="on"
-            style="width: 370px" />
-        </el-form-item>
-        <el-form-item label="新密码" prop="newPass">
-          <el-input
-            placeholder="请输入新密码"
-            v-model="form.newPass"
-            type="password"
-            auto-complete="on"
-            style="width: 370px" />
-        </el-form-item>
-        <el-form-item label="确认密码" prop="confirmPass">
-          <el-input
-            placeholder="请确认密码"
-            v-model="form.confirmPass"
-            type="password"
-            auto-complete="on"
-            style="width: 370px" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="text" @click="cancel">取消</el-button>
-        <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
-      </div>
-    </el-dialog>
-    <el-dialog :visible.sync="backDialog">
-      <div style="text-align: center">
-        <i class="el-icon-success" style="color: #1890ff; font-size: 47px"></i>
-        <p style="padding: 15px 0">
-          修改成功，系统将在<span style="color: #1890ff; padding: 0 5px; font-weight: 700">{{
-            count
-          }}</span
-          >秒后返回登录页面
-        </p>
-        <el-button type="primary" @click="backSubmit">立即登录</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import store from '@/store';
-import { validatePassword } from '@/utils/validate';
-import { updatePass } from '@/api/system/user';
-export default {
-  data() {
-    const confirmPass = (rule, value, callback) => {
-      if (value) {
-        if (this.form.newPass !== value) {
-          callback(new Error('两次输入的密码不一致'));
-        } else {
-          callback();
-        }
-      } else {
-        callback(new Error('请输入确认密码'));
-      }
-    };
-    const newPassPass = (rule, value, callback) => {
-      if (value) {
-        if (!validatePassword(value)) {
-          callback(new Error('密码必须含有大小写字母、数字，且不得少于8位'));
-        } else if (this.form.newPass !== value) {
-          callback(new Error('两次输入的密码不一致'));
-        } else {
-          callback();
-        }
-      } else {
-        callback(new Error('请输入新密码'));
-      }
-    };
-    return {
-      loading: false,
-      dialog: false,
-      title: '修改密码',
-      form: { oldPass: '', newPass: '', confirmPass: '' },
-      rules: {
-        oldPass: [{ required: true, message: '请输入旧密码', trigger: 'blur' }],
-        newPass: [{ required: true, validator: newPassPass, trigger: 'blur' }],
-        confirmPass: [{ required: true, validator: confirmPass, trigger: 'blur' }],
-      },
-      backDialog: false,
-      count: '',
-    };
-  },
-  methods: {
-    cancel() {
-      this.resetForm();
-    },
-    doSubmit() {
-      this.$refs['form'].validate(valid => {
-        if (valid) {
-          this.loading = true;
-          updatePass(this.form)
-            .then(res => {
-              this.resetForm();
-              this.backDialog = true;
-              this.threeGo();
-              // this.$notify({
-              //   title: '密码修改成功，请重新登录',
-              //   type: 'success',
-              //   duration: 1500
-              // })
-              // setTimeout(() => {
-              //   store.dispatch('LogOut').then(() => {
-              //     location.reload() // 为了重新实例化vue-router对象 避免bug
-              //   })
-              // }, 1500)
-            })
-            .catch(() => {
-              this.loading = false;
-            });
-        } else {
-          return false;
-        }
-      });
-    },
-    backSubmit() {
-      store.dispatch('LogOut').then(() => {
-        location.reload(); // 为了重新实例化vue-router对象 避免bug
-      });
-    },
-    threeGo() {
-      const TIME_COUNT = 3;
-      if (!this.timer) {
-        this.count = TIME_COUNT;
-        this.show = false;
-        this.timer = setInterval(() => {
-          if (this.count > 0 && this.count <= TIME_COUNT) {
-            this.count--;
-          } else {
-            this.show = true;
-            clearInterval(this.timer);
-            this.timer = null;
-            // this.backDialog = false
-            //跳转的页面写在此处
-            store.dispatch('LogOut').then(() => {
-              location.reload(); // 为了重新实例化vue-router对象 避免bug
-            });
-          }
-        }, 1000);
-      }
-    },
-    resetForm() {
-      this.dialog = false;
-      this.$refs['form'].resetFields();
-      this.form = { oldPass: '', newPass: '', confirmPass: '' };
-    },
-  },
-};
-</script>
-
-<style scoped></style>
+<template>
+  <div style="display: inline-block">
+    <el-dialog
+      :visible.sync="dialog"
+      :close-on-click-modal="false"
+      :before-close="cancel"
+      :title="title"
+      append-to-body
+      width="500px"
+      @close="cancel">
+      <el-form ref="form" :model="form" :rules="rules" size="small" label-width="88px">
+        <el-form-item label="旧密码" prop="oldPass">
+          <el-input
+            placeholder="请输入旧密码"
+            v-model="form.oldPass"
+            type="password"
+            auto-complete="on"
+            style="width: 370px" />
+        </el-form-item>
+        <el-form-item label="新密码" prop="newPass">
+          <el-input
+            placeholder="请输入新密码"
+            v-model="form.newPass"
+            type="password"
+            auto-complete="on"
+            style="width: 370px" />
+        </el-form-item>
+        <el-form-item label="确认密码" prop="confirmPass">
+          <el-input
+            placeholder="请确认密码"
+            v-model="form.confirmPass"
+            type="password"
+            auto-complete="on"
+            style="width: 370px" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="text" @click="cancel">取消</el-button>
+        <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
+      </div>
+    </el-dialog>
+    <el-dialog :visible.sync="backDialog">
+      <div style="text-align: center">
+        <i class="el-icon-success" style="color: #1890ff; font-size: 47px"></i>
+        <p style="padding: 15px 0">
+          修改成功，系统将在<span style="color: #1890ff; padding: 0 5px; font-weight: 700">{{
+            count
+          }}</span
+          >秒后返回登录页面
+        </p>
+        <el-button type="primary" @click="backSubmit">立即登录</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import store from '@/store';
+import { validatePassword } from '@/utils/validate';
+import { updatePass } from '@/api/system/user';
+export default {
+  data() {
+    const confirmPass = (rule, value, callback) => {
+      if (value) {
+        if (this.form.newPass !== value) {
+          callback(new Error('两次输入的密码不一致'));
+        } else {
+          callback();
+        }
+      } else {
+        callback(new Error('请输入确认密码'));
+      }
+    };
+    const newPassPass = (rule, value, callback) => {
+      if (value) {
+        if (!validatePassword(value)) {
+          callback(new Error('密码必须含有大小写字母、数字，且不得少于8位'));
+        } else if (this.form.newPass !== value) {
+          callback(new Error('两次输入的密码不一致'));
+        } else {
+          callback();
+        }
+      } else {
+        callback(new Error('请输入新密码'));
+      }
+    };
+    return {
+      loading: false,
+      dialog: false,
+      title: '修改密码',
+      form: { oldPass: '', newPass: '', confirmPass: '' },
+      rules: {
+        oldPass: [{ required: true, message: '请输入旧密码', trigger: 'blur' }],
+        newPass: [{ required: true, validator: newPassPass, trigger: 'blur' }],
+        confirmPass: [{ required: true, validator: confirmPass, trigger: 'blur' }],
+      },
+      backDialog: false,
+      count: '',
+    };
+  },
+  methods: {
+    cancel() {
+      this.resetForm();
+    },
+    doSubmit() {
+      this.$refs['form'].validate(valid => {
+        if (valid) {
+          this.loading = true;
+          updatePass(this.form)
+            .then(res => {
+              this.resetForm();
+              this.backDialog = true;
+              this.threeGo();
+              // this.$notify({
+              //   title: '密码修改成功，请重新登录',
+              //   type: 'success',
+              //   duration: 1500
+              // })
+              // setTimeout(() => {
+              //   store.dispatch('LogOut').then(() => {
+              //     location.reload() // 为了重新实例化vue-router对象 避免bug
+              //   })
+              // }, 1500)
+            })
+            .catch(() => {
+              this.loading = false;
+            });
+        } else {
+          return false;
+        }
+      });
+    },
+    backSubmit() {
+      store.dispatch('LogOut').then(() => {
+        location.reload(); // 为了重新实例化vue-router对象 避免bug
+      });
+    },
+    threeGo() {
+      const TIME_COUNT = 3;
+      if (!this.timer) {
+        this.count = TIME_COUNT;
+        this.show = false;
+        this.timer = setInterval(() => {
+          if (this.count > 0 && this.count <= TIME_COUNT) {
+            this.count--;
+          } else {
+            this.show = true;
+            clearInterval(this.timer);
+            this.timer = null;
+            // this.backDialog = false
+            //跳转的页面写在此处
+            store.dispatch('LogOut').then(() => {
+              location.reload(); // 为了重新实例化vue-router对象 避免bug
+            });
+          }
+        }, 1000);
+      }
+    },
+    resetForm() {
+      this.dialog = false;
+      this.$refs['form'].resetFields();
+      this.form = { oldPass: '', newPass: '', confirmPass: '' };
+    },
+  },
+};
+</script>
+
+<style scoped></style>