From 8d67df402d191608302717f8aa338aae11a11782 Mon Sep 17 00:00:00 2001
From: sahara <jwk0528@163.com>
Date: Wed, 28 Aug 2024 18:25:43 +0800
Subject: [PATCH 1/8] =?UTF-8?q?feat:=20=E6=9C=BA=E5=99=A8=E5=A4=9A?=
 =?UTF-8?q?=E4=BA=91=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/DomianConf/AddAk.tsx           |  69 ++++++-
 .../components/DomianConf/index.less          |   2 +-
 .../DeviceManage/CloudConfig/index.tsx        |  44 ++++-
 .../CloudManage/AddMachinePubilc/index.tsx    | 185 ++++++++++--------
 .../CloudManage/Standalone/index.tsx          |   2 +-
 .../WorkSpace/DeviceManage/locales/en-US.ts   |  12 +-
 .../WorkSpace/DeviceManage/locales/zh-CN.ts   |  11 +-
 7 files changed, 226 insertions(+), 99 deletions(-)

diff --git a/src/pages/WorkSpace/DeviceManage/CloudConfig/components/DomianConf/AddAk.tsx b/src/pages/WorkSpace/DeviceManage/CloudConfig/components/DomianConf/AddAk.tsx
index ab0ac483..892e3af5 100644
--- a/src/pages/WorkSpace/DeviceManage/CloudConfig/components/DomianConf/AddAk.tsx
+++ b/src/pages/WorkSpace/DeviceManage/CloudConfig/components/DomianConf/AddAk.tsx
@@ -92,11 +92,31 @@ export default forwardRef(
                     setPadding(false)
                 })
         }
-        const providerArr = [
-            { id: 'aliyun_ecs', name: formatMessage({ id: 'device.aliyun_ecs' }) },
-            { id: 'aliyun_eci', name: formatMessage({ id: 'device.aliyun_eci' }) },
+
+        const cloudTypeList = [
+            { id: 'aliyun', name: formatMessage({ id: 'device.cloud.alibaba' }) },
+            { id: 'tencent', name: formatMessage({ id: 'device.cloud.tencent' }) },
+            { id: 'volcengine', name: formatMessage({ id: 'device.cloud.volcanic' }) }
         ]
 
+        const cloudTypeChange = (val: any) => {
+            console.log('val', val)
+            if (val === 'aliyun') {
+                return [
+                    { id: 'aliyun_ecs', name: formatMessage({ id: 'device.aliyun_ecs' }) },
+                    { id: 'aliyun_eci', name: formatMessage({ id: 'device.aliyun_eci' }) },
+                ]
+            } else if (val === 'tencent') {
+                return [
+                    { id: 'tencent_ecs', name: formatMessage({ id: 'device.tencent_ecs' }) }
+                ]
+            } else if (val === 'volcengine') {
+                return [
+                    { id: 'volcengine_ecs', name: formatMessage({ id: 'device.volcengine_ecs' }) }
+                ]
+            } else return [{}]
+        }
+
         return (
             <Drawer
                 maskClosable={false}
@@ -107,7 +127,7 @@ export default forwardRef(
                 open={visible}
                 className={styles.add_baseline_drawer}
                 footer={
-                    <div style={{ textAlign: 'right', }} >
+                    <div style={{ textAlign: 'right' }} >
                         <Space>
                             <Button onClick={handleClose}><FormattedMessage id="operation.cancel" /></Button>
                             <Button type="primary" disabled={padding} onClick={handleOk}>
@@ -126,19 +146,19 @@ export default forwardRef(
                     }}
                 >
                     <Form.Item
-                        label={<FormattedMessage id="device.cloud.service.provider" />}
-                        name="provider"
-                        rules={[{ required: true, message: formatMessage({ id: 'device.cloud.service.provider.cannot.empty' }) },]}
+                        label={<FormattedMessage id="device.cloud.type" />}
+                        name="cloud_type"
+                        rules={[{ required: true, message: formatMessage({ id: 'device.cloud.type.cannot.empty' }) },]}
                     >
                         <Select
-                            placeholder={formatMessage({ id: 'device.cloud.service.provider.select' })}
+                            placeholder={formatMessage({ id: 'device.cloud.type.select' })}
                             filterOption={(input, option: any) => {
                                 return option.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
                             }}
                             optionFilterProp="children"
                         >
                             {
-                                providerArr.map(
+                                cloudTypeList.map(
                                     (item: any) => (
                                         <Select.Option
                                             key={item.id}
@@ -151,6 +171,37 @@ export default forwardRef(
                             }
                         </Select>
                     </Form.Item>
+                    <Form.Item shouldUpdate={(prevValues, currentValues) => prevValues.cloud_type !== currentValues.cloud_type} noStyle>
+                        {({ getFieldValue }) => (
+                            <Form.Item
+                                label={<FormattedMessage id="device.cloud.service.provider" />}
+                                name="provider"
+                                rules={[{ required: true, message: formatMessage({ id: 'device.cloud.service.provider.cannot.empty' }) },]}
+
+                            >
+                                <Select
+                                    placeholder={formatMessage({ id: 'device.cloud.service.provider.select' })}
+                                    filterOption={(input, option: any) => {
+                                        return option.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
+                                    }}
+                                    optionFilterProp="children"
+                                >
+                                    {
+                                        cloudTypeChange(getFieldValue('cloud_type'))?.map(
+                                            (item: any) => (
+                                                <Select.Option
+                                                    key={item.id}
+                                                    value={item.id}
+                                                >
+                                                    {item.name}
+                                                </Select.Option>
+                                            )
+                                        )
+                                    }
+                                </Select>
+                            </Form.Item>
+                        )}
+                    </Form.Item>
                     <Form.Item
                         label={<FormattedMessage id="device.enable" />}
                         name="enable">
diff --git a/src/pages/WorkSpace/DeviceManage/CloudConfig/components/DomianConf/index.less b/src/pages/WorkSpace/DeviceManage/CloudConfig/components/DomianConf/index.less
index ca20452b..95c9ad28 100644
--- a/src/pages/WorkSpace/DeviceManage/CloudConfig/components/DomianConf/index.less
+++ b/src/pages/WorkSpace/DeviceManage/CloudConfig/components/DomianConf/index.less
@@ -1,7 +1,7 @@
 
 .filter_wrapper_container {
     position: absolute;
-    left: 0;
+    left: 8px;
     top: 0;
     width: 100%;
 }
diff --git a/src/pages/WorkSpace/DeviceManage/CloudConfig/index.tsx b/src/pages/WorkSpace/DeviceManage/CloudConfig/index.tsx
index 34a6e67c..7f7fcef6 100644
--- a/src/pages/WorkSpace/DeviceManage/CloudConfig/index.tsx
+++ b/src/pages/WorkSpace/DeviceManage/CloudConfig/index.tsx
@@ -37,6 +37,7 @@ const CloudConfig: React.FC<any> = (props) => {
 	const [autoFocus, setFocus] = useState(true)
 
 	const defaultParmasAk = {
+		cloud_type: '',
 		name: '',
 		access_id: '',
 		access_key: '',
@@ -125,17 +126,58 @@ const CloudConfig: React.FC<any> = (props) => {
 	const providerList = [
 		{ id: 'aliyun_ecs', name: formatMessage({ id: 'device.aliyun_ecs' }) },
 		{ id: 'aliyun_eci', name: formatMessage({ id: 'device.aliyun_eci' }) },
+		{ id: 'tencent_ecs', name: formatMessage({ id: 'device.tencent_ecs' }) },
+		{ id: 'volcengine_ecs', name: formatMessage({ id: 'device.volcengine_ecs' }) }
 	]
+
 	const defaultList = [
 		{ id: 1, name: formatMessage({ id: 'operation.yes' }) },
 		{ id: 0, name: formatMessage({ id: 'operation.no' }) }
 	]
+
+	const cloudTypeList = [
+		{ id: 'aliyun', name: formatMessage({ id: 'device.cloud.alibaba' }) },
+		{ id: 'tencent', name: formatMessage({ id: 'device.cloud.tencent' }) },
+		{ id: 'volcengine', name: formatMessage({ id: 'device.cloud.volcanic' }) }
+	]
+
 	const styleObj = {
 		container: 180,
 		button_width: 90
 	}
 
+	const renderCloudType = (str: string) => {
+		switch (str) {
+			case 'aliyun':
+				return formatMessage({ id: 'device.cloud.alibaba' })
+			case 'tencent':
+				return formatMessage({ id: 'device.cloud.tencent' })
+			case 'volcengine':
+				return formatMessage({ id: 'device.cloud.volcanic' })
+			default:
+				return '-'
+		}
+	}
+
 	const columnsAk: any = [
+		{
+
+			title: <FormattedMessage id="device.cloud.type" />,
+			dataIndex: 'cloud_type',
+			fixed: 'left',
+			width: 100,
+			filterIcon: () => <FilterFilled style={{ color: fetchParams.cloud_type ? '#1890ff' : undefined }} />,
+			filterDropdown: ({ confirm }: any) => (
+				<SelectRadio
+					list={cloudTypeList}
+					confirm={confirm}
+					onConfirm={(val: any) => {
+						setFetchParams({ ...fetchParams, cloud_type: val })
+					}}
+				/>
+			),
+			render: (str: string) => renderCloudType(str),
+		},
 		{
 			title: 'AK Name',
 			dataIndex: 'name',
@@ -751,7 +793,7 @@ const CloudConfig: React.FC<any> = (props) => {
 				rowKey={record => record.id + ''}
 				pagination={false}
 			/>
-			<Row justify="space-between" style={{ padding: '16px 20px 0px' }}>
+			<Row justify="space-between" style={{ padding: '16px 0px' }}>
 				{
 					data.total > 1 &&
 					<>
diff --git a/src/pages/WorkSpace/DeviceManage/CloudManage/AddMachinePubilc/index.tsx b/src/pages/WorkSpace/DeviceManage/CloudManage/AddMachinePubilc/index.tsx
index d9d1a663..0aaf292d 100644
--- a/src/pages/WorkSpace/DeviceManage/CloudManage/AddMachinePubilc/index.tsx
+++ b/src/pages/WorkSpace/DeviceManage/CloudManage/AddMachinePubilc/index.tsx
@@ -19,14 +19,36 @@ import Disclaimer from '@/components/Disclaimer';
 const { Option } = Select;
 const optionLists = [
     {
-        value: 'aliyun_eci',
-        label: 'aliyun_eci',
-        isLeaf: false,
+        value: 'aliyun',
+        label: 'aliyun',
+        children: [{
+            value: 'aliyun_eci',
+            label: 'aliyun_eci',
+            isLeaf: false,
+        },
+        {
+            value: 'aliyun_ecs',
+            label: 'aliyun_ecs',
+            isLeaf: false,
+        }]
     },
     {
-        value: 'aliyun_ecs',
-        label: 'aliyun_ecs',
-        isLeaf: false,
+        value: 'tencent',
+        label: 'tencent',
+        children: [{
+            value: 'tencent_ecs',
+            label: 'tencent_ecs',
+            isLeaf: false,
+        }]
+    },
+    {
+        value: 'volcengine',
+        label: 'volcengine',
+        children: [{
+            value: 'volcengine_ecs',
+            label: 'volcengine_ecs',
+            isLeaf: false,
+        }]
     },
 ];
 
@@ -141,77 +163,48 @@ const NewMachine: React.FC<any> = (props) => {
             }, 500);
         }
     };
-
-    const loadAkData = async (selectedOptions: any) => {
-        const targetOption = selectedOptions[selectedOptions.length - 1];
-        const { code, data=[], msg } = await querysAK({ ws_id, provider: targetOption.value })
-        if (code === 200) {
-            // targetOption.children = data && data.map((item: any) => { return { label: item.name, value: item.id } });
-            // setOptions([...options])
-            const tempData = options.map((item)=>
-                item.value === targetOption.value ?
-                    ({ ...item, children: data.map((item: any) => ({ label: item.name, value: item.id })), })
-                : item
-            )
-            setOptions(tempData)
-        } else {
-            setTimeout(() => {
-                // targetOption.children = []
-                // setOptions([...options])
-                const tempData = options.map((item)=> item.value === targetOption.value ? ({ ...item, children: [] }) : item )
+    const handleAkChange = async (value: any, selectedOptions: any) => {
+        // 获取云类型 => 云厂商 => AK
+        if (selectedOptions.length === 2 && !selectedOptions[selectedOptions.length - 1].isLeaf) {
+            const targetOption = selectedOptions[selectedOptions.length - 1];
+            const { code, data = [], msg } = await querysAK({ ws_id, cloud_type: value[0], provider: value[1] })
+            if (code === 200) {
+                const tempData = options.map((parent: any) => ({
+                    ...parent,
+                    children: parent.children.map((item: any) => item.value === targetOption.value ? ({
+                        ...item,
+                        children: data.map((item: any) => ({ label: item.name, value: item.id }))
+                    }) : item
+                    )
+                }))
                 setOptions(tempData)
-            }, 500);
-            setValidateAK({ validate: false, meg: msg || formatMessage({ id: 'device.no.compliant.AK' }) })
-            form.setFieldsValue({ manufacturer: undefined })
+            } else {
+                setTimeout(() => {
+                    const tempData = options.map((parent: any) => ({
+                        ...parent,
+                        children: parent.children.map((item: any) => ({ ...item, children: [] })
+                        )
+                    }))
+                    setOptions(tempData)
+                }, 500);
+                setValidateAK({ validate: false, meg: msg || formatMessage({ id: 'device.no.compliant.AK' }) })
+                form.setFieldsValue({ manufacturer: undefined })
+            }
         }
-    }
-
-    const DEFAULT_FORM_VALUE = {
-        instance_type: undefined,
-        instance_type_one: undefined,
-        instance_type_two: undefined,
-        storage_type: undefined,
-        storage_size: 40,
-        storage_number: 0,
-        system_disk_category: undefined,
-        system_disk_size: 40,
-    }
 
-    // 重置联动控件
-    const AkResetStatus = () => {
-        form.setFieldsValue({
-            ...DEFAULT_FORM_VALUE,
-            region: undefined,
-            image: undefined,
-        })
-    }
-    // 重置联动控件
-    const regionResetStatus = () => {
-        form.setFieldsValue({
-            ...DEFAULT_FORM_VALUE,
-            image: undefined,
-        })
-    }
-    // 重置联动控件
-    const imageResetStatus = () => {
-        form.setFieldsValue({
-            ...DEFAULT_FORM_VALUE
-        })
-    }
-
-    const onAkChange = async (value: any, selectedOptions: any) => {
+        // 获取region
         if (!firstAddDataFlag) {
             setDisabled(true)
             regionResetStatus()
-            if (value && value.length) {
+            if (value && value.length > 2) {
                 // case1.存储选的"云厂商"类型，决定规格的表现形式。
-                const frisItem = value[0]
+                const frisItem = value[2]
                 setChangeManufacturer(frisItem)
                 // case2.查询各选框数据源。
                 setLoading(true)
                 const regionZone = form.getFieldValue('region')
                 let param = {
-                    ak_id: value[1],
+                    ak_id: value[2],
                     region: regionZone[0],
                     zone: regionZone[1],
                 }
@@ -232,16 +225,16 @@ const NewMachine: React.FC<any> = (props) => {
             // 第一次添加机器时，"云厂商/AK"和"地域"两个选框有联动关系
             setDisabled(true)
             AkResetStatus()
-            if (value && value.length) {
+            if (value && value.length > 2) {
                 // case1.根据 ak_id 查询Region数据
-                const { code, data = [], msg } = await querysRegion({ ak_id: value[1] })
+                const { code, data = [], msg } = await querysRegion({ ak_id: value[2] })
                 let list = []
                 if (code === 200) {
                     list = data?.map((item: any) => {
                         return {
                             value: item.id,
                             label: textRender(item.id),
-                            ak_id: value[1],
+                            ak_id: value[2],
                             isLeaf: false,
                         }
                     })
@@ -252,7 +245,7 @@ const NewMachine: React.FC<any> = (props) => {
                 setRegion(list)
                 setValidateRegion(!!list.length)
                 // case2.存储选的"云厂商"类型，决定规格的表现形式
-                const frisItem = value[0]
+                const frisItem = value[2]
                 setChangeManufacturer(frisItem.value)
             } else {
                 // 清除
@@ -260,8 +253,40 @@ const NewMachine: React.FC<any> = (props) => {
                 setRegion([])
             }
         }
+    };
+
+    const DEFAULT_FORM_VALUE = {
+        instance_type: undefined,
+        instance_type_one: undefined,
+        instance_type_two: undefined,
+        storage_type: undefined,
+        storage_size: 40,
+        storage_number: 0,
+        system_disk_category: undefined,
+        system_disk_size: 40,
     }
 
+    // 重置联动控件
+    const AkResetStatus = () => {
+        form.setFieldsValue({
+            ...DEFAULT_FORM_VALUE,
+            region: undefined,
+            image: undefined,
+        })
+    }
+    // 重置联动控件
+    const regionResetStatus = () => {
+        form.setFieldsValue({
+            ...DEFAULT_FORM_VALUE,
+            image: undefined,
+        })
+    }
+    // 重置联动控件
+    const imageResetStatus = () => {
+        form.setFieldsValue({
+            ...DEFAULT_FORM_VALUE
+        })
+    }
     const getShowRegion = async (param: any) => {
         setLoading(true)
         const { data: akData = [] } = await querysAK({ ws_id, provider: param.id })
@@ -542,18 +567,7 @@ const NewMachine: React.FC<any> = (props) => {
         setVisible(false)
         setBtnLoading(false)
         form.resetFields()
-        setOptions([
-            {
-                value: 'aliyun_eci',
-                label: 'aliyun_eci',
-                isLeaf: false,
-            },
-            {
-                value: 'aliyun_ecs',
-                label: 'aliyun_ecs',
-                isLeaf: false,
-            },
-        ])
+        setOptions(optionLists)
     }
 
     const disabledState = useMemo(() => {
@@ -664,7 +678,7 @@ const NewMachine: React.FC<any> = (props) => {
                             <Col span={12}>
                                 <Form.Item
                                     name="manufacturer"
-                                    label={<FormattedMessage id="device.manufacturer/ak" />}
+                                    label={<FormattedMessage id="device.type/manufacturer/ak" />}
                                     validateStatus={validateAK.validate ? '' : 'error'}
                                     help={validateAK.validate ? undefined : validateAK.meg}
                                     rules={[{ required: true, message: formatMessage({ id: 'please.select' }) }]}
@@ -672,8 +686,9 @@ const NewMachine: React.FC<any> = (props) => {
                                     <Cascader
                                         disabled={(type === 'cluster' && !firstAddDataFlag)}
                                         options={options}
-                                        loadData={loadAkData}
-                                        onChange={onAkChange}
+                                        // loadData={loadAkData}
+                                        onChange={handleAkChange}
+                                        changeOnSelect
                                         dropdownMenuColumnStyle={{ width: 165 }}
                                         dropdownClassName={styles.selectCascader}
                                     />
@@ -711,7 +726,7 @@ const NewMachine: React.FC<any> = (props) => {
                                 >
                                     <Select showSearch
                                         optionFilterProp="children"
-                                        placeholder={formatMessage({ id: 'please.select' })}
+                                        placeholder={formatMessage(sever.length == 0 ? {id: 'device.no.available.machines'} : {id: 'please.select' })}
                                         labelInValue
                                         disabled={sever.length == 0}
                                         filterOption={(input, option: any) =>
diff --git a/src/pages/WorkSpace/DeviceManage/CloudManage/Standalone/index.tsx b/src/pages/WorkSpace/DeviceManage/CloudManage/Standalone/index.tsx
index d914ec04..73c3c446 100644
--- a/src/pages/WorkSpace/DeviceManage/CloudManage/Standalone/index.tsx
+++ b/src/pages/WorkSpace/DeviceManage/CloudManage/Standalone/index.tsx
@@ -68,7 +68,7 @@ export default (props: any) => {
     const [deleteObj, setDeleteObj] = useState<any>({});
     const [autoFocus, setFocus] = useState<boolean>(true)
     const logDrawer: any = useRef()
-    const deployModal: any = useRef(null);
+    const deployModal: any = useRef<any>(null);
     const viewDetailRef: any = useRef(null)
     const copyDeviceRef: any = useRef(null)
 
diff --git a/src/pages/WorkSpace/DeviceManage/locales/en-US.ts b/src/pages/WorkSpace/DeviceManage/locales/en-US.ts
index c2ddbdf8..ee41dc4b 100644
--- a/src/pages/WorkSpace/DeviceManage/locales/en-US.ts
+++ b/src/pages/WorkSpace/DeviceManage/locales/en-US.ts
@@ -144,7 +144,7 @@ export default {
   'device.cluster.instance': 'Cluster Instance',
   'device.config.name': 'Configuration Name',
   'device.instance.name': 'Instance Name',
-  'device.manufacturer/ak': 'Cloud Vendor/Ak',
+  'device.type/manufacturer/ak': 'Cloud Type/Cloud Vendor/Ak',
   'device.instance_type': 'Instance Type',
   'device.image': 'Image',
   'device.bandwidth': 'Bandwidth',
@@ -205,6 +205,9 @@ export default {
   'device.tag.delete.tips': 'Deleting the dispatch tag will cause the current tag configured by the server pool, job and test template to be unavailable. Please delete it carefully.',
   'device.tag_color': 'Tag Color',
 
+  'device.cloud.type': 'Cloud Type',
+  'device.cloud.type.cannot.empty': 'Cloud Type cannot be empty',
+  'device.cloud.type.select': 'Please selete a Cloud Type',
   'device.ak.config': 'AK Configuration',
   'device.image.config': 'Image Configuration',
   'device.new.ak': 'Create AK',
@@ -229,6 +232,8 @@ export default {
   'device.edit.image': 'Edit Image',
   'device.aliyun_ecs': 'Aliyun CS',
   'device.aliyun_eci': 'Aliyun ECI',
+  'device.volcengine_ecs': 'Volcengine ECS',
+  'device.tencent_ecs': 'Tencent ECS',
   'device.ak.name.cannot.empty': 'AK Name cannot be empty.',
   'device.ak.name.cannot.repeated': 'AK Name cannot be duplicated',
   'device.ak.name.select': 'Please select AK Name',
@@ -254,4 +259,9 @@ export default {
   'device.please.select.creator': 'Please select a creator',
   'device.please.select.update_user': 'Please select a modifier',
   'device.please.select.ak_name': 'Please select akName',
+  'device.no.available.machines': 'No available machines at the moment',
+
+  'device.cloud.alibaba': 'Alibaba Clouds',
+  'device.cloud.tencent': 'Tencent Clouds',
+  'device.cloud.volcanic': 'Volcanic Clouds',
 }
diff --git a/src/pages/WorkSpace/DeviceManage/locales/zh-CN.ts b/src/pages/WorkSpace/DeviceManage/locales/zh-CN.ts
index 67f94df1..25f9e557 100644
--- a/src/pages/WorkSpace/DeviceManage/locales/zh-CN.ts
+++ b/src/pages/WorkSpace/DeviceManage/locales/zh-CN.ts
@@ -144,7 +144,7 @@ export default {
   'device.cluster.instance': '集群实例',
   'device.config.name': '配置名称',
   'device.instance.name': '实例名称',
-  'device.manufacturer/ak': '云厂商/Ak',
+  'device.type/manufacturer/ak': '云类型/云厂商/Ak',
   'device.instance_type': '规格',
   'device.image': '镜像',
   'device.bandwidth': '带宽',
@@ -206,6 +206,9 @@ export default {
   'device.tag.delete.tips': '删除调度标签后，机器池、Job、测试模板所配置的当前标签均不再生效，请谨慎删除！！',
   'device.tag_color': '标签颜色',
 
+  'device.cloud.type': '云类型',
+  'device.cloud.type.cannot.empty': '云类型不能为空',
+  'device.cloud.type.select': '请选择云类型',
   'device.ak.config': 'AK配置',
   'device.image.config': '镜像配置',
   'device.new.ak': '新建AK',
@@ -230,6 +233,8 @@ export default {
   'device.edit.image': '编辑Image',
   'device.aliyun_ecs': '阿里云ECS',
   'device.aliyun_eci': '阿里云ECI',
+  'device.volcengine_ecs': '火山云ECS',
+  'device.tencent_ecs': '腾讯云ECS',
   'device.ak.name.cannot.empty': 'AK Name不能为空',
   'device.ak.name.cannot.repeated': 'AK Name不能重复',
   'device.ak.name.select': '请选择AK Name',
@@ -255,5 +260,9 @@ export default {
   'device.please.select.creator': '请选择创建者',
   'device.please.select.update_user': '请选择修改者',
   'device.please.select.ak_name': '请选择akName',
+  'device.no.available.machines': '暂无可用机器',
 
+  'device.cloud.alibaba': '阿里云',
+  'device.cloud.tencent': '腾讯云',
+  'device.cloud.volcanic': '火山云',
 }
-- 
Gitee


From 5e13c88d71e3e0117323eb9987b878100fe94217 Mon Sep 17 00:00:00 2001
From: sahara <jwk0528@163.com>
Date: Thu, 29 Aug 2024 14:00:03 +0800
Subject: [PATCH 2/8] =?UTF-8?q?fix:=20=E6=B7=BB=E5=8A=A0=E5=A4=9A=E4=BA=91?=
 =?UTF-8?q?=E6=9C=BA=E5=99=A8=E5=8F=82=E6=95=B0=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CloudManage/AddMachinePubilc/index.tsx      | 17 +++++++++--------
 .../CloudManage/Aligroup/GroupMachine/index.tsx |  2 +-
 .../CloudManage/Aligroup/GroupTree/index.tsx    |  2 +-
 .../CloudManage/Standalone/index.tsx            |  4 ++--
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/pages/WorkSpace/DeviceManage/CloudManage/AddMachinePubilc/index.tsx b/src/pages/WorkSpace/DeviceManage/CloudManage/AddMachinePubilc/index.tsx
index 0aaf292d..7ff01b8e 100644
--- a/src/pages/WorkSpace/DeviceManage/CloudManage/AddMachinePubilc/index.tsx
+++ b/src/pages/WorkSpace/DeviceManage/CloudManage/AddMachinePubilc/index.tsx
@@ -7,7 +7,7 @@ import {
 import Owner from '@/components/Owner/index';
 import { textRender } from '@/utils/hooks';
 import { requestCodeMessage, resetImage, resetECI, enumerEnglish } from '@/utils/utils';
-import { PlusCircleTwoTone, MinusCircleTwoTone } from '@ant-design/icons'
+import { PlusCircleTwoTone, MinusCircleTwoTone } from '@ant-design/icons';
 import styles from './style.less';
 import { useParams, useIntl, FormattedMessage, useModel } from 'umi';
 import _ from 'lodash';
@@ -67,7 +67,6 @@ const getInitialExtra = (obj: any) => {
  */
 const NewMachine: React.FC<any> = (props) => {
     const { onRef, is_instance, onSuccess, type } = props
-    // console.log(props)
     const { formatMessage } = useIntl();
     const { openModal, handleDisclaimerOpen } = useModel('disclaimer');
     const { ws_id }: any = useParams();
@@ -187,6 +186,7 @@ const NewMachine: React.FC<any> = (props) => {
                     }))
                     setOptions(tempData)
                 }, 500);
+                message.error(msg || formatMessage({ id: 'device.no.compliant.AK' }))
                 setValidateAK({ validate: false, meg: msg || formatMessage({ id: 'device.no.compliant.AK' }) })
                 form.setFieldsValue({ manufacturer: undefined })
             }
@@ -289,7 +289,7 @@ const NewMachine: React.FC<any> = (props) => {
     }
     const getShowRegion = async (param: any) => {
         setLoading(true)
-        const { data: akData = [] } = await querysAK({ ws_id, provider: param.id })
+        const { data: akData = [] } = await querysAK({ ws_id, cloud_type: param.cloud_type, provider: param.provider })
         const { data = [] } = await querysRegion({ ak_id: param.ak_id })
         const { data: query = [] } = await queryZone({ ak_id: param.ak_id, region: param.region })
 
@@ -359,7 +359,7 @@ const NewMachine: React.FC<any> = (props) => {
         let region = form.getFieldValue('region')
         let manufacturer = form.getFieldValue('manufacturer')
         let param = {
-            ak_id: manufacturer[1],
+            ak_id: manufacturer[2],
             region: region[0],
             zone: region[1],
             instance_type: val
@@ -396,11 +396,10 @@ const NewMachine: React.FC<any> = (props) => {
         const list = row.tag_list.map((item: any) => item.id)
         setTagFlag({ ...tagFlag, isQuery: 'edit', list })
         const param = { ...row }
-
         param.extra_param = getInitialExtra(param.extra_param)
         param.tags = param.tag_list?.map((item: any) => { return item.id }) || []
         param.is_instance = param.is_instance ? 1 : 0
-        param.manufacturer = [param.manufacturer, param.ak_id]
+        // param.manufacturer = [param.cloud_type, param.provider, param.ak_id]
         param.region = [param.region, param.zone]
         param.kernel_install = param.kernel_install ? 1 : 0
         setChangeManufacturer(row.manufacturer)
@@ -455,8 +454,10 @@ const NewMachine: React.FC<any> = (props) => {
         const param = { ...params, ws_id, is_instance, extra_param }
 
         if (params.hasOwnProperty('manufacturer')) {
-            param.manufacturer = params?.manufacturer[0]
-            param.ak_id = params.manufacturer[1]
+            param.cloud_type = params?.manufacturer[0]
+            // param.manufacturer = [params?.manufacturer[0],params?.manufacturer[1], params?.manufacturer[2]]
+            param.manufacturer = params.manufacturer[1]
+            param.ak_id = params.manufacturer[2]
             param.region = params.region[0]
             param.zone = params.region[1]
         }
diff --git a/src/pages/WorkSpace/DeviceManage/CloudManage/Aligroup/GroupMachine/index.tsx b/src/pages/WorkSpace/DeviceManage/CloudManage/Aligroup/GroupMachine/index.tsx
index 57cc0f0b..a5e9a3f1 100644
--- a/src/pages/WorkSpace/DeviceManage/CloudManage/Aligroup/GroupMachine/index.tsx
+++ b/src/pages/WorkSpace/DeviceManage/CloudManage/Aligroup/GroupMachine/index.tsx
@@ -718,7 +718,7 @@ const NewMachine: React.FC<any> = ({ onRef, onSuccess }) => {
                             <Col span={12}>
                                 <Form.Item
                                     name="manufacturer"
-                                    label={<FormattedMessage id="device.manufacturer/ak" />}
+                                    label={<FormattedMessage id="device.type/manufacturer/ak" />}
                                     validateStatus={validateAK.validate ? '' : 'error'}
                                     help={validateAK.validate ? undefined : validateAK.meg}
                                     rules={[{ required: true, message: formatMessage({ id: 'please.select' }) }]}
diff --git a/src/pages/WorkSpace/DeviceManage/CloudManage/Aligroup/GroupTree/index.tsx b/src/pages/WorkSpace/DeviceManage/CloudManage/Aligroup/GroupTree/index.tsx
index 96fe4d7d..a6f011aa 100644
--- a/src/pages/WorkSpace/DeviceManage/CloudManage/Aligroup/GroupTree/index.tsx
+++ b/src/pages/WorkSpace/DeviceManage/CloudManage/Aligroup/GroupTree/index.tsx
@@ -170,7 +170,7 @@ const GroupTree: React.FC<any> = (props) => {
             dataIndex: 'pub_ip',
         },
         {
-            title: <FormattedMessage id="device.manufacturer/ak" />,
+            title: <FormattedMessage id="device.type/manufacturer/ak" />,
             dataIndex: 'manufacturer',
             width: 120,
             ellipsis: {
diff --git a/src/pages/WorkSpace/DeviceManage/CloudManage/Standalone/index.tsx b/src/pages/WorkSpace/DeviceManage/CloudManage/Standalone/index.tsx
index 73c3c446..2f76c470 100644
--- a/src/pages/WorkSpace/DeviceManage/CloudManage/Standalone/index.tsx
+++ b/src/pages/WorkSpace/DeviceManage/CloudManage/Standalone/index.tsx
@@ -322,8 +322,8 @@ export default (props: any) => {
             render: (_: any, row: any) => <ColumnEllipsisText ellipsis={{ tooltip: true }} >{row.instance_id}</ColumnEllipsisText>
         },
         {
-            title: <FormattedMessage id="device.manufacturer/ak" />,
-            dataIndex: 'manufacturer',
+            title: <FormattedMessage id="device.type/manufacturer/ak" />,
+            dataIndex: 'manufacturer_ak',
             ...inputFilterCommonFields("manufacturer_ak_name"),
             width: 160,
             ellipsis: {
-- 
Gitee


From 6370cb91c299252edb51008322f97343715d51c6 Mon Sep 17 00:00:00 2001
From: sahara <jwk0528@163.com>
Date: Thu, 29 Aug 2024 17:24:32 +0800
Subject: [PATCH 3/8] =?UTF-8?q?fix:=20=E5=88=9B=E5=BB=BAjob=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E4=BA=91=E7=B1=BB=E5=9E=8B=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CloudManage/AddMachinePubilc/index.tsx    | 100 +++++++++---------
 .../CloudManage/Aligroup/GroupTree/index.tsx  |   6 +-
 .../CloudManage/Standalone/index.tsx          |   4 +-
 .../SuiteSelectDrawer/ServerObjectSelect.tsx  |  39 +++++--
 4 files changed, 86 insertions(+), 63 deletions(-)

diff --git a/src/pages/WorkSpace/DeviceManage/CloudManage/AddMachinePubilc/index.tsx b/src/pages/WorkSpace/DeviceManage/CloudManage/AddMachinePubilc/index.tsx
index 7ff01b8e..dae72b89 100644
--- a/src/pages/WorkSpace/DeviceManage/CloudManage/AddMachinePubilc/index.tsx
+++ b/src/pages/WorkSpace/DeviceManage/CloudManage/AddMachinePubilc/index.tsx
@@ -108,9 +108,9 @@ const NewMachine: React.FC<any> = (props) => {
                     zone,
                 }
                 if (!!is_instance) {
-                    Promise.all([getShowRegion(params), getSeverList(params)]).then(() => { setLoading(false), setDisabled(false) })
+                    Promise.all([getShowRegion(params, {}), getSeverList(params)]).then(() => { setLoading(false), setDisabled(false) })
                 } else {
-                    Promise.all([getShowRegion(params), getInstancegList(params), getImageList(params), getCategoriesList(params)]).then(() => { setLoading(false), setDisabled(false) })
+                    Promise.all([getShowRegion(params, {}), getInstancegList(params), getImageList(params), getCategoriesList(params)]).then(() => { setLoading(false), setDisabled(false) })
                 }
                 form.setFieldsValue({ manufacturer: [manufacturer, ak_id], region: [region, zone] })
             }
@@ -148,7 +148,44 @@ const NewMachine: React.FC<any> = (props) => {
         const { data } = await querysServer(param)
         setSever(data || [])
     }
+    const getShowRegion = async (param: any, rest_param: any) => {
+        setLoading(true)
+        const { data: akData = [] } = await querysAK({ ws_id, cloud_type: rest_param.cloud_type, provider: rest_param.manufacturer })
+        const { data = [] } = await querysRegion({ ak_id: param.ak_id })
+        const { data: query = [] } = await queryZone({ ak_id: param.ak_id, region: param.region })
+
+        // 数据回显云类型 => 云厂商 => AK
+        const tempData = options.map((parent: any) => ({
+            ...parent,
+            children: parent.children.map((item: any) => item.value === rest_param.manufacturer ? ({
+                ...item,
+                children: akData.map((item: any) => ({ label: item.name, value: item.id }))
+            }) : item
+            )
+        }))
 
+        // 数据回显region
+        let list = data.map((item: any) => {
+            if (item.id == param.region) {
+                return {
+                    value: item.id,
+                    label: textRender(item.id),
+                    ak_id: param.ak_id,
+                    isLeaf: false,
+                    children: query.map((item: any) => { return { label: item.id, value: item.id } })
+                }
+            }
+            return {
+                value: item.id,
+                label: textRender(item.id),
+                ak_id: param.ak_id,
+                isLeaf: false,
+            }
+        })
+        setOptions(tempData)
+        setRegion(list)
+        setLoading(false)
+    }
     const loadRegionData = async (selectedOptions: any) => {
         const targetOption = selectedOptions[selectedOptions.length - 1];
         const { data, code } = await queryZone({ ak_id: targetOption.ak_id, region: targetOption.value })
@@ -287,46 +324,6 @@ const NewMachine: React.FC<any> = (props) => {
             ...DEFAULT_FORM_VALUE
         })
     }
-    const getShowRegion = async (param: any) => {
-        setLoading(true)
-        const { data: akData = [] } = await querysAK({ ws_id, cloud_type: param.cloud_type, provider: param.provider })
-        const { data = [] } = await querysRegion({ ak_id: param.ak_id })
-        const { data: query = [] } = await queryZone({ ak_id: param.ak_id, region: param.region })
-
-        let list = data.map((item: any) => {
-            if (item.id == param.region) {
-                return {
-                    value: item.id,
-                    label: textRender(item.id),
-                    ak_id: param.ak_id,
-                    isLeaf: false,
-                    children: query.map((item: any) => { return { label: item.id, value: item.id } })
-                }
-            }
-            return {
-                value: item.id,
-                label: textRender(item.id),
-                ak_id: param.ak_id,
-                isLeaf: false,
-            }
-        })
-
-        let lists = optionLists.map((item: any) => {
-            if (item.value === param.id) {
-                return {
-                    value: param.id,
-                    label: param.id,
-                    isLeaf: false,
-                    children: akData.map((item: any) => { return { label: item.name, value: item.id } })
-                }
-            }
-            return item
-        })
-        setOptions(lists)
-        setRegion(list)
-        setLoading(false)
-    }
-
     const onRegionChange = (value: any, selectedOptions: any) => {
         if (Array.isArray(selectedOptions) && selectedOptions.length) {
             let param = {
@@ -398,8 +395,8 @@ const NewMachine: React.FC<any> = (props) => {
         const param = { ...row }
         param.extra_param = getInitialExtra(param.extra_param)
         param.tags = param.tag_list?.map((item: any) => { return item.id }) || []
+        param.manufacturer = [param.cloud_type, param.manufacturer, param.ak_id]
         param.is_instance = param.is_instance ? 1 : 0
-        // param.manufacturer = [param.cloud_type, param.provider, param.ak_id]
         param.region = [param.region, param.zone]
         param.kernel_install = param.kernel_install ? 1 : 0
         setChangeManufacturer(row.manufacturer)
@@ -407,7 +404,11 @@ const NewMachine: React.FC<any> = (props) => {
             ak_id: param.ak_id,
             region: param.region[0],
             zone: param.region[1],
-            id: param.manufacturer[0],
+        }
+        const rest_param = {
+            cloud_type: param.cloud_type,
+            manufacturer: param.manufacturer[1],
+            id: param.id,
             instance_type: param.instance_type
         }
         if (param.ak_name == 'aliyun_eci') {
@@ -418,12 +419,12 @@ const NewMachine: React.FC<any> = (props) => {
             param.instance_type_two = Number(t.substring(type1 + 1, type2))
         }
         if (!!is_instance) {
-            Promise.all([getShowRegion(params), getSeverList(params)]).then(() => {
+            Promise.all([getShowRegion(params, rest_param), getSeverList(params)]).then(() => {
                 setLoading(false)
                 setDisabled(false)
             })
         } else {
-            Promise.all([getShowRegion(params), getInstancegList(params), getImageList(params), getCategoriesList(params)]).then(() => { setLoading(false), setDisabled(false) })
+            Promise.all([getShowRegion(params, rest_param), getInstancegList(params), getImageList(params), getCategoriesList(params)]).then(() => { setLoading(false), setDisabled(false) })
         }
         form.setFieldsValue(param)
     }
@@ -452,12 +453,12 @@ const NewMachine: React.FC<any> = (props) => {
         setBtnLoading(true)
         const extra_param = params.extra_param?.filter((i: any) => i.param_key)
         const param = { ...params, ws_id, is_instance, extra_param }
-
+        console.log('params',params)
         if (params.hasOwnProperty('manufacturer')) {
-            param.cloud_type = params?.manufacturer[0]
-            // param.manufacturer = [params?.manufacturer[0],params?.manufacturer[1], params?.manufacturer[2]]
+            param.cloud_type = params.manufacturer[0]
             param.manufacturer = params.manufacturer[1]
             param.ak_id = params.manufacturer[2]
+            // param.ak_id = params.ak_id
             param.region = params.region[0]
             param.zone = params.region[1]
         }
@@ -507,6 +508,7 @@ const NewMachine: React.FC<any> = (props) => {
         param.description = params.description || ''
         param.cluster_id = clusterId
         const { id, machineId } = editData
+        console.log('editData',editData)
         let res: any;
         if (type === 'cluster') {
             res = id ? await editGroupMachine(machineId, { ...param }) : await addGroupMachine({ ...param })
diff --git a/src/pages/WorkSpace/DeviceManage/CloudManage/Aligroup/GroupTree/index.tsx b/src/pages/WorkSpace/DeviceManage/CloudManage/Aligroup/GroupTree/index.tsx
index a6f011aa..7cc936f8 100644
--- a/src/pages/WorkSpace/DeviceManage/CloudManage/Aligroup/GroupTree/index.tsx
+++ b/src/pages/WorkSpace/DeviceManage/CloudManage/Aligroup/GroupTree/index.tsx
@@ -78,7 +78,7 @@ const GroupTree: React.FC<any> = (props) => {
     }
 
     const paramTransform = (val: any) => {
-        const dict = {
+        const dict: any = {
             0: formatMessage({ id: 'operation.not.release' }),
             1: formatMessage({ id: 'operation.release' }),
             2: formatMessage({ id: 'device.failed.save' })
@@ -171,12 +171,12 @@ const GroupTree: React.FC<any> = (props) => {
         },
         {
             title: <FormattedMessage id="device.type/manufacturer/ak" />,
-            dataIndex: 'manufacturer',
+            dataIndex: 'manufacturer_ak',
             width: 120,
             ellipsis: {
                 showTitle: false,
             },
-            render: (_: number, row: any) => <ColumnEllipsisText ellipsis={{ tooltip: true }} >{`${row.manufacturer}/${row.ak_name}`}</ColumnEllipsisText>
+            render: (_: number, row: any) => <ColumnEllipsisText ellipsis={{ tooltip: true }} >{_}</ColumnEllipsisText>
         },
         {
             title: 'Region/Zone',
diff --git a/src/pages/WorkSpace/DeviceManage/CloudManage/Standalone/index.tsx b/src/pages/WorkSpace/DeviceManage/CloudManage/Standalone/index.tsx
index 2f76c470..b832749b 100644
--- a/src/pages/WorkSpace/DeviceManage/CloudManage/Standalone/index.tsx
+++ b/src/pages/WorkSpace/DeviceManage/CloudManage/Standalone/index.tsx
@@ -324,12 +324,12 @@ export default (props: any) => {
         {
             title: <FormattedMessage id="device.type/manufacturer/ak" />,
             dataIndex: 'manufacturer_ak',
-            ...inputFilterCommonFields("manufacturer_ak_name"),
+            ...inputFilterCommonFields("manufacturer_ak"),
             width: 160,
             ellipsis: {
                 showTitle: false
             },
-            render: (_: any, row: any) => <ColumnEllipsisText ellipsis={{ tooltip: true }} >{`${row.manufacturer}/${row.ak_name}`}</ColumnEllipsisText>
+            render: (_: any, row: any) => <ColumnEllipsisText ellipsis={{ tooltip: true }} >{_}</ColumnEllipsisText>
         },
         {
             title: 'Region/Zone',
diff --git a/src/pages/WorkSpace/TestJob/components/SuiteSelectDrawer/ServerObjectSelect.tsx b/src/pages/WorkSpace/TestJob/components/SuiteSelectDrawer/ServerObjectSelect.tsx
index a28ea18c..84d39446 100644
--- a/src/pages/WorkSpace/TestJob/components/SuiteSelectDrawer/ServerObjectSelect.tsx
+++ b/src/pages/WorkSpace/TestJob/components/SuiteSelectDrawer/ServerObjectSelect.tsx
@@ -1,5 +1,5 @@
 /* eslint-disable react-hooks/exhaustive-deps */
-import { Select, Badge, Typography, Form } from 'antd'
+import { Select, Badge, Typography, Form, Tag, Space } from 'antd'
 import React, { useContext, useEffect, useMemo, useState } from 'react'
 import { standloneServerList, queryClusterServer, queryClusterStandaloneServer, queryClusterGroupServer } from './services';
 import debounce from 'lodash/debounce';
@@ -36,7 +36,7 @@ const ServerObjectSelect = (props: any) => {
 
     //内网单机
     const standaloneServerRequest = async (page_num = 1) => {
-        const search = searchValue ? { ip: searchValue }: {}
+        const search = searchValue ? { ip: searchValue } : {}
         const { data, code, total_page } = await standloneServerList({ ws_id, state: ['Available', 'Occupied', 'Reserved'], page_num, page_size: PAGE_SIZE, ...search }) //, page_size : 2
         if (code === 200 && data) {
             setServerList((p: any) => filterRepeat(p, data))
@@ -46,7 +46,7 @@ const ServerObjectSelect = (props: any) => {
 
     //内网集群
     const clusterServerRequest = async (page_num = 1) => {
-        const search = searchValue ? { ip: searchValue }: {}
+        const search = searchValue ? { ip: searchValue } : {}
         const { data, code, total_page } = await queryClusterServer({ cluster_type: 'aligroup', ws_id, page_num, page_size: PAGE_SIZE, ...search })
         if (code === 200 && data) {
             setServerList((p: any) => filterRepeat(p, data))
@@ -56,7 +56,7 @@ const ServerObjectSelect = (props: any) => {
 
     //云上单机
     const clusterStandaloneRequest = async () => {
-        const search = searchValue ? { ip: searchValue }: {}
+        const search = searchValue ? { ip: searchValue } : {}
         const { data, code, total_page } = await queryClusterStandaloneServer({ ws_id, no_page: true, is_instance: serverObjectType === 'instance', state: ['Available', 'Occupied', 'Reserved'], ...search })
         if (code === 200 && data) {
             setServerList((p: any) => filterRepeat(p, data))
@@ -66,7 +66,7 @@ const ServerObjectSelect = (props: any) => {
 
     //云上集群
     const clusterGroupRequest = async () => {
-        const search = searchValue ? { ip: searchValue }: {}
+        const search = searchValue ? { ip: searchValue } : {}
         const { data, code, total_page } = await queryClusterGroupServer({ cluster_type: 'aliyun', ws_id, no_page: true, ...search })
         if (code === 200 && data) {
             setServerList((p: any) => filterRepeat(p, data))
@@ -127,7 +127,7 @@ const ServerObjectSelect = (props: any) => {
     }
 
     // 搜索
-    const onSearch = (word: any)=> {
+    const onSearch = (word: any) => {
         setSearchValue(word || undefined)
     }
 
@@ -142,11 +142,22 @@ const ServerObjectSelect = (props: any) => {
         }, [serverObjectType]
     )
 
+    const renderCloudType = (val: any) => {
+        if (val === 'aliyun') {
+            return <Tag color="#f50" style={{ border: 'none' }}>阿里云</Tag>
+        } else if (val === 'tencent') {
+            return <Tag color="#2db7f5" style={{ border: 'none' }}>腾讯云</Tag>
+        } else if (val === 'volcengine') {
+            return <Tag color="#cd201f" style={{ border: 'none' }}>火山云</Tag>
+        } else return
+    }
+
     const options = useMemo(() => {
         let $options = []
         if (serverObjectType === 'server_object_id') {
             if (run_mode === 'standalone')
                 $options = serverList.map((item: any) => {
+
                     const text = item.ip || item.sn
                     return {
                         value: item.id,
@@ -174,8 +185,11 @@ const ServerObjectSelect = (props: any) => {
                     value: item.id,
                     label: (
                         <Typography.Text ellipsis={{ tooltip: text }}>
-                            <Badge style={{ marginRight: 8 }} status={getServerStatusMap(item.state) as any} />
-                            {text}
+                            <Space size={12}>
+                                <Badge style={{ marginRight: 8 }} status={getServerStatusMap(item.state) as any} />
+                                {text}
+                                {renderCloudType(item.cloud_type)}
+                            </Space>
                         </Typography.Text>
                     ),
                     search_key: text
@@ -185,7 +199,14 @@ const ServerObjectSelect = (props: any) => {
         if (serverObjectType === 'setting')
             $options = serverList.filter((i: any) => !i.is_instance).map((item: any) => ({
                 value: item.id,
-                label: <Typography.Text ellipsis={{ tooltip: true }}>{item.template_name}</Typography.Text>,
+                label: (
+                    <Typography.Text ellipsis={{ tooltip: true }}>
+                        <Space size={12}>
+                            {item.template_name}
+                            {renderCloudType(item.cloud_type)}
+                        </Space>
+                    </Typography.Text>
+                ),
                 search_key: item.template_name
             }))
 
-- 
Gitee


From c5dbe8cdaa992e3313a9f5ebb5054027677d706b Mon Sep 17 00:00:00 2001
From: sahara <jwk0528@163.com>
Date: Thu, 29 Aug 2024 21:23:43 +0800
Subject: [PATCH 4/8] =?UTF-8?q?feat:=20=E4=BA=91=E7=9B=98=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E6=9E=9A=E4=B8=BE&=E4=B8=AD=E8=8B=B1=E6=96=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CloudManage/AddMachinePubilc/index.tsx    | 34 +++++++++----
 .../DeviceManage/CloudManage/DataSetPulic.tsx | 49 ++++++++++++++++++-
 .../CloudManage/Standalone/index.tsx          | 19 ++++++-
 .../WorkSpace/DeviceManage/locales/en-US.ts   | 17 +++++++
 .../WorkSpace/DeviceManage/locales/zh-CN.ts   | 18 ++++++-
 .../TestSettingTable/ServerTooltip.tsx        | 19 +++----
 6 files changed, 132 insertions(+), 24 deletions(-)

diff --git a/src/pages/WorkSpace/DeviceManage/CloudManage/AddMachinePubilc/index.tsx b/src/pages/WorkSpace/DeviceManage/CloudManage/AddMachinePubilc/index.tsx
index dae72b89..fbd8b32a 100644
--- a/src/pages/WorkSpace/DeviceManage/CloudManage/AddMachinePubilc/index.tsx
+++ b/src/pages/WorkSpace/DeviceManage/CloudManage/AddMachinePubilc/index.tsx
@@ -96,23 +96,29 @@ const NewMachine: React.FC<any> = (props) => {
         if (code === 200 && !!dataSource.length) {
             // 回填"云厂商/AK" 和 "地域"两个选框都同步第一次选的数据
             const { test_server = {} } = dataSource[dataSource.length - 1]
-            const { manufacturer, ak_id, region, zone } = test_server
-            if (ak_id && manufacturer && region && zone) {
+            const { cloud_type, manufacturer, ak_id, region, zone, instance_type } = test_server
+            if (cloud_type && ak_id && manufacturer && region && zone) {
                 setFirstAddDataFlag(false)
                 setChangeManufacturer(manufacturer)
                 setShowZone(true)
                 let params = {
                     ak_id,
-                    id: manufacturer,
+                    // id: manufacturer,
                     region,
                     zone,
                 }
+                const rest_param = {
+                    cloud_type,
+                    manufacturer,
+                    id,
+                    instance_type,
+                }
                 if (!!is_instance) {
-                    Promise.all([getShowRegion(params, {}), getSeverList(params)]).then(() => { setLoading(false), setDisabled(false) })
+                    Promise.all([getShowRegion(params, rest_param), getSeverList(params)]).then(() => { setLoading(false), setDisabled(false) })
                 } else {
-                    Promise.all([getShowRegion(params, {}), getInstancegList(params), getImageList(params), getCategoriesList(params)]).then(() => { setLoading(false), setDisabled(false) })
+                    Promise.all([getShowRegion(params, rest_param), getInstancegList(params), getImageList(params), getCategoriesList(params)]).then(() => { setLoading(false), setDisabled(false) })
                 }
-                form.setFieldsValue({ manufacturer: [manufacturer, ak_id], region: [region, zone] })
+                form.setFieldsValue({ manufacturer: [cloud_type, manufacturer, ak_id], region: [region, zone] })
             }
         } else {
             setFirstAddDataFlag(true)
@@ -453,7 +459,6 @@ const NewMachine: React.FC<any> = (props) => {
         setBtnLoading(true)
         const extra_param = params.extra_param?.filter((i: any) => i.param_key)
         const param = { ...params, ws_id, is_instance, extra_param }
-        console.log('params',params)
         if (params.hasOwnProperty('manufacturer')) {
             param.cloud_type = params.manufacturer[0]
             param.manufacturer = params.manufacturer[1]
@@ -508,7 +513,6 @@ const NewMachine: React.FC<any> = (props) => {
         param.description = params.description || ''
         param.cluster_id = clusterId
         const { id, machineId } = editData
-        console.log('editData',editData)
         let res: any;
         if (type === 'cluster') {
             res = id ? await editGroupMachine(machineId, { ...param }) : await addGroupMachine({ ...param })
@@ -562,6 +566,16 @@ const NewMachine: React.FC<any> = (props) => {
         if (flag) onSubmit()
     }, [clusterId, image])
 
+    const handleExtendedFieldsChange = (value: any) => {
+        if (value && value.indexOf('aliyun') > -1) {
+            return formatMessage({ id: 'device.aliyun.params'})
+        } else if (value && value.indexOf('tencent') > -1) {
+            return formatMessage({ id: 'device.tencent.params'})
+        } else if (value && value.indexOf('volcengine') > -1) {
+            return formatMessage({ id: 'device.volcengine.params'})
+        } else return
+    }
+
     const onClose = () => {
         // 初始化状态
         setValidateRegion(true)
@@ -729,7 +743,7 @@ const NewMachine: React.FC<any> = (props) => {
                                 >
                                     <Select showSearch
                                         optionFilterProp="children"
-                                        placeholder={formatMessage(sever.length == 0 ? {id: 'device.no.available.machines'} : {id: 'please.select' })}
+                                        placeholder={formatMessage(sever.length == 0 ? { id: 'device.no.available.machines' } : { id: 'please.select' })}
                                         labelInValue
                                         disabled={sever.length == 0}
                                         filterOption={(input, option: any) =>
@@ -973,7 +987,7 @@ const NewMachine: React.FC<any> = (props) => {
                         {!is_instance ?
                             <Col span={24} className={styles.warp}>
                                 <Form.Item
-                                    label={<QusetionIconTootip title={formatMessage({ id: 'device.extended.fields' })} desc={formatMessage({ id: 'device.aliyun.params' })} />}
+                                    label={<QusetionIconTootip title={formatMessage({ id: 'device.extended.fields' })} desc={handleExtendedFieldsChange(manufacturerType)} />}
                                     labelAlign="left"
                                     style={{ marginBottom: 0 }}
                                 >
diff --git a/src/pages/WorkSpace/DeviceManage/CloudManage/DataSetPulic.tsx b/src/pages/WorkSpace/DeviceManage/CloudManage/DataSetPulic.tsx
index d091a6a5..1056989f 100644
--- a/src/pages/WorkSpace/DeviceManage/CloudManage/DataSetPulic.tsx
+++ b/src/pages/WorkSpace/DeviceManage/CloudManage/DataSetPulic.tsx
@@ -15,16 +15,61 @@ const DataSetPulic: React.FC<DataSet> = (props) => {
         return <div>{formatMessage({ id: 'device.cloud_ssd' })}</div>
     } else if (name == 'cloud_essd') {
         return <div>{formatMessage({ id: 'device.cloud_essd' })}</div>
+    } else if (name == 'ephemeral_ssd') {
+        return <div>{formatMessage({ id: 'device.cloud_essd' })}</div>
+    } else if (name == 'cloud_auto') {
+        return <div>{formatMessage({ id: 'device.cloud_auto' })}</div>
+    } else if (name == 'cloud_essd_entry') {
+        return <div>{formatMessage({ id: 'device.cloud_essd_entry' })}</div>
+    } else if (name == 'ESSD_PL0') {
+        return <div>{formatMessage({ id: 'device.ESSD_PL0' })}</div>
+    } else if (name == 'ESSD_FlexPL') {
+        return <div>{formatMessage({ id: 'device.ESSD_FlexPL' })}</div>
+    } else if (name == 'LOCAL_BASIC') {
+        return <div>{formatMessage({ id: 'device.LOCAL_BASIC' })}</div>
+    } else if (name == 'LOCAL_SSD') {
+        return <div>{formatMessage({ id: 'device.LOCAL_SSD' })}</div>
+    } else if (name == 'CLOUD_BASIC') {
+        return <div>{formatMessage({ id: 'device.CLOUD_BASIC' })}</div>
+    } else if (name == 'CLOUD_SSD') {
+        return <div>{formatMessage({ id: 'device.CLOUD_SSD' })}</div>
+    } else if (name == 'CLOUD_PREMIUM') {
+        return <div>{formatMessage({ id: 'device.CLOUD_PREMIUM' })}</div>
+    } else if (name == 'CLOUD_BSSD') {
+        return <div>{formatMessage({ id: 'device.CLOUD_BSSD' })}</div>
+    } else if (name == 'CLOUD_HSSD') {
+        return <div>{formatMessage({ id: 'device.CLOUD_HSSD' })}</div>
+    } else if (name == 'CLOUD_TSSD') {
+        return <div>{formatMessage({ id: 'device.CLOUD_TSSD' })}</div>
+    } else if (name == 'LOCAL_NVME') {
+        return <div>{formatMessage({ id: 'device.LOCAL_NVME' })}</div>
+    } else if (name == 'LOCAL_PRO') {
+        return <div>{formatMessage({ id: 'device.LOCAL_PRO' })}</div>
     } else {
-        return <div>-</div>
+        return <div>{name || '-'}</div>
     }
 }
 export const dataSetMethod = (dict: any, formatMessage: any) => {
-    const obj = {
+    const obj: any = {
         cloud: formatMessage({ id: 'device.cloud' }),
         cloud_efficiency: formatMessage({ id: 'device.cloud_efficiency' }),
         cloud_ssd: formatMessage({ id: 'device.cloud_ssd' }),
         cloud_essd: formatMessage({ id: 'device.cloud_essd' }),
+        ephemeral_ssd: formatMessage({ id: 'device.ephemeral_ssd' }),
+        cloud_auto: formatMessage({ id: 'device.cloud_auto' }),
+        cloud_essd_entry: formatMessage({ id: 'device.cloud_essd_entry' }),
+        ESSD_PL0: formatMessage({ id: 'device.ESSD_PL0' }),
+        ESSD_FlexPL: formatMessage({ id: 'device.ESSD_FlexPL' }),
+        LOCAL_BASIC: formatMessage({ id: 'device.LOCAL_BASIC' }),
+        LOCAL_SSD: formatMessage({ id: 'device.LOCAL_SSD' }),
+        CLOUD_BASIC: formatMessage({ id: 'device.CLOUD_BASIC' }),
+        CLOUD_SSD: formatMessage({ id: 'device.CLOUD_SSD' }),
+        CLOUD_PREMIUM: formatMessage({ id: 'device.CLOUD_PREMIUM' }),
+        CLOUD_BSSD: formatMessage({ id: 'device.CLOUD_BSSD' }),
+        CLOUD_HSSD: formatMessage({ id: 'device.CLOUD_HSSD' }),
+        CLOUD_TSSD: formatMessage({ id: 'device.CLOUD_TSSD' }),
+        LOCAL_NVME: formatMessage({ id: 'device.LOCAL_NVME' }),
+        LOCAL_PRO: formatMessage({ id: 'device.LOCAL_PRO' })
     }
     return obj[dict]
 }
diff --git a/src/pages/WorkSpace/DeviceManage/CloudManage/Standalone/index.tsx b/src/pages/WorkSpace/DeviceManage/CloudManage/Standalone/index.tsx
index b832749b..4a8a2f30 100644
--- a/src/pages/WorkSpace/DeviceManage/CloudManage/Standalone/index.tsx
+++ b/src/pages/WorkSpace/DeviceManage/CloudManage/Standalone/index.tsx
@@ -324,7 +324,7 @@ export default (props: any) => {
         {
             title: <FormattedMessage id="device.type/manufacturer/ak" />,
             dataIndex: 'manufacturer_ak',
-            ...inputFilterCommonFields("manufacturer_ak"),
+            ...inputFilterCommonFields("manufacturer_ak_name"),
             width: 160,
             ellipsis: {
                 showTitle: false
@@ -380,6 +380,21 @@ export default (props: any) => {
                     ["cloud_efficiency", formatMessage({ id: 'device.cloud_efficiency' })],
                     ["cloud_ssd", formatMessage({ id: 'device.cloud_ssd' })],
                     ["cloud_essd", formatMessage({ id: 'device.cloud_essd' })],
+                    ['ephemeral_ssd', formatMessage({ id: 'device.ephemeral_ssd' })],
+                    ['cloud_auto', formatMessage({ id: 'device.cloud_auto' })],
+                    ['cloud_essd_entry', formatMessage({ id: 'device.cloud_essd_entry' })],
+                    ['ESSD_PL0', formatMessage({ id: 'device.ESSD_PL0' })],
+                    ['ESSD_FlexPL', formatMessage({ id: 'device.ESSD_FlexPL' })],
+                    ['LOCAL_BASIC', formatMessage({ id: 'device.LOCAL_BASIC' })],
+                    ['LOCAL_SSD', formatMessage({ id: 'device.LOCAL_SSD' })],
+                    ['CLOUD_BASIC', formatMessage({ id: 'device.CLOUD_BASIC' })],
+                    ['CLOUD_SSD', formatMessage({ id: 'device.CLOUD_SSD' })],
+                    ['CLOUD_PREMIUM', formatMessage({ id: 'device.CLOUD_PREMIUM' })],
+                    ['CLOUD_BSSD', formatMessage({ id: 'device.CLOUD_BSSD' })],
+                    ['CLOUD_HSSD', formatMessage({ id: 'device.CLOUD_HSSD' })],
+                    ['CLOUD_TSSD', formatMessage({ id: 'device.CLOUD_TSSD' })],
+                    ['LOCAL_NVME', formatMessage({ id: 'device.LOCAL_NVME' })],
+                    ['LOCAL_PRO', formatMessage({ id: 'device.LOCAL_PRO' })]
                 ].map(i => ({ id: i[0], name: i[1] }))
             ),
             dataIndex: 'storage_type',
@@ -387,7 +402,7 @@ export default (props: any) => {
             ellipsis: {
                 showTitle: false
             },
-            render: (_: any, row: any) => <DataSetPulic name={row.storage_type} formatMessage={formatMessage} />
+            render: (_: any, row: any) => <ColumnEllipsisText ellipsis={{ tooltip: true }} ><DataSetPulic name={row.storage_type} formatMessage={formatMessage} /></ColumnEllipsisText>
         },
         {
             title: <FormattedMessage id="device.release_rule" />,
diff --git a/src/pages/WorkSpace/DeviceManage/locales/en-US.ts b/src/pages/WorkSpace/DeviceManage/locales/en-US.ts
index ee41dc4b..8492804f 100644
--- a/src/pages/WorkSpace/DeviceManage/locales/en-US.ts
+++ b/src/pages/WorkSpace/DeviceManage/locales/en-US.ts
@@ -154,6 +154,8 @@ export default {
   'device.system.disk': 'System Disk',
   'device.extended.fields': 'Extended Fields',
   'device.aliyun.params': 'Alibaba Cloud openAPI parameters',
+  'device.tencent.params': 'Tencent Cloud openAPI parameters',
+  'device.volcengine.params': 'Volcengine Cloud openAPI parameters',
   'device.toneagent.working.mode': 'Toneagent working mode',
   'device.active.mode': 'Active mode',
   'device.passive.mode': 'Passive mode',
@@ -191,6 +193,21 @@ export default {
   'device.cloud_efficiency': 'Effcient Cloud Disk',
   'device.cloud_ssd': 'SSD Cloud Disk',
   'device.cloud_essd': 'ESSD Cloud Disk',
+  'device.ephemeral_ssd': 'EPHEMERAL SSD Disk',
+  'device.cloud_auto': 'CLOUD AUTO Disk',
+  'device.cloud_essd_entry': 'CLOUD ESSD ENTRY Disk',
+  'device.ESSD_PL0': 'ESSD PL0 Disk',
+  'device.ESSD_FlexPL': 'ESSD FlexPL Disk',
+  'device.LOCAL_BASIC': 'LOCAL BASIC Disk',
+  'device.LOCAL_SSD': 'LOCAL SSD Disk',
+  'device.CLOUD_BASIC': 'CLOUD BASIC Disk',
+  'device.CLOUD_SSD': 'CLOUD SSD Disk',
+  'device.CLOUD_PREMIUM': 'CLOUD PREMIUM Disk',
+  'device.CLOUD_BSSD': 'CLOUD BSSD Disk',
+  'device.CLOUD_HSSD': 'CLOUD HSSD Disk',
+  'device.CLOUD_TSSD': 'CLOUD TSSD Disk',
+  'device.LOCAL_NVME': 'LOCAL NVME Disk',
+  'device.LOCAL_PRO': 'LOCAL PRO Disk',
 
 
   'device.dispatch.tag': 'Dispatch Tag',
diff --git a/src/pages/WorkSpace/DeviceManage/locales/zh-CN.ts b/src/pages/WorkSpace/DeviceManage/locales/zh-CN.ts
index 25f9e557..7bdad910 100644
--- a/src/pages/WorkSpace/DeviceManage/locales/zh-CN.ts
+++ b/src/pages/WorkSpace/DeviceManage/locales/zh-CN.ts
@@ -154,6 +154,8 @@ export default {
   'device.system.disk': '系统盘',
   'device.extended.fields': '扩展字段',
   'device.aliyun.params': '阿里云openAPI参数',
+  'device.tencent.params': '腾讯云openAPI参数',
+  'device.volcengine.params': '火山云openAPI参数',
   'device.toneagent.working.mode': 'toneagent工作模式',
   'device.active.mode': '主动模式',
   'device.passive.mode': '被动模式',
@@ -192,7 +194,21 @@ export default {
   'device.cloud_efficiency': '高效云盘',
   'device.cloud_ssd': 'SSD云盘',
   'device.cloud_essd': 'ESSD云盘',
-
+  'device.ephemeral_ssd': '本地SSD盘',
+  'device.cloud_auto': 'ESSD AutoPL云盘',
+  'device.cloud_essd_entry': 'ESSD Entry云盘',
+  'device.ESSD_PL0': '极速型SSD PL0',
+  'device.ESSD_FlexPL': '极速型SSD FlexPL',
+  'device.LOCAL_BASIC': '本地硬盘',
+  'device.LOCAL_SSD': '本地SSD硬盘',
+  'device.CLOUD_BASIC': '普通云硬盘',
+  'device.CLOUD_SSD': 'SSD云硬盘',
+  'device.CLOUD_PREMIUM': '高性能云硬盘',
+  'device.CLOUD_BSSD': '通用性SSD云硬盘',
+  'device.CLOUD_HSSD': '增强型SSD云硬盘',
+  'device.CLOUD_TSSD': '极速型SSD云硬盘',
+  'device.LOCAL_NVME': '本地NVME硬盘',
+  'device.LOCAL_PRO': '本地HDD硬盘',
 
   'device.dispatch.tag': '调度标签',
   'device.create.tag': '创建标签',
diff --git a/src/pages/WorkSpace/TestResult/Details/TestSettingTable/ServerTooltip.tsx b/src/pages/WorkSpace/TestResult/Details/TestSettingTable/ServerTooltip.tsx
index fd73f6a9..2194134e 100644
--- a/src/pages/WorkSpace/TestResult/Details/TestSettingTable/ServerTooltip.tsx
+++ b/src/pages/WorkSpace/TestResult/Details/TestSettingTable/ServerTooltip.tsx
@@ -5,6 +5,7 @@ import { useParams, useIntl, FormattedMessage } from "umi"
 import { cloudList as queryCloudServer, queryClusterMachine } from "@/pages/WorkSpace/DeviceManage/CloudManage/service"
 import styled from 'styled-components'
 import { queryClusterServer } from "@/pages/WorkSpace/TestJob/components/SuiteSelectDrawer/services"
+import { dataSetMethod } from '@/pages/WorkSpace/DeviceManage/CloudManage/DataSetPulic';
 
 const Wrapper = styled(Space)`
     width: 100%;
@@ -27,15 +28,15 @@ const Container = styled.div`
     padding: 20px;
 `
 
-export const dataSetMethod = (dict: any, formatMessage?: any) => {
-    const obj: any = {
-        cloud: formatMessage({ id: 'common.cloud' }),
-        cloud_efficiency: formatMessage({ id: 'common.cloud_efficiency' }),
-        cloud_ssd: formatMessage({ id: 'common.cloud_ssd' }),
-        cloud_essd: formatMessage({ id: 'common.cloud_essd' }),
-    }
-    return obj[dict]
-}
+// export const dataSetMethod = (dict: any, formatMessage?: any) => {
+//     const obj: any = {
+//         cloud: formatMessage({ id: 'common.cloud' }),
+//         cloud_efficiency: formatMessage({ id: 'common.cloud_efficiency' }),
+//         cloud_ssd: formatMessage({ id: 'common.cloud_ssd' }),
+//         cloud_essd: formatMessage({ id: 'common.cloud_essd' }),
+//     }
+//     return obj[dict]
+// }
 
 type TRowProps = {
     label: string;
-- 
Gitee


From 103f5e6340adf44096abcca1c173c283b84fb8f0 Mon Sep 17 00:00:00 2001
From: sahara <jwk0528@163.com>
Date: Fri, 30 Aug 2024 18:21:40 +0800
Subject: [PATCH 5/8] =?UTF-8?q?fix:=20=E6=9C=BA=E5=99=A8=E9=95=9C=E5=83=8F?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CloudManage/AddMachinePubilc/index.tsx    | 28 +++---
 .../CloudManage/Aligroup/GroupTree/index.tsx  |  6 +-
 .../SuiteSelectDrawer/ServerObjectSelect.tsx  | 10 +--
 src/utils/hooks.tsx                           |  5 +-
 src/utils/utils.ts                            | 90 ++++++++++++++++++-
 5 files changed, 115 insertions(+), 24 deletions(-)

diff --git a/src/pages/WorkSpace/DeviceManage/CloudManage/AddMachinePubilc/index.tsx b/src/pages/WorkSpace/DeviceManage/CloudManage/AddMachinePubilc/index.tsx
index fbd8b32a..af6ad7d5 100644
--- a/src/pages/WorkSpace/DeviceManage/CloudManage/AddMachinePubilc/index.tsx
+++ b/src/pages/WorkSpace/DeviceManage/CloudManage/AddMachinePubilc/index.tsx
@@ -6,7 +6,7 @@ import {
 } from '../service';
 import Owner from '@/components/Owner/index';
 import { textRender } from '@/utils/hooks';
-import { requestCodeMessage, resetImage, resetECI, enumerEnglish } from '@/utils/utils';
+import { requestCodeMessage, resetImage, resetECI, enumerEnglish, QuantityLimitMin, QuantityLimitMax } from '@/utils/utils';
 import { PlusCircleTwoTone, MinusCircleTwoTone } from '@ant-design/icons';
 import styles from './style.less';
 import { useParams, useIntl, FormattedMessage, useModel } from 'umi';
@@ -116,7 +116,7 @@ const NewMachine: React.FC<any> = (props) => {
                 if (!!is_instance) {
                     Promise.all([getShowRegion(params, rest_param), getSeverList(params)]).then(() => { setLoading(false), setDisabled(false) })
                 } else {
-                    Promise.all([getShowRegion(params, rest_param), getInstancegList(params), getImageList(params), getCategoriesList(params)]).then(() => { setLoading(false), setDisabled(false) })
+                    Promise.all([getShowRegion(params, rest_param), getInstancegList(params), getCategoriesList(params)]).then(() => { setLoading(false), setDisabled(false) })
                 }
                 form.setFieldsValue({ manufacturer: [cloud_type, manufacturer, ak_id], region: [region, zone] })
             }
@@ -351,7 +351,7 @@ const NewMachine: React.FC<any> = (props) => {
             })
             setShowZone(true)
             is_instance ? Promise.all([getSeverList(param)]).then(() => { setLoading(false), setDisabled(false) })
-                : Promise.all([getInstancegList(param), getImageList(param), getCategoriesList(param)]).then(() => { setLoading(false), setDisabled(false) })
+                : Promise.all([getInstancegList(param), getCategoriesList(param)]).then(() => { setLoading(false), setDisabled(false) })
         } else {
             // case2.清除选项时
             regionResetStatus()
@@ -575,7 +575,6 @@ const NewMachine: React.FC<any> = (props) => {
             return formatMessage({ id: 'device.volcengine.params'})
         } else return
     }
-
     const onClose = () => {
         // 初始化状态
         setValidateRegion(true)
@@ -629,13 +628,13 @@ const NewMachine: React.FC<any> = (props) => {
                     initialValues={{
                         instance_type_one: 1,
                         instance_type_two: 1,
-                        system_disk_size: 40,
+                        system_disk_size: manufacturerType.indexOf('tencent') > -1 ? 50 : 40,
                         storage_size: 40,
                         storage_number: 0,
                         release_rule: 1,
                         kernel_install: 1,
                         bandwidth: 10,
-                        storage_type: 'cloud_efficiency',
+                        storage_type: manufacturerType.indexOf('aliyun') > -1 ? 'cloud_efficiency' : undefined,
                         extra_param: [{ param_key: '', param_value: '' }],
                         channel_type: 'toneagent',
                         state: 'Available',
@@ -802,7 +801,7 @@ const NewMachine: React.FC<any> = (props) => {
                                             name="instance_type"
                                             rules={[{ required: true, message: formatMessage({ id: 'please.select' }) }]}
                                         >
-                                            <Select disabled={disabled || image.length === 0}
+                                            <Select disabled={disabled}
                                                 showSearch
                                                 placeholder={formatMessage({ id: 'please.select' })}
                                                 optionFilterProp="children"
@@ -891,8 +890,8 @@ const NewMachine: React.FC<any> = (props) => {
                                         //type="text"
                                         placeholder={formatMessage({ id: 'device.spec.size' })}
                                         style={{ width: 70 }}
-                                        min={20}
-                                        max={500}
+                                        min={QuantityLimitMin(manufacturerType, 'system_disk_size')}
+                                        max={QuantityLimitMax(manufacturerType, 'system_disk_size')}
                                         disabled={disabled || image.length === 0}
                                     />
                                 </Form.Item>
@@ -935,8 +934,8 @@ const NewMachine: React.FC<any> = (props) => {
                                     <InputNumber
                                         placeholder={formatMessage({ id: 'device.spec.size' })}
                                         style={{ width: 70 }}
-                                        min={20}
-                                        max={500}
+                                        min={QuantityLimitMin(manufacturerType, 'storage_size')}
+                                        max={QuantityLimitMax(manufacturerType, 'storage_size')}
                                         disabled={disabled || image.length === 0}
                                     />
                                 </Form.Item>
@@ -954,8 +953,8 @@ const NewMachine: React.FC<any> = (props) => {
                                     <InputNumber
                                         placeholder={formatMessage({ id: 'device.quantity' })}
                                         style={{ width: 70 }}
-                                        min={0}
-                                        max={16}
+                                        min={QuantityLimitMin(manufacturerType, 'storage_number')}
+                                        max={QuantityLimitMax(manufacturerType, 'storage_number')}
                                         disabled={disabled || image.length === 0}
                                     />
                                 </Form.Item>
@@ -975,7 +974,8 @@ const NewMachine: React.FC<any> = (props) => {
                                 >
                                     <Input
                                         type="number"
-                                        min={10}
+                                        min={QuantityLimitMin(manufacturerType, 'bandwidth')}
+                                        max={QuantityLimitMax(manufacturerType, 'bandwidth')}
                                         style={{ width: '100%' }}
                                         addonAfter="Mbit/s"
                                         placeholder={formatMessage({ id: 'please.enter' })}
diff --git a/src/pages/WorkSpace/DeviceManage/CloudManage/Aligroup/GroupTree/index.tsx b/src/pages/WorkSpace/DeviceManage/CloudManage/Aligroup/GroupTree/index.tsx
index 7cc936f8..14008891 100644
--- a/src/pages/WorkSpace/DeviceManage/CloudManage/Aligroup/GroupTree/index.tsx
+++ b/src/pages/WorkSpace/DeviceManage/CloudManage/Aligroup/GroupTree/index.tsx
@@ -198,12 +198,12 @@ const GroupTree: React.FC<any> = (props) => {
         },
         {
             title: <FormattedMessage id="device.image" />,
+            dataIndex: 'image',
             width: 120,
             ellipsis: {
                 showTitle: false,
             },
-            dataIndex: 'image',
-            render: (_: number, row: any) => <ColumnEllipsisText ellipsis={{ tooltip: row.image }} >{row.image_name}</ColumnEllipsisText>
+            render: (_: number, row: any) => <ColumnEllipsisText ellipsis={{ tooltip: true }} >{row.image_name}</ColumnEllipsisText>
         },
         {
             title: <FormattedMessage id="device.bandwidth" />,
@@ -217,7 +217,7 @@ const GroupTree: React.FC<any> = (props) => {
                 showTitle: false,
             },
             width: 100,
-            render: (_: number, row: any) => <DataSetPulic name={row.storage_type} formatMessage={formatMessage} />
+            render: (_: number, row: any) => <ColumnEllipsisText ellipsis={{ tooltip: true }}><DataSetPulic name={row.storage_type} formatMessage={formatMessage} /></ColumnEllipsisText>
         },
         {
             title: <FormattedMessage id="device.console_conf" />,
diff --git a/src/pages/WorkSpace/TestJob/components/SuiteSelectDrawer/ServerObjectSelect.tsx b/src/pages/WorkSpace/TestJob/components/SuiteSelectDrawer/ServerObjectSelect.tsx
index 84d39446..1a15d4bc 100644
--- a/src/pages/WorkSpace/TestJob/components/SuiteSelectDrawer/ServerObjectSelect.tsx
+++ b/src/pages/WorkSpace/TestJob/components/SuiteSelectDrawer/ServerObjectSelect.tsx
@@ -27,7 +27,7 @@ const ServerObjectSelect = (props: any) => {
     const { serverObjectType, run_mode, server_type, serverList } = props
     const { ws_id } = useParams<any>()
     const { setServerList } = useContext<any>(DrawerProvider)
-    const PAGE_SIZE = 100
+    const PAGE_SIZE = 999
     const [fetching, setFetching] = useState(true)
     const [pageNum, setPageNum] = useState(1)
     const [pageVisibleState, setPageVisibleState] = React.useState(false)
@@ -55,9 +55,9 @@ const ServerObjectSelect = (props: any) => {
     }
 
     //云上单机
-    const clusterStandaloneRequest = async () => {
+    const clusterStandaloneRequest = async (page_num = 1) => {
         const search = searchValue ? { ip: searchValue } : {}
-        const { data, code, total_page } = await queryClusterStandaloneServer({ ws_id, no_page: true, is_instance: serverObjectType === 'instance', state: ['Available', 'Occupied', 'Reserved'], ...search })
+        const { data, code, total_page } = await queryClusterStandaloneServer({ ws_id, no_page: true, is_instance: serverObjectType === 'instance', state: ['Available', 'Occupied', 'Reserved'], ...search, page_num, page_size: PAGE_SIZE })
         if (code === 200 && data) {
             setServerList((p: any) => filterRepeat(p, data))
             setTotalPage(total_page)
@@ -65,9 +65,9 @@ const ServerObjectSelect = (props: any) => {
     }
 
     //云上集群
-    const clusterGroupRequest = async () => {
+    const clusterGroupRequest = async (page_num = 1) => {
         const search = searchValue ? { ip: searchValue } : {}
-        const { data, code, total_page } = await queryClusterGroupServer({ cluster_type: 'aliyun', ws_id, no_page: true, ...search })
+        const { data, code, total_page } = await queryClusterGroupServer({ cluster_type: 'aliyun', ws_id, no_page: true, ...search, page_num, page_size: PAGE_SIZE })
         if (code === 200 && data) {
             setServerList((p: any) => filterRepeat(p, data))
             setTotalPage(total_page)
diff --git a/src/utils/hooks.tsx b/src/utils/hooks.tsx
index 61198b72..fe925d1b 100644
--- a/src/utils/hooks.tsx
+++ b/src/utils/hooks.tsx
@@ -121,7 +121,10 @@ export const enumer = (name: any) => {
     const list: any = {
         system: '公共镜像',
         self: '自定义镜像',
-        others: '共享镜像'
+        others: '共享镜像',
+        PRIVATE_IMAGE:'私有镜像',
+        PUBLIC_IMAGE:'公共镜像',
+        SHARED_IMAGE: '共享镜像',
     }
     return list[name];
 }
diff --git a/src/utils/utils.ts b/src/utils/utils.ts
index e4ccfcd1..c41ee729 100644
--- a/src/utils/utils.ts
+++ b/src/utils/utils.ts
@@ -380,6 +380,93 @@ export const enumerEnglish = (name: any, formatMessage: any) => {
   return (list as any)[name];
 };
 
+// 适配多云系统盘的最小容量
+export const QuantityLimitMin = (val: any, field: string) => {
+  if (val && val.indexOf('aliyun') > -1) {
+      switch (field) {
+          case 'system_disk_size':
+              return 20;
+          case 'storage_size':
+              return 20;
+          case 'storage_number':
+              return 0;
+          case 'bandwidth':
+              return 10;
+          default:
+              return 0;
+      }
+  } else if (val && val.indexOf('tencent') > -1) {
+      switch (field) {
+          case 'system_disk_size':
+              return 50;
+          case 'storage_size':
+              return 20;
+          case 'storage_number':
+              return 0;
+          case 'bandwidth':
+              return 10;
+          default:
+              return 0;
+      }
+  } else if (val && val.indexOf('volcengine') > -1) {
+      switch (field) {
+          case 'system_disk_size':
+              return 20;
+          case 'storage_size':
+              return 10;
+          case 'storage_number':
+              return 0;
+          case 'bandwidth':
+              return 1;
+          default:
+              return 0;
+      } 
+  } else return 0
+}
+// 适配多云系统盘的最大容量
+export const QuantityLimitMax = (val: any, field: string) => {
+  if (val && val.indexOf('aliyun') > -1) {
+      switch (field) {
+          case 'system_disk_size':
+              return 500;
+          case 'storage_size':
+              return 500;
+          case 'storage_number':
+              return 16;
+          case 'bandwidth':
+              return 200;
+          default:
+              return 0;
+      }
+  } else if (val && val.indexOf('tencent') > -1) {
+      switch (field) {
+          case 'system_disk_size':
+              return 500;
+          case 'storage_size':
+              return 500;
+          case 'storage_number':
+              return 20;
+          case 'bandwidth':
+              return 100;
+          default:
+              return 0;
+      }
+  } else if (val && val.indexOf('volcengine') > -1) {
+      switch (field) {
+          case 'system_disk_size':
+              return 2048;
+          case 'storage_size':
+              return 32768;
+          case 'storage_number':
+              return 16;
+          case 'bandwidth':
+              return 200;
+          default:
+              return 0;
+      } 
+  } else return 0
+}
+
 export const gblen = (str: string) => {
   let len = 0;
   for (let i = 0; i < str.length; i++)
@@ -656,4 +743,5 @@ export const getPageNumOnDel = (
   const $page_num = Math.ceil((data?.total - list) / params.page_size) || 1
 
   return $page_num < params.page_num ? $page_num : params.page_num
-}
\ No newline at end of file
+}
+
-- 
Gitee


From b034affe705228bada535ff9f3723a8464aab664 Mon Sep 17 00:00:00 2001
From: sahara <jwk0528@163.com>
Date: Mon, 2 Sep 2024 14:27:39 +0800
Subject: [PATCH 6/8] =?UTF-8?q?fix:=20=E4=BA=91=E4=B8=8A=E6=9C=BA=E5=99=A8?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=B0=83=E7=94=A8=E6=97=B6=E6=9C=BA=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CloudManage/AddMachinePubilc/index.tsx    | 63 ++++++++++---------
 1 file changed, 32 insertions(+), 31 deletions(-)

diff --git a/src/pages/WorkSpace/DeviceManage/CloudManage/AddMachinePubilc/index.tsx b/src/pages/WorkSpace/DeviceManage/CloudManage/AddMachinePubilc/index.tsx
index af6ad7d5..e3670a6a 100644
--- a/src/pages/WorkSpace/DeviceManage/CloudManage/AddMachinePubilc/index.tsx
+++ b/src/pages/WorkSpace/DeviceManage/CloudManage/AddMachinePubilc/index.tsx
@@ -103,20 +103,19 @@ const NewMachine: React.FC<any> = (props) => {
                 setShowZone(true)
                 let params = {
                     ak_id,
-                    // id: manufacturer,
                     region,
                     zone,
+                    instance_type
                 }
                 const rest_param = {
                     cloud_type,
                     manufacturer,
                     id,
-                    instance_type,
                 }
                 if (!!is_instance) {
                     Promise.all([getShowRegion(params, rest_param), getSeverList(params)]).then(() => { setLoading(false), setDisabled(false) })
                 } else {
-                    Promise.all([getShowRegion(params, rest_param), getInstancegList(params), getCategoriesList(params)]).then(() => { setLoading(false), setDisabled(false) })
+                    Promise.all([getShowRegion(params, rest_param), getInstancegList(params)]).then(() => { setLoading(false), setDisabled(false) })
                 }
                 form.setFieldsValue({ manufacturer: [cloud_type, manufacturer, ak_id], region: [region, zone] })
             }
@@ -140,14 +139,6 @@ const NewMachine: React.FC<any> = (props) => {
 
     const getCategoriesList = async (param: any) => {
         const { data } = await queryCategories(param)
-        /**  重组数据适配数据盘的默认值 */
-        /* let newData = data.slice(0)
-        let result = newData.some((v: any) => {
-            return v.value === 'cloud_efficiency'
-        })
-        const params = [{ title: '高效云盘', value: 'cloud_efficiency' }]
-        if (!result) newData = newData.concat(params)
-        setCategories(newData || []) */
         setCategories(data)
     }
     const getSeverList = async (param: any) => {
@@ -306,7 +297,7 @@ const NewMachine: React.FC<any> = (props) => {
         storage_size: 40,
         storage_number: 0,
         system_disk_category: undefined,
-        system_disk_size: 40,
+        // system_disk_size: 40,
     }
 
     // 重置联动控件
@@ -368,6 +359,7 @@ const NewMachine: React.FC<any> = (props) => {
             instance_type: val
         }
         getImageList(param)
+        getCategoriesList(param)
     }
 
     const newMachine = (id: any) => {
@@ -391,7 +383,7 @@ const NewMachine: React.FC<any> = (props) => {
     }));
 
     const editMachine = (row: any) => {
-        setFirstAddDataFlag(true)
+        setFirstAddDataFlag(false)
         setClusterId(row.cluster_id)
         setEditData(row)
         setShowZone(true)
@@ -410,12 +402,12 @@ const NewMachine: React.FC<any> = (props) => {
             ak_id: param.ak_id,
             region: param.region[0],
             zone: param.region[1],
+            instance_type: param.instance_type
         }
         const rest_param = {
             cloud_type: param.cloud_type,
             manufacturer: param.manufacturer[1],
             id: param.id,
-            instance_type: param.instance_type
         }
         if (param.ak_name == 'aliyun_eci') {
             const t = param.instance_type
@@ -590,6 +582,15 @@ const NewMachine: React.FC<any> = (props) => {
         return editData && editData.state === 'Occupied'
     }, [editData])
 
+    const cloud_type_param = Form.useWatch('manufacturer',form)
+
+    useEffect(() => {
+        form.setFieldsValue({ 
+            system_disk_size: cloud_type_param?.indexOf('tencent') > -1 ? 50 : 40,
+            storage_type: cloud_type_param?.indexOf('aliyun') > -1 ? 'cloud_efficiency' : undefined 
+        })
+    },[ cloud_type_param ])
+   
     return (
         <Drawer
             maskClosable={false}
@@ -628,13 +629,11 @@ const NewMachine: React.FC<any> = (props) => {
                     initialValues={{
                         instance_type_one: 1,
                         instance_type_two: 1,
-                        system_disk_size: manufacturerType.indexOf('tencent') > -1 ? 50 : 40,
                         storage_size: 40,
                         storage_number: 0,
                         release_rule: 1,
                         kernel_install: 1,
                         bandwidth: 10,
-                        storage_type: manufacturerType.indexOf('aliyun') > -1 ? 'cloud_efficiency' : undefined,
                         extra_param: [{ param_key: '', param_value: '' }],
                         channel_type: 'toneagent',
                         state: 'Available',
@@ -868,7 +867,7 @@ const NewMachine: React.FC<any> = (props) => {
                                             /> :
                                             <Select
                                                 placeholder={formatMessage({ id: 'please.select' })}
-                                                disabled={disabled}
+                                                disabled={disabled || image.length === 0}
                                                 options={categories?.sys_cat?.map((i: any) => ({
                                                     label: i.title,
                                                     value: i.value,
@@ -884,14 +883,13 @@ const NewMachine: React.FC<any> = (props) => {
                                 <Form.Item
                                     name="system_disk_size"
                                     label=" "
-                                    rules={[{ required: false, message: formatMessage({ id: 'please.select' }) }]}
                                 >
                                     <InputNumber
-                                        //type="text"
                                         placeholder={formatMessage({ id: 'device.spec.size' })}
+                                        // defaultValue={manufacturerType?.indexOf('tencent') > -1 ? 50 : 40}
                                         style={{ width: 70 }}
-                                        min={QuantityLimitMin(manufacturerType, 'system_disk_size')}
-                                        max={QuantityLimitMax(manufacturerType, 'system_disk_size')}
+                                        // min={QuantityLimitMin(manufacturerType, 'system_disk_size')}
+                                        // max={QuantityLimitMax(manufacturerType, 'system_disk_size')}
                                         disabled={disabled || image.length === 0}
                                     />
                                 </Form.Item>
@@ -913,7 +911,7 @@ const NewMachine: React.FC<any> = (props) => {
                                             /> :
                                             <Select
                                                 placeholder={formatMessage({ id: 'please.select' })}
-                                                disabled={disabled}
+                                                disabled={disabled || image.length === 0}
                                                 options={categories?.data_cat?.map((i: any) => ({
                                                     label: i.title,
                                                     value: i.value,
@@ -929,13 +927,12 @@ const NewMachine: React.FC<any> = (props) => {
                                 <Form.Item
                                     name="storage_size"
                                     label=" "
-                                    rules={[{ required: false, message: formatMessage({ id: 'please.enter' }) }]}
                                 >
                                     <InputNumber
                                         placeholder={formatMessage({ id: 'device.spec.size' })}
                                         style={{ width: 70 }}
-                                        min={QuantityLimitMin(manufacturerType, 'storage_size')}
-                                        max={QuantityLimitMax(manufacturerType, 'storage_size')}
+                                        // min={QuantityLimitMin(manufacturerType, 'storage_size')}
+                                        // max={QuantityLimitMax(manufacturerType, 'storage_size')}
                                         disabled={disabled || image.length === 0}
                                     />
                                 </Form.Item>
@@ -948,13 +945,12 @@ const NewMachine: React.FC<any> = (props) => {
                                 <Form.Item
                                     name="storage_number"
                                     label=" "
-                                    rules={[{ required: false, message: formatMessage({ id: 'please.enter' }) }]}
                                 >
                                     <InputNumber
                                         placeholder={formatMessage({ id: 'device.quantity' })}
                                         style={{ width: 70 }}
-                                        min={QuantityLimitMin(manufacturerType, 'storage_number')}
-                                        max={QuantityLimitMax(manufacturerType, 'storage_number')}
+                                        // min={QuantityLimitMin(manufacturerType, 'storage_number')}
+                                        // max={QuantityLimitMax(manufacturerType, 'storage_number')}
                                         disabled={disabled || image.length === 0}
                                     />
                                 </Form.Item>
@@ -970,12 +966,17 @@ const NewMachine: React.FC<any> = (props) => {
                                 <Form.Item
                                     name="bandwidth"
                                     label={<FormattedMessage id="device.bandwidth" />}
-                                    rules={[{ required: true, message: formatMessage({ id: 'please.enter' }) }]}
+                                    rules={[{ 
+                                        required: true, 
+                                        min: QuantityLimitMin(manufacturerType, 'bandwidth'), 
+                                        max: QuantityLimitMax(manufacturerType, 'bandwidth'),
+                                        message: formatMessage({ id: 'please.enter' }) 
+                                    }]}
                                 >
                                     <Input
                                         type="number"
-                                        min={QuantityLimitMin(manufacturerType, 'bandwidth')}
-                                        max={QuantityLimitMax(manufacturerType, 'bandwidth')}
+                                        // min={QuantityLimitMin(manufacturerType, 'bandwidth')}
+                                        // max={QuantityLimitMax(manufacturerType, 'bandwidth')}
                                         style={{ width: '100%' }}
                                         addonAfter="Mbit/s"
                                         placeholder={formatMessage({ id: 'please.enter' })}
-- 
Gitee


From dbbf23158539d994698f248913a9d8e036942de6 Mon Sep 17 00:00:00 2001
From: sahara <jwk0528@163.com>
Date: Mon, 2 Sep 2024 15:15:38 +0800
Subject: [PATCH 7/8] =?UTF-8?q?fix:=20=E4=BA=91=E4=B8=8A=E6=9C=BA=E5=99=A8?=
 =?UTF-8?q?=E5=B8=A6=E5=AE=BD=E6=A0=A1=E9=AA=8C=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DeviceManage/CloudManage/AddMachinePubilc/index.tsx    | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/pages/WorkSpace/DeviceManage/CloudManage/AddMachinePubilc/index.tsx b/src/pages/WorkSpace/DeviceManage/CloudManage/AddMachinePubilc/index.tsx
index e3670a6a..aa33cdba 100644
--- a/src/pages/WorkSpace/DeviceManage/CloudManage/AddMachinePubilc/index.tsx
+++ b/src/pages/WorkSpace/DeviceManage/CloudManage/AddMachinePubilc/index.tsx
@@ -626,6 +626,7 @@ const NewMachine: React.FC<any> = (props) => {
                 <Form
                     layout="vertical"
                     form={form}
+                    scrollToFirstError={true}
                     initialValues={{
                         instance_type_one: 1,
                         instance_type_two: 1,
@@ -968,15 +969,13 @@ const NewMachine: React.FC<any> = (props) => {
                                     label={<FormattedMessage id="device.bandwidth" />}
                                     rules={[{ 
                                         required: true, 
-                                        min: QuantityLimitMin(manufacturerType, 'bandwidth'), 
-                                        max: QuantityLimitMax(manufacturerType, 'bandwidth'),
+                                        // min: QuantityLimitMin(manufacturerType, 'bandwidth'), 
+                                        // max: QuantityLimitMax(manufacturerType, 'bandwidth'),
                                         message: formatMessage({ id: 'please.enter' }) 
                                     }]}
                                 >
                                     <Input
                                         type="number"
-                                        // min={QuantityLimitMin(manufacturerType, 'bandwidth')}
-                                        // max={QuantityLimitMax(manufacturerType, 'bandwidth')}
                                         style={{ width: '100%' }}
                                         addonAfter="Mbit/s"
                                         placeholder={formatMessage({ id: 'please.enter' })}
-- 
Gitee


From b6231227df33f4e2d58334e801ce70d148457853 Mon Sep 17 00:00:00 2001
From: sahara <jwk0528@163.com>
Date: Mon, 2 Sep 2024 16:20:57 +0800
Subject: [PATCH 8/8] =?UTF-8?q?fix:=20=E4=BA=91=E4=B8=8A=E6=9C=BA=E5=99=A8?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=9B=98=E5=AD=97=E6=AE=B5=E5=9B=9E=E6=98=BE?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CloudManage/AddMachinePubilc/index.tsx    | 33 ++++++++++++-------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/src/pages/WorkSpace/DeviceManage/CloudManage/AddMachinePubilc/index.tsx b/src/pages/WorkSpace/DeviceManage/CloudManage/AddMachinePubilc/index.tsx
index aa33cdba..ad1d552d 100644
--- a/src/pages/WorkSpace/DeviceManage/CloudManage/AddMachinePubilc/index.tsx
+++ b/src/pages/WorkSpace/DeviceManage/CloudManage/AddMachinePubilc/index.tsx
@@ -226,6 +226,19 @@ const NewMachine: React.FC<any> = (props) => {
             }
         }
 
+        let storage_type_name;
+        if(value[1]?.indexOf('aliyun') > -1){
+            storage_type_name = 'cloud_efficiency'
+        } else if(value[1]?.indexOf('tencent') > -1){
+            storage_type_name = 'CLOUD_PREMIUM'
+        } else {
+            storage_type_name = 'ESSD_PL0'
+        } 
+        form.setFieldsValue({
+            system_disk_size: value[1]?.indexOf('tencent') > -1 ? 50 : 40,
+            storage_type: storage_type_name 
+        })
+
         // 获取region
         if (!firstAddDataFlag) {
             setDisabled(true)
@@ -242,7 +255,6 @@ const NewMachine: React.FC<any> = (props) => {
                     region: regionZone[0],
                     zone: regionZone[1],
                 }
-
                 if (is_instance) {
                     Promise.all([getSeverList(param)]).then(() => { setLoading(false), setDisabled(false) })
                 } else {
@@ -293,7 +305,7 @@ const NewMachine: React.FC<any> = (props) => {
         instance_type: undefined,
         instance_type_one: undefined,
         instance_type_two: undefined,
-        storage_type: undefined,
+        // storage_type: undefined,
         storage_size: 40,
         storage_number: 0,
         system_disk_category: undefined,
@@ -337,7 +349,6 @@ const NewMachine: React.FC<any> = (props) => {
                 image: undefined,
                 instance_id: undefined,
                 instance_type: undefined,
-                storage_type: undefined,
                 system_disk_category: undefined,
             })
             setShowZone(true)
@@ -582,14 +593,14 @@ const NewMachine: React.FC<any> = (props) => {
         return editData && editData.state === 'Occupied'
     }, [editData])
 
-    const cloud_type_param = Form.useWatch('manufacturer',form)
+    // const cloud_type_param = Form.useWatch('manufacturer',form)
 
-    useEffect(() => {
-        form.setFieldsValue({ 
-            system_disk_size: cloud_type_param?.indexOf('tencent') > -1 ? 50 : 40,
-            storage_type: cloud_type_param?.indexOf('aliyun') > -1 ? 'cloud_efficiency' : undefined 
-        })
-    },[ cloud_type_param ])
+    // useEffect(() => {
+    //     form.setFieldsValue({ 
+    //         system_disk_size: cloud_type_param?.indexOf('tencent') > -1 ? 50 : 40,
+    //         storage_type: cloud_type_param?.indexOf('aliyun') > -1 ? 'cloud_efficiency' : undefined 
+    //     })
+    // },[ cloud_type_param ])
    
     return (
         <Drawer
@@ -631,6 +642,7 @@ const NewMachine: React.FC<any> = (props) => {
                         instance_type_one: 1,
                         instance_type_two: 1,
                         storage_size: 40,
+                        // system_disk_size: 40,
                         storage_number: 0,
                         release_rule: 1,
                         kernel_install: 1,
@@ -887,7 +899,6 @@ const NewMachine: React.FC<any> = (props) => {
                                 >
                                     <InputNumber
                                         placeholder={formatMessage({ id: 'device.spec.size' })}
-                                        // defaultValue={manufacturerType?.indexOf('tencent') > -1 ? 50 : 40}
                                         style={{ width: 70 }}
                                         // min={QuantityLimitMin(manufacturerType, 'system_disk_size')}
                                         // max={QuantityLimitMax(manufacturerType, 'system_disk_size')}
-- 
Gitee