Merge aaf2d46a56 into c03be2f5d8

webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/ModelBasicForm.tsx

@@ -145,25 +145,27 @@ const ModelBasicForm: React.FC<Props> = ({
               ))}
             </Select>
           </FormItem>
-          <FormItem
+
-            name="catalog"
+           <FormItem
-            label="Catalog"
+              name="catalog"
-            rules={[{ required: true, message: '请选择Catalog' }]}
+              label="Catalog"
-            hidden={!catalogSelectOpen}
+              rules={[{ required: catalogSelectOpen, message: '请选择Catalog' }]}
-          >
+              hidden={!catalogSelectOpen}
-            <Select
-              showSearch
-              placeholder="请选择Catalog"
-              disabled={isEdit}
-              onSelect={onCatalogSelect}
             >
-              {catalogList.map((item) => (
+              <Select
-                <Select.Option key={item} value={item}>
+                showSearch
-                  {item}
+                placeholder="请选择Catalog"
-                </Select.Option>
+                disabled={isEdit}
-              ))}
+                onSelect={onCatalogSelect}
-            </Select>
+              >
-          </FormItem>
+                {catalogList.map((item) => (
+                  <Select.Option key={item} value={item}>
+                    {item}
+                  </Select.Option>
+                ))}
+              </Select>
+            </FormItem>
+
           <FormItem
             name="dbName"
             label="数据库名"