From ee672806e09690c5c6dcaa66a48a23e87a4492e2 Mon Sep 17 00:00:00 2001
From: jingrow <support@jingrow.com>
Date: Tue, 29 Jul 2025 17:42:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=96=B0=E5=BB=BA=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1=E5=99=A8=E4=BD=93=E9=AA=8C=E5=8F=8A=E9=95=9C=E5=83=8F?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E8=AE=BE=E7=BD=AE=E6=8E=92=E5=BA=8F=E5=8F=8A?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=98=BF=E9=87=8C=E9=95=9C=E5=83=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dashboard/src2/pages/NewJsiteServer.vue |  2 +-
 jcloud/api/aliyun_server_light.py       | 16 +++++++++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/dashboard/src2/pages/NewJsiteServer.vue b/dashboard/src2/pages/NewJsiteServer.vue
index 1704900..2c0f9ee 100644
--- a/dashboard/src2/pages/NewJsiteServer.vue
+++ b/dashboard/src2/pages/NewJsiteServer.vue
@@ -36,7 +36,7 @@
 
           <div>
             <label class="block text-sm font-medium text-gray-700 mb-2">镜像选择（Jsite服务器推荐选择Ubuntu-22.04）</label>
-            <select v-model="selectedImageId" class="w-full border rounded px-3 py-2" required @change="onImageChange">
+            <select v-model="selectedImageId" class="w-full border rounded px-3 py-2" required :disabled="!selectedRegionId" @change="onImageChange">
               <option value="">请选择镜像</option>
               <option v-for="image in images" :key="getImageId(image)" :value="getImageId(image)">
                 {{ getImageDisplayName(image) }}
diff --git a/jcloud/api/aliyun_server_light.py b/jcloud/api/aliyun_server_light.py
index 01ed2a1..3eb9c95 100644
--- a/jcloud/api/aliyun_server_light.py
+++ b/jcloud/api/aliyun_server_light.py
@@ -653,7 +653,21 @@ def get_aliyun_plans(region_id='cn-shanghai'):
 def get_aliyun_images(image_type='system', region_id='cn-shanghai'):
     """获取可用镜像列表"""
     manager = _get_manager()
-    return manager.get_images(image_type, region_id)
+    result = manager.get_images(image_type, region_id)
+    
+    # 如果获取成功且有镜像数据，过滤并排序
+    if result.get('success') and result.get('data') and 'images' in result['data']:
+        images = result['data']['images']
+        # 过滤掉以 "alibaba" 开头的镜像（不区分大小写）
+        filtered_images = [
+            image for image in images 
+            if not image.get('image_name', '').lower().startswith('alibaba')
+        ]
+        # 按镜像名称（image_name）进行字母排序
+        sorted_images = sorted(filtered_images, key=lambda x: x.get('image_name', '').lower())
+        result['data']['images'] = sorted_images
+    
+    return result
 
 @jingrow.whitelist()
 def get_aliyun_regions():