cloud-web-corejs 1.0.54-dev.358 → 1.0.54-dev.359

package/src/index.js

@@ -24,19 +24,20 @@ Vue.component('BaseKeepAlive', BaseKeepAlive)
 import VXETable from 'vxe-table';
 import 'vxe-table/lib/style.css';
 
-/* // 引入扩展插件
+// 引入扩展插件
 import '@/components/table/plugins/extend-cell-area/vxe-table-extend-cell-area.es6.min.js'
 import '@/components/table/plugins/extend-cell-area/vxe-table-extend-cell-area.min.css'
 
 // 设置授权信息
 VXETable.setup({
   // showAuthLog: true, // 是否在控制台显示授权信息，专业版支持关闭
-  authId: 'gbeumewkoyt2rhf9', // 获取授权后在官网登录后进入“用户中心”查看
+  // authId: 'gbeumewkoyt2rhf9', // 获取授权后在官网登录后进入“用户中心”查看
+  authId: 'gbeumewkoyt2rhft', // 获取授权后在官网登录后进入“用户中心”查看
   // onAuth (e) {
   //   // 打印授权状态
   //   console.log(e)
   // }
-}) */
+})
 
 
 

package/src/views/user/user/modifyPasswordDialog.vue

@@ -40,51 +40,58 @@
             clearable
           />
         </el-form-item>
+        <el-form-item label-width="0" style="padding: 5px">
+          <div class="tips_1" style="white-space: pre-wrap; line-height: 20px">
+            {{ $t1(tip) }}
+          </div>
+        </el-form-item>
       </el-form>
     </div>
     <span slot="footer" class="dialog-footer">
-			<el-button type="primary" plain class="button-sty" @click="dialogClose" v-if="!modifyMust">
-				<i class="el-icon-close el-icon"></i>
-				{{ $t1('取 消') }}
-			</el-button>
-			<el-button type="primary" @click="saveData" class="button-sty">
-				<i class="el-icon-check el-icon"></i>
-				{{ $t1('确 定') }}
-			</el-button>
-		</span>
+      <el-button
+        type="primary"
+        plain
+        class="button-sty"
+        @click="dialogClose"
+        v-if="!modifyMust"
+      >
+        <i class="el-icon-close el-icon"></i>
+        {{ $t1("取 消") }}
+      </el-button>
+      <el-button type="primary" @click="saveData" class="button-sty">
+        <i class="el-icon-check el-icon"></i>
+        {{ $t1("确 定") }}
+      </el-button>
+    </span>
   </el-dialog>
 </template>
 
 <script>
-import {getParameterVauleByCode} from "@base/api/user";
+import { getParameterVauleByCode } from "@base/api/user";
 
 export default {
   components: {},
-  created() {
-
-  },
-  mounted() {
-
-  },
+  created() {},
+  mounted() {},
   data() {
     var validatePass = (rule, value, callback) => {
       const isPassRequired = true;
-      if (isPassRequired && (value == '' || value == undefined)) {
-        callback(new Error(this.$t1('密码不能为空')));
+      if (isPassRequired && (value == "" || value == undefined)) {
+        callback(new Error(this.$t1("密码不能为空")));
       } else {
         callback();
       }
-      this.$refs.editForm.validateField('rePassword');
+      this.$refs.editForm.validateField("rePassword");
     };
     var validatePass2 = (rule, value, callback) => {
       const isPassRequired = true;
-      const rePassword = value != undefined ? value : '';
-      const password = this.formData.password != undefined ? this.formData.password : '';
+      const rePassword = value != undefined ? value : "";
+      const password = this.formData.password != undefined ? this.formData.password : "";
 
-      if (isPassRequired && rePassword == '') {
-        callback(new Error(this.$t1('确认密码不能为空')));
+      if (isPassRequired && rePassword == "") {
+        callback(new Error(this.$t1("确认密码不能为空")));
       } else if (rePassword != password) {
-        callback(new Error(this.$t1('两次输入密码不一致!')));
+        callback(new Error(this.$t1("两次输入密码不一致!")));
       } else {
         callback();
       }
@@ -94,9 +101,13 @@ export default {
       falseValue: false,
       modifyMust: false,
       user: {},
-      formData: {password: null, rePassword: null},
-      passRules: [{validator: validatePass, trigger: 'blur', required: true}],
-      pass2Rules: [{validator: validatePass2, trigger: 'blur', required: true}]
+      formData: { password: null, rePassword: null },
+      passRules: [{ validator: validatePass, trigger: "blur", required: true }],
+      pass2Rules: [{ validator: validatePass2, trigger: "blur", required: true }],
+      tip: `密码规则:
+1、密码必须是8~20位，包含英文大写、英文小写、数字、特殊字符中的3种组合，字符例如:!@#$%^&0，不能包含空格和中文字符;
+2、密码有效期为90天，且不允许与前3次的密码相同
+3、密码不允许包含登录账号、hisense、admin、连续字母、连续键盘键等弱密码信息，例如:qwer1234!@、admin1234@#等`,
     };
   },
   methods: {
@@ -105,33 +116,33 @@ export default {
         url: USER_PREFIX + `/user/currentUser`,
         method: `post`,
         data: {
-          id: this.dataId
+          id: this.dataId,
         },
-        success: res => {
+        success: (res) => {
           var user = res.objx || {};
           this.user = res.objx || {};
-        }
+        },
       });
     },
     saveData() {
-      this.$refs.editForm.validate(valid => {
+      this.$refs.editForm.validate((valid) => {
         if (valid) {
-          this.$baseConfirm(this.$t1('您确定要修改密码吗？')).then(() => {
-            let resData = {...this.user, ...this.formData}
-            var url = USER_PREFIX + '/user/updateUserInfo';
+          this.$baseConfirm(this.$t1("您确定要修改密码吗？")).then(() => {
+            let resData = { ...this.user, ...this.formData };
+            var url = USER_PREFIX + "/user/updateUserInfo";
             this.$http({
               url: url,
               method: `post`,
               data: resData,
               isLoading: true,
-              success: res => {
+              success: (res) => {
                 this.$message({
                   message: res.content,
-                  type: 'success',
-                  duration: 2000
+                  type: "success",
+                  duration: 2000,
                 });
                 this.dialogClose();
-              }
+              },
             });
           });
         } else {
@@ -139,17 +150,17 @@ export default {
           let rePassword = this.formData.rePassword;
           if (!password || !rePassword) {
             this.$message({
-              message: this.$t1('密码/确认密码不能为空'),
-              type: 'error',
-              duration: 2000
+              message: this.$t1("密码/确认密码不能为空"),
+              type: "error",
+              duration: 2000,
             });
-            return
+            return;
           }
           if (password !== rePassword) {
             this.$message({
-              message: this.$t1('两次输入密码不一致'),
-              type: 'error',
-              duration: 2000
+              message: this.$t1("两次输入密码不一致"),
+              type: "error",
+              duration: 2000,
             });
           }
         }
@@ -164,15 +175,15 @@ export default {
     },
     init() {
       getParameterVauleByCode({
-        data: {code: "checkPasswordModify"},
+        data: { code: "checkPasswordModify" },
         success: (res0) => {
           if (res0.objx && res0.objx.value) {
             this.$http({
               url: USER_PREFIX + `/user/checkPasswordModifyDate`,
               method: `post`,
               data: {},
-              success: res => {
-                let flag = 0;//0 不提示；1 提示但不强制修改，即弹框它可以点x关掉；2 提示且强制修改，即他不能关掉这个弹框，要输入密码，点确定才能关掉
+              success: (res) => {
+                let flag = 0; //0 不提示；1 提示但不强制修改，即弹框它可以点x关掉；2 提示且强制修改，即他不能关掉这个弹框，要输入密码，点确定才能关掉
                 if (res.objx) {
                   flag = res.objx.flag || 0;
                 }
@@ -182,12 +193,12 @@ export default {
                   this.modifyMust = flag == 2;
                   this.showDialog = true;
                 }
-              }
+              },
             });
           }
-        }
-      })
-    }
-  }
+        },
+      });
+    },
+  },
 };
 </script>