n20-common-lib 2.4.34 → 2.4.36-alpha

package/package.json

@@ -1,48 +1,8 @@
 {
-  "name": "n20-common-lib",
-  "version": "2.4.34",
-  "private": false,
-  "main": "src/index.js",
-  "scripts": {
-    "serve": "vue-cli-service serve",
-    "serve:theme": "vue-cli-service serve --testTheme",
-    "test": "vue-cli-service serve --test",
-    "build": "node versionInfo.js && npm run build:css && vue-cli-service build --testTheme",
-    "lint": "vue-cli-service lint",
-    "info": "node versionInfo.js",
-    "build:Jenkins_1": "vue-cli-service build --serverConfig ./server-config-jenkins.jsonc",
-    "build:gzip": "vue-cli-service build --gzip",
-    "build:report": "vue-cli-service build --analy",
-    "build:css": "node build_css",
-    "build:js": "vue-cli-service build --formats umd-min --target lib src/index.js --name index --dest lib  --analy",
-    "build:doc": "node versionInfo.js && vue-cli-service build --testTheme",
-    "getI18n": "node ./node_modules/nstc-get-i18n"
-  },
-  "files": [
-    "src/_qiankun",
-    "src/assets",
-    "src/components",
-    "src/directives",
-    "src/locale",
-    "src/mixins",
-    "src/utils",
-    "src/plugins",
-    "src/index.js",
-    "src/i18n.json",
-    "style/*.css",
-    "style/*.css.map",
-    "style/fonts",
-    "theme/*.css",
-    "theme/fonts",
-    "bpmn2svg",
-    "g6.js",
-    "u-table.js",
-    "vxe-table.js",
-    "nstc-g6/index.js",
-    "nstc-g6/assets",
-    "nstc-g6/components",
-    "nstc-g6/directives",
-    "nstc-g6/utils"
+  "browserslist": [
+    "> 1%",
+    "last 2 versions",
+    "not dead"
   ],
   "dependencies": {
     "axios": "*",
@@ -103,15 +63,55 @@
     "vue-router": "^3.5.2",
     "vue-template-compiler": "^2.6.11",
     "vuex": "^3.6.2",
+    "vxe-table": "^3.6.17",
     "webpack-bundle-analyzer": "^3.9.0",
+    "xe-utils": "^3.5.11",
     "xlsx": "0.14.1",
-    "xlsx-style": "^0.8.13",
-    "vxe-table": "^3.6.17",
-    "xe-utils": "^3.5.11"
+    "xlsx-style": "^0.8.13"
   },
-  "browserslist": [
-    "> 1%",
-    "last 2 versions",
-    "not dead"
-  ]
-}
+  "files": [
+    "src/_qiankun",
+    "src/assets",
+    "src/components",
+    "src/directives",
+    "src/locale",
+    "src/mixins",
+    "src/utils",
+    "src/plugins",
+    "src/index.js",
+    "src/i18n.json",
+    "style/*.css",
+    "style/*.css.map",
+    "style/fonts",
+    "theme/*.css",
+    "theme/fonts",
+    "bpmn2svg",
+    "g6.js",
+    "u-table.js",
+    "vxe-table.js",
+    "nstc-g6/index.js",
+    "nstc-g6/assets",
+    "nstc-g6/components",
+    "nstc-g6/directives",
+    "nstc-g6/utils"
+  ],
+  "main": "src/index.js",
+  "name": "n20-common-lib",
+  "private": false,
+  "scripts": {
+    "build": "node versionInfo.js && npm run build:css && vue-cli-service build --testTheme",
+    "build:Jenkins_1": "vue-cli-service build --serverConfig ./server-config-jenkins.jsonc",
+    "build:css": "node build_css",
+    "build:doc": "node versionInfo.js && vue-cli-service build --testTheme",
+    "build:gzip": "vue-cli-service build --gzip",
+    "build:js": "vue-cli-service build --formats umd-min --target lib src/index.js --name index --dest lib  --analy",
+    "build:report": "vue-cli-service build --analy",
+    "getI18n": "node ./node_modules/nstc-get-i18n",
+    "info": "node versionInfo.js",
+    "lint": "vue-cli-service lint",
+    "serve": "vue-cli-service serve",
+    "serve:theme": "vue-cli-service serve --testTheme",
+    "test": "vue-cli-service serve --test"
+  },
+  "version": "2.4.36-alpha"
+}

package/src/components/Layout/HeaderWrap/changePwd.vue

@@ -1,6 +1,11 @@
 <template>
   <div v-loading="laoding">
-    <el-form ref="cp-form" :model="form" :label-width="_lang == 'zh' ? '6em' : '11em'" @submit.native.prevent>
+    <el-form
+      ref="cp-form"
+      :model="form"
+      :label-width="_lang == 'zh' ? '6em' : '11em'"
+      @submit.native.prevent
+    >
       <el-form-item :label="'账号' | $lc">
         <el-input :value="form.username" disabled />
       </el-form-item>
@@ -9,27 +14,36 @@
         prop="orginPassword"
         :rules="[
           { required: true, message: $lc('请输入原始密码'), trigger: 'blur' },
-          { validator: orginPasswordVd, trigger: 'blur' }
+          { validator: orginPasswordVd, trigger: 'blur' },
         ]"
       >
-        <el-input v-model="form.orginPassword" type="password" :placeholder="'请输入原始密码' | $lc" />
+        <el-input
+          v-model="form.orginPassword"
+          type="password"
+          :placeholder="'请输入原始密码' | $lc"
+        />
       </el-form-item>
       <el-form-item
         :label="'新密码' | $lc"
         prop="newPassword"
         :rules="[
           { required: true, message: $lc('请输入新密码'), trigger: 'blur' },
-          { validator: newPasswordVd, trigger: 'blur' }
+          { validator: newPasswordVd, trigger: 'blur' },
         ]"
       >
-        <el-input v-model="form.newPassword" :placeholder="'请输入新密码' | $lc" show-password @change="newPwdChange" />
+        <el-input
+          v-model="form.newPassword"
+          :placeholder="'请输入新密码' | $lc"
+          show-password
+          @change="newPwdChange"
+        />
       </el-form-item>
       <el-form-item
         :label="'确认密码' | $lc"
         prop="validatePassword"
         :rules="[
           { required: true, message: $lc('请确认新密码'), trigger: 'blur' },
-          { validator: validatePasswordVd, trigger: 'blur' }
+          { validator: validatePasswordVd, trigger: 'blur' },
         ]"
       >
         <el-input
@@ -42,22 +56,24 @@
     </el-form>
 
     <div class="dialog-footer">
-      <el-button type="primary" @click="confirmFn">{{ '确认' | $lc }}</el-button>
-      <el-button @click="closeFn">{{ '取消' | $lc }}</el-button>
+      <el-button type="primary" @click="confirmFn">{{
+        "确认" | $lc
+      }}</el-button>
+      <el-button @click="closeFn">{{ "取消" | $lc }}</el-button>
     </div>
   </div>
 </template>
 
 <script>
-import { $lc } from '../../../utils/i18n/index'
-import auth from '../../../utils/auth'
-import axios from '../../../utils/axios'
+import { $lc } from "../../../utils/i18n/index";
+import auth from "../../../utils/auth";
+import axios from "../../../utils/axios";
 export default {
   props: {
     visible: {
       type: Boolean,
-      default: false
-    }
+      default: false,
+    },
   },
   data() {
     return {
@@ -66,136 +82,143 @@ export default {
       pwdRE: undefined,
       pwdReMsg: undefined,
       form: {
-        username: sessionStorage.getItem('userNo'),
-        orginPassword: '',
-        newPassword: '',
-        validatePassword: ''
+        username: sessionStorage.getItem("userNo"),
+        orginPassword: "",
+        newPassword: "",
+        validatePassword: "",
       },
-      laoding: false
-    }
+      laoding: false,
+    };
   },
   watch: {
     visible(v) {
       if (!v) {
-        this.$refs['cp-form'].resetFields()
+        this.$refs["cp-form"].resetFields();
       }
-    }
+    },
   },
   created() {
-    this.getPwdRule()
+    this.getPwdRule();
   },
   methods: {
     getPwdRule() {
-      axios.post('/bems/prod_1.0/user/api/userController/use').then(({ data }) => {
-        let { minLength, maxLength, passwordStrength } = data
-        this.pwdMin = minLength
-        this.pwdMax = maxLength
-        switch (passwordStrength) {
-          case '0':
-            this.pwdRE = [/[A-z0-9]+/]
-            this.pwdReMsg = $lc(`密码只能为字母数字`)
-            break
-          case '1':
-            this.pwdRE = [/[A-z]+/, /[0-9]+/]
-            this.pwdReMsg = $lc(`密码只能包含数字 + 字母`)
-            break
-          case '2':
-            this.pwdRE = [/[A-Z]+/, /[a-z]+/, /[0-9]+/]
-            this.pwdReMsg = $lc(`密码只能包含数字 + 大写字母 + 小写字母`)
-            break
-        }
-      })
+      axios
+        .post("/bems/prod_1.0/user/api/userController/use")
+        .then(({ data }) => {
+          let { minLength, maxLength, passwordStrength } = data;
+          this.pwdMin = minLength;
+          this.pwdMax = maxLength;
+          switch (passwordStrength) {
+            case "0":
+              this.pwdRE = [/[A-z0-9]+/];
+              this.pwdReMsg = $lc(`密码只能为字母数字`);
+              break;
+            case "1":
+              this.pwdRE = [/[A-z]+/, /[0-9]+/];
+              this.pwdReMsg = $lc(`密码只能包含数字 + 字母`);
+              break;
+            case "2":
+              this.pwdRE = [/[A-Z]+/, /[a-z]+/, /[0-9]+/];
+              this.pwdReMsg = $lc(`密码只能包含数字 + 大写字母 + 小写字母`);
+              break;
+          }
+        });
     },
 
     orginPasswordVd(r, value, callback) {
       axios
         .post(
-          '/bems/prod_1.0/uas/api/authorization/password/validate',
+          "/bems/prod_1.0/uas/api/authorization/password/validate",
           {
-            username: this.form.username,
-            password: value
+            // username: this.form.username,
+            password: value,
           },
           { noMsg: true, loading: false }
         )
         .then(() => {
-          callback()
+          callback();
         })
         .catch(() => {
-          callback(new Error($lc('原始密码与旧密码不一致')))
-        })
+          callback(new Error($lc("原始密码与旧密码不一致")));
+        });
     },
     newPasswordVd(r, value, callback) {
-      let _re_1 = new RegExp(`^.{${this.pwdMin},${this.pwdMax}}$`)
+      let _re_1 = new RegExp(`^.{${this.pwdMin},${this.pwdMax}}$`);
       if (!_re_1.test(value)) {
-        callback(new Error(`${$lc('密码长度范围:')}${this.pwdMin}-${this.pwdMax}${$lc('位')}`))
+        callback(
+          new Error(
+            `${$lc("密码长度范围:")}${this.pwdMin}-${this.pwdMax}${$lc("位")}`
+          )
+        );
       }
 
       if (this.pwdRE) {
         this.pwdRE.some((re) => {
           if (!re.test(value)) {
-            callback(new Error(this.pwdReMsg))
-            return true
+            callback(new Error(this.pwdReMsg));
+            return true;
           }
-        })
+        });
       }
-      callback()
+      callback();
     },
     validatePasswordVd(r, value, callback) {
       if (value === this.form.newPassword) {
-        callback()
+        callback();
       } else {
-        callback(new Error($lc('两次输入密码不一致!')))
+        callback(new Error($lc("两次输入密码不一致!")));
       }
     },
     newPwdChange(val) {
       if (!val) {
-        this.form.validatePassword = ''
-        this.$refs['cp-form'].clearValidate('validatePassword')
+        this.form.validatePassword = "";
+        this.$refs["cp-form"].clearValidate("validatePassword");
       }
     },
     confirmFn() {
-      this.$refs['cp-form'].validate((v) => {
+      this.$refs["cp-form"].validate((v) => {
         if (v) {
           if (this.form.newPassword === this.form.orginPassword) {
-            this.$message.error($lc('新密码不能与旧密码相同!'))
-            this.form.newPassword = ''
-            this.form.validatePassword = ''
-            return
+            this.$message.error($lc("新密码不能与旧密码相同!"));
+            this.form.newPassword = "";
+            this.form.validatePassword = "";
+            return;
           }
 
-          this.laoding = true
+          this.laoding = true;
           axios
             .post(
-              '/bems/prod_1.0/uas/api/authorization/password/update',
+              "/bems/prod_1.0/uas/api/authorization/password/update",
               {
-                username: this.form.username,
-                newPassword: this.form.newPassword
+                // username: this.form.username,
+                password: this.form.orginPassword,
+                newPassword: this.form.newPassword,
               },
               {
                 loading: () => {
-                  this.laoding = false
-                }
+                  this.laoding = false;
+                },
               }
             )
             .then(() => {
-              this.confirmFnThen()
-            })
+              this.confirmFnThen();
+            });
         }
-      })
+      });
     },
     confirmFnThen() {
       this.$message({
-        message: '密码修改成功!',
-        type: 'success'
-      })
-      axios.delete('/bems/prod_1.0/uas/api/authorization/logout').then(() => {
-        this.closeFn()
-        auth.removeToken()
-      })
+        message: "密码修改成功!",
+        type: "success",
+      });
+      axios.delete("/bems/prod_1.0/uas/api/authorization/logout").then(() => {
+        this.closeFn();
+        auth.removeToken();
+      });
     },
     closeFn() {
-      this.$emit('update:visible', false)
-    }
-  }
-}
+      this.$emit("update:visible", false);
+    },
+  },
+};
 </script>

package/src/components/Layout/HeaderWrap/index.vue

@@ -426,14 +426,19 @@ export default {
       })
     },
     logoutA() {
-      axios.delete('/bems/prod_1.0/uas/api/authorization/logout').then(() => {
-        if (this.afterLogout) {
-          let After = this.afterLogout()
-          After.then && After.then(auth.removeToken())
-        } else {
+      axios
+        .delete('/bems/prod_1.0/uas/api/authorization/logout', {}, { noMsg: true })
+        .then(() => {
+          if (this.afterLogout) {
+            let After = this.afterLogout()
+            After.then && After.then(auth.removeToken())
+          } else {
+            auth.removeToken()
+          }
+        })
+        .catch(() => {
           auth.removeToken()
-        }
-      })
+        })
     },
     // 检查是否代理中
     async getProxyAuthIing() {

package/src/components/Layout/HeaderWrap/indexN.vue

@@ -188,7 +188,7 @@
             </div>
             <el-dropdown-menu slot="dropdown">
               <el-dropdown-item v-for="item in systemList" :key="item.id" @click.native="clickSystem(item)">
-                <span>{{ item.systemName | $lc }}</span>
+                <span>{{ item.systemName }}</span>
               </el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
@@ -570,14 +570,19 @@ export default {
       })
     },
     logoutA() {
-      axios.delete('/bems/prod_1.0/uas/api/authorization/logout').then(() => {
-        if (this.afterLogout) {
-          let After = this.afterLogout()
-          After.then && After.then(auth.removeToken())
-        } else {
+      axios
+        .delete('/bems/prod_1.0/uas/api/authorization/logout', {}, { noMsg: true })
+        .then(() => {
+          if (this.afterLogout) {
+            let After = this.afterLogout()
+            After.then && After.then(auth.removeToken())
+          } else {
+            auth.removeToken()
+          }
+        })
+        .catch(() => {
           auth.removeToken()
-        }
-      })
+        })
     },
     // 检查是否代理中
     async getProxyAuthIing() {