diff --git a/src/locales/en.json b/src/locales/en.json index 97738341..94713dca 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -1872,6 +1872,8 @@ "Please select {name} first": "Please select {name} first", "Please set CPU && Ram first.": "Please set CPU && Ram first.", "Please set MUNA": "Please set MUNA", + "Please set a size no less than {minSize} GiB!": "Please set a size no less than {minSize} GiB!", + "Please set the system disk size!": "Please set the system disk size!", "Please upload files smaller than { size }GiB on the page. It is recommended to upload files over { size }GiB using API.": "Please upload files smaller than { size }GiB on the page. It is recommended to upload files over { size }GiB using API.", "Pointer Record": "Pointer Record", "Poland": "Poland", diff --git a/src/locales/ko-kr.json b/src/locales/ko-kr.json index 8268f560..875f9275 100644 --- a/src/locales/ko-kr.json +++ b/src/locales/ko-kr.json @@ -1872,6 +1872,8 @@ "Please select {name} first": "{name}을(를) 먼저 선택하세요.", "Please set CPU && Ram first.": "먼저 CPU와 RAM을 설정하세요.", "Please set MUNA": "MUNA를 설정하세요.", + "Please set a size no less than {minSize} GiB!": "크기를 {minSize}GiB 이상으로 설정하세요!", + "Please set the system disk size!": "시스템 디스크 크기를 설정해주세요!", "Please upload files smaller than { size }GiB on the page. It is recommended to upload files over { size }GiB using API.": "페이지에서 { size }GiB보다 작은 파일을 업로드하세요. { size }GiB 이상의 파일은 API를 사용하여 업로드하는 것이 권장됩니다.", "Pointer Record": "포인터 레코드", "Poland": "", diff --git a/src/locales/zh-hans.json b/src/locales/zh-hans.json index 3565edd9..bee612fa 100644 --- a/src/locales/zh-hans.json +++ b/src/locales/zh-hans.json @@ -1872,6 +1872,8 @@ "Please select {name} first": "请先选择{name}", "Please set CPU && Ram first.": "请先设置CPU、内存。", "Please set MUNA": "请设置NUMA节点", + "Please set a size no less than {minSize} GiB!": "请设置不小于 {minSize} GiB 的容量!", + "Please set the system disk size!": "请设置系统盘的容量!", "Please upload files smaller than { size }GiB on the page. It is recommended to upload files over { size }GiB using API.": "页面请上传小于{ size }GiB的文件,超过{ size }GiB的文件建议使用API上传。", "Pointer Record": "指针记录", "Poland": "波兰", diff --git a/src/pages/compute/containers/Instance/actions/StepCreate/BaseStep/index.jsx b/src/pages/compute/containers/Instance/actions/StepCreate/BaseStep/index.jsx index 78171947..cbc06e40 100644 --- a/src/pages/compute/containers/Instance/actions/StepCreate/BaseStep/index.jsx +++ b/src/pages/compute/containers/Instance/actions/StepCreate/BaseStep/index.jsx @@ -267,10 +267,22 @@ export class BaseStep extends Base { } checkSystemDisk = (rule, value) => { - if (!value.type) { + const { size = 10, type } = value || {}; + const minSize = this.getSystemDiskMinSize(); + if (!type) { // eslint-disable-next-line prefer-promise-reject-errors return Promise.reject(''); } + if (!size) { + return Promise.reject(new Error(t('Please set the system disk size!'))); + } + if (size < minSize) { + return Promise.reject( + new Error( + t('Please set a size no less than {minSize} GiB!', { minSize }) + ) + ); + } return Promise.resolve(); }; @@ -788,6 +800,7 @@ export class BaseStep extends Base { minSize: this.getSystemDiskMinSize(), extra: t('Disk size is limited by the min disk of flavor, image, etc.'), onChange: this.onSystemDiskChange, + dependencies: ['flavor', 'image', 'instanceSnapshot', 'bootFromVolume'], }, { name: 'instanceSnapshotDisk',