:bookmark: :bookmark: :bookmark: 3.4.0

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pigx-ui",
-  "version": "3.3.0",
+  "version": "3.4.0",
   "private": true,
   "scripts": {
     "pre": "cnpm install || yarn --registry https://registry.npm.taobao.org || npm install --registry https://registry.npm.taobao.org ",

src/const/crud/activiti/activiti.js

@@ -38,21 +38,41 @@ export const tableOption = {
     fixed: true,
     label: '模型标识',
     prop: 'key',
-    editDisabled: true
+    editDisabled: true,
+    rules: [{
+      required: true,
+      message: '请输入模型标识',
+      trigger: 'blur'
+    }]
   }, {
     label: '流程分类',
     prop: 'category',
-    search: true
+    search: true,
+    rules: [{
+      required: true,
+      message: '请输入流程分类',
+      trigger: 'blur'
+    }]
   }, {
     label: '模型名称',
-    prop: 'name'
+    prop: 'name',
+    rules: [{
+      required: true,
+      message: '请输入模型名称',
+      trigger: 'blur'
+    }]
   },
   {
     label: '描述',
     prop: 'desc',
     hide: true,
     editDisabled: false,
-    addDisplay: true
+    addDisplay: true,
+    rules: [{
+      required: true,
+      message: '请输入描述',
+      trigger: 'blur'
+    }]
   }, {
     label: '版本号',
     prop: 'version',

src/page/index/top/top-search.vue

@@ -55,6 +55,9 @@ export default {
   methods: {
     getMenuList() {
       const findMenu = list => {
+         if (list === undefined){
+             return
+         }
         for (let i = 0; i < list.length; i++) {
           const ele = Object.assign({}, list[i])
           if (ele[this.childrenKey]) findMenu(ele[this.childrenKey])

src/page/index/top/top-setting.vue

@@ -9,7 +9,7 @@
       class="setting__content">
       <div class="setting__header">版权信息</div>
       <div class="setting__body setting__about">
-        <p>Version：PigX 3.1.0</p>
+        <p>Version：PigX 3.4.0</p>
         <p>Copyright: Pig4Cloud ©2018-2025</p>
       </div>
       <div class="setting__header">设置

src/page/login/index.vue

@@ -5,7 +5,7 @@
       <div class="login-logo">
         <img src="/img/logo.png" alt="">
       </div>
-      <p class="login-tip">{{ website.infoTitle}} v 3.3</p>
+      <p class="login-tip">{{ website.infoTitle}} v 3.4</p>
       <div class="login-border">
         <div class="login-main">
           <h4 class="login-title">

src/page/wel.vue

@@ -4,18 +4,18 @@
       <div class="banner-text">
         <span>
           <a href="https://avue.top/#/pay" target="_blank">
-            <img src="https://img.shields.io/badge/Avue-2.1.0-green.svg" alt="Build Status">
+            <img src="https://img.shields.io/badge/Avue-2.1.2-green.svg" alt="Build Status">
           </a>
-          <img src="https://img.shields.io/badge/Spring%20Boot-2.1.7.RELEASE-yellowgreen.svg" alt="Downloads">
-          <img src="https://img.shields.io/badge/Spring%20Cloud-Greenwich.SR2-blue.svg" alt="Coverage Status">
+          <img src="https://img.shields.io/badge/Spring%20Boot-2.1.9.RELEASE-yellowgreen.svg" alt="Downloads">
+          <img src="https://img.shields.io/badge/Spring%20Cloud-Greenwich.SR3-blue.svg" alt="Coverage Status">
         </span>
         <br>
         <span>
           <el-collapse v-model="activeNames">
             <el-collapse-item title="完整的微服务架构" name="1">
               <div>基于Spring Cloud Gateway</div>
-              <div>基于Spring Cloud Greenwich.SR2</div>
-              <div>基于Spring Boot 2.1.7.RELEASE</div>
+              <div>基于Spring Cloud Greenwich.SR3</div>
+              <div>基于Spring Boot 2.1.9.RELEASE</div>
             </el-collapse-item>
             <el-collapse-item title="完善的权限控制" name="2">
               <div>基于Spring Security OAuth实现鉴权体系；</div>

src/views/admin/user/info.vue

@@ -147,7 +147,7 @@ export default {
       }
     }
     return {
-      switchStatus: '',
+      switchStatus: 'userManager',
       avatarUrl: '',
       show: false,
       headers: {
@@ -169,16 +169,7 @@ export default {
     }
   },
   created() {
-    this.ruleForm2.username = this.userInfo.username
-    this.ruleForm2.phone = this.userInfo.phone
-    this.ruleForm2.avatar = this.userInfo.avatar
-    this.switchStatus = 'userManager'
-    handleImg(this.userInfo.avatar, 'avatar')
-    //判断是否选择了租户ID
-    const TENANT_ID = getStore({ name: 'tenantId' })
-    if (TENANT_ID) {
-        this.headers['TENANT-ID'] = TENANT_ID // 租户ID
-    }
+      this.resetForm()
   },
   computed: {
     ...mapState({
@@ -201,12 +192,7 @@ export default {
             data: this.ruleForm2
           }).then(response => {
             if (response.data.data) {
-              this.$notify({
-                title: '成功',
-                message: '修改成功',
-                type: 'success',
-                duration: 2000
-              })
+              this.$notify.success('修改成功')
               // 修改密码之后强制重新登录
               if (this.switchStatus === 'passwordManager') {
                 this.$store.dispatch('LogOut').then(() => {
@@ -214,20 +200,10 @@ export default {
                 })
               }
             } else {
-              this.$notify({
-                title: '失败',
-                message: response.data.msg,
-                type: 'error',
-                duration: 2000
-              })
+              this.$notify.error(response.data.msg)
             }
           }).catch(() => {
-            this.$notify({
-              title: '失败',
-              message: '修改失败',
-              type: 'error',
-              duration: 2000
-            })
+            this.$notify.error('修改失败')
           })
         } else {
           return false
@@ -235,7 +211,18 @@ export default {
       })
     },
     resetForm(formName) {
-      this.$refs[formName].resetFields()
+        this.ruleForm2.password = undefined
+        this.ruleForm2.newpassword1 = undefined
+        this.ruleForm2.newpassword2 = undefined
+        this.ruleForm2.username = this.userInfo.username
+        this.ruleForm2.phone = this.userInfo.phone
+        this.ruleForm2.avatar = this.userInfo.avatar
+        handleImg(this.userInfo.avatar, 'avatar')
+        //判断是否选择了租户ID
+        const TENANT_ID = getStore({ name: 'tenantId' })
+        if (TENANT_ID) {
+            this.headers['TENANT-ID'] = TENANT_ID // 租户ID
+        }
     },
     handleClick(thirdpart) {
       let appid, client_id, redirect_uri, url

src/views/mp/wxaccountfans/index.vue

@@ -17,7 +17,7 @@
 <template>
   <div class="execution">
     <basic-container>
-      <el-row :gutter="12">
+      <el-row :gutter="20">
         <el-col :span="4">
           <div class="grid-content bg-purple">
             <el-input v-model="q.nickname" placeholder="请输入昵称"/>
@@ -34,7 +34,7 @@
             </el-select>
           </div>
         </el-col>
-        <el-col :span="4">
+        <el-col :span="12">
           <div class="grid-content bg-purple">
             <el-button type="primary" icon="el-icon-search" @click="search">搜索</el-button>
             <el-button type="primary" icon="el-icon-sort" @click="asyncFans">同步</el-button>