From b078e649d0365d21ff72bbfed49d109c518dd737 Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Fri, 30 Aug 2024 15:06:35 +0800 Subject: [PATCH] =?UTF-8?q?[update]=20=E5=9B=BD=E6=A0=87=E3=80=81=E5=A4=96?= =?UTF-8?q?=E6=A0=87=E3=80=81=E4=BC=81=E6=A0=87=E3=80=81=E8=B5=84=E6=96=99?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E5=B7=A6=E4=BE=A7=E6=A0=91=E6=8B=96=E6=8B=BD?= =?UTF-8?q?=EF=BC=8C=E6=8B=96=E6=8B=BD=E5=88=B0=E5=86=85=E5=AE=B9=E5=8C=BA?= =?UTF-8?q?=E5=88=99=E6=8A=8A=E6=8B=96=E6=8B=BD=E8=8A=82=E7=82=B9=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E4=B8=BA=E8=AF=A5=E8=8A=82=E7=82=B9=E7=9A=84=E5=AD=90?= =?UTF-8?q?=E8=8A=82=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../standard/EnterpriseStandardList.vue | 13 +++++++++++-- .../domesticStandard/DomesticStandardList.vue | 13 +++++++++++-- .../overseasStandard/OverseasStandardList.vue | 13 +++++++++++-- .../profileCenter/ProfileCenterList.vue | 13 +++++++++++-- 4 files changed, 44 insertions(+), 8 deletions(-) diff --git a/src/views/enterpriseStandardLibrary/standard/EnterpriseStandardList.vue b/src/views/enterpriseStandardLibrary/standard/EnterpriseStandardList.vue index f87295a8..d6453e3f 100644 --- a/src/views/enterpriseStandardLibrary/standard/EnterpriseStandardList.vue +++ b/src/views/enterpriseStandardLibrary/standard/EnterpriseStandardList.vue @@ -416,8 +416,17 @@ export default { // 判断只能在同级排序 if (!info.dropToGap) { // 不在缝隙中,在内容区 - this.$message.warning('请拖动到缝隙中') - return false + // this.$message.warning('请拖动到缝隙中') + // return false + paramObj.id = dragNodeData.id + paramObj.parentId = nodeData.id // 目标节点的id为parentId + if (nodeData.children && nodeData.children.length > 1) { + // 有子节点,排序为最后一个节点排序+0.0001 + paramObj.nodeOrder = nodeData.children[nodeData.children.length - 1].nodeOrder + 0.0001 + } else { + // 没有子节点,排序为0.0001 + paramObj.nodeOrder = 0.0001 + } } else if ( (info.node.children || []).length > 0 && // Has children info.node.expanded && // Is expanded diff --git a/src/views/standardRegulationLibrary/domesticStandard/DomesticStandardList.vue b/src/views/standardRegulationLibrary/domesticStandard/DomesticStandardList.vue index be00f743..6feb8a31 100644 --- a/src/views/standardRegulationLibrary/domesticStandard/DomesticStandardList.vue +++ b/src/views/standardRegulationLibrary/domesticStandard/DomesticStandardList.vue @@ -421,8 +421,17 @@ export default { // 判断只能在同级排序 if (!info.dropToGap) { // 不在缝隙中,在内容区 - this.$message.warning('请拖动到缝隙中') - return false + // this.$message.warning('请拖动到缝隙中') + // return false + paramObj.id = dragNodeData.id + paramObj.parentId = nodeData.id // 目标节点的id为parentId + if (nodeData.children && nodeData.children.length > 1) { + // 有子节点,排序为最后一个节点排序+0.0001 + paramObj.nodeOrder = nodeData.children[nodeData.children.length - 1].nodeOrder + 0.0001 + } else { + // 没有子节点,排序为0.0001 + paramObj.nodeOrder = 0.0001 + } } else if ( (info.node.children || []).length > 0 && // Has children info.node.expanded && // Is expanded diff --git a/src/views/standardRegulationLibrary/overseasStandard/OverseasStandardList.vue b/src/views/standardRegulationLibrary/overseasStandard/OverseasStandardList.vue index 6dbec3f0..b9caef01 100644 --- a/src/views/standardRegulationLibrary/overseasStandard/OverseasStandardList.vue +++ b/src/views/standardRegulationLibrary/overseasStandard/OverseasStandardList.vue @@ -422,8 +422,17 @@ export default { // 判断只能在同级排序 if (!info.dropToGap) { // 不在缝隙中,在内容区 - this.$message.warning('请拖动到缝隙中') - return false + // this.$message.warning('请拖动到缝隙中') + // return false + paramObj.id = dragNodeData.id + paramObj.parentId = nodeData.id // 目标节点的id为parentId + if (nodeData.children && nodeData.children.length > 1) { + // 有子节点,排序为最后一个节点排序+0.0001 + paramObj.nodeOrder = nodeData.children[nodeData.children.length - 1].nodeOrder + 0.0001 + } else { + // 没有子节点,排序为0.0001 + paramObj.nodeOrder = 0.0001 + } } else if ( (info.node.children || []).length > 0 && // Has children info.node.expanded && // Is expanded diff --git a/src/views/standardRegulationLibrary/profileCenter/ProfileCenterList.vue b/src/views/standardRegulationLibrary/profileCenter/ProfileCenterList.vue index 3834cc20..1e68dbc5 100644 --- a/src/views/standardRegulationLibrary/profileCenter/ProfileCenterList.vue +++ b/src/views/standardRegulationLibrary/profileCenter/ProfileCenterList.vue @@ -262,8 +262,17 @@ export default { // 判断只能在同级排序 if (!info.dropToGap) { // 不在缝隙中,在内容区 - this.$message.warning('请拖动到缝隙中') - return false + // this.$message.warning('请拖动到缝隙中') + // return false + paramObj.id = dragNodeData.id + paramObj.parentId = nodeData.id // 目标节点的id为parentId + if (nodeData.children && nodeData.children.length > 1) { + // 有子节点,排序为最后一个节点排序+0.01 + paramObj.sort = nodeData.children[nodeData.children.length - 1].sort + 0.01 + } else { + // 没有子节点,排序为0.01 + paramObj.sort = 0.01 + } } else if ( (info.node.children || []).length > 0 && // Has children info.node.expanded && // Is expanded