@xuekl/cli-components 1.9.146 → 1.9.148

package/XklDict.vue

@@ -71,8 +71,28 @@ const filterMethod = (val: any) => {
 const visibleChange = (visible: boolean) => {
     if (isDisplaySelectedDataFirst) {
         if (visible) {
-            list.value = list.value.sort((a) => {
-                return selectData.value && (Array.isArray(selectData.value) ? selectData.value.includes(a.dictValue) : selectData.value === a.dictValue) ? -1 : 1
+            // ✅ 稳定排序逻辑：已选中的排前面，且两组内部都保留原数组顺序
+            list.value = list.value.sort((a, b) => {
+                // 1. 获取a、b的选中状态
+                const aIsSelected = selectData.value && (
+                    Array.isArray(selectData.value)
+                        ? selectData.value.includes(a.dictValue)
+                        : selectData.value === a.dictValue
+                );
+                const bIsSelected = selectData.value && (
+                    Array.isArray(selectData.value)
+                        ? selectData.value.includes(b.dictValue)
+                        : selectData.value === b.dictValue
+                );
+
+                // ✅ 核心稳定排序规则
+                if (aIsSelected && !bIsSelected) {
+                    return -1; // a选中、b未选 → a排前面
+                } else if (!aIsSelected && bIsSelected) {
+                    return 1;  // a未选、b选中 → b排前面
+                } else {
+                    return 0;  // 同为选中/同为未选 → 保持原有相对顺序【关键】
+                }
             })
         }
     }

package/XklFormInfo.vue

@@ -35,8 +35,12 @@ const { form } = props
 const formList: FormItem[] = []
 const opts = form._opts || {}
 
+form._sort = form._sort || []
+let formKeys = Object.keys(form)
+formKeys = [...form._sort, ...formKeys.filter(key => !form._sort.includes(key))]
+
 // 获取符合mode的字段
-Object.keys(form).forEach(prop => {
+formKeys.forEach(prop => {
     if (form['get' + setUpperFirst(prop)]) {
         let field: FormItem = form['get' + setUpperFirst(prop)]()
         field.show = field.show || (() => true)

package/XklSelect.vue

@@ -242,10 +242,31 @@ const valChangeHandle = (val: string | number | string[] | number[]) => {
 const visibleChange = (visible: boolean) => {
     if (isDisplaySelectedDataFirst) {
         if (visible) {
-            const valueTarget = config?.valueTarget
-            dataList.value = dataList.value.sort((a) => {
-                return selectData.value && (Array.isArray(selectData.value) ? selectData.value.includes(a[valueTarget]) : selectData.value === a[valueTarget]) ? -1 : 1
-            })
+            const valueTarget = config?.valueTarget;
+            // 无匹配字段则不排序，避免报错
+            if (!valueTarget) return;
+            // ✅ 稳定排序核心：a、b两两对比 + 同状态返回0 保持原顺序
+            dataList.value = dataList.value.sort((a, b) => {
+                // 获取当前项的匹配字段值
+                const aVal = a[valueTarget];
+                const bVal = b[valueTarget];
+                // 判断a/b的选中状态
+                const aIsSelected = selectData.value && (
+                    Array.isArray(selectData.value)
+                        ? selectData.value.includes(aVal)
+                        : selectData.value === aVal
+                );
+                const bIsSelected = selectData.value && (
+                    Array.isArray(selectData.value)
+                        ? selectData.value.includes(bVal)
+                        : selectData.value === bVal
+                );
+
+                // ✅ 排序规则：选中的排前面，同状态则保持原顺序
+                if (aIsSelected && !bIsSelected) return -1;
+                if (!aIsSelected && bIsSelected) return 1;
+                return 0;
+            });
         }
     }
     emit('visibleChange', visible)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xuekl/cli-components",
-  "version": "1.9.146",
+  "version": "1.9.148",
   "description": "element-plus 组件二次封装",
   "main": "index.ts",
   "scripts": {