From 0c65e30e987ef3e1aa40e207390849be491c7b4b Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Tue, 22 Aug 2023 15:06:29 +0800 Subject: [PATCH] =?UTF-8?q?[update]=20=E6=96=87=E6=A1=A3=E6=8B=86=E5=88=86?= =?UTF-8?q?=E7=9A=84=E5=BC=B9=E6=A1=86=E6=8B=86=E5=88=86=E5=87=BA=E6=9D=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/ueditor/ueditor.config.js | 4 +- src/common/lang/en-us.js | 9 +- src/common/lang/zh-cn.js | 9 +- src/components/customField/TableData.vue | 24 +- .../splitUpload/SplitAddClauseUploadImage.vue | 198 ++++++++ src/components/uEditor/UEditor.vue | 10 +- .../documentTool/modules/SplitAddForm.vue | 444 +++--------------- .../modules/SplitClauseDetail.vue | 37 ++ .../documentTool/modules/SplitDetail.vue | 299 +++--------- .../modules/SplitDetailAddTable.vue | 173 +++++++ .../modules/SplitDetailAddTypeCheck.vue | 278 +++++++++++ .../modules/SplitDetailBatchSetting.vue | 85 ++++ .../modules/SplitDetailNodeAdd.vue | 159 +++++++ 13 files changed, 1101 insertions(+), 628 deletions(-) create mode 100644 src/components/splitUpload/SplitAddClauseUploadImage.vue create mode 100644 src/views/documentTool/modules/SplitClauseDetail.vue create mode 100644 src/views/documentTool/modules/SplitDetailAddTable.vue create mode 100644 src/views/documentTool/modules/SplitDetailAddTypeCheck.vue create mode 100644 src/views/documentTool/modules/SplitDetailBatchSetting.vue create mode 100644 src/views/documentTool/modules/SplitDetailNodeAdd.vue diff --git a/public/ueditor/ueditor.config.js b/public/ueditor/ueditor.config.js index 356ffa39..6030eef1 100644 --- a/public/ueditor/ueditor.config.js +++ b/public/ueditor/ueditor.config.js @@ -20,7 +20,9 @@ * 因此,UEditor提供了针对不同页面的编辑器可单独配置的根路径,具体来说,在需要实例化编辑器的页面最顶部写上如下代码即可。当然,需要令此处的URL等于对应的配置。 * window.UEDITOR_HOME_URL = "/xxxx/xxxx/"; */ - var URL = window.UEDITOR_HOME_URL || getUEBasePath(); + + window.UEDITOR_HOME_URL = "/public/ueditor/" + var URL = window.UEDITOR_HOME_URL || getUEBasePath(); /** * 配置项主体。注意,此处所有涉及到路径的配置别遗漏URL变量。 diff --git a/src/common/lang/en-us.js b/src/common/lang/en-us.js index 3212dc6c..a01adbd0 100644 --- a/src/common/lang/en-us.js +++ b/src/common/lang/en-us.js @@ -399,7 +399,14 @@ module.exports = { selectDirectoryTerms: 'Please Select the directory location to add terms', documentSplitTemplate: 'Document Split Template', mergeTerms: 'Determine Merger Terms', - pleaseUploadSplitFile: 'Please Upload Split File' + pleaseUploadSplitFile: 'Please Upload Split File', + text: 'Text', + picture: 'Picture', + table: 'Table', + addQuantity: 'Add Quantity', + enterQuantity: 'Please enter quantity', + numberRows: 'Number of rows', + numberColumns: 'Number of columns' }, comparison: { releaseSituation: 'Release situation', diff --git a/src/common/lang/zh-cn.js b/src/common/lang/zh-cn.js index 7d340b93..47301b93 100644 --- a/src/common/lang/zh-cn.js +++ b/src/common/lang/zh-cn.js @@ -399,7 +399,14 @@ module.exports = { selectDirectoryTerms: '请选择添加条款的目录位置', documentSplitTemplate: '文档拆分模板', mergeTerms: '确定合并条款', - pleaseUploadSplitFile: '请上传拆分文件' + pleaseUploadSplitFile: '请上传拆分文件', + text: '文本', + picture: '图片', + table: '表格', + addQuantity: '添加数量', + enterQuantity: '请输入数量', + numberRows: '行数', + numberColumns: '列数', }, comparison: { releaseSituation: '发布情况', diff --git a/src/components/customField/TableData.vue b/src/components/customField/TableData.vue index e5f39cb9..21980ba4 100644 --- a/src/components/customField/TableData.vue +++ b/src/components/customField/TableData.vue @@ -28,12 +28,12 @@ - + {{text}} - + {{text}} @@ -47,6 +47,9 @@ {{text}} + + {{record.iterms_conditions&&record.iterms_conditions!=='null'?record.iterms_conditions.replace(/<.*?>/ig, ' ') : ''}} + @@ -192,7 +195,7 @@ export default { align: 'left', ellipsis: true, width: 215 - }, + } // { // title: this.$t('operation'), // align: 'center', @@ -275,6 +278,12 @@ export default { this.columns[index].scopedSlots = { customRender: 'urlClick' } + } else if (res.db_field_name === 'iterms_conditions') { + // 拆分文档详情页的条款内容点击可预览 + this.columns[index].width = 500 + this.columns[index].scopedSlots = { + customRender: 'showContent' + } } else { this.columns[index].scopedSlots = { customRender: 'detailText' @@ -348,6 +357,9 @@ export default { }, urlClick (item) { window.open(item) + }, + showContent (item) { + this.$emit('showContent', item) } } } @@ -358,7 +370,7 @@ export default { margin-right: 10px; } -.textName { +.text-name { width: 100%; overflow: hidden; display: -webkit-box; @@ -370,4 +382,8 @@ export default { text-justify: inter-ideograph; word-break: break-all; } + +.item-solt { + cursor: pointer; +} diff --git a/src/components/splitUpload/SplitAddClauseUploadImage.vue b/src/components/splitUpload/SplitAddClauseUploadImage.vue new file mode 100644 index 00000000..de3d4bf8 --- /dev/null +++ b/src/components/splitUpload/SplitAddClauseUploadImage.vue @@ -0,0 +1,198 @@ + + + + + diff --git a/src/components/uEditor/UEditor.vue b/src/components/uEditor/UEditor.vue index 3d792076..3315c128 100644 --- a/src/components/uEditor/UEditor.vue +++ b/src/components/uEditor/UEditor.vue @@ -5,10 +5,10 @@ + + diff --git a/src/views/documentTool/modules/SplitDetail.vue b/src/views/documentTool/modules/SplitDetail.vue index 3f098e2c..28996ca1 100644 --- a/src/views/documentTool/modules/SplitDetail.vue +++ b/src/views/documentTool/modules/SplitDetail.vue @@ -18,7 +18,7 @@ >