Browse Source

Merge branch 'master' of http://gogsb.soaringnova.com/liutao/ai-proj-demo

Zhang Li 1 year ago
parent
commit
be4dd65fd5

+ 2 - 2
src/module/datasource/component/DatasourceData.jsx

@@ -179,7 +179,7 @@ const DatasourceData = props => {
             dataSource={contentData}
             bordered
             loading={contentLoading}
-            scroll={{ x: 3500 }}
+            scroll={{ x: contentCols.length * 120 }}
           />
         </TabPane>
         <TabPane tab="预览表结构" key="schema">
@@ -188,7 +188,7 @@ const DatasourceData = props => {
             dataSource={schemaData}
             bordered
             loading={schemaLoading}
-            scroll={{ x: 3500 }}
+            scroll={{ x: schemaCols.length * 120 }}
           />
         </TabPane>
       </Tabs>

+ 2 - 2
src/module/datasource/component/DatasourceManage.jsx

@@ -577,7 +577,7 @@ const DatasourceManage = forwardRef(({ dataType }, ref) => {
               dataSource={contentData}
               bordered
               loading={contentLoading}
-              scroll={{ x: 3500 }}
+              scroll={{ x: contentCols.length * 120 }}
             />
           </TabPane>
           <TabPane
@@ -589,7 +589,7 @@ const DatasourceManage = forwardRef(({ dataType }, ref) => {
               dataSource={schemaData}
               bordered
               loading={schemaLoading}
-              scroll={{ x: 3500 }}
+              scroll={{ x: schemaCols.length * 120 }}
             />
           </TabPane>
         </Tabs>

+ 1 - 1
src/module/workmgmt/component/JobCreate.jsx

@@ -376,7 +376,7 @@ export default function JobCreate() {
         ...ConfigDataForm.getFieldValue(),
         script_file: '',
         type: currentJobType,
-        dag_uuid: 'test',
+        dag_uuid: data.data.dag_id,
         // 镜像
         image_url: '',
         relation_list,