Просмотр исходного кода

UAS分享页主题应用失效bug/新建数据源数据连接卡片样式bug/图标查看列表格样式bug

zhuth 6 лет назад
Родитель
Сommit
f7ed310c22

+ 2 - 1
src/components/chartDesigner/sections/chartDataPreview.jsx

@@ -15,7 +15,7 @@ class ChartDataPreview extends React.Component {
     }
     }
     componentDidMount() {
     componentDidMount() {
         const { dispatch, chartCode, chartType, chartOption, chartConfig, filters } = this.props;
         const { dispatch, chartCode, chartType, chartOption, chartConfig, filters } = this.props;
-        let h = document.body.clientHeight * 0.8 - 40 - 40 - 40 - 2;
+        let h = document.body.clientHeight * 0.8 - 64 - 24 * 2 - 40 - 40 - 2;
         this.setState({
         this.setState({
             loading: true,
             loading: true,
             tableBodyHeight: h,
             tableBodyHeight: h,
@@ -37,6 +37,7 @@ class ChartDataPreview extends React.Component {
             className={`datapreview chartdatapreview ${modalClassName}`}
             className={`datapreview chartdatapreview ${modalClassName}`}
             title='查看列'
             title='查看列'
             width='80%'
             width='80%'
+            height='80%'
             visible={visibleBox}
             visible={visibleBox}
             footer={null}
             footer={null}
             onCancel={() => {
             onCancel={() => {

+ 1 - 1
src/components/dataSourceDetail/dataConnectConfig.jsx

@@ -75,7 +75,7 @@ class DataConnectConfig extends React.Component {
                     }
                     }
                     actions={[
                     actions={[
                         <div>
                         <div>
-                            {l.dbType === 'file' ? <Icon type='file' /> : <div><Icon type='database' />{l.dbType[0].toUpperCase() + l.dbType.slice(1)}</div>}
+                            {l.dbType === 'file' ? <Icon type='file' /> : <div className='database-type-wrap'><div><Icon type='database' /></div>{l.dbType[0].toUpperCase() + l.dbType.slice(1)}</div>}
                         </div>,
                         </div>,
                         <Dropdown overlay={this.generateOperationMenu(l)} trigger={['click']}>
                         <Dropdown overlay={this.generateOperationMenu(l)} trigger={['click']}>
                             <Icon style={{ fontSize: '24px' }} type="ellipsis" theme="outlined" />
                             <Icon style={{ fontSize: '24px' }} type="ellipsis" theme="outlined" />

+ 4 - 0
src/components/dataSourceDetail/dataConnectConfig.less

@@ -79,6 +79,10 @@
                                     background: #fff;
                                     background: #fff;
                                     li {
                                     li {
                                         margin: 4px 0;
                                         margin: 4px 0;
+                                        .database-type-wrap {
+                                            display: flex;
+                                            padding: 0 4px;
+                                        }
                                     }
                                     }
                                 }
                                 }
                             }
                             }

+ 4 - 1
src/models/dashboard.js

@@ -646,6 +646,7 @@ export default {
                     let data = {
                     let data = {
                         code:  resData.id+'',
                         code:  resData.id+'',
                         name: resData.bdName,
                         name: resData.bdName,
+                        menuCode: resData.menuId + '',
                         items: items,
                         items: items,
                         description: resData.bdNote || '',
                         description: resData.bdNote || '',
                         creatorCode: resData.createId + '',
                         creatorCode: resData.createId + '',
@@ -657,7 +658,8 @@ export default {
                         filters: JSON.parse((resData.filters|| "[]")),
                         filters: JSON.parse((resData.filters|| "[]")),
                         shareCode: resData.bdCode,
                         shareCode: resData.bdCode,
                         chartCodes: chartCodes,
                         chartCodes: chartCodes,
-                        demo: resData.demo
+                        demo: resData.demo,
+                        theme: resData.theme
                     }
                     }
 
 
                     let fields = [];
                     let fields = [];
@@ -746,6 +748,7 @@ export default {
                     let data = {
                     let data = {
                         code:  resData.id+'',
                         code:  resData.id+'',
                         name: resData.bdName,
                         name: resData.bdName,
+                        menuCode: resData.menuId + '',
                         items: items,
                         items: items,
                         description: resData.bdNote || '',
                         description: resData.bdNote || '',
                         creatorCode: resData.createId + '',
                         creatorCode: resData.createId + '',