diff --git a/jero-web/src/components/StandardResolutionSheet.vue b/jero-web/src/components/StandardResolutionSheet.vue
index 7acb318..fb1671c 100644
--- a/jero-web/src/components/StandardResolutionSheet.vue
+++ b/jero-web/src/components/StandardResolutionSheet.vue
@@ -468,7 +468,7 @@ export default {
}
/deep/ .ant-tree li span.ant-tree-switcher {
- float: right;
+ /*float: right;*/
}
.ant-spin-nested-loading {
diff --git a/jero-web/src/views/documentTool/documentComparison/DocumentDataComparison.vue b/jero-web/src/views/documentTool/documentComparison/DocumentDataComparison.vue
index 3e3bb9f..85f4649 100644
--- a/jero-web/src/views/documentTool/documentComparison/DocumentDataComparison.vue
+++ b/jero-web/src/views/documentTool/documentComparison/DocumentDataComparison.vue
@@ -38,11 +38,11 @@
:replace-fields="{key: 'menuId'}"
@select="onSelectLeft"
:tree-data="resultData.menuLeft">
-
{{ title }}
+
@@ -714,7 +714,7 @@ export default {
}
/deep/ .ant-tree li span.ant-tree-switcher {
- float: right;
+ /*float: right;*/
}
::-webkit-scrollbar {
diff --git a/jero-web/src/views/documentTool/documentComparison/comparisonOfTerms.vue b/jero-web/src/views/documentTool/documentComparison/comparisonOfTerms.vue
index 045c953..4402ca3 100644
--- a/jero-web/src/views/documentTool/documentComparison/comparisonOfTerms.vue
+++ b/jero-web/src/views/documentTool/documentComparison/comparisonOfTerms.vue
@@ -489,7 +489,7 @@ export default {
}
/deep/ .ant-tree li span.ant-tree-switcher {
- float: right;
+ /*float: right;*/
}
::-webkit-scrollbar {
diff --git a/jero-web/src/views/documentTool/documentSplit/modules/ImportSplitResultModal.vue b/jero-web/src/views/documentTool/documentSplit/modules/ImportSplitResultModal.vue
index 7b25ac2..0da4d16 100644
--- a/jero-web/src/views/documentTool/documentSplit/modules/ImportSplitResultModal.vue
+++ b/jero-web/src/views/documentTool/documentSplit/modules/ImportSplitResultModal.vue
@@ -189,7 +189,7 @@ export default {
cancelText: this.$t('docTool.split.gotIt'),
title: this.$t('docTool.split.formatRequirement'),
content: (h) => {
- const contentArr = [this.$t('docTool.split.formatRequirementContentOne'), this.$t('docTool.split.formatRequirementContentTwo'), this.$t('docTool.split.formatRequirementContentThree'), this.$t('docTool.split.formatRequirementContentFour')]
+ const contentArr = ['1.导入的文档是zip格式', '2.图片为jpg、jpeg、 png、 gif格式', '3.文档中的图片,在导入exceI中以文件名填写,图文件存放在相对路径的目录下', '4.文档中的表格,在导入exceI中以链接的形式展示,击链接跳转到指定的sheet页面']
const contentDomArr = []
for (const content of contentArr) {
console.log(content)
diff --git a/jero-web/src/views/documentTool/documentSplit/modules/SplitAddForm.vue b/jero-web/src/views/documentTool/documentSplit/modules/SplitAddForm.vue
index ec5179b..b7535a2 100644
--- a/jero-web/src/views/documentTool/documentSplit/modules/SplitAddForm.vue
+++ b/jero-web/src/views/documentTool/documentSplit/modules/SplitAddForm.vue
@@ -48,7 +48,7 @@
@@ -59,13 +59,12 @@
v-model="clause.itemContent"
v-if="clause.type === TypeOfClauseItem.TEXT.value" />
-
-
+
-
+
{{ $t('newlyAdded') }}
@@ -145,6 +144,7 @@ export default {
itemVal: {},
contentTrees: '',
isTableEdit: false,
+ isTopList: false
}
},
props: {
@@ -214,16 +214,28 @@ export default {
*/
handleAddClauseContent (index) {
if (index === -1) {
+ this.isTopList = false
+ this.addIndex = this.contentList.length - 1
+ } else if (!index) {
+ this.isTopList = true
this.addIndex = this.contentList.length - 1
} else {
this.addIndex = index
+ this.isTopList = false
}
this.$refs.splitDetailAddTypeCheck.open()
},
// 增加条款内容成功
handleAddOk (type, content) {
- const headerArr = this.contentList.splice(0, this.addIndex + 1)
- const footerArr = this.contentList.splice(-this.addIndex)
+ let headerArr = []
+ let footerArr = []
+ if (this.isTopList) {
+ headerArr = this.contentList
+ footerArr = []
+ } else {
+ headerArr = this.contentList.splice(0, this.addIndex + 1)
+ footerArr = this.contentList.splice(-this.addIndex)
+ }
const insertArr = []
switch (type) {
case TypeOfClauseItem.TEXT.value:
@@ -251,6 +263,7 @@ export default {
}
}
this.contentList = [...headerArr, ...insertArr, ...footerArr]
+ console.log(this.contentList)
},
/**
* 表格编辑