Przeglądaj źródła

页面高度样式调整

zhuth 6 lat temu
rodzic
commit
345f5d2bb0

+ 4 - 0
src/components/chart/list.less

@@ -1,6 +1,9 @@
 .chart-list {
     &>.ant-layout-content {
         &>.ant-card {
+            height: 100%;
+            display: flex;
+            flex-direction: column;
             &>.ant-card-head {
                 padding: 0 10px;
                 .tools {
@@ -40,6 +43,7 @@
                 }
             }
             &>.ant-card-body {
+                flex: 1;
                 padding: 10px;
                 display: flex;
                 flex-wrap: wrap;

+ 7 - 1
src/components/dashboard/list.less

@@ -1,7 +1,10 @@
 .dashboard-view {
     .dashboard-body {
         padding: 0;
-        .ant-card-head {
+        height: 100%;
+        display: flex;
+        flex-direction: column;
+        &>.ant-card-head {
             padding: 0 10px;
             .dashboard-tools {
                 flex: 1;
@@ -30,6 +33,9 @@
                 }
             }
         }
+        &>.ant-card-body {
+            flex: 1;
+        }
     }
     .ant-card-body {
         padding: 0;

+ 4 - 0
src/components/dataConnect/list.less

@@ -1,6 +1,9 @@
 .layout-dataconnect {
     &>.ant-layout-content {
         &>.ant-card {
+            height: 100%;
+            display: flex;
+            flex-direction: column;
             &>.ant-card-head {
                 padding: 0 10px;
                 .tools {
@@ -14,6 +17,7 @@
                 }
             }
             &>.ant-card-body {
+                flex: 1;
                 padding: 16px;
                 display: flex;
                 flex-wrap: wrap;

+ 7 - 1
src/components/dataSource/list.less

@@ -1,7 +1,10 @@
 .datasource-view {
     .datasource-body {
         padding: 0;
-        .ant-card-head {
+        height: 100%;
+        display: flex;
+        flex-direction: column;
+        &>.ant-card-head {
             padding: 0 10px;
             .datasource-tools {
                 flex: 1;
@@ -39,6 +42,9 @@
                 }
             }
         }
+        &>.ant-card-body {
+            flex: 1;
+        }
     }
     .ant-card-body {
         padding: 0;

+ 0 - 0
src/components/homePage/layout.jsx


+ 13 - 12
src/models/chart.js

@@ -419,15 +419,19 @@ export default {
                 operate: g.operate,
                 groupName: g.label
             }))
-            const res = yield call(service.fetch, {
-                url: URLS.GROUP_CHART_BATCH_SET,
-                body
-            });
-            if(!res.err && res.data.code > 0) {
-                message.success('修改分组信息成功');
-                yield put({ type: 'remoteGroupList', mandatory: true });
-            }else {
-                message.error('修改分组信息失败: ' + (res.data.msg)); 
+            try{
+                const res = yield call(service.fetch, {
+                    url: URLS.GROUP_CHART_BATCH_SET,
+                    body
+                });
+                if(!res.err && res.data.code > 0) {
+                    message.success('修改分组信息成功');
+                    yield put({ type: 'remoteGroupList', mandatory: true });
+                }else {
+                    message.error('修改分组信息失败: ' + (res.data.msg));
+                }
+            }catch(e) {
+                message.error('修改分组信息失败: ' + e.message);
             }
         },
         /**
@@ -455,12 +459,10 @@ export default {
                         groupIndex: pgroups.length,
                     }
                 }
-                console.log('新增图表分组', body);
                 const res = yield call(service.fetch, {
                     url: URLS.GROUP_CHART_ADD,
                     body: body
                 });
-                console.log('新增图表分组', body, res);
                 if(!res.err && res.data.code > 0) {
                     let group = {
                         code: res.data.data + '',
@@ -473,7 +475,6 @@ export default {
                     message.error('添加分组失败: ' + (res.err || res.data.msg));
                 }
             }catch(e) {
-                console.log(e);
                 message.error('添加分组失败: ' + e.message);
             }
         },

+ 13 - 9
src/models/dataSource.js

@@ -403,15 +403,19 @@ export default {
                 operate: g.operate,
                 groupName: g.label
             }))
-            const res = yield call(service.fetch, {
-                url: URLS.GROUP_DATASOURCE_BATCH_SET,
-                body
-            });
-            if(!res.err && res.data.code > 0) {
-                message.success('修改分组信息成功');
-                yield put({ type: 'remoteGroupList', mandatory: true });
-            }else {
-                message.error('修改分组信息失败: ' + (res.data.msg)); 
+            try{
+                const res = yield call(service.fetch, {
+                    url: URLS.GROUP_DATASOURCE_BATCH_SET,
+                    body
+                });
+                if(!res.err && res.data.code > 0) {
+                    message.success('修改分组信息成功');
+                    yield put({ type: 'remoteGroupList', mandatory: true });
+                }else {
+                    message.error('修改分组信息失败: ' + (res.data.msg));
+                }
+            }catch(e) {
+                message.error('修改分组信息失败: ' + e.message);
             }
         },
         /**