Merge branch 'v2.0' into debug

src/views/customer/user/Index.vue

@@ -234,7 +234,7 @@ async function handleImportUser(e){
           <span>{{row.CountryCode}}-{{row.Mobile}}</span>
         </template>
         <template #DepartmentName="{ row }">
-          <span>{{row.Position}}-{{row.DepartmentName}}</span>
+          <span>{{row.Position}}{{row.Position&&row.DepartmentName?' - ':''}}{{row.DepartmentName}}</span>
         </template>
         <template #PositionStatus="{ row }">
           <t-tag 

src/views/system/helpCenter/AddDocment.vue

@@ -262,6 +262,7 @@ onMounted(() => {
               value: 'ClassifyId',
               label: 'ClassifyName',
               children: 'Children',
+              disabled:'Disabled'
             }"
             clearable
             placeholder="所属分类"

src/views/system/helpCenter/classify/Index.vue

@@ -1,6 +1,6 @@
 
-<script setup>
-import { SearchIcon } from 'tdesign-icons-vue-next';
+<script setup lang="jsx">
+import { SearchIcon,CaretRightSmallIcon,CaretDownSmallIcon } from 'tdesign-icons-vue-next';
 import {apiSystemHelpCenter} from '@/api/system'
 import { useTemplateRef } from 'vue';
 import EditClassify from './components/EditClassify.vue'
@@ -37,8 +37,10 @@ async function getClassifyData(){
 }
 getClassifyData()
 
+let canDrag=true
 async function handleSort({newData,current,target,targetIndex}){
   console.log(newData,current,target,targetIndex);
+  if(!canDrag) return
   const params={
     ClassifyId:current.ClassifyId,
     ParentClassifyId:target.ParentId,
@@ -80,6 +82,10 @@ async function handleSort({newData,current,target,targetIndex}){
   }
 }
 function handleAbnormalDragSort(e){
+  canDrag=false
+  setTimeout(() => {
+    canDrag=true
+  }, 500);
   if (e.code === 1001) {
     MessagePlugin.warning('不同层级的元素，不允许调整顺序');
   }
@@ -110,6 +116,10 @@ function handleShowAuthSetClassify(item){
   showAuthSetClassify.value=true
 }
 
+function treeExpandAndFoldIconRender (h, { type, row }) {
+  return type === 'expand' ? <CaretDownSmallIcon /> : <CaretRightSmallIcon />;
+}
+
 </script>
 
 <template>
@@ -134,6 +144,7 @@ function handleShowAuthSetClassify(item){
       drag-sort="row"
       :data="classifyData"
       :columns="tableCol"
+      :tree-expand-and-fold-icon="treeExpandAndFoldIconRender"
       :tree="{
         childrenKey:'Children',
         treeNodeColumnIndex: 0,

src/views/system/helpCenter/classify/components/EditClassify.vue

@@ -37,7 +37,7 @@ async function handleSave(){
   const params={
     ParentId:formData.parent||0,
     HelpDocClassifyName:formData.name,
-    Level:parentLevel-1,
+    Level:parentLevel,
   }
   const res=props.data?await apiSystemHelpCenter.classifyEdit({
     HelpDocClassifyId:props.data.ClassifyId,
@@ -92,7 +92,8 @@ watch(
           :keys="{
             value:'ClassifyId',
             label:'ClassifyName',
-            children:'Children'
+            children:'Children',
+            disabled:'Disabled'
           }"
           :disabled="props.data?true:false"
           placeholder="请选择上级目录（不选默认添加的是一级分类）"