Merge aaf2d46a56 into 08a2e889e7

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

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