|
@@ -5,10 +5,12 @@
|
|
|
<AuthButton :auth="pageAuthBtnQuery" />
|
|
|
</PublicPageHeader>
|
|
|
<div :style="pageTableContentHeight" class="TablePage_content flex-wrap">
|
|
|
- <div v-if="treeData.length" class="TablePage_content_left">
|
|
|
- <PublicPageTree :tree-data="treeData" :dep-math="depMath" @treeNodeClick="treeNodeClick" />
|
|
|
- </div>
|
|
|
- <div :class="treeData.length ? 'tableSacle' : 'tableAuto'" class="TablePage_content_right">
|
|
|
+ <template v-if="!dataFlag">
|
|
|
+ <div v-if="treeData.length" class="TablePage_content_left">
|
|
|
+ <PublicPageTree :tree-data="treeData" :dep-math="depMath" @treeNodeClick="treeNodeClick" />
|
|
|
+ </div>
|
|
|
+ </template>
|
|
|
+ <div :class="dataFlag ? 'tableAuto' : treeData.length ? 'tableSacle' : 'tableAuto'" class="TablePage_content_right">
|
|
|
<PublicPageTable :loading="loading" :table-cols="tableCols" :table-btns="authBtns" :data="tableData" :header-cell-class-name="headerCellClass" :row-class-name="rowClass" :cell-class-name="cellClass" :formatter="tableFormatter" show-summary @mounted="tableMountedHandler" @load="load" @cell-click="cellClickHandler" @handleEdit="handleEdit" @handleOther="handleOther" @handleRemove="handleRemove" />
|
|
|
</div>
|
|
|
</div>
|
|
@@ -48,6 +50,10 @@ export default {
|
|
|
type: String,
|
|
|
default: ''
|
|
|
},
|
|
|
+ dataFlag: {
|
|
|
+ type: Boolean,
|
|
|
+ default: false
|
|
|
+ },
|
|
|
msgContent: {
|
|
|
type: Object,
|
|
|
default: () => new Object()
|
|
@@ -91,11 +97,11 @@ export default {
|
|
|
computed: {
|
|
|
...mapGetters(['authArrs']),
|
|
|
pageTableHeight () {
|
|
|
- if (Object.keys(this.msgContent).length) return 'height:100%'
|
|
|
+ if (this.dataFlag) return 'height:100%'
|
|
|
return ''
|
|
|
},
|
|
|
pageTableContentHeight () {
|
|
|
- if (Object.keys(this.msgContent).length) return 'height:calc(100% - 60px)'
|
|
|
+ if (this.dataFlag) return 'height:calc(100% - 60px)'
|
|
|
return ''
|
|
|
},
|
|
|
pageAuthBtnQuery () {
|
|
@@ -179,8 +185,9 @@ export default {
|
|
|
//获取表头数据
|
|
|
getColumnData (columnArrs = []) {
|
|
|
const returnData = [...columnArrs]
|
|
|
+ console.log(returnData)
|
|
|
this.$store.dispatch('auth/changeAuthMsg', returnData)
|
|
|
- const tableColsCopy = _.cloneDeep(returnData).filter((item) => item.isdisplay == 1);
|
|
|
+ const tableColsCopy = _.cloneDeep(returnData).filter((item) => item.isdisplay == 1 || item.isdisplay == 'true');
|
|
|
const tableColsCopyOrder = _.orderBy(tableColsCopy, ['displaynumber'], ['asc']);
|
|
|
// const formItemCopy = _.cloneDeep(returnData).filter((item) => item.isdisplay == 2 || item.isdisplay == 3);
|
|
|
// this.formItem = _.orderBy(formItemCopy, ['displaynumber'], ['asc']);
|