src/components/common/VnSelect.vue

@@ -104,6 +104,7 @@ const noOneOpt = ref({
     [optionValue.value]: false,
     [optionLabel.value]: noOneText,
 });
+const sort = computed(() => [...($props.sortBy ?? []), `${$props.optionLabel} DESC`]);
 
 const value = computed({
     get() {
@@ -137,9 +138,8 @@ function findKeyInOptions() {
     if (!$props.options) return;
     return filter($props.modelValue, $props.options)?.length;
 }
-
+function sortOptions(data) {
-function setOptions(data) {
+    return data.sort((a, b) => {
-    data = data.sort((a, b) => {
         const search = lastVal.value?.toString()?.toLowerCase();
         const aValue = String(a[$props.optionLabel]).toLowerCase();
         const bValue = String(b[$props.optionLabel]).toLowerCase();
@@ -156,6 +156,9 @@ function setOptions(data) {
 
         return aValue.localeCompare(bValue);
     });
+}
+function setOptions(data) {
+    if (lastVal.value) data = sortOptions(data);
     myOptions.value = JSON.parse(JSON.stringify(data));
     myOptionsOriginal.value = JSON.parse(JSON.stringify(data));
 }
@@ -165,7 +168,8 @@ function filter(val, options) {
 
     if (!search) return options;
 
-    return options.filter((row) => {
+    return sortOptions(
+        options.filter((row) => {
             if ($props.filterOptions.length) {
                 return $props.filterOptions.some((prop) => {
                     const propValue = String(row[prop]).toLowerCase();
@@ -178,13 +182,14 @@ function filter(val, options) {
             const optionLabel = String(row[$props.optionLabel]).toLowerCase();
 
             return id == search || optionLabel.includes(search);
-    });
+        })
+    );
 }
 
 async function fetchFilter(val) {
     if (!$props.url || !dataRef.value) return;
 
-    const { fields, include, sortBy, limit } = $props;
+    const { fields, include, limit } = $props;
     const key =
         optionFilterValue.value ??
         (new RegExp(/\d/g).test(val)
@@ -203,24 +208,10 @@ async function fetchFilter(val) {
     $props.exprBuilder && Object.assign(where, $props.exprBuilder(key, val));
     const fetchOptions = { where, include, limit };
     if (fields) fetchOptions.fields = fields;
-    if (sortBy) {
-        fetchOptions.order = [
-            getOrderCaseString(key, val),
-            typeof sortBy === 'string' ? sortBy : [...sortBy],
-        ];
-    }
 
     return dataRef.value.fetch(fetchOptions);
 }
 
-function getOrderCaseString(prop, value) {
-    return `CASE
-        WHEN ${prop} LIKE '${value}%' THEN 1
-        WHEN ${prop} LIKE '%${value}%' THEN 2
-        ELSE 3
-    END, ${prop} DESC`;
-}
-
 async function filterHandler(val, update) {
     if (!val && lastVal.value === val) {
         lastVal.value = val;
@@ -266,7 +257,7 @@ const getVal = (val) => ($props.useLike ? { like: `%${val}%` } : val);
         @on-fetch="(data) => setOptions(data)"
         :where="where || { [optionValue]: value }"
         :limit="limit"
-        :sort-by="sortBy"
+        :sort-by="sort"
         :fields="fields"
         :params="params"
     />