From 1e9c7a02ec2b8caf7dda6000d7f0f79849df6b45 Mon Sep 17 00:00:00 2001
From: 朱佳吉 <1527963051@qq.com>
Date: 星期四, 09 五月 2024 14:15:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/view/b2-standard-template.vue | 48 ++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 40 insertions(+), 8 deletions(-)
diff --git a/src/components/view/b2-standard-template.vue b/src/components/view/b2-standard-template.vue
index bf60cf6..f4e7e35 100644
--- a/src/components/view/b2-standard-template.vue
+++ b/src/components/view/b2-standard-template.vue
@@ -59,7 +59,8 @@
</div>
<div class="table">
<ValueTable ref="ValueTable" :url="$api.StandardTemplate.selectStandardTemplatePageList"
- :upUrl="$api.StandardTemplate.upStandardTemplate" :delUrl="$api.StandardTemplate.delStandardTemplate" :componentData="componentData" :key="upIndex" />
+ :upUrl="$api.StandardTemplate.upStandardTemplate" :delUrl="$api.StandardTemplate.delStandardTemplate"
+ :componentData="componentData" :key="upIndex" />
</div>
<el-dialog title="妯℃澘缂栧埗" :visible.sync="isShow" width="80%" :before-close="isClose">
<div style="width: 100%;height: 80vh;overflow: auto;" v-if="isShow">
@@ -169,33 +170,64 @@
this.isShow = true
this.row = row
},
- closed(){
+ closed() {
this.loading = true
let data = luckysheet.toJson()
- this.$axios.post(this.$api.StandardTemplate.upStandardTemplate,{
+ delete data.title
+ delete data.container
+ delete data.lang
+ delete data.showsheetbar
+ delete data.showstatisticBarConfig
+ delete data.enableAddRow
+ delete data.enableAddBackTop
+ delete data.showtoolbarConfig
+ delete data.cellRightClickConfig
+ delete data.myFolderUrl
+ delete data.functionButton
+ if(data.data[0].config.borderInfo != undefined){
+ for (var i = 0; i < data.data[0].config.borderInfo.length; i++) {
+ let str = data.data[0].config.borderInfo
+ if (str[i].rangeType === 'range') {
+ if (str[i].borderType === 'border-none') {
+ data.data[0].config.borderInfo.splice(i, 1)
+ i -= 1
+ }
+ }
+ }
+ }
+ data.data[0].celldata.forEach(a=>{
+ if(a.v.ps!=undefined&&a.v.ps.value==='妫�楠屽��' || a.v.ps!=undefined&&a.v.ps.value==='璁惧鍚嶇О' || a.v.ps!=undefined&&a.v.ps.value==='璁惧缂栫爜'){
+ if(a.v.v === undefined){
+ a.v.v = ""
+ }
+ }
+ })
+ this.$axios.post(this.$api.StandardTemplate.upStandardTemplate, {
id: this.row.id,
thing: JSON.stringify(data),
name: luckysheet.getWorkbookName(['name'])
- },{
+ }, {
headers: {
'Content-Type': 'application/json'
}
- }).then(res=>{
- if (res.code==201) return
+ }).then(res => {
+ if (res.code == 201) return
this.loading = false
this.$message.success('宸蹭繚瀛�')
this.isShow = false
this.refreshTable()
})
},
- isClose(done){
+ isClose(done) {
this.$confirm('鏄惁闇�瑕佷繚瀛�?', "璀﹀憡", {
confirmButtonText: "纭畾",
cancelButtonText: "鍙栨秷",
type: "warning"
}).then(() => {
this.closed()
- }).catch(()=>{done()})
+ }).catch(() => {
+ done()
+ })
}
}
}
--
Gitblit v1.9.3