diff --git a/src/App.vue b/src/App.vue
index f0a193689..87ed26edb 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,14 +1,3 @@
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/components/selector/index.vue b/src/components/selector/index.vue
index a490153c5..f01a55cfe 100644
--- a/src/components/selector/index.vue
+++ b/src/components/selector/index.vue
@@ -5,14 +5,14 @@
- 22
+ {{key}}
|
@@ -40,16 +40,16 @@ export default defineComponent({
props: {
disabled: {
type: Boolean,
- default: false,
+ default: false
},
value: {
type: Number,
- default: 0,
+ default: 0
},
max: {
type: Number,
- default: 10,
- },
+ default: 10
+ }
},
setup(props, { emit }) {
let currentValue = props.value;
@@ -79,30 +79,32 @@ export default defineComponent({
if (selectedList.length === 1) {
overList.push({ index });
- // let i = 0;
-
let firstIndex = overList[0].index;
+
// 往左走,索引变大
-
if (index > firstIndex) {
- // console.log(index, firstIndex);
- let leftIndex = index - firstIndex;
-
- for (var i =0; i < index; i++) {
- // useDebounceFn(() => {
- if(document.querySelector(".hs-select__item" + (i+index))) {
- addClass(document.querySelector(".hs-select__item" + (i+index)), inRange);
- }
- // }, 100)();
+ while (index >= firstIndex) {
+ addClass(
+ document.querySelector(".hs-select__item" + firstIndex),
+ inRange
+ );
+ firstIndex++;
}
} else {
+ while (index <= firstIndex) {
+ addClass(
+ document.querySelector(".hs-select__item" + firstIndex),
+ inRange
+ );
+ firstIndex--;
+ }
}
}
addClass(document.querySelector("." + voidClass + index), activeClass);
};
- const resetCurrentValue = (index) => {
+ const resetCurrentValue = index => {
// 移除先检查是否选中 选中则返回false 不移除
const currentHsDom = document.querySelector("." + voidClass + index);
if (currentHsDom.className.includes(stayClass)) {
@@ -113,8 +115,22 @@ export default defineComponent({
// 当选中一个元素后,开始移除背景色
if (selectedList.length === 1) {
- for (let i = 0; i <= index; i++) {
- removeClass(document.querySelector(".hs-select__item" + i), inRange);
+ let firstIndex = overList[0].index;
+ if (index >= firstIndex) {
+ for (let i = 0; i <= index; i++) {
+ removeClass(
+ document.querySelector(".hs-select__item" + i),
+ inRange
+ );
+ }
+ } else {
+ while (index <= firstIndex) {
+ removeClass(
+ document.querySelector(".hs-select__item" + index),
+ inRange
+ );
+ index++;
+ }
}
}
};
@@ -129,7 +145,7 @@ export default defineComponent({
// let rangeDom = document.querySelector(".hs-select__item" + index)
} else {
nextTick(() => {
- selectedList.forEach((v) => {
+ selectedList.forEach(v => {
removeClass(
document.querySelector("." + voidClass + v.index),
activeClass,
@@ -153,9 +169,9 @@ export default defineComponent({
setCurrentValue,
resetCurrentValue,
selectValue,
- classes,
+ classes
};
- },
+ }
});
diff --git a/src/views/welcome.vue b/src/views/welcome.vue
index 8219cde4a..a85a56905 100644
--- a/src/views/welcome.vue
+++ b/src/views/welcome.vue
@@ -32,6 +32,7 @@ import { ref, computed, onMounted, inject, nextTick } from "vue";
import { deviceDetection } from "../utils/deviceDetection";
import { echartsJson } from "../api/mock";
import { useEventListener, tryOnUnmounted } from "@vueuse/core";
+import * as echarts from "echarts";
let brokenLine: any = null; //折线图实例
export default {
@@ -43,7 +44,6 @@ export default {
let mobile = ref(deviceDetection());
let date: Date = new Date();
let loading = ref(true);
- let echarts = inject("echarts"); //引入
setTimeout(() => {
loading.value = !loading.value;