From 19d987b5387051ab818a9575d9c4c7ed6768ada3 Mon Sep 17 00:00:00 2001
From: "Min Ji, Choi" <30827184+mmindy@users.noreply.github.com>
Date: Thu, 11 Mar 2021 14:47:49 +0900
Subject: [PATCH] =?UTF-8?q?[#780][3.0]=20slider=20=EC=BB=B4=ED=8F=AC?=
 =?UTF-8?q?=EB=84=8C=ED=8A=B8=20step,=20mark=20=EA=B4=80=EB=A0=A8=20?=
 =?UTF-8?q?=EB=B0=98=EC=9D=91=ED=98=95=20=EB=A1=9C=EC=A7=81=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95=20(#781)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

##########
step, mark 값 반응형 추가

Co-authored-by: mjchoi <mjchoi@ex-em.com>
---
 src/components/slider/uses.js | 115 +++++++++++++++++-----------------
 1 file changed, 58 insertions(+), 57 deletions(-)

diff --git a/src/components/slider/uses.js b/src/components/slider/uses.js
index ecca19ff3..8f40de977 100644
--- a/src/components/slider/uses.js
+++ b/src/components/slider/uses.js
@@ -7,6 +7,56 @@ export const useModel = () => {
   const { props, emit } = getCurrentInstance();
   const currentValue = ref(props.modelValue);
 
+  const setStepList = () => {
+    if (!props.showStep) {
+      return [];
+    }
+    // step은 이동 단위 기준으로, 입력값에 따라 클릭 및 드레그 시 이동 단위를 나타냄
+    const sliderRange = props.max - props.min;
+    const stepCount = sliderRange / props.step;
+    const stepWidth = convertToPercent(props.step, sliderRange);
+    const result = [];
+    for (let ix = 1; ix < stepCount; ix++) {
+      result.push(ix * stepWidth);
+    }
+    return result;
+  };
+
+  const setMarkList = () => {
+    if (!props.mark || !Object.keys(props.mark).length) {
+      return [];
+    }
+    const getResultList = (obj, type = 'value') => {
+      if (!obj) {
+        return [];
+      }
+      const style = props.mark.style && (typeof props.mark.style === 'object') ? props.mark.style : {};
+      const keyList = Object.keys(obj);
+      const resultList = [];
+      let markVal;
+      for (let ix = 0; ix < keyList.length; ix++) {
+        markVal = +keyList[ix];
+        if (!isNaN(markVal)) {
+          resultList.push({
+            posX: type === 'value' ? convertToPercent(markVal, props.max - props.min) : markVal,
+            label: obj[markVal],
+            style,
+          });
+        }
+      }
+      return resultList;
+    };
+
+    const hasDetailOption = props.mark.value || props.mark.percent;
+    if (!hasDetailOption) {
+      return [...getResultList(props.mark)];
+    }
+    return [
+      ...getResultList(props.mark.value),
+      ...getResultList(props.mark.percent, 'percent'),
+    ];
+  };
+
   const state = reactive({
     isInit: false,
     dragging: false,
@@ -15,12 +65,12 @@ export const useModel = () => {
     rightValue: null,
   });
   const slider = reactive({
-    valueRange: null,
-    stepList: [],
-    markList: [],
+    valueRange: 0,
+    stepList: computed(setStepList),
+    markList: computed(setMarkList),
     offset: {
-      left: null,
-      width: null,
+      left: 0,
+      width: 0,
     },
   });
   const sliderLine = ref();
@@ -96,6 +146,9 @@ export const useModel = () => {
       currentValue.value = curr;
     }
   });
+  watch(() => props.step, () => {
+    setSliderValue(currentValue.value);
+  });
 
   return {
     currentValue,
@@ -330,60 +383,8 @@ export const useInit = (params) => {
     state.isInit = true;
   };
 
-  const initStepList = () => {
-    if (!props.showStep) {
-      return;
-    }
-    // step은 이동 단위 기준으로, 입력값에 따라 클릭 및 드레그 시 이동 단위를 나타냄
-    const stepCount = slider.valueRange / props.step;
-    const stepWidth = convertToPercent(props.step, slider.valueRange);
-    const result = [];
-    for (let ix = 1; ix < stepCount; ix++) {
-      result.push(ix * stepWidth);
-    }
-    slider.stepList = result;
-  };
-
-  const initMarkList = () => {
-    if (!props.mark || !Object.keys(props.mark).length) {
-      return;
-    }
-    const getResultList = (obj, type = 'value') => {
-      if (!obj) {
-        return [];
-      }
-      const style = props.mark.style && (typeof props.mark.style === 'object') ? props.mark.style : {};
-      const keyList = Object.keys(obj);
-      const resultList = [];
-      let markVal;
-      for (let ix = 0; ix < keyList.length; ix++) {
-        markVal = +keyList[ix];
-        if (!isNaN(markVal)) {
-          resultList.push({
-            posX: type === 'value' ? convertToPercent(markVal, slider.valueRange) : markVal,
-            label: obj[markVal],
-            style,
-          });
-        }
-      }
-      return resultList;
-    };
-
-    const hasListOption = props.mark.value || props.mark.percent;
-    if (!hasListOption) {
-      slider.markList = getResultList(props.mark);
-    } else {
-      slider.markList = [
-        ...getResultList(props.mark.value),
-        ...getResultList(props.mark.percent, 'percent'),
-      ];
-    }
-  };
-
   onMounted(() => {
     validateProps();
     initValue();
-    initStepList();
-    initMarkList();
   });
 };