Browse Source

数据源列配置按钮【获取数据列】状态控制

zhuth 6 years ago
parent
commit
fe78c94276

+ 2 - 2
src/components/dataSourceDetail/columnConfig.jsx

@@ -446,13 +446,13 @@ class DataSourceColumnConfig extends React.Component {
                                         onVisibleChange={this.handleVisibleChange}
                                         onVisibleChange={this.handleVisibleChange}
                                         trigger='click'
                                         trigger='click'
                                     >
                                     >
-                                        <Button type={!fetching && dataSourceDetail.targetDirty ? 'danger' : null} disabled={!dataSourceDetail.address || fetching} onClick={() => {
+                                        <Button type={!fetching && dataSourceDetail.targetDirty && dataSourceDetail.fetched ? 'danger' : null} disabled={!dataSourceDetail.address || fetching} onClick={() => {
                                             if(!dataSourceDetail.columns || dataSourceDetail.columns.length === 0) {
                                             if(!dataSourceDetail.columns || dataSourceDetail.columns.length === 0) {
                                                 dispatch({ type: 'dataSourceDetail/importColumns', cover: true });
                                                 dispatch({ type: 'dataSourceDetail/importColumns', cover: true });
                                             }
                                             }
                                         }}>
                                         }}>
                                         {fetching && <Icon type="loading" theme="outlined" />}
                                         {fetching && <Icon type="loading" theme="outlined" />}
-                                        {!fetching && dataSourceDetail.targetDirty ? '重新获取数据列' : '获取数据列'}
+                                        {!fetching && dataSourceDetail.targetDirty && dataSourceDetail.fetched ? '重新获取数据列' : '获取数据列'}
                                         </Button>
                                         </Button>
                                     </Tooltip>
                                     </Tooltip>
                                 </div>
                                 </div>

+ 5 - 0
src/models/dataSourceDetail.js

@@ -19,6 +19,7 @@ export default {
             port: null,
             port: null,
             target: null,
             target: null,
             targetDirty: false,
             targetDirty: false,
+            fetched: false,
             creatorCode: null,
             creatorCode: null,
             creatorName: null,
             creatorName: null,
             createTime: null,
             createTime: null,
@@ -151,6 +152,10 @@ export default {
                     { name: 'notice', value: e.message + '' || e + '' }
                     { name: 'notice', value: e.message + '' || e + '' }
                 ] });
                 ] });
                 message.error('加载列数据失败: ' + e.message);
                 message.error('加载列数据失败: ' + e.message);
+            }finally {
+                yield put({ type: 'setFields', fields: [
+                    { name: 'fetched', value: true }
+                ] });
             }
             }
         },
         },
     },
     },