|
|
@@ -86,7 +86,7 @@
|
|
|
:data-cindex="columnHeader[edb_index]"
|
|
|
v-if="(edb.Data.find(_ =>_.DataTime === date).ShowValue&&!edb.Data.find(_ =>_.DataTime === date).CanEdit)||disabled"
|
|
|
>
|
|
|
- {{edb.Data.find(_ =>_.DataTime === date).ShowValue}}
|
|
|
+ {{showCellValue(edb.Data.find(_ =>_.DataTime === date))}}
|
|
|
</span>
|
|
|
|
|
|
<!-- 输入值/公式 -->
|
|
|
@@ -399,6 +399,27 @@
|
|
|
</div>
|
|
|
</m-dialog>
|
|
|
|
|
|
+ <!-- 小数位数 -->
|
|
|
+ <m-dialog
|
|
|
+ :show.sync="isSetDecimalDialog"
|
|
|
+ width="455px"
|
|
|
+ :title="$t('OnlineExcelPage.data_format_settings')"
|
|
|
+ @close="isSetDecimalDialog = false"
|
|
|
+ >
|
|
|
+ <div style="display: flex;justify-content: center;align-items: center;">
|
|
|
+ {{ $t('OnlineExcelPage.number_of_decimal_places') }}<el-input-number precision="0" style="width: 120px;margin-left: 10px;" :placeholder="$t('OnlineExcelPage.please_input')" v-model="ruleForm.Decimal" controls-position="right" :min="0" :max="30"></el-input-number>
|
|
|
+ </div>
|
|
|
+ <div style="display: flex;justify-content: center;margin-top:60px">
|
|
|
+ <el-button style="margin-right: 30px" type="primary" plain @click="isSetDecimalDialog = false"
|
|
|
+ >{{$t('Dialog.cancel_btn')}}</el-button
|
|
|
+ >
|
|
|
+ <el-button
|
|
|
+ type="primary"
|
|
|
+ @click="saveDecima"
|
|
|
+ >{{$t('OnlineExcelPage.confirm_btn')}}</el-button
|
|
|
+ >
|
|
|
+ </div>
|
|
|
+ </m-dialog>
|
|
|
</div>
|
|
|
</template>
|
|
|
<script>
|
|
|
@@ -471,7 +492,7 @@ export default {
|
|
|
return this.$store.state.isCollapse
|
|
|
},
|
|
|
contextMenuOption(){
|
|
|
- return [{ label: this.$t('ETable.Btn.delete_btn') ,key: 'del' }]
|
|
|
+ return [{ label: this.$t('ETable.Btn.delete_btn') ,key: 'del' },{ label: this.$t('OnlineExcelPage.data_format_settings') ,key: 'setDecimal' }]
|
|
|
},
|
|
|
currentLang() {
|
|
|
return this.$store.state.lang
|
|
|
@@ -479,6 +500,15 @@ export default {
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
+ // 设置小数位数
|
|
|
+ dateMap:{},
|
|
|
+ colMap:[],
|
|
|
+ ruleForm:{},
|
|
|
+ isSetDecimalDialog:false,
|
|
|
+ setType:'',
|
|
|
+ setDecimalIndex:'',
|
|
|
+ DecimalConfig:[],
|
|
|
+
|
|
|
isSlideLeft: false,
|
|
|
formula: '',
|
|
|
config:{
|
|
|
@@ -716,17 +746,23 @@ export default {
|
|
|
|
|
|
/* 右键事件 */
|
|
|
async handleContext(key) {
|
|
|
+ console.log(key)
|
|
|
let { rindex,cindex } = this.rightClickCell;
|
|
|
-
|
|
|
+ console.log(rindex,cindex)
|
|
|
if(rindex==='-1') { //删除列
|
|
|
console.log('删除列',cindex)
|
|
|
+ let index = this.columnHeader.findIndex(_ => _ === cindex);
|
|
|
+ if(key=='del'){
|
|
|
+ const configIndex=this.DecimalConfig.findIndex(el=>el.Col==this.config.data[index].EdbInfoId)
|
|
|
+ if(configIndex>-1){
|
|
|
+ this.DecimalConfig.splice(configIndex,1)
|
|
|
+ }
|
|
|
if(cindex === 'A') {
|
|
|
await this.$confirm(this.$t('OnlineExcelPage.dlt_the_all_msg') ,this.$t('Confirm.prompt') ,{ type: 'warning' })
|
|
|
this.reset()
|
|
|
return
|
|
|
}
|
|
|
|
|
|
- let index = this.columnHeader.findIndex(_ => _ === cindex);
|
|
|
this.config.data.splice(index,1)
|
|
|
this.config.textRowData.forEach(row => {
|
|
|
row.splice(index+1,1)
|
|
|
@@ -735,25 +771,34 @@ export default {
|
|
|
if(!(index < this.config.data[0].length)){
|
|
|
resetStyle()
|
|
|
}
|
|
|
+ }else{
|
|
|
+ this.openSetDecimalDia('col', this.config.data[index],index)
|
|
|
+ }
|
|
|
}else if(cindex === '-1') { //删除行
|
|
|
console.log('删除行',rindex)
|
|
|
-
|
|
|
- if(this.dateArr.length === 1) return this.$message.warning(this.$t('OnlineExcelPage.please_keep_one_msg') )
|
|
|
-
|
|
|
let index = this.rowHeader.findIndex(_ => _ === rindex)
|
|
|
- if(index >= this.dateArr.length) {
|
|
|
- this.config.textRowData.splice(index-this.dateArr.length,1)
|
|
|
- }else {
|
|
|
- this.dateArr.splice(index,1)
|
|
|
- this.config.data.forEach(_ => {
|
|
|
- _.Data.splice(index,1)
|
|
|
- })
|
|
|
+ console.log(index)
|
|
|
+ if(key=='del'){
|
|
|
+ if(this.dateArr.length === 1) return this.$message.warning(this.$t('OnlineExcelPage.please_keep_one_msg') )
|
|
|
+ const configIndex=this.DecimalConfig.findIndex(el=>el.Row==this.config.data[0].Data[index].DataTime)
|
|
|
+ if(configIndex>-1){
|
|
|
+ this.DecimalConfig.splice(configIndex,1)
|
|
|
+ }
|
|
|
+ if(index >= this.dateArr.length) {
|
|
|
+ this.config.textRowData.splice(index-this.dateArr.length,1)
|
|
|
+ }else {
|
|
|
+ this.dateArr.splice(index,1)
|
|
|
+ this.config.data.forEach(_ => {
|
|
|
+ _.Data.splice(index,1)
|
|
|
+ })
|
|
|
+ }
|
|
|
+ // 删除的是最后一行
|
|
|
+ if(!(index < this.config.data.length)){
|
|
|
+ resetStyle()
|
|
|
+ }
|
|
|
+ }else{
|
|
|
+ this.openSetDecimalDia('row',{},index)
|
|
|
}
|
|
|
- // 删除的是最后一行
|
|
|
- if(!(index < this.config.data.length)){
|
|
|
- resetStyle()
|
|
|
- }
|
|
|
-
|
|
|
}
|
|
|
if(!this.disabled && this.hasInit){
|
|
|
this.$emit("autoSave")
|
|
|
@@ -761,6 +806,83 @@ export default {
|
|
|
this.hideContextMenu()
|
|
|
},
|
|
|
|
|
|
+ // 判断展示小数位数值还是原来的值
|
|
|
+ showCellValue(cell){
|
|
|
+ // console.log(cell)
|
|
|
+ let Value=''
|
|
|
+ if("Decimal" in cell&&cell.Decimal!=-1){
|
|
|
+ const multiplier = Math.pow(10, cell.Decimal);
|
|
|
+ const cellValue=+cell.Value
|
|
|
+ Value= cell.Decimal == 0 ? Math.round(cellValue) : Math.round(cellValue * multiplier) / multiplier;
|
|
|
+ }else{
|
|
|
+ Value=cell.ShowValue
|
|
|
+ }
|
|
|
+ return Value
|
|
|
+ },
|
|
|
+
|
|
|
+ //打开设置数据格式弹框
|
|
|
+ openSetDecimalDia(type,row,index){
|
|
|
+ this.ruleForm=JSON.parse(JSON.stringify({...row,Decimal:row.Decimal!=-1?row.Decimal:undefined}))
|
|
|
+ this.setType=type
|
|
|
+ this.setDecimalIndex=index
|
|
|
+ this.isSetDecimalDialog=true
|
|
|
+ },
|
|
|
+ // 保存
|
|
|
+ saveDecima(){
|
|
|
+ if(!isNaN(parseFloat(this.ruleForm.Decimal)) && isFinite(this.ruleForm.Decimal)){
|
|
|
+ if(this.setType=='col'){
|
|
|
+ console.log(this.ruleForm,this.config.data[this.setDecimalIndex])
|
|
|
+ const index=this.colMap.findIndex(el=>el.EdbInfoId==this.ruleForm.EdbInfoId)
|
|
|
+ if(index>-1){
|
|
|
+ this.colMap[index].Decimal=this.ruleForm.Decimal
|
|
|
+ }else{
|
|
|
+ this.colMap.push({
|
|
|
+ EdbInfoId:this.ruleForm.EdbInfoId,
|
|
|
+ Decimal:this.ruleForm.Decimal
|
|
|
+ })
|
|
|
+ }
|
|
|
+ this.ruleForm.Data.forEach(el=>{
|
|
|
+ el.Decimal=this.ruleForm.Decimal
|
|
|
+ })
|
|
|
+ this.config.data[this.setDecimalIndex]=JSON.parse(JSON.stringify(this.ruleForm))
|
|
|
+ console.log(this.colMap)
|
|
|
+ const configIndex=this.DecimalConfig.findIndex(el=>el.Col==this.ruleForm.EdbInfoId)
|
|
|
+ if(configIndex>-1){
|
|
|
+ this.DecimalConfig.splice(configIndex,1)
|
|
|
+ }
|
|
|
+ this.DecimalConfig.push({
|
|
|
+ Row:"",
|
|
|
+ Col:this.ruleForm.EdbInfoId,
|
|
|
+ Decimal:this.ruleForm.Decimal
|
|
|
+ })
|
|
|
+ console.log(this.DecimalConfig)
|
|
|
+ }else{
|
|
|
+ const cell=this.config.data[0].Data[this.setDecimalIndex]
|
|
|
+ this.dateMap[cell.DataTime]=this.ruleForm.Decimal
|
|
|
+ this.config.data.forEach(_ => {
|
|
|
+ _.Data[this.setDecimalIndex].Decimal=this.ruleForm.Decimal
|
|
|
+ })
|
|
|
+ const configIndex=this.DecimalConfig.findIndex(el=>el.Row==cell.DataTime)
|
|
|
+ if(configIndex>-1){
|
|
|
+ this.DecimalConfig.splice(configIndex,1)
|
|
|
+ }
|
|
|
+ this.DecimalConfig.push({
|
|
|
+ Row:cell.DataTime,
|
|
|
+ Col:0,
|
|
|
+ Decimal:this.ruleForm.Decimal
|
|
|
+ })
|
|
|
+ console.log(this.DecimalConfig)
|
|
|
+ }
|
|
|
+ this.isSetDecimalDialog=false
|
|
|
+ }else{
|
|
|
+ this.$message({
|
|
|
+ message:this.$t('OnlineExcelPage.please_set_number'),
|
|
|
+ type: 'warning'
|
|
|
+ });
|
|
|
+ }
|
|
|
+ console.log(this.config.data)
|
|
|
+ },
|
|
|
+
|
|
|
/* 保存时处理参数 */
|
|
|
getSaveParams() {
|
|
|
const { data,textRowData,order } = this.config;
|
|
|
@@ -771,11 +893,12 @@ export default {
|
|
|
RelationEdbInfoList: cell.DataType===4?this.dealFormulaConstruction(cell.Value):[]
|
|
|
}))
|
|
|
})
|
|
|
-
|
|
|
+ console.log(data)
|
|
|
let Data = data.map((_,index) => {
|
|
|
return {
|
|
|
EdbInfoId: _.EdbInfoId,
|
|
|
EdbAliasName: _.EdbAliasName,
|
|
|
+ Decimal:_.Decimal!=-1?_.Decimal:-1,
|
|
|
Tag: this.columnHeader[index],
|
|
|
Data: _.Data.map(cell => ({
|
|
|
...cell,
|
|
|
@@ -790,6 +913,7 @@ export default {
|
|
|
Sort: order,
|
|
|
TextRowData,
|
|
|
Data,
|
|
|
+ DecimalConfig:this.DecimalConfig
|
|
|
}
|
|
|
console.log(params)
|
|
|
return params
|
|
|
@@ -810,11 +934,21 @@ export default {
|
|
|
initSheetData(initData) {
|
|
|
this.hasInit=false
|
|
|
if(initData.Data) {
|
|
|
- const { Data,Sort,TextRowData } = initData;
|
|
|
+ const { Data,Sort,TextRowData,DecimalConfig } = initData;
|
|
|
|
|
|
this.config.order = Sort;
|
|
|
this.config.data = Data;
|
|
|
this.config.textRowData = TextRowData;
|
|
|
+ this.DecimalConfig=DecimalConfig?DecimalConfig:[]
|
|
|
+ this.colMap=[]
|
|
|
+ Data.forEach(el=>{
|
|
|
+ if(el.Decimal!=-1){
|
|
|
+ this.colMap.push({
|
|
|
+ EdbInfoId:el.EdbInfoId,
|
|
|
+ Decimal:el.Decimal
|
|
|
+ })
|
|
|
+ }
|
|
|
+ })
|
|
|
}
|
|
|
this.$nextTick(()=>{
|
|
|
this.hasInit=true
|
|
|
@@ -1055,6 +1189,7 @@ export default {
|
|
|
.item {
|
|
|
padding: 10px 25px;
|
|
|
cursor: pointer;
|
|
|
+ text-align: center;
|
|
|
&:hover {
|
|
|
background-color: #f5f7fa;
|
|
|
}
|
ldong