Merge pull request #346 from yuri0528/dev-login

fix: 添加搜索参数/密码规则校验
TencentBlueKing · Apr 6, 2022 · 5631a3c · 5631a3c
2 parents f818f2f + bf774f6
commit 5631a3c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/src/pages/src/components/catalog/operation/SetPassword.vue b/src/pages/src/components/catalog/operation/SetPassword.vue
@@ -458,7 +458,6 @@ export default {
     // 提交前验证是否有错误
     validate() {
       this.validatePasswordLength();
-      this.validatePasswordRule();
       this.validateAutoUnlock();
       this.validateFreezeDays();
       this.validateInitPassword();
@@ -476,7 +475,7 @@ export default {
     },
     // 保存
     saveInfo() {
-      this.validate() && this.$emit('savePassport');
+      this.validate() && this.$emit('savePassport', this.passwordRuleError);
     },
     // 展开或隐藏邮件模板
     toggleEmailTemplate() {

diff --git a/src/pages/src/views/catalog/operation/LocalSet.vue b/src/pages/src/views/catalog/operation/LocalSet.vue
@@ -124,9 +124,15 @@ export default {
         this.isLoading = false;
       }
     },
-    async handleSavePassport() {
+    async handleSavePassport(state) {
       try {
         this.isLoading = true;
+        console.log(state);
+        if (this.passwordInfo.password_rult_length === null) {
+          this.passwordInfo.password_rult_length = '';
+        } else {
+          state = true;
+        }
         const action = this.passwordHasCreated ? 'catalog/ajaxPutPassport' : 'catalog/ajaxPostPassport';
         await this.$store.dispatch(action, {
           id: this.catalogInfo.id,

diff --git a/src/pages/src/views/organization/index.vue b/src/pages/src/views/organization/index.vue
@@ -752,7 +752,7 @@ export default {
     },
     // 搜索table
     handleTableSearch(list) {
-      const valueList = [];
+      const valueList = [`category_id=${this.currentCategoryId}`];
       let key = '';
       list.forEach((item) => {
         const value = [];