quasar-ui-sellmate-ui-kit 3.14.5 → 3.14.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quasar-ui-sellmate-ui-kit",
-  "version": "3.14.5",
+  "version": "3.14.7",
   "author": "Sellmate Dev Team <dev@sellmate.co.kr>",
   "description": "Sellmate UI Kit",
   "license": "MIT",

package/src/components/SButton.vue

@@ -60,6 +60,7 @@
 
   // TODO: hover 색 맞추기
   .s-button {
+    font-weight: $font-weight-md;
     &.q-btn {
       min-height: 0;
       height: fit-content;
@@ -114,16 +115,11 @@
         }
       }
     }
-    &.bg-primary,
-    &.bg-Blue_B_Darken-3 {
-      font-weight: $font-weight-md !important;
-    }
   }
   .s-button-xs {
     &.q-btn {
       height: 24px;
       padding: $button-padding-xs;
-      font-weight: $default-font-weight;
       font-size: $default-font;
       line-height: $default-content-height;
       min-width: 60px;
@@ -153,7 +149,6 @@
     &.q-btn {
       height: 28px;
       padding: $button-padding-sm;
-      font-weight: $default-font-weight;
       font-size: $default-font;
       line-height: $default-content-height;
       min-width: 70px;
@@ -181,7 +176,6 @@
   }
   .s-button-md {
     padding: $button-padding-md;
-    font-weight: $default-font-weight;
     font-size: $font-md;
     line-height: $line-height-md;
     min-width: 100px;
@@ -206,7 +200,9 @@
       max-height: $line-height-md;
     }
   }
-
+  .s-button.q-btn--outline {
+    font-weight: $default-font-weight;
+  }
   .s-button.q-btn--outline.disabled,
   .s-button.disabled {
     background: $Grey_Lighten-3 !important;
@@ -218,6 +214,7 @@
     }
   }
   .s-button.text-only {
+    font-weight: $default-font-weight;
     background: none !important;
     padding: 0 !important;
     min-width: 0;

package/src/components/SSelectSearch.vue

@@ -5,9 +5,7 @@
     options-dense
     :dropdown-icon="selectDownArrowIcon"
     v-model="model"
-    :options="filteredOptions"
-    emit-value
-    map-options
+    :options="options"
     color="positive"
     class="s-select-search"
     :popup-content-class="
@@ -51,12 +49,8 @@
         </q-item-section>
       </q-item>
     </template>
-    <template
-      v-if="(options && options.length && !model) || (noSelected && options && !options.length)"
-      #selected
-    >
-      <div v-if="noSelected && !options.length">{{ noSelected }}</div>
-      <div v-else>
+    <template v-if="!model" #selected>
+      <div>
         {{ placeholder }}
       </div>
     </template>
@@ -103,7 +97,7 @@
         required: true,
       },
       modelValue: {
-        type: [String, Number, null],
+        type: [String, Number, null, Object],
         required: true,
       },
       optionLabel: {
@@ -116,7 +110,7 @@
       },
       placeholder: {
         type: String,
-        default: '전체',
+        default: '선택',
       },
       noData: {
         type: String,
@@ -125,19 +119,10 @@
       popupContentClass: {
         type: String,
       },
-      noSelected: {
-        type: String,
-        default: '선택',
-      },
     },
     setup(props, { emit }) {
       const id = useId();
       const model = ref(props.modelValue);
-      const filteredOptions = ref(props.options || []);
-      const findLabel = () =>
-        props.options.find(opt => opt[props.optionValue] === props.modelValue)[props.optionLabel] ||
-        '';
-
       const search = ref('');
       const sSelectRef = ref(null);
 
@@ -149,13 +134,10 @@
 
       function handleInput(val) {
         if (!sSelectRef.value) return;
-
         search.value = val;
         sSelectRef.value.setOptionIndex(-1);
-
-        if (!val && props.options) {
-          filteredOptions.value = props.options;
-          sSelectRef.value.setOptionIndex(-1);
+        if (!val) {
+          emit('onSearch', val);
         }
       }
 
@@ -166,58 +148,24 @@
         emit('onSearch', '');
       }
 
-      const onSearch = debounce(val => {
-        if (!val && props.options) {
-          filteredOptions.value = props.options;
-          return;
-        }
-
-        // 옵션을 선택 했을 때
-        if (sSelectRef.value && sSelectRef.value.getOptionIndex() !== -1) {
-          model.value = filteredOptions.value[sSelectRef.value.getOptionIndex()][props.optionValue];
-          handleDelete();
-          sSelectRef.value.setOptionIndex(-1);
-          sSelectRef.value.hidePopup();
-          return;
-        }
-
-        const filtered = props.options.filter(
-          v => (v[props.optionLabel] || v).toLowerCase().indexOf(val.toLowerCase()) > -1,
-        );
-
-        if (!filtered.length && sSelectRef.value) {
-          emit('onSearch', val);
-          sSelectRef.value.setOptionIndex(-1);
-          return;
-        }
-
-        filteredOptions.value = filtered;
-      }, 200);
+      function onSearch(val) {
+        if (!sSelectRef.value) return;
+        sSelectRef.value.setOptionIndex(-1);
+        emit('onSearch', val);
+      }
 
       watch(
         () => props.modelValue,
         val => {
           model.value = val;
-          if (sSelectRef.value) sSelectRef.value.setOptionIndex(-1);
         },
       );
 
-      watch(model, val => {
-        emit('update:modelValue', val);
-      });
-
       watch(
-        () => props.options,
-        val => {
-          // const existingValues = new Set(filteredOptions.value.map((option) => option.value));
-          // const nonDuplicateOptions = val.filter((option) => !existingValues.has(option.value));
-          // filteredOptions.value.push(...nonDuplicateOptions);
-          if (val) {
-            filteredOptions.value = val;
-            if (sSelectRef.value) sSelectRef.value.setOptionIndex(-1);
-          }
+        () => model.value,
+        newValue => {
+          emit('update:modelValue', newValue);
         },
-        { deep: true },
       );
 
       const isScrolled = ref(false);
@@ -260,7 +208,6 @@
         model,
         selectDownArrowIcon,
         onSearch,
-        filteredOptions,
         search,
         sSelectRef,
         isScrolled,