From 4e4770fafafb63a593293c234fd23db78faefaae Mon Sep 17 00:00:00 2001
From: ChenZeping <chenzeping>
Date: 星期二, 11 五月 2021 10:49:07 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/utils/List.js | 40 ++++++++++++++++++++++++++++------------
1 files changed, 28 insertions(+), 12 deletions(-)
diff --git a/src/utils/List.js b/src/utils/List.js
index 178cdc7..c7137c7 100644
--- a/src/utils/List.js
+++ b/src/utils/List.js
@@ -4,6 +4,28 @@
}
add (index, element) {
+ if (element.indexOf(',') > 0) {
+ const arr = element.split(',')
+ for (const k in arr) {
+ if (!this.contains(element)) {
+ this._addElement(index, arr[k])
+ }
+ }
+ } else if (!this.contains(element)) {
+ this._addElement(index, element)
+ }
+ }
+
+ _addIndex (index, element) {
+ const newArr = []
+ for (var i = this.dataSouce.length - 1; i > index - 1; i--) {
+ newArr[i + 1] = this.dataSouce[i]
+ }
+ newArr[index] = element
+ this.dataSouce = newArr
+ }
+
+ _addElement (index, element) {
if (!index) {
this.addEnd(element)
} else if (index >= this.dataSouce.length) {
@@ -11,7 +33,7 @@
} else if (index === 1) {
this.addFront(element)
} else {
- this._add(index, element)
+ this._addIndex(index, element)
}
}
@@ -20,7 +42,9 @@
* @param {*} element 瑕佹坊鍔犵殑鍏冪礌
*/
addEnd (element) {
- this.dataSouce[this.dataSouce.length] = element
+ if (!this.contains(element)) {
+ this.dataSouce[this.dataSouce.length] = element
+ }
}
/**
@@ -29,16 +53,9 @@
* @param {*} after
*/
addFront (element) {
- this._add(0, element)
- }
-
- _add (index, element) {
- const newArr = []
- for (var i = this.dataSouce.length - 1; i > index - 1; i--) {
- newArr[i + 1] = this.dataSouce[i]
+ if (!this.contains(element)) {
+ this._addIndex(0, element)
}
- newArr[index] = element
- this.dataSouce = newArr
}
/**
@@ -84,7 +101,6 @@
removeBlank () {
const arr = this.dataSouce
- console.log(arr)
for (const k in arr) {
if (!arr[k]) {
this.dataSouce.splice(k, 1)
--
Gitblit v1.8.0