From bc06b70ee7666a0cd865c1fc639fb92eebe03ebc Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Thu, 15 Aug 2024 10:50:20 +0800
Subject: [PATCH 1/6] =?UTF-8?q?[update]=20=E6=A0=87=E7=AD=BE=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9=E5=AD=97=E5=85=B8=E9=85=8D=E7=BD=AE=E7=88=B6=E7=BA=A7?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E7=BC=96=E8=BE=91=E7=9A=84=E6=97=B6=E5=80=99?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 8af05ad5dd9e486ddf4213f77e5e45373f105b43)
---
 src/views/system/tags/modules/TagContentDictItemModal.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/views/system/tags/modules/TagContentDictItemModal.vue b/src/views/system/tags/modules/TagContentDictItemModal.vue
index bb0ddde..fe4c7e1 100644
--- a/src/views/system/tags/modules/TagContentDictItemModal.vue
+++ b/src/views/system/tags/modules/TagContentDictItemModal.vue
@@ -42,7 +42,6 @@
             allowClear
             showSearch
             tree-node-filter-prop="title"
-            :disabled="model.id"
           >
           </a-tree-select>
         </a-form-model-item>

From fdb300568cf8890670c5ec98c7d0c4ab35180c0b Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Thu, 15 Aug 2024 11:31:01 +0800
Subject: [PATCH 2/6] =?UTF-8?q?[update]=20=E6=A0=87=E7=AD=BE=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9=E5=AD=97=E5=85=B8=E9=85=8D=E7=BD=AE=E7=88=B6=E7=BA=A7?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E7=BC=96=E8=BE=91=E7=9A=84=E6=97=B6=E5=80=99?=
 =?UTF-8?q?=E4=B8=8D=E8=83=BD=E9=80=89=E4=B8=AD=E8=87=AA=E5=B7=B1=E6=9C=AC?=
 =?UTF-8?q?=E8=BA=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit cf96b686195e8fc3074481bd167a4e579bb2382b)
---
 .../tags/modules/TagContentDictItemModal.vue      | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/views/system/tags/modules/TagContentDictItemModal.vue b/src/views/system/tags/modules/TagContentDictItemModal.vue
index fe4c7e1..18a4784 100644
--- a/src/views/system/tags/modules/TagContentDictItemModal.vue
+++ b/src/views/system/tags/modules/TagContentDictItemModal.vue
@@ -238,8 +238,23 @@ export default {
         if (res.success) {
           // todo 不知道为啥发生了改变
           this.parentDataPid = res.result.records || []
+          if (this.model.id) {
+            this.disabledSelf(this.parentDataPid, this.model.id)
+          }
         }
       })
+    },
+    // 设置父级名称不能选中自己本身
+    disabledSelf (treeData, value) {
+      for (const item of treeData) {
+        if (item.id === value) {
+          item.disabled = true
+          break
+        }
+        if (item.children) {
+          this.disabledSelf(item.children, value)
+        }
+      }
     }
   }
 }

From 98da0e2709f1fd087af560affa7f2fb43158e0fd Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Thu, 15 Aug 2024 14:24:41 +0800
Subject: [PATCH 3/6] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9=E9=A9=BE?=
 =?UTF-8?q?=E9=A9=B6=E4=BD=8D=E7=BD=AE=E5=AD=97=E5=85=B8code?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit cf2dd8b0829cadfb4799a0a855cc9f4d2cb65f04)
---
 .../selection/MarketRegulationsListSelectionModal.vue         | 2 +-
 .../marketRegulationsList/MarketRegulationsFormPage.vue       | 4 ++--
 .../marketRegulationsList/MarketRegulationsList.vue           | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/selection/MarketRegulationsListSelectionModal.vue b/src/components/selection/MarketRegulationsListSelectionModal.vue
index 91306e2..d7d1de1 100644
--- a/src/components/selection/MarketRegulationsListSelectionModal.vue
+++ b/src/components/selection/MarketRegulationsListSelectionModal.vue
@@ -53,7 +53,7 @@
                 <j-dict-select-tag
                   :placeholder="$t('pleaseSelect') + $t('standardRegulationLibrary.marketRegulationsList.drivingPosition')"
                   v-model="queryParam.drivePosition"
-                  dict-code="driving_position"></j-dict-select-tag>
+                  dict-code="drive_position"></j-dict-select-tag>
               </a-form-item>
             </a-col>
 
diff --git a/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsFormPage.vue b/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsFormPage.vue
index 7c84805..3f1f64c 100644
--- a/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsFormPage.vue
+++ b/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsFormPage.vue
@@ -50,10 +50,10 @@
                          :wrapperCol="wrapperCol"
                          :label="$t('standardRegulationLibrary.marketRegulationsList.drivingPosition')">
 <!--              <j-dict-select-tag v-decorator="['drivePosition', validatorRules.drivePosition]"-->
-<!--                                 dict-code="driving_position"-->
+<!--                                 dict-code="drive_position"-->
 <!--                                 :placeholder="$t('pleaseSelect') + $t('standardRegulationLibrary.marketRegulationsList.drivingPosition')" />-->
               <j-multi-select-tag v-decorator="['drivePosition', validatorRules.drivePosition]"
-                                  dict-code="driving_position"
+                                  dict-code="drive_position"
                                   :placeholder="$t('pleaseSelect') + $t('standardRegulationLibrary.marketRegulationsList.drivingPosition')" />
             </a-form-item>
           </a-col>
diff --git a/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsList.vue b/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsList.vue
index fee0493..db0ddcb 100644
--- a/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsList.vue
+++ b/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsList.vue
@@ -48,7 +48,7 @@
                 <j-dict-select-tag
                   :placeholder="$t('pleaseSelect') + $t('standardRegulationLibrary.marketRegulationsList.drivingPosition')"
                   v-model="queryParam.drivePosition"
-                  dict-code="driving_position"></j-dict-select-tag>
+                  dict-code="drive_position"></j-dict-select-tag>
               </a-form-item>
             </a-col>
 

From c4e92992f50123ce771262d657c89c42ba620732 Mon Sep 17 00:00:00 2001
From: danshihao <danshihao@syxysoft.com>
Date: Fri, 16 Aug 2024 10:50:34 +0800
Subject: [PATCH 4/6] =?UTF-8?q?[update=20=E6=8B=86=E5=88=86=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91]=20=E5=B7=A6=E4=BE=A7=E6=A0=91=E8=8A=82=E7=82=B9?=
 =?UTF-8?q?=E5=8F=AF=E6=8B=96=E6=8B=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 077babed847aeb6897b9895f76e6fe1edab78c6b)
---
 src/api/documentToolApi.js                    |  3 ++
 .../documentSplit/DocumentSplitDetail.vue     | 44 ++++++++++++++++++-
 2 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/src/api/documentToolApi.js b/src/api/documentToolApi.js
index 0fc8448..53eddaf 100644
--- a/src/api/documentToolApi.js
+++ b/src/api/documentToolApi.js
@@ -52,6 +52,8 @@ const copyClause = (params) => getAction('/laws/DocumentTool/documentSplit/copyD
 const getInterpretationArticlesList = (params) => getAction('/laws/DocumentTool/documentSplit/queryInterpretationArticlesList', params)
 // 标准对应的解读信息
 const getStandardInterpretation = (params) => postAction('/laws/DocumentTool/documentSplit/queryDocumentSplitDetailList', params)
+// 文档拆分-编辑-拖拽节点
+const dragClauseTreeNode = (params) => getAction('/split/sarFileSplitMenu/updateMenuLevel', params)
 
 // 文档对比-发布/撤回
 const withdrawPublication = (params) => postAction('/compare/sarFileCompareInfo/changeState', params)
@@ -135,6 +137,7 @@ export {
   copyClause,
   getInterpretationArticlesList,
   getStandardInterpretation,
+  dragClauseTreeNode,
 
   // 文档比对
   withdrawPublication,
diff --git a/src/views/documentTool/documentSplit/DocumentSplitDetail.vue b/src/views/documentTool/documentSplit/DocumentSplitDetail.vue
index 9d3913b..905b0a1 100644
--- a/src/views/documentTool/documentSplit/DocumentSplitDetail.vue
+++ b/src/views/documentTool/documentSplit/DocumentSplitDetail.vue
@@ -11,7 +11,10 @@
                     :tree-data="treeData"
                     :selected-keys="selectedKeys"
                     :expanded-keys.sync="expandedKeys"
-                    :replaceFields="{key: 'id'}">
+                    :replaceFields="{key: 'id'}"
+                    class="draggable-tree"
+                    draggable
+                    @drop="onDrop">
               <template #title="record">
                 <div class="tree-operate-node"
                      @mouseenter="handleTreeMouseover(record.id)"
@@ -211,7 +214,7 @@ import {
   batchCopyClause,
   merageClause,
   getClauseTreeData,
-  copyClause
+  copyClause, dragClauseTreeNode
 } from '../../../api/documentToolApi.js'
 import Search from '../../../components/customField/Search.vue'
 import { isHasPermission } from '../../../utils/hasPermission.js'
@@ -338,6 +341,31 @@ export default {
     this.loadMenuData()
   },
   methods: {
+    // 拖拽事件
+    onDrop (info) {
+      // 拖到节点间隙就不做处理，只能拖到节点上
+      if (info.dropToGap) {
+        return
+      }
+      // console.log('拖拽全部参数', info)
+      console.log('拖拽的节点', info.node.eventKey, info.node.dataRef.name, info.node.dataRef.itemName)
+      console.log('拖拽到节点', info.dragNode.eventKey, info.dragNode.dataRef.name, info.dragNode.dataRef.itemName)
+      const sourceId = info.node.eventKey
+      const targetId = info.dragNode.eventKey
+      this.loading = true
+      dragClauseTreeNode({ targetId, sourceId }).then(res => {
+        if (res.success) {
+          this.$message.success(res.message)
+          this.onClearSelected()
+          this.loadMenuData()
+          this.loadData()
+        } else {
+          this.$message.warn(res.message)
+        }
+      }).finally(() => {
+        this.loading = false
+      })
+    },
     // 查看文件
     handleViewFile (_, record) {
       this.$refs.uploadFile.open(record.technical_specification_design_guide)
@@ -691,4 +719,16 @@ export default {
   font-size: 16px;
   margin-right: 10px;
 }
+
+// 不显示拖拽到节点间隙的样式，只能拖拽到节点上
+.draggable-tree {
+  /deep/ li {
+    &.drag-over-gap-top,
+    &.drag-over-gap-bottom {
+      & > span[draggable] {
+        border-color: transparent !important;
+      }
+    }
+  }
+}
 </style>

From 40a270d0a680656f44493846e5a104a7dc5b68eb Mon Sep 17 00:00:00 2001
From: danshihao <danshihao@syxysoft.com>
Date: Fri, 16 Aug 2024 10:59:13 +0800
Subject: [PATCH 5/6] =?UTF-8?q?[update=20=E6=8B=86=E5=88=86=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91]=20=E5=B7=A6=E4=BE=A7=E6=A0=91=E8=8A=82=E7=82=B9?=
 =?UTF-8?q?=E5=8F=AF=E6=8B=96=E6=8B=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 9d81d963fad52898c7cc42627ebd4c9c8c678ee8)
---
 .../documentTool/documentSplit/DocumentSplitDetail.vue    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/documentTool/documentSplit/DocumentSplitDetail.vue b/src/views/documentTool/documentSplit/DocumentSplitDetail.vue
index 905b0a1..c405949 100644
--- a/src/views/documentTool/documentSplit/DocumentSplitDetail.vue
+++ b/src/views/documentTool/documentSplit/DocumentSplitDetail.vue
@@ -348,10 +348,10 @@ export default {
         return
       }
       // console.log('拖拽全部参数', info)
-      console.log('拖拽的节点', info.node.eventKey, info.node.dataRef.name, info.node.dataRef.itemName)
-      console.log('拖拽到节点', info.dragNode.eventKey, info.dragNode.dataRef.name, info.dragNode.dataRef.itemName)
-      const sourceId = info.node.eventKey
-      const targetId = info.dragNode.eventKey
+      console.log('拖拽的节点', info.dragNode.eventKey, info.dragNode.dataRef.name, info.dragNode.dataRef.itemName)
+      console.log('拖拽到节点', info.node.eventKey, info.node.dataRef.name, info.node.dataRef.itemName)
+      const sourceId = info.dragNode.eventKey
+      const targetId = info.node.eventKey
       this.loading = true
       dragClauseTreeNode({ targetId, sourceId }).then(res => {
         if (res.success) {

From e3380914f259fe60bb395237c1bd188c1980aa73 Mon Sep 17 00:00:00 2001
From: danshihao <danshihao@syxysoft.com>
Date: Fri, 16 Aug 2024 14:26:51 +0800
Subject: [PATCH 6/6] =?UTF-8?q?[update=20=E6=8B=86=E5=88=86=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91]=20=E5=B7=A6=E4=BE=A7=E6=A0=91=E8=8A=82=E7=82=B9?=
 =?UTF-8?q?=E6=8B=96=E6=8B=BD=E6=97=B6=E4=B8=8D=E6=82=AC=E6=B5=AE=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 3c2d00087beb214b798ddf730b9a20db4df4999c)
---
 .../documentSplit/DocumentSplitDetail.vue        | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/views/documentTool/documentSplit/DocumentSplitDetail.vue b/src/views/documentTool/documentSplit/DocumentSplitDetail.vue
index c405949..ce4b197 100644
--- a/src/views/documentTool/documentSplit/DocumentSplitDetail.vue
+++ b/src/views/documentTool/documentSplit/DocumentSplitDetail.vue
@@ -14,6 +14,8 @@
                     :replaceFields="{key: 'id'}"
                     class="draggable-tree"
                     draggable
+                    @dragstart="changeDraggingStatus(true)"
+                    @dragend="changeDraggingStatus(false)"
                     @drop="onDrop">
               <template #title="record">
                 <div class="tree-operate-node"
@@ -23,12 +25,14 @@
                   <a-icon class="parent-node-icon"
                           type="folder"
                           v-if="record.dataRef.children && record.dataRef.children.length > 0" />
-                  <a-tooltip placement="topLeft">
+                  <!-- 拖拽中不显示 -->
+                  <a-tooltip placement="topLeft" v-if="!dragging">
                     <template #title>
                       {{ record.name }}{{ record.itemName }}
                     </template>
                     <span class="tree-node-custom-title">{{ record.name }} {{ record.itemName }}</span>
                   </a-tooltip>
+                  <span class="tree-node-custom-title" v-else>{{ record.name }} {{ record.itemName }}</span>
                   <div class="tree-operate-node-btn-box"
                        :class="{'tree-operate-node-btn-box-hide': record.id !== mouseInNodeKey}">
                     <!--新增-->
@@ -263,6 +267,7 @@ export default {
       getQueryConditionFunc: getDocSplitSearch,
       getTableHeaderFunc: getDocSplitTableHeader,
       treeData: [],
+      dragging: false, // 是否拖拽中
       searchValue: '',
       selectedKeys: [],
       mouseInNodeKey: null, // 鼠标悬浮的节点key值
@@ -341,7 +346,14 @@ export default {
     this.loadMenuData()
   },
   methods: {
-    // 拖拽事件
+    // 修改拖拽状态
+    changeDraggingStatus (status) {
+      this.dragging = status
+    },
+    /**
+     * 拖拽到某个节点触发
+     * @param info
+     */
     onDrop (info) {
       // 拖到节点间隙就不做处理，只能拖到节点上
       if (info.dropToGap) {