Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp

hx-op/src/view/systemManage/systemMenu/editSystemMenu.vue

@@ -107,6 +107,7 @@
   const redirectIsshow = ref(true);//重定向路由是否显示
   const keepAliveIsshow = ref(false);//缓存是否显示
   const hideChildrenIsshow = ref(true);//是否隐藏子级是否显示
+  let isClicked = ref(true);//增加防重复点击
   interface FormState {
     menuName: string;
     previousMenu:string;
@@ -161,6 +162,7 @@
   const onClose = () => {
     visible.value = false;
     formRef.value.resetFields();
+    isClicked.value = true;
   };
   //菜单类型按钮切换
   const chanageMenuType = (e:any,typeMenu:any)=>{
@@ -247,22 +249,34 @@
           params.hideChildren = formState.value.hideChildren;//是否隐藏子级
         }
         if(addOrEditType.value==1){//新增
+          if(isClicked.value){
+            isClicked.value = false;
             http.post(menuS.queryMenuPageAdd, params).then(() => {
-            NsMessage.success('操作成功');
               visible.value = !visible.value;
-            emit("editObject",formState)
+              emit("editObject",formState);
+              NsMessage.success('操作成功');
+              setTimeout(() => {
+                isClicked.value = !visible.value;
+              }, 500);
             });
+          }
         }else{
           params.permissionId = currentLineData.value.permissionId;
           params.createTime = currentLineData.value.createTime;
           params.updateTime = currentLineData.value.updateTime;
           params.isDelete = currentLineData.value.isDelete;
+          if(isClicked.value){
+            isClicked.value = false;
             http.post(menuS.queryMenuPageEdit, params).then(() => {
-            NsMessage.success('操作成功');
               visible.value = !visible.value;
-            emit("editObject",formState)
+              emit("editObject",formState);
+              NsMessage.success('操作成功');
+              setTimeout(() => {
+                isClicked.value = !visible.value;
+              }, 500);
             });
           }
+        }
       })
     }
     //获取菜单列表
@@ -335,7 +349,8 @@
           formState.value.perissionBtn = record.label;
           formState.value.menuJumpUrl = record.component;
           formState.value.menuRedirect = record.redirect.name;
-
+          formState.value.keepAlive = record.keepAlive;
+          formState.value.hideChildren = record.hideChildren;
         }
         
       }

lib/saas/view/system/login.vue

@@ -80,7 +80,7 @@
   import { storeToRefs } from 'pinia';
   import { NsMessage } from '/nerv-lib/component';
   import { replyDynamRoutesPath } from '/nerv-lib/util/dynamicRoutesss';
-  import { Enobscure, Deobscure } from '/nerv-lib/util/crypto';
+  // import { Enobscure, Deobscure } from '/nerv-lib/util/crypto';
 
   export default defineComponent({
     name: 'UserLogin',
@@ -127,7 +127,8 @@
       const submit = (value): void => {
         let data = JSON.stringify({
           accountNo: userName.value.trim(),
-          password: Enobscure(password.value.trim()),
+          password: password.value.trim()
+          // password: Enobscure(password.value.trim()),//登录密码加密处理，待前后端代码合并一致后再放开
         });
         validator(null, value?.code)
           .then(() => {