Merge remote-tracking branch 'origin/master'

app_web/src/pages/uaa/sys-permissionmpickup-view/sys-permissionmpickup-view-base.vue

@@ -615,6 +615,7 @@ export default class SYS_PERMISSIONMPickupViewBase extends Vue {
         }
         const removeSelect: boolean = this.viewSelections.some((selection: any) => selection._select);
         this.containerModel.view_leftbtn.disabled = !removeSelect;
+        this.selectedData = JSON.stringify(this.viewSelections);
     }
 
     /**
@@ -635,6 +636,7 @@ export default class SYS_PERMISSIONMPickupViewBase extends Vue {
         });
         const removeSelect: boolean = this.viewSelections.some((selection: any) => selection._select);
         this.containerModel.view_leftbtn.disabled = !removeSelect;
+        this.selectedData = JSON.stringify(this.viewSelections);
     }
 
     /**
@@ -647,13 +649,17 @@ export default class SYS_PERMISSIONMPickupViewBase extends Vue {
             if (!Object.is(model.type, 'PICKUPVIEWPANEL')) {
                 return;
             }
+            let newSelections:any[] = [];
             model.selections.forEach((item: any) => {
                 const index: number = this.viewSelections.findIndex((selection: any) => Object.is(item.srfkey, selection.srfkey));
                 if (index === -1) {
                     let _item: any = { ...JSON.parse(JSON.stringify(item)) };
                     Object.assign(_item, { _select: false })
-                    this.viewSelections.push(_item);
+                    newSelections.push(_item);
+                }else{
+                    newSelections.push(this.viewSelections[index]);
                 }
+                this.viewSelections = newSelections;
             });
         });
     }
@@ -666,6 +672,7 @@ export default class SYS_PERMISSIONMPickupViewBase extends Vue {
     public onCLickAllLeft():void {
         this.viewSelections = [];
         this.containerModel.view_leftbtn.disabled = true;
+        this.selectedData = JSON.stringify(this.viewSelections);
     }
 
     /**

app_web/src/pages/uaa/sys-role-permissionmpickup-view/sys-role-permissionmpickup-view-base.vue

@@ -615,6 +615,7 @@ export default class SYS_ROLE_PERMISSIONMPickupViewBase extends Vue {
         }
         const removeSelect: boolean = this.viewSelections.some((selection: any) => selection._select);
         this.containerModel.view_leftbtn.disabled = !removeSelect;
+        this.selectedData = JSON.stringify(this.viewSelections);
     }
 
     /**
@@ -635,6 +636,7 @@ export default class SYS_ROLE_PERMISSIONMPickupViewBase extends Vue {
         });
         const removeSelect: boolean = this.viewSelections.some((selection: any) => selection._select);
         this.containerModel.view_leftbtn.disabled = !removeSelect;
+        this.selectedData = JSON.stringify(this.viewSelections);
     }
 
     /**
@@ -647,13 +649,17 @@ export default class SYS_ROLE_PERMISSIONMPickupViewBase extends Vue {
             if (!Object.is(model.type, 'PICKUPVIEWPANEL')) {
                 return;
             }
+            let newSelections:any[] = [];
             model.selections.forEach((item: any) => {
                 const index: number = this.viewSelections.findIndex((selection: any) => Object.is(item.srfkey, selection.srfkey));
                 if (index === -1) {
                     let _item: any = { ...JSON.parse(JSON.stringify(item)) };
                     Object.assign(_item, { _select: false })
-                    this.viewSelections.push(_item);
+                    newSelections.push(_item);
+                }else{
+                    newSelections.push(this.viewSelections[index]);
                 }
+                this.viewSelections = newSelections;
             });
         });
     }
@@ -666,6 +672,7 @@ export default class SYS_ROLE_PERMISSIONMPickupViewBase extends Vue {
     public onCLickAllLeft():void {
         this.viewSelections = [];
         this.containerModel.view_leftbtn.disabled = true;
+        this.selectedData = JSON.stringify(this.viewSelections);
     }
 
     /**

app_web/src/pages/uaa/sys-rolempickup-view/sys-rolempickup-view-base.vue

@@ -615,6 +615,7 @@ export default class SYS_ROLEMPickupViewBase extends Vue {
         }
         const removeSelect: boolean = this.viewSelections.some((selection: any) => selection._select);
         this.containerModel.view_leftbtn.disabled = !removeSelect;
+        this.selectedData = JSON.stringify(this.viewSelections);
     }
 
     /**
@@ -635,6 +636,7 @@ export default class SYS_ROLEMPickupViewBase extends Vue {
         });
         const removeSelect: boolean = this.viewSelections.some((selection: any) => selection._select);
         this.containerModel.view_leftbtn.disabled = !removeSelect;
+        this.selectedData = JSON.stringify(this.viewSelections);
     }
 
     /**
@@ -647,13 +649,17 @@ export default class SYS_ROLEMPickupViewBase extends Vue {
             if (!Object.is(model.type, 'PICKUPVIEWPANEL')) {
                 return;
             }
+            let newSelections:any[] = [];
             model.selections.forEach((item: any) => {
                 const index: number = this.viewSelections.findIndex((selection: any) => Object.is(item.srfkey, selection.srfkey));
                 if (index === -1) {
                     let _item: any = { ...JSON.parse(JSON.stringify(item)) };
                     Object.assign(_item, { _select: false })
-                    this.viewSelections.push(_item);
+                    newSelections.push(_item);
+                }else{
+                    newSelections.push(this.viewSelections[index]);
                 }
+                this.viewSelections = newSelections;
             });
         });
     }
@@ -666,6 +672,7 @@ export default class SYS_ROLEMPickupViewBase extends Vue {
     public onCLickAllLeft():void {
         this.viewSelections = [];
         this.containerModel.view_leftbtn.disabled = true;
+        this.selectedData = JSON.stringify(this.viewSelections);
     }
 
     /**

app_web/src/pages/uaa/sys-user-rolempickup-view/sys-user-rolempickup-view-base.vue

@@ -615,6 +615,7 @@ export default class SYS_USER_ROLEMPickupViewBase extends Vue {
         }
         const removeSelect: boolean = this.viewSelections.some((selection: any) => selection._select);
         this.containerModel.view_leftbtn.disabled = !removeSelect;
+        this.selectedData = JSON.stringify(this.viewSelections);
     }
 
     /**
@@ -635,6 +636,7 @@ export default class SYS_USER_ROLEMPickupViewBase extends Vue {
         });
         const removeSelect: boolean = this.viewSelections.some((selection: any) => selection._select);
         this.containerModel.view_leftbtn.disabled = !removeSelect;
+        this.selectedData = JSON.stringify(this.viewSelections);
     }
 
     /**
@@ -647,13 +649,17 @@ export default class SYS_USER_ROLEMPickupViewBase extends Vue {
             if (!Object.is(model.type, 'PICKUPVIEWPANEL')) {
                 return;
             }
+            let newSelections:any[] = [];
             model.selections.forEach((item: any) => {
                 const index: number = this.viewSelections.findIndex((selection: any) => Object.is(item.srfkey, selection.srfkey));
                 if (index === -1) {
                     let _item: any = { ...JSON.parse(JSON.stringify(item)) };
                     Object.assign(_item, { _select: false })
-                    this.viewSelections.push(_item);
+                    newSelections.push(_item);
+                }else{
+                    newSelections.push(this.viewSelections[index]);
                 }
+                this.viewSelections = newSelections;
             });
         });
     }
@@ -666,6 +672,7 @@ export default class SYS_USER_ROLEMPickupViewBase extends Vue {
     public onCLickAllLeft():void {
         this.viewSelections = [];
         this.containerModel.view_leftbtn.disabled = true;
+        this.selectedData = JSON.stringify(this.viewSelections);
     }
 
     /**

app_web/src/pages/uaa/sys-usermpickup-view/sys-usermpickup-view-base.vue

@@ -615,6 +615,7 @@ export default class SYS_USERMPickupViewBase extends Vue {
         }
         const removeSelect: boolean = this.viewSelections.some((selection: any) => selection._select);
         this.containerModel.view_leftbtn.disabled = !removeSelect;
+        this.selectedData = JSON.stringify(this.viewSelections);
     }
 
     /**
@@ -635,6 +636,7 @@ export default class SYS_USERMPickupViewBase extends Vue {
         });
         const removeSelect: boolean = this.viewSelections.some((selection: any) => selection._select);
         this.containerModel.view_leftbtn.disabled = !removeSelect;
+        this.selectedData = JSON.stringify(this.viewSelections);
     }
 
     /**
@@ -647,13 +649,17 @@ export default class SYS_USERMPickupViewBase extends Vue {
             if (!Object.is(model.type, 'PICKUPVIEWPANEL')) {
                 return;
             }
+            let newSelections:any[] = [];
             model.selections.forEach((item: any) => {
                 const index: number = this.viewSelections.findIndex((selection: any) => Object.is(item.srfkey, selection.srfkey));
                 if (index === -1) {
                     let _item: any = { ...JSON.parse(JSON.stringify(item)) };
                     Object.assign(_item, { _select: false })
-                    this.viewSelections.push(_item);
+                    newSelections.push(_item);
+                }else{
+                    newSelections.push(this.viewSelections[index]);
                 }
+                this.viewSelections = newSelections;
             });
         });
     }
@@ -666,6 +672,7 @@ export default class SYS_USERMPickupViewBase extends Vue {
     public onCLickAllLeft():void {
         this.viewSelections = [];
         this.containerModel.view_leftbtn.disabled = true;
+        this.selectedData = JSON.stringify(this.viewSelections);
     }
 
     /**