vxe-pc-ui 3.14.19 → 3.14.21

package/packages/language/ar-EG.ts

@@ -166,7 +166,7 @@ export default {
       cstmDragTarget: 'نقل: {0}',
       setting: {
         colSort: 'نوع',
-        sortHelpTip: '点击并拖动图标可以调整顺序',
+        sortHelpTip: '点击图标开始拖动',
         colTitle: 'عنوان العمود',
         colResizable: 'عرض العمود (بكسل)',
         colVisible: 'ما إذا كان لعرض',
@@ -652,7 +652,7 @@ export default {
           groupPlaceholder: '拖至此处进行分组',
           valuesPlaceholder: '拖至此处进行聚合',
           dragExistCol: '该列已存在',
-          sortHelpTip: '点击并拖动图标可以调整顺序'
+          sortHelpTip: '点击图标开始拖动'
         },
         aggFuncs: {
           sum: '求和',

package/packages/language/de-DE.ts

@@ -166,7 +166,7 @@ export default {
       cstmDragTarget: 'Bewegung: {0}',
       setting: {
         colSort: 'Sortieren',
-        sortHelpTip: 'Klicken Sie auf das Symbol und ziehen Sie das Symbol, um die Bestellung anzupassen',
+        sortHelpTip: '点击图标开始拖动',
         colTitle: 'Spaltenentitel',
         colResizable: 'Säulenbreite (Pixel)',
         colVisible: 'Ob angezeigt',
@@ -652,7 +652,7 @@ export default {
           groupPlaceholder: 'Ziehen Sie hier zur Gruppe',
           valuesPlaceholder: 'Ziehen Sie hierher, um zu aggregieren',
           dragExistCol: 'Diese Spalte existiert bereits',
-          sortHelpTip: 'Klicken Sie auf das Symbol und ziehen Sie das Symbol, um die Bestellung anzupassen'
+          sortHelpTip: '点击图标开始拖动'
         },
         aggFuncs: {
           sum: 'Bitten Sie nach Summe',

package/packages/language/en-US.ts

@@ -166,7 +166,7 @@ export default {
       cstmDragTarget: 'Move: {0}',
       setting: {
         colSort: 'Sort',
-        sortHelpTip: 'Click and drag the icons to adjust the order.',
+        sortHelpTip: '点击图标开始拖动',
         colTitle: 'Column title',
         colResizable: 'Column width (pixels)',
         colVisible: 'Whether to display',
@@ -652,7 +652,7 @@ export default {
           groupPlaceholder: 'Drag here to set row groups',
           valuesPlaceholder: 'Drag here to aggregate',
           dragExistCol: 'The column already exists',
-          sortHelpTip: 'Click and drag the icons to adjust the order.'
+          sortHelpTip: '点击图标开始拖动'
         },
         aggFuncs: {
           sum: 'Sum',

package/packages/language/es-ES.ts

@@ -166,7 +166,7 @@ export default {
       cstmDragTarget: 'Mover: {0}',
       setting: {
         colSort: 'Clasificar',
-        sortHelpTip: 'Haga clic y arrastre el icono para ajustar el pedido',
+        sortHelpTip: '点击图标开始拖动',
         colTitle: 'Título de columna',
         colResizable: 'Ancho de columna (píxeles)',
         colVisible: 'Si mostrar',
@@ -652,7 +652,7 @@ export default {
           groupPlaceholder: 'Arrastre aquí al grupo',
           valuesPlaceholder: 'Arrastre aquí para agregar',
           dragExistCol: 'Esta columna ya existe',
-          sortHelpTip: 'Haga clic y arrastre el icono para ajustar el pedido'
+          sortHelpTip: '点击图标开始拖动'
         },
         aggFuncs: {
           sum: 'Pedir suma',

package/packages/language/fr-FR.ts

@@ -166,7 +166,7 @@ export default {
       cstmDragTarget: 'Déplacer: {0}',
       setting: {
         colSort: 'Trier',
-        sortHelpTip: '点击并拖动图标可以调整顺序',
+        sortHelpTip: '点击图标开始拖动',
         colTitle: 'Titre de la colonne',
         colResizable: 'Largeur de colonne (pixels)',
         colVisible: "S'il faut afficher",
@@ -652,7 +652,7 @@ export default {
           groupPlaceholder: '拖至此处进行分组',
           valuesPlaceholder: '拖至此处进行聚合',
           dragExistCol: '该列已存在',
-          sortHelpTip: '点击并拖动图标可以调整顺序'
+          sortHelpTip: '点击图标开始拖动'
         },
         aggFuncs: {
           sum: '求和',

package/packages/language/hu-HU.ts

@@ -166,7 +166,7 @@ export default {
       cstmDragTarget: 'Mozgás: {0}',
       setting: {
         colSort: 'Fajta',
-        sortHelpTip: '点击并拖动图标可以调整顺序',
+        sortHelpTip: '点击图标开始拖动',
         colTitle: 'Oszlopcím',
         colResizable: 'Oszlop szélessége (pixelek)',
         colVisible: 'Függetlenül attól, hogy megjelenjen',
@@ -652,7 +652,7 @@ export default {
           groupPlaceholder: '拖至此处进行分组',
           valuesPlaceholder: '拖至此处进行聚合',
           dragExistCol: '该列已存在',
-          sortHelpTip: '点击并拖动图标可以调整顺序'
+          sortHelpTip: '点击图标开始拖动'
         },
         aggFuncs: {
           sum: '求和',

package/packages/language/hy-AM.ts

@@ -166,7 +166,7 @@ export default {
       cstmDragTarget: '移动：{0}',
       setting: {
         colSort: '排序',
-        sortHelpTip: '点击并拖动图标可以调整顺序',
+        sortHelpTip: '点击图标开始拖动',
         colTitle: '列标题',
         colResizable: '列宽（像素）',
         colVisible: '是否显示',
@@ -652,7 +652,7 @@ export default {
           groupPlaceholder: '拖至此处进行分组',
           valuesPlaceholder: '拖至此处进行聚合',
           dragExistCol: '该列已存在',
-          sortHelpTip: '点击并拖动图标可以调整顺序'
+          sortHelpTip: '点击图标开始拖动'
         },
         aggFuncs: {
           sum: '求和',

package/packages/language/id-ID.ts

@@ -166,7 +166,7 @@ export default {
       cstmDragTarget: 'Pindahkan: {0}',
       setting: {
         colSort: 'Menyortir',
-        sortHelpTip: '点击并拖动图标可以调整顺序',
+        sortHelpTip: '点击图标开始拖动',
         colTitle: 'Judul kolom',
         colResizable: 'Lebar kolom (piksel)',
         colVisible: 'Apakah akan menampilkan',
@@ -652,7 +652,7 @@ export default {
           groupPlaceholder: '拖至此处进行分组',
           valuesPlaceholder: '拖至此处进行聚合',
           dragExistCol: '该列已存在',
-          sortHelpTip: '点击并拖动图标可以调整顺序'
+          sortHelpTip: '点击图标开始拖动'
         },
         aggFuncs: {
           sum: '求和',

package/packages/language/it-IT.ts

@@ -166,7 +166,7 @@ export default {
       cstmDragTarget: 'Muovi: {0}',
       setting: {
         colSort: 'Ordinare',
-        sortHelpTip: '点击并拖动图标可以调整顺序',
+        sortHelpTip: '点击图标开始拖动',
         colTitle: 'Titolo della colonna',
         colResizable: 'Larghezza della colonna (pixel)',
         colVisible: 'Se visualizzare',
@@ -652,7 +652,7 @@ export default {
           groupPlaceholder: '拖至此处进行分组',
           valuesPlaceholder: '拖至此处进行聚合',
           dragExistCol: '该列已存在',
-          sortHelpTip: '点击并拖动图标可以调整顺序'
+          sortHelpTip: '点击图标开始拖动'
         },
         aggFuncs: {
           sum: '求和',

package/packages/language/ja-JP.ts

@@ -166,7 +166,7 @@ export default {
       cstmDragTarget: '移動：{0}',
       setting: {
         colSort: '選別',
-        sortHelpTip: 'アイコンをクリックしてドラッグして、注文を調整します',
+        sortHelpTip: '点击图标开始拖动',
         colTitle: '列のタイトル',
         colResizable: '列幅（ピクセル）',
         colVisible: '表示するかどうか',
@@ -652,7 +652,7 @@ export default {
           groupPlaceholder: 'ここでグループにドラッグします',
           valuesPlaceholder: 'ここにドラッグして集約します',
           dragExistCol: 'このコラムはすでに存在しています',
-          sortHelpTip: 'アイコンをクリックしてドラッグして、注文を調整します'
+          sortHelpTip: '点击图标开始拖动'
         },
         aggFuncs: {
           sum: '合計を尋ねます',

package/packages/language/ko-KR.ts

@@ -166,7 +166,7 @@ export default {
       cstmDragTarget: '움직임 : {0}',
       setting: {
         colSort: '종류',
-        sortHelpTip: '아이콘을 클릭하고 드래그하여 순서를 조정하십시오',
+        sortHelpTip: '点击图标开始拖动',
         colTitle: '열 제목',
         colResizable: '열 폭 (픽셀)',
         colVisible: '표시 여부',
@@ -652,7 +652,7 @@ export default {
           groupPlaceholder: '여기로 끌어 그룹화하십시오',
           valuesPlaceholder: '집계를 위해 여기를 끌어냅니다',
           dragExistCol: '이 열은 이미 존재합니다',
-          sortHelpTip: '아이콘을 클릭하고 드래그하여 순서를 조정하십시오'
+          sortHelpTip: '点击图标开始拖动'
         },
         aggFuncs: {
           sum: '합계를 요청하십시오',

package/packages/language/ms-MY.ts

@@ -166,7 +166,7 @@ export default {
       cstmDragTarget: 'Bergerak: {0}',
       setting: {
         colSort: 'Menyusun',
-        sortHelpTip: '点击并拖动图标可以调整顺序',
+        sortHelpTip: '点击图标开始拖动',
         colTitle: 'Tajuk lajur',
         colResizable: 'Lebar lajur (piksel)',
         colVisible: 'Sama ada untuk memaparkan',
@@ -652,7 +652,7 @@ export default {
           groupPlaceholder: '拖至此处进行分组',
           valuesPlaceholder: '拖至此处进行聚合',
           dragExistCol: '该列已存在',
-          sortHelpTip: '点击并拖动图标可以调整顺序'
+          sortHelpTip: '点击图标开始拖动'
         },
         aggFuncs: {
           sum: '求和',

package/packages/language/nb-NO.ts

@@ -166,7 +166,7 @@ export default {
       cstmDragTarget: 'Flytt: {0}',
       setting: {
         colSort: 'Sortere',
-        sortHelpTip: '点击并拖动图标可以调整顺序',
+        sortHelpTip: '点击图标开始拖动',
         colTitle: 'Kolonnetittel',
         colResizable: 'Kolonnebredde (piksler)',
         colVisible: 'Om du skal vise',
@@ -652,7 +652,7 @@ export default {
           groupPlaceholder: '拖至此处进行分组',
           valuesPlaceholder: '拖至此处进行聚合',
           dragExistCol: '该列已存在',
-          sortHelpTip: '点击并拖动图标可以调整顺序'
+          sortHelpTip: '点击图标开始拖动'
         },
         aggFuncs: {
           sum: '求和',

package/packages/language/pt-BR.ts

@@ -166,7 +166,7 @@ export default {
       cstmDragTarget: 'Move: {0}',
       setting: {
         colSort: 'Organizar',
-        sortHelpTip: '点击并拖动图标可以调整顺序',
+        sortHelpTip: '点击图标开始拖动',
         colTitle: 'Título da coluna',
         colResizable: 'Largura da coluna (pixels)',
         colVisible: 'Se deve exibir',
@@ -652,7 +652,7 @@ export default {
           groupPlaceholder: '拖至此处进行分组',
           valuesPlaceholder: '拖至此处进行聚合',
           dragExistCol: '该列已存在',
-          sortHelpTip: '点击并拖动图标可以调整顺序'
+          sortHelpTip: '点击图标开始拖动'
         },
         aggFuncs: {
           sum: '求和',

package/packages/language/ru-RU.ts

@@ -166,7 +166,7 @@ export default {
       cstmDragTarget: 'MOVE: {0}',
       setting: {
         colSort: 'Сортировка',
-        sortHelpTip: 'Нажмите и перетащите значок, чтобы настроить заказ',
+        sortHelpTip: '点击图标开始拖动',
         colTitle: 'Заголовок столбца',
         colResizable: 'Ширина столбца (пиксели)',
         colVisible: 'Отображать ли',
@@ -652,7 +652,7 @@ export default {
           groupPlaceholder: 'Перетащите сюда, чтобы группировать',
           valuesPlaceholder: 'Перетащите сюда, чтобы агрегировать',
           dragExistCol: 'Эта колонка уже существует',
-          sortHelpTip: 'Нажмите и перетащите значок, чтобы настроить заказ'
+          sortHelpTip: '点击图标开始拖动'
         },
         aggFuncs: {
           sum: 'Попросить сумму',

package/packages/language/th-TH.ts

@@ -166,7 +166,7 @@ export default {
       cstmDragTarget: 'ย้าย: {0}',
       setting: {
         colSort: 'เรียงลำดับ',
-        sortHelpTip: '点击并拖动图标可以调整顺序',
+        sortHelpTip: '点击图标开始拖动',
         colTitle: 'ชื่อคอลัมน์',
         colResizable: 'ความกว้างของคอลัมน์ (พิกเซล)',
         colVisible: 'ไม่ว่าจะแสดง',
@@ -652,7 +652,7 @@ export default {
           groupPlaceholder: '拖至此处进行分组',
           valuesPlaceholder: '拖至此处进行聚合',
           dragExistCol: '该列已存在',
-          sortHelpTip: '点击并拖动图标可以调整顺序'
+          sortHelpTip: '点击图标开始拖动'
         },
         aggFuncs: {
           sum: '求和',

package/packages/language/ug-CN.ts

@@ -166,7 +166,7 @@ export default {
       cstmDragTarget: 'يۆتكەش：{0}',
       setting: {
         colSort: 'تەرتىپلەش',
-        sortHelpTip: '点击并拖动图标可以调整顺序',
+        sortHelpTip: '点击图标开始拖动',
         colTitle: '列标题',
         colResizable: 'قۇر كەڭلىڭى(پېكسىل)',
         colVisible: 'كۆرۈنەمدۇ-كۆرۈنمەمدۇ',
@@ -652,7 +652,7 @@ export default {
           groupPlaceholder: '拖至此处进行分组',
           valuesPlaceholder: '拖至此处进行聚合',
           dragExistCol: '该列已存在',
-          sortHelpTip: '点击并拖动图标可以调整顺序'
+          sortHelpTip: '点击图标开始拖动'
         },
         aggFuncs: {
           sum: '求和',

package/packages/language/uk-UA.ts

@@ -166,7 +166,7 @@ export default {
       cstmDragTarget: 'Перемістити: {0}',
       setting: {
         colSort: 'Сортувати',
-        sortHelpTip: '点击并拖动图标可以调整顺序',
+        sortHelpTip: '点击图标开始拖动',
         colTitle: 'Заголовок стовпців',
         colResizable: 'Ширина стовпця (пікселі)',
         colVisible: 'Чи відображати',
@@ -652,7 +652,7 @@ export default {
           groupPlaceholder: '拖至此处进行分组',
           valuesPlaceholder: '拖至此处进行聚合',
           dragExistCol: '该列已存在',
-          sortHelpTip: '点击并拖动图标可以调整顺序'
+          sortHelpTip: '点击图标开始拖动'
         },
         aggFuncs: {
           sum: '求和',

package/packages/language/uz-UZ.ts

@@ -166,7 +166,7 @@ export default {
       cstmDragTarget: "Ko'chiring: {0}",
       setting: {
         colSort: 'Tartib',
-        sortHelpTip: '点击并拖动图标可以调整顺序',
+        sortHelpTip: '点击图标开始拖动',
         colTitle: 'Ustun unvon',
         colResizable: 'Ustun kengligi (piksellar)',
         colVisible: "Ko'rsatish kerakmi",
@@ -652,7 +652,7 @@ export default {
           groupPlaceholder: '拖至此处进行分组',
           valuesPlaceholder: '拖至此处进行聚合',
           dragExistCol: '该列已存在',
-          sortHelpTip: '点击并拖动图标可以调整顺序'
+          sortHelpTip: '点击图标开始拖动'
         },
         aggFuncs: {
           sum: '求和',

package/packages/language/vi-VN.ts

@@ -166,7 +166,7 @@ export default {
       cstmDragTarget: 'Di chuyển: {0}',
       setting: {
         colSort: 'Loại',
-        sortHelpTip: 'Nhấp và kéo biểu tượng để điều chỉnh thứ tự',
+        sortHelpTip: '点击图标开始拖动',
         colTitle: 'Tiêu đề cột',
         colResizable: 'Chiều rộng cột (pixel)',
         colVisible: 'Có hiển thị không',
@@ -652,7 +652,7 @@ export default {
           groupPlaceholder: 'Kéo ở đây để nhóm',
           valuesPlaceholder: 'Kéo ở đây để tổng hợp',
           dragExistCol: 'Cột này đã tồn tại',
-          sortHelpTip: 'Nhấp và kéo biểu tượng để điều chỉnh thứ tự'
+          sortHelpTip: '点击图标开始拖动'
         },
         aggFuncs: {
           sum: 'Yêu cầu tổng',

package/packages/language/zh-CHT.ts

@@ -166,7 +166,7 @@ export default {
       cstmDragTarget: '移動：{0}',
       setting: {
         colSort: '排序',
-        sortHelpTip: '點擊並拖動圖標可以調整順序',
+        sortHelpTip: '点击图标开始拖动',
         colTitle: '列標題',
         colResizable: '列寬（像素）',
         colVisible: '是否顯示',
@@ -652,7 +652,7 @@ export default {
           groupPlaceholder: '拖至此處進行分組',
           valuesPlaceholder: '拖至此處進行聚合',
           dragExistCol: '該列已存在',
-          sortHelpTip: '點擊並拖動圖標可以調整順序'
+          sortHelpTip: '点击图标开始拖动'
         },
         aggFuncs: {
           sum: '求和',

package/packages/language/zh-CN.ts

@@ -166,7 +166,7 @@ export default {
       cstmDragTarget: '移动：{0}',
       setting: {
         colSort: '排序',
-        sortHelpTip: '点击并拖动图标可以调整顺序',
+        sortHelpTip: '点击图标开始拖动',
         colTitle: '列标题',
         colResizable: '列宽（像素）',
         colVisible: '是否显示',
@@ -652,7 +652,7 @@ export default {
           groupPlaceholder: '拖至此处进行分组',
           valuesPlaceholder: '拖至此处进行聚合',
           dragExistCol: '该列已存在',
-          sortHelpTip: '点击并拖动图标可以调整顺序'
+          sortHelpTip: '点击图标开始拖动'
         },
         aggFuncs: {
           sum: '求和',

package/packages/tree/src/tree.ts

@@ -484,6 +484,18 @@ function handleNodeDragSwapEvent ($xeTree: VxeTreeConstructor & VxeTreePrivateMe
   return Promise.resolve(errRest)
 }
 
+function handleVisibleOrCheckMode (mode: '' | 'all' | 'first' | 'last' | null | undefined, isExistChild: boolean, nLevel: number) {
+  if (mode) {
+    if (mode === 'first') {
+      return !nLevel
+    }
+    if (mode === 'last') {
+      return !isExistChild
+    }
+  }
+  return true
+}
+
 function createInternalData (): TreeInternalData {
   return {
     // initialized: false,
@@ -2632,19 +2644,16 @@ export default /* define-vxe-component start */ defineVxeComponent({
       }
       return renderEmptyElement($xeTree)
     },
-    renderRadio (h: CreateElement, node: any, nodeid: string, isChecked: boolean) {
+    renderRadio (h: CreateElement, node: any, nodeid: string, isExistChild: boolean, nLevel: number, isChecked: boolean) {
       const $xeTree = this
       const props = $xeTree
 
       const { showRadio } = props
       const radioOpts = $xeTree.computeRadioOpts
-      const { showIcon, checkMethod, visibleMethod } = radioOpts
-      const isVisible = !visibleMethod || visibleMethod({ $tree: $xeTree, node })
-      let isDisabled = !!checkMethod
+      const { showIcon, checkMode, checkMethod, visibleMode, visibleMethod } = radioOpts
+      const isVisible = visibleMethod ? visibleMethod({ $tree: $xeTree, node }) : handleVisibleOrCheckMode(visibleMode, isExistChild, nLevel)
       if (showRadio && showIcon && isVisible) {
-        if (checkMethod) {
-          isDisabled = !checkMethod({ $tree: $xeTree, node })
-        }
+        const isDisabled = checkMethod ? !checkMethod({ $tree: $xeTree, node }) : !handleVisibleOrCheckMode(checkMode, isExistChild, nLevel)
         return h('div', {
           class: ['vxe-tree--radio-option', {
             'is--checked': isChecked,
@@ -2665,19 +2674,16 @@ export default /* define-vxe-component start */ defineVxeComponent({
       }
       return renderEmptyElement($xeTree)
     },
-    renderCheckbox  (h: CreateElement, node: any, nodeid: string, isChecked: boolean, isIndeterminate: boolean) {
+    renderCheckbox  (h: CreateElement, node: any, nodeid: string, isExistChild: boolean, nLevel: number, isChecked: boolean, isIndeterminate: boolean) {
       const $xeTree = this
       const props = $xeTree
 
       const { showCheckbox } = props
       const checkboxOpts = $xeTree.computeCheckboxOpts
-      const { showIcon, checkMethod, visibleMethod } = checkboxOpts
-      const isVisible = !visibleMethod || visibleMethod({ $tree: $xeTree, node })
-      let isDisabled = !!checkMethod
+      const { showIcon, checkMode, checkMethod, visibleMode, visibleMethod } = checkboxOpts
+      const isVisible = visibleMethod ? visibleMethod({ $tree: $xeTree, node }) : handleVisibleOrCheckMode(visibleMode, isExistChild, nLevel)
       if (showCheckbox && showIcon && isVisible) {
-        if (checkMethod) {
-          isDisabled = !checkMethod({ $tree: $xeTree, node })
-        }
+        const isDisabled = checkMethod ? !checkMethod({ $tree: $xeTree, node }) : !handleVisibleOrCheckMode(checkMode, isExistChild, nLevel)
         return h('div', {
           class: ['vxe-tree--checkbox-option', {
             'is--checked': isChecked,
@@ -2713,12 +2719,12 @@ export default /* define-vxe-component start */ defineVxeComponent({
       const titleField = $xeTree.computeTitleField
       const hasChildField = $xeTree.computeHasChildField
       const childList: any[] = XEUtils.get(node, childrenField)
-      const hasChild = childList && childList.length
+      const isExistChild = childList && childList.length > 0
       const iconSlot = slots.icon
       const titleSlot = slots.title
       const extraSlot = slots.extra
       const isExpand = updateExpandedFlag && treeExpandedMaps[nodeid]
-      const nodeItem = nodeMaps[nodeid]
+      const nodeItem = nodeMaps[nodeid] || {}
       const nodeValue = XEUtils.get(node, titleField)
       const nLevel = nodeItem.level
 
@@ -2805,7 +2811,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
             : renderEmptyElement($xeTree),
           h('div', {
             class: 'vxe-tree--node-item-switcher'
-          }, showIcon && (lazy ? (isLazyLoaded ? hasChild : hasLazyChilds) : hasChild)
+          }, showIcon && (lazy ? (isLazyLoaded ? isExistChild : hasLazyChilds) : isExistChild)
             ? [
                 h('div', {
                   class: 'vxe-tree--node-item-icon',
@@ -2824,8 +2830,8 @@ export default /* define-vxe-component start */ defineVxeComponent({
               ]
             : []),
           $xeTree.renderDragIcon(h, node, nodeid),
-          $xeTree.renderRadio(h, node, nodeid, isRadioChecked),
-          $xeTree.renderCheckbox(h, node, nodeid, isCheckboxChecked, isIndeterminate),
+          $xeTree.renderRadio(h, node, nodeid, isExistChild, nLevel, isRadioChecked),
+          $xeTree.renderCheckbox(h, node, nodeid, isExistChild, nLevel, isCheckboxChecked, isIndeterminate),
           h('div', {
             class: 'vxe-tree--node-item-inner'
           }, [