|
@@ -218,7 +218,7 @@
|
|
|
<div class="sheet-wrap">
|
|
|
<Sheet
|
|
|
ref="sheetRef"
|
|
|
- v-if="sheetDetailInfo.Source === 1"
|
|
|
+ v-if="sheetDetailInfo.Source === 1&&sheetDetailInfo.ExcelInfoId"
|
|
|
:option="{
|
|
|
data: [{
|
|
|
...JSON.parse(sheetDetailInfo.Content),
|
|
@@ -801,8 +801,8 @@ export default {
|
|
|
this.editButtonText = this.sheetDetailInfo.CanEdit?'':`${this.sheetDetailInfo.Editor}编辑中`
|
|
|
|
|
|
this.$nextTick(() => {
|
|
|
-
|
|
|
- this.sheetDetailInfo.Source === 1 && this.$refs.sheetRef.init();
|
|
|
+ //sheet组件Mounted已经init一次,再次调用会导致工具栏样式错乱
|
|
|
+ //this.sheetDetailInfo.Source === 1 && this.$refs.sheetRef.init();
|
|
|
|
|
|
this.sheetDetailInfo.Source === 2 &&
|
|
|
this.$refs.customTableRef.initSheetData(res.Data.TableData);
|
|
@@ -1050,19 +1050,21 @@ $normal-font: 14px;
|
|
|
.main-right {
|
|
|
width: 80%;
|
|
|
min-width: 800px;
|
|
|
+ position: relative;
|
|
|
height: calc(100vh - 120px);
|
|
|
+ display: flex;
|
|
|
.sheet-detail-wrapper {
|
|
|
- height: 100%;
|
|
|
+ flex: 1;
|
|
|
border: 1px solid #ececec;
|
|
|
border-radius: 4px;
|
|
|
box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.05);
|
|
|
- overflow: auto;
|
|
|
background: #fff;
|
|
|
+ box-sizing: border-box;
|
|
|
+ overflow-x: auto;
|
|
|
+ display: flex;
|
|
|
+ flex-direction: column;
|
|
|
.detail-top {
|
|
|
padding: 20px;
|
|
|
- // display: flex;
|
|
|
- // justify-content: space-between;
|
|
|
- // align-items: center;
|
|
|
border-bottom: 1px solid #ececec;
|
|
|
.sheet-name {
|
|
|
font-size: 18px;
|
|
@@ -1078,6 +1080,7 @@ $normal-font: 14px;
|
|
|
display: flex;
|
|
|
justify-content: space-between;
|
|
|
align-items: center;
|
|
|
+ white-space: pre;
|
|
|
.author{
|
|
|
color: #666666;
|
|
|
font-size: 16px;
|
|
@@ -1099,10 +1102,10 @@ $normal-font: 14px;
|
|
|
|
|
|
}
|
|
|
.sheet-wrap {
|
|
|
+ flex:1;
|
|
|
position: relative;
|
|
|
- height: calc(100vh - 210px);
|
|
|
+ box-sizing: border-box;
|
|
|
padding: 15px;
|
|
|
- /* min-height: 500px; */
|
|
|
}
|
|
|
}
|
|
|
|