leisure-core 0.6.22 → 0.6.24

package/le-home/src/main.vue

@@ -20,6 +20,15 @@
               </span>
               <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item command="1">修改密码</el-dropdown-item>
+                <el-dropdown-item command="3">个人信息</el-dropdown-item>
+                <el-dropdown-item
+                  v-for="item in extraDropdownItems"
+                  :key="item.command"
+                  :command="item.command"
+                  :divided="item.divided"
+                >
+                  {{ item.label }}
+                </el-dropdown-item>
                 <el-dropdown-item command="2">退出</el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
@@ -134,9 +143,6 @@
             autocomplete="off"
           ></el-input>
         </el-form-item>
-        <el-form-item label="昵称" prop="nick">
-          <el-input v-model="ruleForm.nick" autocomplete="off"></el-input>
-        </el-form-item>
       </el-form>
       <div
         ref="pwdref"
@@ -156,6 +162,16 @@
         >
       </div>
     </el-dialog>
+    <le-dialog-container :showDialog="showPerInfo" title="个人信息" width="30%">
+      <le-list-form
+        :formColumns="formColumns"
+        :formData="perInfo"
+        :columnsPerRow="1"
+        :handleStatus="2"
+        @closeDialog="cancelChangePerInfo"
+        @saveData="savePerInfo"
+      ></le-list-form>
+    </le-dialog-container>
     <div v-show="contextMenuVisible">
       <ul
         :style="{ left: menuLeft + 'px', top: menuTop + 'px' }"
@@ -184,11 +200,16 @@
   </el-container>
 </template>
 <script>
+import { cancel } from "@/api/distribution_goods";
 import { cloneDeep } from "lodash";
 import { throttle } from "lodash"; // 可选，用于性能优化
 export default {
   name: "le-home",
   props: {
+    extraDropdownItems: {
+      type: Array,
+      default: () => [],
+    },
     companyInfo: {
       type: Object,
       default: () => ({}),
@@ -234,6 +255,7 @@ export default {
       title: "",
       cacheView: [],
       showChangePwd: false,
+      showPerInfo: false,
       username: "",
       changeUid: "",
       tabNameCurrent: "",
@@ -241,7 +263,14 @@ export default {
       ruleForm: {
         pwd: "",
         confirmPwd: "",
+      },
+      formColumns: [
+        { prop: "nick", label: "昵称" },
+        { prop: "phone", label: "手机号" },
+      ],
+      perInfo: {
         nick: this.$store.getters.userinfo.nick,
+        phone: this.$store.getters.userinfo.phone,
       },
       rules: {
         pwd: [{ validator: validatePass, trigger: "blur" }],
@@ -391,12 +420,10 @@ export default {
       }
     },
     handleCommand(command) {
-      if (command == 1) {
-        this.changPwd();
-      }
-      if (command == 2) {
-        this.signout();
-      }
+      if (command === "1") this.changPwd();
+      else if (command === "2") this.signout();
+      else if (command === "3") this.changPerson();
+      else this.$emit("command", command); // 抛出外部命令
     },
     changPwd() {
       this.changeUid = this.$store.getters.userinfo.id;
@@ -404,12 +431,47 @@ export default {
       this.ruleForm.confirmPwd = "";
       this.showChangePwd = true;
     },
+    changPerson() {
+      this.changeUid = this.$store.getters.userinfo.id;
+      this.perInfo.nick = this.$store.getters.userinfo.nick;
+      this.perInfo.phone = this.$store.getters.userinfo.phone;
+      this.showPerInfo = true;
+    },
+    validatePhone(phone) {
+      const phoneRegex = /^1[3-9]\d{9}$/;
+      return phoneRegex.test(phone);
+    },
     cancelChangePwd() {
       this.showChangePwd = false;
       this.changeUid = "";
       this.ruleForm.pwd = "";
       this.ruleForm.confirmPwd = "";
     },
+    cancelChangePerInfo() {
+      this.showPerInfo = false;
+      this.perInfo.nick = "";
+      this.perInfo.phone = "";
+    },
+    savePerInfo(param) {
+      if (param.phone) {
+        if (!this.validatePhone(param.phone)) {
+          this.$message.error("请输入有效的手机号");
+          return;
+        }
+      }
+
+      if (!param.nick && !param.phone) {
+        this.$message.error("昵称和手机号至少填写一项");
+        return;
+      }
+
+      let params = {
+        uid: this.$store.getters.userinfo.id,
+        nick: param.nick,
+        phone: param.phone,
+      };
+      this.$emit("savePerInfo", params);
+    },
     saveChangePwd(formName) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
@@ -417,7 +479,6 @@ export default {
             pwd: this.ruleForm.pwd,
             confirmPwd: this.ruleForm.confirmPwd,
             uid: this.changeUid,
-            nick: this.ruleForm.nick,
           };
           this.$emit("userChangePwd", params, this.changePwdAfter);
         } else {
@@ -428,7 +489,7 @@ export default {
     },
     changePwdAfter(res) {
       if (res && res.data && res.data.code == "10000") {
-        this.$message.success("修改密码成功");
+        this.$message.success("更新成功");
         localStorage.clear();
         this.$store.commit("setUserInfo", null);
         this.$router.replace({ path: "/" });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "leisure-core",
-  "version": "0.6.22",
+  "version": "0.6.24",
   "description": "leisure-core是京心数据基于vue2.x开发的一套后台管理系统桌面端组件库，封装了大量实用的UI控件模板,非常方便开发者快速搭建前端应用",
   "private": false,
   "author": "北方乐逍遥(zcx7878)",