@newview/permission-service 1.2.52 → 1.2.54

package/README.md

@@ -1,7 +1,11 @@
+### 版本 1.2.54
+1、子平台用户管理优化
 
-### 版本 1.2.52
-1、添加角色默认选中
+1、图签转换
+### 版本 1.2.49
+1、图签转换
 
+1. 平台及子系统功能优化
 ### 版本 1.2.48
 1. 平台及子系统功能优化
 

package/dist/permission-service.js

@@ -1911,7 +1911,8 @@ let RoleInstance$1 = class RoleInstance extends BaseInstance {
           isButtonGroup: false
         },
         rowConfig: {
-          isHover: true
+          isHover: true,
+          isCurrent: true
         },
         isPagination: true,
         pageSize: 15
@@ -4539,6 +4540,7 @@ let UserinforInstance$1 = class UserinforInstance extends BaseInstance {
     __publicField(this, "institutionTree", ref([]));
     __publicField(this, "loadingInstitutionTree", ref(false));
     __publicField(this, "insTreeIds", ref(""));
+    __publicField(this, "institutionList", []);
     // 响应式方法 | xxx = () => {}
     /**
      * 平台切换
@@ -4940,8 +4942,9 @@ let UserinforInstance$1 = class UserinforInstance extends BaseInstance {
         let res = this.utilities.parseApiResult(await this.userinforApi.getInstitutionTreeAllUsers(0, this.selectedPlatform.Id));
         if (res && res.length > 0) {
           let user = res.filter((x) => x.IsDel == 0 && x.Phone == this.userFormModel.Phone && x.Id !== this.userFormModel.Id);
-          if (user.length > 0) {
-            this.message.warning(`手机号 ${this.userFormModel.Phone} 已在当前平台下关联其他账号, 请重新输入!`);
+          if (user) {
+            let ins = this.institutionList.find((e) => e["InstitutionId"] == user.InstitutionId);
+            this.modal.info({ title: "系统提示", content: `手机号 ${this.userFormModel.Phone} 已在【${this.selectedPlatform.PlatformAbbreviation}】【${ins.InstitutionAbbreviation}】下关联其他账号, 请重新输入!` });
             this.saveingUser.value = false;
             return;
           }
@@ -5481,6 +5484,7 @@ let UserinforInstance$1 = class UserinforInstance extends BaseInstance {
       return childDatas;
     };
     this.institutionTree.value = whileChildData(0);
+    this.institutionList = datas;
     if (!hasSelected && this.institutionTree.value.length > 0) {
       const data = this.institutionTree.value[0];
       data.selected = true;
@@ -11567,6 +11571,7 @@ class UserinforInstance2 extends BaseInstance {
     // 响应属性 | ref、reactive、computed
     __publicField(this, "institutionTree", ref([]));
     __publicField(this, "loadingInstitutionTree", ref(false));
+    __publicField(this, "institutionList", []);
     // 响应式方法 | xxx = () => {}
     /**
      * 平台切换
@@ -11999,9 +12004,10 @@ class UserinforInstance2 extends BaseInstance {
         }
         let res = this.utilities.parseApiResult(await this.userinforApi.getInstitutionTreeAllUsers(0, this.selectedPlatform.Id));
         if (res && res.length > 0) {
-          let user = res.filter((x) => x.IsDel == 0 && x.Phone == this.userFormModel.Phone && x.Id !== this.userFormModel.Id);
-          if (user.length > 0) {
-            this.message.warning(`手机号 ${this.userFormModel.Phone} 已在当前平台下关联其他账号, 请重新输入!`);
+          let user = res.find((x) => x.IsDel == 0 && x.Phone == this.userFormModel.Phone && x.Id !== this.userFormModel.Id);
+          if (user) {
+            let ins = this.institutionList.find((e) => e["InstitutionId"] == user.InstitutionId);
+            this.modal.info({ title: "系统提示", content: `手机号 ${this.userFormModel.Phone} 已在【${this.selectedPlatform.PlatformAbbreviation}】【${ins.InstitutionAbbreviation}】下关联其他账号, 请重新输入!` });
             this.saveingUser.value = false;
             return;
           }
@@ -12681,6 +12687,7 @@ class UserinforInstance2 extends BaseInstance {
       return childDatas;
     };
     this.institutionTree.value = whileChildData(0);
+    this.institutionList = datas;
     if (!hasSelected && this.institutionTree.value.length > 0) {
       const data = this.institutionTree.value[0];
       data.selected = true;
@@ -30981,7 +30988,7 @@ class ProjectSummaryInstance extends BaseInstance {
       if (res.length > 0) {
         console.log("表单数据xxxx", res);
         Object.assign(this.nowData, res[0]);
-        let formData = JSON.parse(res[0].ConfigData);
+        let formData = JSON.parse(this.fixJsonWithNewlines(res[0].ConfigData));
         console.log("xxxxxxxxxx解析json", formData);
         Object.assign(formData, {
           Province: res[0].Province ? res[0].Province : "",
@@ -31011,6 +31018,9 @@ class ProjectSummaryInstance extends BaseInstance {
       this.message.error("请求数据出错，请联系管理员");
     }
   }
+  fixJsonWithNewlines(jsonString) {
+    return jsonString.replace(/\n/g, "\\n").replace(/\r/g, "\\r");
+  }
   // 私有方法 | private 方法名() {}
   // private test2() {}
   /**