ps-toolkit-ui 1.22.20 → 1.22.22

package/fesm2015/ps-toolkit-ui.js

@@ -2083,7 +2083,7 @@ class InputClass {
             const rs = this.getSelectedOptions(f.options);
             l = l.concat(rs);
         }
-        return l;
+        return l.sort((a, b) => a.priority - b.priority);
     }
     getSelectedRows(rows = this.rows) {
         let l = [];
@@ -2112,6 +2112,7 @@ class OptionClass {
     constructor(name, value, options = [], cls = null, dis = false) {
         this.show = true;
         this.selected = false;
+        this.priority = 0;
         this.parent = null;
         this.loading = false;
         this.disabled = false;
@@ -5846,6 +5847,7 @@ class FormSelectComponent {
     constructor() {
         this.changeIndex = new EventEmitter();
         this.cSearch = '';
+        this.priority = 0;
     }
     get type() { return InputType; }
     ngOnInit() {
@@ -5861,6 +5863,7 @@ class FormSelectComponent {
                 if (v != null) {
                     this.inp.value = v.map(String);
                     this.setValue(v.map(String));
+                    this.priority = v.map(String).length;
                 }
             }
         };
@@ -5894,6 +5897,7 @@ class FormSelectComponent {
             }
             else {
                 this.setValue([]);
+                this.priority = 0;
             }
             if (this.inp.rel != null) {
                 this.inp.rel.options = [];
@@ -5913,7 +5917,6 @@ class FormSelectComponent {
             d[this.inp.name + 'Name'] = this.inp.search;
             if (this.inp.addNew) {
                 d[this.inp.name] = this.inp.search;
-                d[this.inp.name + 'Name'] = this.inp.search;
                 d[this.inp.name + 'Id'] = this.inp.value;
             }
             return d;
@@ -5936,6 +5939,9 @@ class FormSelectComponent {
     setValue(ids, rows = this.inp.options) {
         for (const r of rows) {
             r.selected = ids.includes(r.value);
+            if (r.selected) {
+                r.priority = ids.indexOf(r.value);
+            }
             if (this.inp.onlyChild) {
                 if (r.selected) {
                     this.checkParent(r.parent);
@@ -6113,6 +6119,7 @@ class FormSelectComponent {
             this.inp.value = op.value;
             this.inp.options.find(x => x.value === op.parent.value).options.forEach(x => x.selected = false);
             op.selected = true;
+            op.priority = this.priority++;
         }
     }
     toggle(op) {
@@ -6133,6 +6140,7 @@ class FormSelectComponent {
     }
     check(c) {
         c.selected = true;
+        c.priority = this.priority++;
         if (this.inp.onlyChild) {
             this.checkChildren(c);
         }
@@ -6157,6 +6165,7 @@ class FormSelectComponent {
             }
             else {
                 p.selected = true;
+                p.priority = this.priority++;
             }
             this.checkParent(p.parent);
         }