From 6d86c3e447de116a51661aad9adb6b286d539eb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=98=B1=E8=BE=BE?= Date: Wed, 14 May 2025 15:36:34 +0800 Subject: [PATCH 1/3] =?UTF-8?q?style(button):=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=A0=B7=E5=BC=8F=E5=92=8C=E5=B8=83=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 调整了多个组件中的按钮样式，包括禁用状态的样式 - 优化了按钮的排列和间距 - 统一了按钮的样式类和属性 - 移除了部分冗余的代码 --- src/assets/sass/renderSass/table.scss | 8 +++ .../RenderTable/component/bodySlot/index.vue | 52 ++++++++-------- src/views/knowledge/detail/index.vue | 21 ++++--- src/views/rules/Index.vue | 8 +-- src/views/system/role/index.vue | 8 +-- src/views/system/user/index.vue | 61 +++++++++---------- 6 files changed, 83 insertions(+), 75 deletions(-) diff --git a/src/assets/sass/renderSass/table.scss b/src/assets/sass/renderSass/table.scss index 71602e8..f52a3ea 100644 --- a/src/assets/sass/renderSass/table.scss +++ b/src/assets/sass/renderSass/table.scss @@ -60,6 +60,14 @@ } } +.el-table { + & .el-button { + &.is-disabled { + background: unset; + color: #cecece; + } + } +} //.el-pagination.is-background .el-pager li:not(.disabled).active { // //} diff --git a/src/components/RenderTable/component/bodySlot/index.vue b/src/components/RenderTable/component/bodySlot/index.vue index a2401ae..c0fd7cb 100644 --- a/src/components/RenderTable/component/bodySlot/index.vue +++ b/src/components/RenderTable/component/bodySlot/index.vue @@ -61,33 +61,33 @@ const RenderSlot = { if (params.column.isRedraw) { let content = data.props.render(h, params) let contentDiv = content.children - if (contentDiv.length > 2) { - // 切割掉第一个div - const first = contentDiv.splice(0, 1) - const other = contentDiv.splice(0, contentDiv.length) - first[0].data.class = 'normal-button' - first[0].data.props.type = null - first[0].data.props.size = null - other.forEach(item => { - // item.data.class = 'normal-button ' - item.data.class = 'normal-button popver-button' - }) + // if (contentDiv.length > 2) { + // 切割掉第一个div + // const first = contentDiv.splice(0, 1) + // const other = contentDiv.splice(0, contentDiv.length) + // first[0].data.class = 'normal-button' + // first[0].data.props.type = null + // first[0].data.props.size = null + // other.forEach(item => { + // // item.data.class = 'normal-button ' + // item.data.class = 'normal-button popver-button' + // }) + // + // content.children = [renderTooltip(first), renderPopver(other)] + // // content.children = [renderTooltip(first), ...other] + // return content + // } else { + // const first = contentDiv.splice(0, contentDiv) - content.children = [renderTooltip(first), renderPopver(other)] - // content.children = [renderTooltip(first), ...other] - return content - } else { - // const first = contentDiv.splice(0, contentDiv) - - contentDiv = contentDiv.map(item => { - item.data.class = 'normal-button' - item.data.props.type = null - item.data.props.size = null - return renderTooltip([item]) - }) - content.children = contentDiv - return content - } + contentDiv = contentDiv.map(item => { + item.data.class = 'normal-button' + item.data.props.type = null + item.data.props.size = null + return renderTooltip([item]) + }) + content.children = contentDiv + return content + // } // let div = } else { return data.props.render(h, params) diff --git a/src/views/knowledge/detail/index.vue b/src/views/knowledge/detail/index.vue index 6fa13ba..243f105 100644 --- a/src/views/knowledge/detail/index.vue +++ b/src/views/knowledge/detail/index.vue @@ -62,6 +62,7 @@ size="medium" icon="el-icon-plus" class="primary-button" + disbaled @click="jumpAddKnowledge" >上传知识 @@ -91,7 +92,7 @@ this.deleteKnowledge(params.row) } - }, - '删除' + } + // '删除' ), // h( // 'el-button', @@ -725,15 +726,15 @@ export default { props: { type: 'primary', size: 'mini', - icon: 'el-icon-tickets', + icon: 'el-icon-help', title: '添加元数据', disabled: params.row.documentStatus !== 1 }, on: { click: () => this.handleAddMetadata(params.row) } - }, - '标注元数据' + } + // '标注元数据' ), params.row.optStatus < 4 ? h( @@ -743,14 +744,14 @@ export default { props: { type: 'primary', size: 'mini', - icon: 'el-icon-tickets', - title: '添加元数据' + icon: 'el-icon-video-play', + title: '继续处理' }, on: { click: () => this.jumpToUpload(params) } - }, - '文件拆分处理' + } + // '文件拆分处理' ) : '' ]) diff --git a/src/views/rules/Index.vue b/src/views/rules/Index.vue index d8ad308..4bb84f8 100644 --- a/src/views/rules/Index.vue +++ b/src/views/rules/Index.vue @@ -54,8 +54,8 @@ export default { }, class: 'normal-button', on: { click: () => this.handleEdit(params.row) } - }, - '修改' + } + // '修改' ), h( 'el-button', @@ -70,8 +70,8 @@ export default { on: { click: () => this.handleDelete(params.row, params.index) } - }, - '删除' + } + // '删除' ) ]) } diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue index 4b8c416..ef66a37 100644 --- a/src/views/system/role/index.vue +++ b/src/views/system/role/index.vue @@ -179,8 +179,8 @@ export default { }, class: 'normal-button', on: { click: () => this.handleDelete(params.row) } - }, - '删除' + } + // '删除' ), h( 'el-button', @@ -195,8 +195,8 @@ export default { on: { click: () => this.handlePermissionVisible(params.row) } - }, - '设置权限' + } + // '设置权限' ) ]) } diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index 0cd652e..dd28b1a 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -177,43 +177,42 @@ export default { props: { type: 'text', size: 'mini', - icon: 'el-icon-remove-outline', - style: + icon: params.row.status === 0 - ? 'color: #F56C6C' - : 'color: #67C23A' + ? 'el-icon-remove-outline' + : 'el-icon-circle-check', + title: params.row.status === 0 ? '停用' : '启用' }, + // style: + // params.row.status === 0 + // ? 'color: #F56C6C' + // : 'color: #67C23A', + on: { click: () => this.handleToggleStatus(params.row) } - }, - params.row.status === 0 ? '停用' : '启用' + } + // params.row.status === 0 ? '停用' : '启用' ), - h( - 'el-button', - { - props: { - type: 'text', - size: 'mini', - style: 'color: #409EFF', - icon: 'el-icon-refresh-right' - }, - class: 'normal-button', - on: { click: () => this.handleResetPassword(params.row) } + h('el-button', { + props: { + type: 'text', + size: 'mini', + style: 'color: #409EFF', + icon: 'el-icon-refresh-right', + title: '重置密码' }, - '重置密码' - ), - h( - 'el-button', - { - props: { - type: 'text', - size: 'mini', - style: 'color: #F56C6C', - icon: 'el-icon-delete' - }, - on: { click: () => this.handleDelete(params.row) } + class: 'normal-button', + on: { click: () => this.handleResetPassword(params.row) } + }), + h('el-button', { + props: { + type: 'text', + size: 'mini', + style: 'color: #F56C6C', + icon: 'el-icon-delete', + title: '删除' }, - '删除' - ) + on: { click: () => this.handleDelete(params.row) } + }) ]) } } From 87070366c357a74ec1c46b392bbf554ceb3c9d1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=98=B1=E8=BE=BE?= Date: Wed, 14 May 2025 15:38:10 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix(app):=20=E4=BF=AE=E5=A4=8D=E6=96=87?= =?UTF-8?q?=E6=A1=A3=E7=AE=A1=E7=90=86=E6=95=B0=E6=8D=AE=E9=9B=86=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E8=BF=94=E5=9B=9E=E6=95=B0=E6=8D=AE=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改了对返回数据 content 的判断条件 - 确保 dataset 和 datasetList 能正确赋值 --- src/views/app/Home.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/app/Home.vue b/src/views/app/Home.vue index 921104c..1744563 100644 --- a/src/views/app/Home.vue +++ b/src/views/app/Home.vue @@ -393,7 +393,7 @@ export default { async getKnowledgeList() { let { content } = await docManageDataset({ nameLike: this.nameLike }) - if (content.content && content.length > 0) { + if (content.content && content.content.length > 0) { this.dataset = content.content[0] this.datasetList = content.content } From 6a321263e6d859e2572c4dcee5dfd1b0e3e77d2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=98=B1=E8=BE=BE?= Date: Wed, 14 May 2025 16:29:19 +0800 Subject: [PATCH 3/3] =?UTF-8?q?refactor(knowledge):=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E7=9F=A5=E8=AF=86=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改 Tooltip组件的代码格式 - 更新知识详情页面的数据处理逻辑 -调整文本分割设置的参数 --- .../component/TooltipScope/index.vue | 10 ++++++- src/icons/svg/miner.svg | 1 + src/views/knowledge/detail/index.vue | 28 +++++++++++++++++-- .../knowledge/detail/reviewKnowledge.vue | 8 +++--- 4 files changed, 40 insertions(+), 7 deletions(-) create mode 100644 src/icons/svg/miner.svg diff --git a/src/components/RenderTable/component/TooltipScope/index.vue b/src/components/RenderTable/component/TooltipScope/index.vue index 6b36727..c93f808 100644 --- a/src/components/RenderTable/component/TooltipScope/index.vue +++ b/src/components/RenderTable/component/TooltipScope/index.vue @@ -6,7 +6,15 @@ export default { let { scope, item } = this return scope.row[item.prop] ? (
- +
{scope.row[item.prop]}
diff --git a/src/icons/svg/miner.svg b/src/icons/svg/miner.svg new file mode 100644 index 0000000..0c075e8 --- /dev/null +++ b/src/icons/svg/miner.svg @@ -0,0 +1 @@ + diff --git a/src/views/knowledge/detail/index.vue b/src/views/knowledge/detail/index.vue index 243f105..cd82fc1 100644 --- a/src/views/knowledge/detail/index.vue +++ b/src/views/knowledge/detail/index.vue @@ -483,7 +483,12 @@ export default { querys.datasetId = datasetId querys.documentId = params.row.id if (params.row.optStatus === 0) { - querys.activeLevel = 1 + if (params.row.useMineru === 1) { + querys.activeLevel = 0 + querys.isMd = true + } else { + querys.activeLevel = 1 + } } else { querys.activeLevel = params.row.optStatus - 1 querys.isMd = true @@ -633,7 +638,26 @@ export default { let text = documentSourceOptions.find( item => item.value === String(params.row.documentSource) ).label - return h('div', [h('span', text)]) + return h( + 'div', + { + class: 'flex align-items-c' + }, + [ + h('svg-icon', { + props: { + iconClass: params.row.useMineru === 1 ? 'miner' : 'none' + }, + class: 'mr5', + style: { + // display: params.row.useMineru === 1 ? '' : 'none', + width: '15px', + fontSize: '15px' + } + }), + h('span', {}, text) + ] + ) } }, { diff --git a/src/views/knowledge/detail/reviewKnowledge.vue b/src/views/knowledge/detail/reviewKnowledge.vue index 8867a8d..7ba8496 100644 --- a/src/views/knowledge/detail/reviewKnowledge.vue +++ b/src/views/knowledge/detail/reviewKnowledge.vue @@ -243,8 +243,8 @@ export default { removeExtraSpaces: true, removeUrlsEmails: false, separator: '\\n\\n', - maxTokens: 1000, - chunkOverlap: 50 + maxTokens: 4000, + chunkOverlap: 400 }, form: { @@ -252,8 +252,8 @@ export default { removeExtraSpaces: true, removeUrlsEmails: false, separator: '\\n\\n', - maxTokens: 1000, - chunkOverlap: 50 + maxTokens: 4000, + chunkOverlap: 400 }, datasetDetail: {}, documentDetail: {},