From c23edc33b6fedd59e48f82ff383ce484fc3559fc Mon Sep 17 00:00:00 2001
From: IchliebedichZhu <54796446@qq.com>
Date: Sat, 9 Mar 2024 23:14:12 +0000
Subject: [PATCH 1/3] feat: convert number slider to composition API

---
 .../modules/settings/numberSlider.vue         | 118 +++++++++---------
 1 file changed, 61 insertions(+), 57 deletions(-)

diff --git a/src/components/modules/settings/numberSlider.vue b/src/components/modules/settings/numberSlider.vue
index 670ece9..1e48d86 100644
--- a/src/components/modules/settings/numberSlider.vue
+++ b/src/components/modules/settings/numberSlider.vue
@@ -8,68 +8,72 @@
 <template>
   <div id="number-slider">
     <span :style="{ width: labelWidth }" class="label">{{ label }}</span>
-    <el-slider v-model="innerValue" :min="minValue" :max="maxValue" :step="step" input-size="small" :show-input="showInput" :show-tooltip="false" :show-input-controls="false" @change="changeValue"> </el-slider>
+    <el-slider
+      v-model="innerValue"
+      :min="minValue" :max="maxValue" :step="step"
+      input-size="small" 
+      :show-input="showInput" :show-tooltip="false" :show-input-controls="false"
+      @change="changeValue"
+    /> 
   </div>
 </template>
 
-<script>
-const NAME = 'number-slider'
-import { mapGetters, mapActions } from 'vuex'
+<script lang="ts" setup>
+// const NAME = 'number-slider'
+import { Arrayable } from 'element-plus/es/utils';
+import { watch, ref, onMounted } from 'vue';
+import { mapActions } from 'vuex'
 
-export default {
-  name: NAME,
-  props: {
-    label: {
-      default: '',
-    },
-    labelWidth: {
-      default: '71px',
-    },
-    modelValue: {
-      default: 0,
-    },
-    minValue: {
-      default: 0,
-    },
-    maxValue: {
-      default: 500,
-    },
-    step: {
-      default: 1,
-    },
-    showInput: {
-      default: true,
-    },
-  },
-  emits: ['update:modelValue', 'finish'],
-  data() {
-    return {
-      innerValue: 0,
-      // first: true,
+type TProps = {
+  label?: string
+  labelWidth?: string
+  modelValue?: number
+  minValue?: number
+  maxValue?: number
+  step?: number
+  showInput?: boolean
+}
+
+type TEmits = {
+  (event: 'update:modelValue', data: number): void
+  (event: 'finish', data: Arrayable<number>): void
+}
+
+const props = withDefaults(defineProps<TProps>(), {
+  label: '',
+  labelWidth: '71px',
+  modelValue: 0,
+  minValue: 0,
+  maxValue: 500,
+  step: 1,
+  showInput: true
+})
+const emit = defineEmits<TEmits>()
+
+const innerValue = ref<number>(0)
+
+watch(
+  () => innerValue.value,
+  (value) => {
+    if (props.modelValue !== value) {
+      emit('update:modelValue', value)
     }
-  },
-  computed: {
-    ...mapGetters([]),
-  },
-  watch: {
-    innerValue(value) {
-      if (this.modelValue !== value) {
-        this.$emit('update:modelValue', value)
-      }
-    },
-    modelValue(val) {
-      this.innerValue = this.modelValue
-    },
-  },
-  created() {
-    this.innerValue = this.modelValue
-  },
-  methods: {
-    ...mapActions([]),
-    changeValue(value) {
-      this.$emit('finish', value)
-    },
-  },
+  }
+)
+
+watch(
+  () => props.modelValue,
+  () => {
+    innerValue.value = props.modelValue
+  }
+)
+
+onMounted(() => {
+  innerValue.value = props.modelValue
+})
+
+function changeValue(value: Arrayable<number>) {
+  emit('finish', value)
 }
 </script>
 

From c63ca8389425dc0690ad4eabd8e8d7a8c33bb826 Mon Sep 17 00:00:00 2001
From: IchliebedichZhu <54796446@qq.com>
Date: Sun, 10 Mar 2024 10:09:53 +0000
Subject: [PATCH 2/3] feat: convert text input component to composition API

---
 src/components/modules/settings/textInput.vue | 84 ++++++++++---------
 1 file changed, 46 insertions(+), 38 deletions(-)

diff --git a/src/components/modules/settings/textInput.vue b/src/components/modules/settings/textInput.vue
index c96804a..9c532bf 100644
--- a/src/components/modules/settings/textInput.vue
+++ b/src/components/modules/settings/textInput.vue
@@ -9,51 +9,59 @@
   <div class="text-input">
     <p v-if="label" class="input-label">{{ label }}</p>
     <div :class="{ 'input-wrap': true, active: inputBorder }">
-      <input :class="{ 'real-input': true, disable: !editable }" type="text" :value="modelValue" :readonly="editable ? false : 'readonly'" @input="updateValue($event.target.value)" @focus="focusInput" @blur="blurInput" />
+      <input 
+        :class="{ 'real-input': true, disable: !props.editable }" 
+        type="text" :value="props.modelValue" 
+        :readonly="!editable" 
+        @input="updateValue(($event.target as HTMLInputElement).value)" 
+        @focus="focusInput"
+        @blur="blurInput"
+      />
     </div>
   </div>
 </template>
 
-<script>
+<script lang="ts" setup>
+import { ref } from 'vue'
 // 文本输入组件
 const NAME = 'text-input'
 
-export default {
-  name: NAME,
-  props: {
-    label: {
-      default: '',
-    },
-    modelValue: {
-      default: '',
-    },
-    editable: {
-      default: true,
-    },
-  },
-  emits: ['update:modelValue', 'finish'],
-  data() {
-    return {
-      inputBorder: false,
-      tagText: '',
-    }
-  },
-  computed: {},
-  methods: {
-    updateValue(value) {
-      this.$emit('update:modelValue', value)
-    },
-    focusInput() {
-      this.inputBorder = true
-      this.tagText = this.modelValue
-    },
-    blurInput() {
-      this.inputBorder = false
-      if (this.modelValue !== this.tagText) {
-        this.$emit('finish', this.modelValue)
-      }
-    },
-  },
+type TProps = {
+  label?: string
+  modelValue?: string
+  editable?: boolean
+}
+
+type TEmits = {
+  (event:'update:modelValue', data: string): void
+  (event: 'finish', data: string): void
+}
+
+const props = withDefaults(defineProps<TProps>(), {
+  label: '',
+  modelValue: '',
+  editable: true,
+})
+
+const emit = defineEmits<TEmits>()
+
+const inputBorder = ref(false)
+const tagText = ref<string>('')
+
+function updateValue(value: string) {
+  emit('update:modelValue', value)
+}
+
+function focusInput() {
+  inputBorder.value = true
+  tagText.value = props.modelValue
+}
+
+function blurInput() {
+  inputBorder.value = false
+  if (props.modelValue !== tagText.value) {
+    emit('finish', props.modelValue)
+  }
 }
 </script>
 

From 83f7f5e485da335f070ef3887fbfa05e90d1f81f Mon Sep 17 00:00:00 2001
From: IchliebedichZhu <54796446@qq.com>
Date: Sun, 10 Mar 2024 10:37:47 +0000
Subject: [PATCH 3/3] feat: convert value select component to composition API

---
 src/components/modules/settings/textInput.vue |   2 +-
 .../modules/settings/textInputArea.vue        | 102 +++----
 .../modules/settings/valueSelect.vue          | 254 +++++++++---------
 3 files changed, 188 insertions(+), 170 deletions(-)

diff --git a/src/components/modules/settings/textInput.vue b/src/components/modules/settings/textInput.vue
index 9c532bf..8743c18 100644
--- a/src/components/modules/settings/textInput.vue
+++ b/src/components/modules/settings/textInput.vue
@@ -24,7 +24,7 @@
 <script lang="ts" setup>
 import { ref } from 'vue'
 // 文本输入组件
-const NAME = 'text-input'
+// const NAME = 'text-input'
 
 type TProps = {
   label?: string
diff --git a/src/components/modules/settings/textInputArea.vue b/src/components/modules/settings/textInputArea.vue
index f594850..6bbffad 100644
--- a/src/components/modules/settings/textInputArea.vue
+++ b/src/components/modules/settings/textInputArea.vue
@@ -9,61 +9,65 @@
   <div id="text-input-area">
     <p v-if="label" class="input-label">{{ label }}</p>
     <div :class="{ 'input-wrap': true, active: inputBorder }">
-      <textarea :maxlength="max" :class="{ 'real-input': true, disable: !editable }" type="text" rows="3" :value="dealValue" :readonly="editable ? false : 'readonly'" @input="updateValue($event.target.value)" @focus="focusInput" @blur="blurInput" />
+      <textarea
+        :maxlength="max" :class="{ 'real-input': true, disable: !editable }" 
+        type="text" rows="3" :value="dealValue" 
+        :readonly="!editable" @input="updateValue(($event.target as HTMLTextAreaElement).value)"
+        @focus="focusInput" @blur="blurInput"
+      />
     </div>
   </div>
 </template>
 
-<script>
+<script lang="ts" setup>
+import { ref, computed } from 'vue'
 // 文本域输入组件
-const NAME = 'text-input-area'
+// const NAME = 'text-input-area'
 
-export default {
-  name: NAME,
-  props: {
-    label: {
-      default: '',
-    },
-    modelValue: {
-      default: '',
-    },
-    editable: {
-      default: true,
-    },
-    max: {},
-  },
-  emits: ['update:modelValue', 'finish'],
-  data() {
-    return {
-      inputBorder: false,
-      tagText: '',
-    }
-  },
-  computed: {
-    dealValue() {
-      return this.modelValue
-      // return this.modelValue.replace(/<br\/>/g, '\r\n').replace(/&nbsp;/g, ' ')
-    },
-  },
-  methods: {
-    updateValue(value) {
-      this.$emit('update:modelValue', this.getValue(value))
-    },
-    focusInput() {
-      this.inputBorder = true
-      this.tagText = this.modelValue
-    },
-    blurInput() {
-      this.inputBorder = false
-      let v = this.getValue(this.modelValue)
-      if (v !== this.tagText) {
-        this.$emit('finish', v)
-      }
-    },
-    getValue(value) {
-      return value.replace(/\n|\r\n/g, '<br/>').replace(/ /g, '&nbsp;')
-    },
-  },
+type TProps = {
+  label?: string
+  modelValue?: string
+  editable?: boolean
+  max?: string
+}
+
+type TEmits = {
+  (event:'update:modelValue', data: string): void
+  (event: 'finish', data: string): void
+}
+
+const props = withDefaults(defineProps<TProps>(), {
+  label: '',
+  modelValue: '',
+  editable: true,
+})
+
+const emit = defineEmits<TEmits>()
+const inputBorder = ref(false)
+const tagText = ref<string>('')
+
+const dealValue = computed(() => {
+  return props.modelValue
+})
+
+function updateValue(value: string) {
+  emit('update:modelValue', getValue(value))
+}
+
+function focusInput() {
+  inputBorder.value = true
+  tagText.value = props.modelValue
+}
+
+function blurInput() {
+  inputBorder.value = false
+  let v = getValue(props.modelValue)
+  if (v !== tagText.value) {
+    emit('finish', v)
+  }
+}
+function getValue(value: string) {
+  return value.replace(/\n|\r\n/g, '<br/>').replace(/ /g, '&nbsp;')
 }
 </script>
 
diff --git a/src/components/modules/settings/valueSelect.vue b/src/components/modules/settings/valueSelect.vue
index 2f5c5ac..94ae3db 100644
--- a/src/components/modules/settings/valueSelect.vue
+++ b/src/components/modules/settings/valueSelect.vue
@@ -13,18 +13,22 @@
     <el-popover placement="bottom-end" trigger="click" width="auto">
       <!-- 单列表 -->
       <ul v-if="data && Array.isArray(data)" class="list-ul">
-        <li v-for="listItem in data" :key="typeof listItem === 'object' ? listItem.alias : listItem" :class="{ active: listItem == innerValue }" @click="selectItem(listItem)">
-          <img v-if="listItem.preview" class="preview" :src="listItem.preview" />
+        <li
+          v-for="listItem in data" :key="typeof listItem === 'object' ? listItem.alias : listItem"
+          :class="{ active: listItem == state.innerValue }"
+          @click="selectItem(listItem)"
+        >
+          <img v-if="listItem.preview" class="preview" :src="listItem.preview" alt="preview" />
           <span v-else>{{ (typeof listItem === 'object' ? listItem.alias : listItem) + suffix }}</span>
         </li>
       </ul>
       <!-- tab分类列表 -->
       <div v-else class="tabs-wrap">
-        <el-tabs v-model="activeTab">
+        <el-tabs v-model="state.activeTab">
           <el-tab-pane v-for="(val, key, i) in data" :key="'tab' + i" :label="key" :name="key">
             <ul class="list-ul">
-              <li v-for="listItem in data[key]" :key="typeof listItem === 'object' ? listItem.alias : listItem" :class="{ active: listItem == innerValue }" @click="selectItem(listItem)">
-                <img v-if="listItem.preview" class="preview" :src="listItem.preview" />
+              <li v-for="listItem in data[key]" :key="typeof listItem === 'object' ? listItem.alias : listItem" :class="{ active: listItem == state.innerValue }" @click="selectItem(listItem)">
+                <img v-if="listItem.preview" class="preview" :src="listItem.preview" alt="preview" />
                 <span v-else :style="{ fontFamily: `'${listItem.value}'` }">{{ (typeof listItem === 'object' ? listItem.alias : listItem) + suffix }}</span>
               </li>
             </ul>
@@ -32,9 +36,16 @@
         </el-tabs>
       </div>
       <template #reference>
-        <div :class="['input-wrap', { active: inputBorder }]" :style="{ width: inputWidth }">
+        <div :class="['input-wrap', { active: state.inputBorder }]" :style="{ width: inputWidth }">
           <!-- <img v-if="innerPreview" class="preview" :src="innerPreview" /> -->
-          <input :style="{ fontFamily: modelValue.value }" :class="['real-input', { disable: !disable }]" :readonly="readonly ? 'readonly' : false" type="text" :value="showValue" @input="inputText" @focus="inputBorder = true" @blur="inputBorder = false" @keydown="(e) => opNumber(e)" />
+          <input
+            :style="{ fontFamily: modelValue.value }"
+            :class="['real-input', { disable: !disable }]"
+            :readonly="readonly" type="text"
+            :value="showValue"
+            @input="inputText" @focus="state.inputBorder = true"
+            @blur="state.inputBorder = false" @keydown="(e) => opNumber(e)"
+          />
           <!-- <span class="input-unit">{{ suffix }}</span> -->
           <div class="op-btn">
             <!-- <div class="down" @click="inputBorder = !inputBorder"></div> -->
@@ -46,124 +57,127 @@
   </div>
 </template>
 
-<script>
+<script lang="ts" setup>
 // 下拉选择框
 const NAME = 'value-input'
 import { ElTabPane, ElTabs } from 'element-plus'
+import { computed, onMounted, reactive, ref, watch } from 'vue';
 
-export default {
-  name: NAME,
-  components: { ElTabPane, ElTabs },
-  props: {
-    label: {
-      default: '',
-    },
-    modelValue: {
-      default: '',
-    },
-    suffix: {
-      default: '',
-    },
-    data: {
-      required: true,
-    },
-    disable: {
-      default: true,
-    },
-    inputWidth: {
-      default: '80px',
-    },
-    // textAlign: {
-    //   default: 'center',
-    // },
-    readonly: {
-      default: false,
-    },
-    step: {
-      default: 1,
-    },
-  },
-  emits: ['finish', 'update:modelValue'],
-  data() {
-    return {
-      inputBorder: false,
-      tagText: '',
-      width: '0',
-      innerValue: '',
-      innerPreview: '',
-      activeTab: '中文',
+type TProps = {
+  label?: string
+  modelValue?: Record<string, any>
+  suffix?: string
+  data: Record<string, any>
+  disable?: boolean
+  inputWidth?: string
+  readonly?: boolean
+  step?: number
+}
+
+type TEmits = {
+  (event:'update:modelValue', data: Record<string, any> | string | number): void
+  (event: 'finish', data: Record<string, any> | string | number): void
+}
+
+type TState = {
+  inputBorder: boolean
+  tagText: string
+  width: string | number
+  innerValue: string
+  innerPreview: string
+  activeTab: string
+}
+
+const props = withDefaults(defineProps<TProps>(), {
+  label: '',
+  modelValue: () => ({}),
+  suffic: '',
+  data: () => ({}),
+  disable: true,
+  inputWidth: '80px',
+  readonly: false,
+  step: 1,
+})
+const emit = defineEmits<TEmits>()
+const state = reactive<TState>({
+  inputBorder: false,
+  tagText: '',
+  width: '0',
+  innerValue: '',
+  innerPreview: '',
+  activeTab: '中文',
+})
+const selectRef = ref<HTMLElement | null>(null)
+
+const showValue = computed(() => {
+  return state.innerValue
+})
+
+watch(
+  () => props.modelValue,
+  () => {
+    state.innerValue = typeof props.modelValue === 'object' ? props.modelValue.alias : props.modelValue
+  }
+)
+
+watch(
+  () => state.inputBorder,
+  (value) => {
+    if (value) {
+      state.tagText = state.innerValue
+    } else {
+      if (state.innerValue !== state.tagText) {
+        emit('finish', state.innerValue)
+      }
     }
-  },
-  computed: {
-    showValue() {
-      // return this.innerValue + this.suffix
-      return this.innerValue
-    },
-  },
-  watch: {
-    modelValue(value) {
-      this.innerValue = typeof this.modelValue === 'object' ? this.modelValue.alias : this.modelValue
-    },
-    inputBorder(value) {
-      if (value) {
-        this.tagText = this.innerValue
-      } else {
-        if (this.innerValue !== this.tagText) {
-          this.$emit('finish', this.innerValue)
-        }
-      }
-    },
-  },
-  created() {
-    this.innerValue = typeof this.modelValue === 'object' ? this.modelValue.alias : this.modelValue
-  },
-  mounted() {
-    this.width = this.$refs.select.offsetWidth
-    // if (Object.prototype.toString.call(this.data) === '[Object Object]') {
-    //   for (const key in this.data) {
-    //     console.log(key)
-    //     break
-    //   }
-    // }
-  },
-  methods: {
-    selectItem(item) {
-      let value = typeof item === 'object' ? item.alias : item
-      if (this.innerValue !== value) {
-        this.innerValue = value
-        this.innerPreview = item.preview
-        this.$emit('finish', item)
-      }
-    },
-    inputText(e) {
-      // this.innerValue = e.target.value.replace(RegExp(this.suffix), '')
-      this.innerValue = e.target.value
-      setTimeout(() => {
-        this.$emit('finish', this.innerValue)
-      }, 100)
-    },
-    opNumber(e) {
-      e.stopPropagation()
-      switch (e.keyCode) {
-        case 38:
-          typeof this.innerValue === 'number' && this.up()
-          return
-        case 40:
-          typeof this.innerValue === 'number' && this.down()
-          return
-      }
-    },
-    up() {
-      this.$emit('update:modelValue', parseInt(this.modelValue || 0, 10) + this.step)
-    },
-    down() {
-      let value = parseInt(this.modelValue || 0, 10) - this.step
-      if (value < 0) {
-        value = 0
-      }
-      this.$emit('update:modelValue', value)
-    },
-  },
+  }
+)
+
+onMounted(() => {
+  state.innerValue = typeof props.modelValue === 'object' ? props.modelValue.alias : props.modelValue
+  if (selectRef.value) {
+    state.width = selectRef.value.offsetWidth
+  }
+})
+
+function selectItem(item: Record<string, any>) {
+  let value = typeof item === 'object' ? item.alias : item
+  if (state.innerValue !== value) {
+    state.innerValue = value
+    state.innerPreview = item.preview
+    emit('finish', item)
+  }
+}
+
+function inputText(e: Event) {
+  // this.innerValue = e.target.value.replace(RegExp(this.suffix), '')
+  state.innerValue = (e.target as HTMLInputElement).value
+  setTimeout(() => {
+    emit('finish', state.innerValue)
+  }, 100)
+}
+function opNumber(e: KeyboardEvent) {
+  e.stopPropagation()
+  switch (e.keyCode) {
+    case 38:
+      typeof state.innerValue === 'number' && up()
+      return
+    case 40:
+      typeof state.innerValue === 'number' && down()
+      return
+  }
+}
+
+function up() {
+  emit('update:modelValue', parseInt(`${props.modelValue}` ?? '0', 10) + props.step)
+}
+
+function down() {
+  let value = parseInt(`${props.modelValue}` ?? '0', 10) - props.step
+  if (value < 0) {
+    value = 0
+  }
+  emit('update:modelValue', value)
 }
 </script>