hw-cus-ui 1.1.21 → 1.1.23

package/HwPickerTree/HwPickerTree.vue

@@ -90,144 +90,119 @@
   </view>
 </template>
 
-<script setup>
+<script lang="ts" setup>
 import { ref, onMounted, watch, nextTick } from 'vue';
 
-const props = defineProps({
-  range: {
-    type: Array,
-    default: []
-  },
-  rangeNext: {
-    type: Array,
-    default: []
-  },
-  request: {
-    type: Function,
-    default: null
-  },
-  idKey: {
-    //字段key值
-    type: String,
-    default: 'id'
-  },
-  // 字符串或者字符串数组
-  modelValue: {
-    type: String,
-    default: ''
-  },
-  nameKey: {
-    //字段value值
-    type: String,
-    default: 'name'
-  },
-  allKey: {
-    //冗余字段
-    type: String,
-    default: 'value'
-  },
-  placeholder: {
-    //冗余字段
-    type: String,
-    default: '请选择'
-  },
-  title: {
-    //头
-    type: String,
-    default: ''
-  },
-  multiple: {
-    // 是否可以多选
-    type: Boolean,
-    default: true
-    // default: true
-  },
-  isSearch: {
-    type: Boolean,
-    default: false
-  },
-  disabled: {
-    // 是否禁用
-    type: Boolean,
-    default: false
-  },
-  cascade: {
-    // 是否级联选择
-    type: Boolean,
-    default: false
-    // default: true
-  },
-  isShowLabel: {
-    // 是否显示标题
-    type: Boolean,
-    default: true
-  },
-  selectParent: {
-    //是否可以选父级
-    type: Boolean,
-    default: true
-  },
-  foldAll: {
-    //折叠时关闭所有已经打开的子集，再次打开时需要一级一级打开
-    type: Boolean,
-    default: false
-  },
-  confirmColor: {
-    // 确定按钮颜色
-    type: String,
-    default: '#007aff' // #1facac
-  },
-  cancelColor: {
-    // 取消按钮颜色
-    type: String,
-    default: '#757575' // #757575
-  },
-  titleColor: {
-    // 标题颜色
-    type: String,
-    default: '#757575' // #757575
-  },
-  currentIcon: {
-    // 展开时候的ic
-    type: String,
-    default:
-      'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFEAAABRCAYAAACqj0o2AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoV2luZG93cykiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6MEQ0QTM0MzQ1Q0RBMTFFOUE0MjY4NzI1Njc1RjI1ODIiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6MEQ0QTM0MzU1Q0RBMTFFOUE0MjY4NzI1Njc1RjI1ODIiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDowRDRBMzQzMjVDREExMUU5QTQyNjg3MjU2NzVGMjU4MiIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDowRDRBMzQzMzVDREExMUU5QTQyNjg3MjU2NzVGMjU4MiIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PidwepsAAAK0SURBVHja7JxbTsJAFIYHww7ciStgCeoGvGxAiOsgURegoL5720AXYLiIr0aJviq3Zx3PhIEnKG3ndtr+f3KixrSUj/ZjzjClIqUUiFm2gAAQAREQEUAEREAERAQQAREQAREBREAEREBEEqa67h9RFDWllDv0awWYlqlQHmu1WjMRRMoV1QFttA12y3xRtdNczq8EsE4/f8FumX2q77ROvNXk8UGMEKdUz6tYJHljaZAbuyUH+UR1to5BEohTuqwPCeS4pAA/qY6o/kyHOAMCeRK3owJnj+rH1jjxhqpVsstaebCz6TmnHWyXyY+xHjSBWBY/bvSgadtXBj9u9KCN3rnIfkzkQVsTEEX0Y2IP2oKo/HhMICcFAThUcwVZNGU6FdbX/XURzkbVF4+ybGhjPrFdgP66QdXNurGtSdk6Xdb9nAJ8oDo3OQlsQZzkdPw41ONBo6vI5scDefRjZg+6gpg3Pxp50CXEvPjR2IOuIXL3oxUPuobI3Y9WPOgDIlc/WvOgL4iL/vqFCcD7LH0xB4hj7cfQ/fWH9qCT+FhG0tN+DBk1PzjOM0SVllixcsBT1AvYc/kAPhc0hRg/3uvxoCgKRN9+dOrBUBB9+9GpB0NC9OVH5x4MDdG1H714kANEV3705kEOEBf9dcPi/lQnsuvLg1wgSu3Ha0v7Uh4MMgUXeuG71H407a+VBy9CPQkOdw+MtB+nGbd/D+FBbhBNxo9SjwcngJjNj0E9yBFiFj8G9SBXiGn8GNyDnCEm8SMLD3KHGOdHNh7kDjHOj2w8mAeIi/5arX+c6b/fxHz9oADEdGdjR/fXCw/OOB5oVfCOgnepz8IB14PMw03jCmTE+QBx5z0gAmKSqK9OUF+hcAeIhu/QYr4Qie8rjW83hhMBERARQAREQAREBBABERCLnH8BBgA+TQI7U4t53AAAAABJRU5ErkJggg=='
-  },
-  defaultIcon: {
-    // 折叠时候的ic
-    type: String,
-    default:
-      'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFEAAABRCAYAAACqj0o2AAACE0lEQVR4Xu3c200DMRCF4XEltJAOkEugA+ggpUAHoQMqiFMCdEAJUMEiS4mEELlIO7bPOeN9i6K1rG/952myyea1WiCtXmEuYBPR4RBMxInoIOCwhOtJLKVszWyXc/5y2BvNEq6I+/3+kFK6M7OHnPM7jcLKjbZAvD/uaZtzflm5P4rbWyJWgDcze1LPuzVihfxUz7sH4ilJ2bx7Isrm3RtRMu8RiHJ5j0SUyXs0okTeCIj0eSMh0uaNhkiZNyIiXd7IiDR5oyNS5M2ACJ83EyJs3myIkHkzIsLlzYwIkzc7IkTeCojD81ZCHJa3GuKQvBURu+etjNgtb3XELnlHQGyedyTEZnlHQ2ySd0RE97wjI7rlHR3RJe+JeIrbLOecD6ePpZQ6W1kn2epo4MUrPOKyLN8ppYq1+y1VStncOjIdGnFZlo+U0uOtWOeOY2TE12Ouq//pEA7xXL7XfvcufR8K0Svfv6CREN3yDYfYIt9QiK3yjYTYLF95xB75SiP2ylcZsVu+cogj8pVCHJWvEuKwfOkREfKlRkTJlxkRJl86RMR8qRBR82VChM0XHpEhX2hElnyREWnyhUNkzBcKkTVfJETafIcjKuQ7FFEl35GIMvl2R1TMtyuiar49EWXzbY5oZpv/hibXTF2h3+s60FRKeT6+3TjMS3nrA3ZFRD8xrfY3ER1kJ+JEdBBwWGKeRAfEH1wS5WFZSDB/AAAAAElFTkSuQmCC'
-  },
-  lastIcon: {
-    // 没有子集的ic
-    type: String,
-    default: ''
-  }
+// 树节点接口
+interface TreeNode {
+  id: string | number;
+  name: string;
+  value?: any;
+  children?: TreeNode[];
+  [key: string]: any;
+}
+
+// 树列表项接口
+interface TreeListItem {
+  id: string | number;
+  name: string;
+  value: any;
+  source: any;
+  parentId: (string | number)[];
+  parents: any[];
+  rank: number;
+  showChild: boolean;
+  open: boolean;
+  show: boolean;
+  hideArr: (string | number | null)[];
+  orChecked: boolean;
+  checked: boolean;
+  childNum: number;
+  lastRank?: boolean;
+  children?: TreeListItem[];
+}
+
+// Props 接口
+interface PickerTreeProps {
+  range: TreeNode[];
+  rangeNext: TreeNode[];
+  request?: ((params: { pageSize: number; pageNum: number; resourceC: string }) => Promise<{ rows: any[]; total?: number }>) | null;
+  idKey: string;
+  modelValue: string | string[];
+  nameKey: string;
+  allKey: string;
+  placeholder: string;
+  title: string;
+  multiple: boolean;
+  isSearch: boolean;
+  disabled: boolean;
+  cascade: boolean;
+  isShowLabel: boolean;
+  selectParent: boolean;
+  foldAll: boolean;
+  confirmColor: string;
+  cancelColor: string;
+  titleColor: string;
+  currentIcon: string;
+  defaultIcon: string;
+  lastIcon: string;
+}
+
+const props = withDefaults(defineProps<PickerTreeProps>(), {
+  range: () => [],
+  rangeNext: () => [],
+  request: null,
+  idKey: 'id',
+  modelValue: '',
+  nameKey: 'name',
+  allKey: 'value',
+  placeholder: '请选择',
+  title: '',
+  multiple: true,
+  isSearch: false,
+  disabled: false,
+  cascade: false,
+  isShowLabel: true,
+  selectParent: true,
+  foldAll: false,
+  confirmColor: '#007aff',
+  cancelColor: '#757575',
+  titleColor: '#757575',
+  currentIcon: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFEAAABRCAYAAACqj0o2AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoV2luZG93cykiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6MEQ0QTM0MzQ1Q0RBMTFFOUE0MjY4NzI1Njc1RjI1ODIiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6MEQ0QTM0MzU1Q0RBMTFFOUE0MjY4NzI1Njc1RjI1ODIiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDowRDRBMzQzMjVDREExMUU5QTQyNjg3MjU2NzVGMjU4MiIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDowRDRBMzQzMzVDREExMUU5QTQyNjg3MjU2NzVGMjU4MiIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PidwepsAAAK0SURBVHja7JxbTsJAFIYHww7ciStgCeoGvGxAiOsgURegoL5720AXYLiIr0aJviq3Zx3PhIEnKG3ndtr+f3KixrSUj/ZjzjClIqUUiFm2gAAQAREQEUAEREAERAQQAREQAREBREAEREBEEqa67h9RFDWllDv0awWYlqlQHmu1WjMRRMoV1QFttA12y3xRtdNczq8EsE4/f8FumX2q77ROvNXk8UGMEKdUz6tYJHljaZAbuyUH+UR1to5BEohTuqwPCeS4pAA/qY6o/kyHOAMCeRK3owJnj+rH1jjxhqpVsstaebCz6TmnHWyXyY+xHjSBWBY/bvSgadtXBj9u9KCN3rnIfkzkQVsTEEX0Y2IP2oKo/HhMICcFAThUcwVZNGU6FdbX/XURzkbVF4+ybGhjPrFdgP66QdXNurGtSdk6Xdb9nAJ8oDo3OQlsQZzkdPw41ONBo6vI5scDefRjZg+6gpg3Pxp50CXEvPjR2IOuIXL3oxUPuobI3Y9WPOgDIlc/WvOgL4iL/vqFCcD7LH0xB4hj7cfQ/fWH9qCT+FhG0tN+DBk1PzjOM0SVllixcsBT1AvYc/kAPhc0hRg/3uvxoCgKRN9+dOrBUBB9+9GpB0NC9OVH5x4MDdG1H714kANEV3705kEOEBf9dcPi/lQnsuvLg1wgSu3Ha0v7Uh4MMgUXeuG71H407a+VBy9CPQkOdw+MtB+nGbd/D+FBbhBNxo9SjwcngJjNj0E9yBFiFj8G9SBXiGn8GNyDnCEm8SMLD3KHGOdHNh7kDjHOj2w8mAeIi/5arX+c6b/fxHz9oADEdGdjR/fXCw/OOB5oVfCOgnepz8IB14PMw03jCmTE+QBx5z0gAmKSqK9OUF+hcAeIhu/QYr4Qie8rjW83hhMBERARQAREQAREBBABERCLnH8BBgA+TQI7U4t53AAAAABJRU5ErkJggg==',
+  defaultIcon: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFEAAABRCAYAAACqj0o2AAACE0lEQVR4Xu3c200DMRCF4XEltJAOkEugA+ggpUAHoQMqiFMCdEAJUMEiS4mEELlIO7bPOeN9i6K1rG/952myyea1WiCtXmEuYBPR4RBMxInoIOCwhOtJLKVszWyXc/5y2BvNEq6I+/3+kFK6M7OHnPM7jcLKjbZAvD/uaZtzflm5P4rbWyJWgDcze1LPuzVihfxUz7sH4ilJ2bx7Isrm3RtRMu8RiHJ5j0SUyXs0okTeCIj0eSMh0uaNhkiZNyIiXd7IiDR5oyNS5M2ACJ83EyJs3myIkHkzIsLlzYwIkzc7IkTeCojD81ZCHJa3GuKQvBURu+etjNgtb3XELnlHQGyedyTEZnlHQ2ySd0RE97wjI7rlHR3RJe+JeIrbLOecD6ePpZQ6W1kn2epo4MUrPOKyLN8ppYq1+y1VStncOjIdGnFZlo+U0uOtWOeOY2TE12Ouq//pEA7xXL7XfvcufR8K0Svfv6CREN3yDYfYIt9QiK3yjYTYLF95xB75SiP2ylcZsVu+cogj8pVCHJWvEuKwfOkREfKlRkTJlxkRJl86RMR8qRBR82VChM0XHpEhX2hElnyREWnyhUNkzBcKkTVfJETafIcjKuQ7FFEl35GIMvl2R1TMtyuiar49EWXzbY5oZpv/hibXTF2h3+s60FRKeT6+3TjMS3nrA3ZFRD8xrfY3ER1kJ+JEdBBwWGKeRAfEH1wS5WFZSDB/AAAAAElFTkSuQmCC',
+  lastIcon: ''
 });
 
-const emit = defineEmits(['cancel', 'confirm', 'update:modelValue']);
+// Emits 接口
+interface PickerTreeEmits {
+  (e: 'cancel'): void;
+  (e: 'confirm', data: TreeListItem[]): void;
+  (e: 'update:modelValue', value: string | string[]): void;
+}
+
+const emit = defineEmits<PickerTreeEmits>();
 
 defineExpose({
   _show,
   _hide
 });
-const paging = ref(null);
-
-const showTree = ref(false);
-const dataList = ref([]);
-const searchName = ref('');
-const treeList = ref([]);
-const returnedItem = ref([]);
-const childNums = ref([]);
-const curLabel = defineModel('label', { default: '', type: String });
-
-let val = [];
-let temporarySelectedValue = [];
-let label = [];
-let originalTreeList = []; // 保存原始数据
-
-const changeSelect = (val) => {
+
+const paging = ref<any>(null);
+
+const showTree = ref<boolean>(false);
+const dataList = ref<any[]>([]);
+const searchName = ref<string>('');
+const treeList = ref<TreeListItem[]>([]);
+const returnedItem = ref<TreeNode | null>(null);
+const childNums = ref<Record<string | number, number>>({});
+const curLabel = defineModel<string>('label', { default: '', type: String });
+
+let val: (string | number)[] = [];
+let temporarySelectedValue: (string | number)[] = [];
+let label: string[] = [];
+let originalTreeList: TreeListItem[] = []; // 保存原始数据
+
+const changeSelect = (val: string): void => {
   // 如果没有输入搜索内容，则恢复原始列表
   if (props.request) {
     paging.value && paging.value.reload();
@@ -252,7 +227,7 @@ const changeSelect = (val) => {
  */
 watch(
   () => props.range,
-  (newVal) => {
+  (newVal: TreeNode[]) => {
     if (!props.request) {
       _initTree(newVal);
     }
@@ -260,7 +235,7 @@ watch(
 );
 watch(
   () => dataList.value,
-  (newVal) => {
+  (newVal: any[]) => {
     if (props.request) {
       const data = newVal.map((item) => {
         return {
@@ -300,7 +275,7 @@ watch(
  */
 watch(
   () => props.modelValue,
-  (newVal) => {
+  (newVal: string | string[]) => {
     if (!newVal) {
       curLabel.value = '';
     }
@@ -324,7 +299,7 @@ onMounted(() => {
   }
 });
 
-function queryList(pageNum, pageSize) {
+function queryList(pageNum: number, pageSize: number): void {
   if (!props.request) return;
   props
     .request({
@@ -343,7 +318,7 @@ function queryList(pageNum, pageSize) {
 /**
  * 显示树选择器
  */
-function _show() {
+function _show(): void {
   if (props.disabled) return;
   showTree.value = true;
   if (props.request) {
@@ -356,7 +331,7 @@ function _show() {
 /**
  * 隐藏树选择器
  */
-function _hide() {
+function _hide(): void {
   // temporarySelectedValue = [];
   showTree.value = false;
   emit('cancel');
@@ -365,7 +340,7 @@ function _hide() {
 /**
  * 取消选择操作
  */
-function _cancel() {
+function _cancel(): void {
   // if (!props.multiple) {
   //   curLabel.value = '';
   //   emit('update:modelValue', '');
@@ -382,9 +357,9 @@ function _cancel() {
 /**
  * 确认选择操作，处理选中数据并触发事件
  */
-function _confirm() {
+function _confirm(): void {
   // 处理所选数据
-  let rt = [];
+  let rt: TreeListItem[] = [];
   treeList.value.forEach((v, i) => {
     if (treeList.value[i].checked) {
       rt.push({
@@ -420,12 +395,12 @@ function _confirm() {
 
 /**
  * 扁平化树结构，将嵌套数据转换为列表形式
- * @param {Array} list - 树形数据列表
- * @param {Number} rank - 当前节点层级
- * @param {Array} parentId - 父节点ID数组
- * @param {Array} parents - 父节点对象数组
+ * @param list - 树形数据列表
+ * @param rank - 当前节点层级
+ * @param parentId - 父节点ID数组
+ * @param parents - 父节点对象数组
  */
-function _renderTreeList(list = [], rank = 0, parentId = [], parents = []) {
+function _renderTreeList(list: TreeNode[] = [], rank: number = 0, parentId: (string | number)[] = [], parents: any[] = []): void {
   val = [];
   temporarySelectedValue = [];
   if (Array.isArray(props.modelValue)) {
@@ -461,9 +436,8 @@ function _renderTreeList(list = [], rank = 0, parentId = [], parents = []) {
     });
 
     if (Array.isArray(item.children) && item.children.length > 0) {
-      let parentid = [...parentId],
-        parentArr = [...parents];
-      delete parentArr.children;
+      const parentid = [...parentId];
+      const parentArr: any[] = [...parents];
       parentid.push(item[props.idKey]);
       parentArr.push({
         [props.idKey]: item[props.idKey],
@@ -481,7 +455,7 @@ function _renderTreeList(list = [], rank = 0, parentId = [], parents = []) {
 /**
  * 处理默认选中项，展开已选中节点的父级
  */
-function _defaultSelect() {
+function _defaultSelect(range?: TreeNode[]): void {
   treeList.value.forEach((v) => {
     if (v.checked) {
       treeList.value.forEach((v2) => {
@@ -499,11 +473,11 @@ function _defaultSelect() {
 
 /**
  * 根据ID查找节点
- * @param {String|Number} id - 节点ID
- * @param {Array} arr - 查找范围数组
- * @returns {Object} 查找到的节点对象
+ * @param id - 节点ID
+ * @param arr - 查找范围数组
+ * @returns 查找到的节点对象
  */
-function getOwn(id, arr) {
+function getOwn(id: string | number, arr: TreeNode[]): TreeNode | undefined {
   if (arr && arr.length) {
     //利用foreach循环遍历
     arr.forEach((item) => {
@@ -511,23 +485,24 @@ function getOwn(id, arr) {
       if (item[props.idKey] === id) {
         // 存储数据到空数组
         returnedItem.value = item;
-      } else if (item.children !== null) {
+      } else if (item.children !== null && item.children !== undefined) {
         //判断chlidren是否有数据
         //递归调用
         getOwn(id, item.children);
       }
     });
-    return returnedItem.value;
+    return returnedItem.value || undefined;
   }
+  return undefined;
 }
 
 /**
  * 设置节点显示状态
- * @param {String|Number} id - 节点ID
- * @param {Array} arr - 节点数组
- * @param {Boolean} isShow - 是否显示
+ * @param id - 节点ID
+ * @param arr - 节点数组
+ * @param isShow - 是否显示
  */
-function setShow(id, arr, isShow) {
+function setShow(id: string | number, arr: any[], isShow: boolean): void {
   arr.forEach((item, index) => {
     if (item.parentId.includes(id)) {
       treeList.value[index].showChild = isShow;
@@ -539,10 +514,10 @@ function setShow(id, arr, isShow) {
 }
 /**
  * 点击树节点处理函数
- * @param {Object} item - 被点击的节点对象
- * @param {Number} index - 节点在列表中的索引
+ * @param item - 被点击的节点对象
+ * @param index - 节点在列表中的索引
  */
-function _treeItemTap(item, index) {
+function _treeItemTap(item: TreeListItem, index: number): void {
   if (item.lastRank === true) {
     //点击最后一级时触发事件
     treeList.value[index].checked = !treeList.value[index].checked;
@@ -556,7 +531,7 @@ function _treeItemTap(item, index) {
     const range = props.range;
     // 找到当前元素
     const own = getOwn(id, range);
-    const checkedChildren = own.children;
+    const checkedChildren = own?.children;
     // 子元素插入的索引位置
     const nextIndex = treeList.value.findIndex((itemT) => itemT.id === item.id);
     if (checkedChildren === undefined || checkedChildren.length < 1) {
@@ -566,7 +541,7 @@ function _treeItemTap(item, index) {
     treeList.value[index].childNum = checkedChildren.length;
     const newRank = item.rank + 1;
     checkedChildren.forEach((itemC) => {
-      const childObj = {
+      const childObj: TreeListItem = {
         id: itemC[props.idKey],
         name: itemC[props.nameKey],
         value: itemC[props.allKey],
@@ -576,11 +551,12 @@ function _treeItemTap(item, index) {
         rank: newRank, // 层级
         showChild: false, //子级是否显示
         open: false, //是否打开
-        show: 1, // 自身是否显示
+        show: true, // 自身是否显示
         hideArr: [],
         lastRank: itemC.children && itemC.children.length > 0 ? false : true,
         orChecked: treeList.value[index].checked,
-        checked: props.cascade ? treeList.value[index].checked : false
+        checked: props.cascade ? treeList.value[index].checked : false,
+        childNum: 0
       };
       if (!treeList.value.some((itemT) => itemT.id === itemC[props.idKey])) {
         treeList.value.splice(nextIndex + 1, 0, childObj);
@@ -613,13 +589,13 @@ function _treeItemTap(item, index) {
           setShow(childItem.id, treeList.value, false);
         }
       }
-      if (childItem.children !== undefined) {
-        childItem.children.forEach((childItem1, i1) => {
+      if (childItem.children !== undefined && Array.isArray(childItem.children)) {
+        childItem.children.forEach((childItem1: TreeListItem, i1: number) => {
           if (!childItem1.parentId.includes(childItem.id)) {
             return;
           }
-          childItem.children[i1].showChild = false;
-          childItem.children[i1].show = false;
+          childItem.children![i1].showChild = false;
+          childItem.children![i1].show = false;
         });
       }
       childItem.show = false;
@@ -645,26 +621,26 @@ function _treeItemTap(item, index) {
 }
 /**
  * 同步选中状态到子节点
- * @param {Array} trees - 树节点数组
- * @param {String|Number} pid - 父节点ID
- * @param {Boolean} checked - 选中状态
+ * @param trees - 树节点数组
+ * @param pid - 父节点ID
+ * @param checked - 选中状态
  */
-function syncChecked(trees, pid, checked) {
+function syncChecked(trees: TreeListItem[], pid: string | number, checked: boolean): void {
   trees.forEach((item, index) => {
     if (item.parentId.includes(pid)) {
       treeList.value[index].checked = checked;
       syncChecked(trees, item.id, checked);
-    } else if (item.children !== undefined) {
+    } else if (item.children !== undefined && Array.isArray(item.children)) {
       syncChecked(item.children, pid, checked);
     }
   });
 }
 /**
  * 设置祖先节点选中状态
- * @param {Array} pids - 父节点ID数组
- * @param {Boolean} checked - 选中状态
+ * @param pids - 父节点ID数组
+ * @param checked - 选中状态
  */
-function setAncestors(pids, checked) {
+function setAncestors(pids: (string | number)[], checked: boolean): void {
   treeList.value.forEach((item, index) => {
     if (pids.includes(item.id)) {
       if (checked && childNums.value[item.id] !== undefined && item.childNum === childNums.value[item.id]) {
@@ -680,10 +656,10 @@ function setAncestors(pids, checked) {
 
 /**
  * 树节点选择处理函数
- * @param {Object} item - 被选择的节点对象
- * @param {Number} index - 节点在列表中的索引
+ * @param item - 被选择的节点对象
+ * @param index - 节点在列表中的索引
  */
-function _treeItemSelect(item, index) {
+function _treeItemSelect(item: TreeListItem, index: number): void {
   treeList.value[index].checked = !treeList.value[index].checked;
 
   if (treeList.value[index].checked) {
@@ -718,9 +694,9 @@ function _treeItemSelect(item, index) {
 }
 /**
  * 处理单选/多选逻辑
- * @param {Number} index - 当前选中项的索引
+ * @param index - 当前选中项的索引
  */
-function _fixMultiple(index) {
+function _fixMultiple(index: number): void {
   if (!props.multiple) {
     // 如果是单选
     treeList.value.forEach((v, i) => {
@@ -735,7 +711,7 @@ function _fixMultiple(index) {
 /**
  * 重置树列表数据
  */
-function _reTreeList() {
+function _reTreeList(): void {
   if (!props.range.length) {
     return;
   }
@@ -746,9 +722,9 @@ function _reTreeList() {
 
 /**
  * 初始化树结构
- * @param {Array} range - 树数据范围
+ * @param range - 树数据范围
  */
-function _initTree(range = props.range) {
+function _initTree(range: TreeNode[] = props.range): void {
   treeList.value = [];
   val = [];
   label = [];

package/HwPickerTree/index.ts

@@ -1,12 +1,10 @@
-// index.ts
-import type { App } from 'vue';
-import HwPickerTree from './HwPickerTree.vue';
-import type { HwPickerTreeProps, HwPickerTreeEmits, HwPickerTreeInstance } from './HwPickerTree.d.ts';
-
-// 使用install方法，在app.use挂载
-HwPickerTree.install = (app: App) => {
-  app.component(HwPickerTree.__name as string, HwPickerTree); //注册组件
-};
-
-export default HwPickerTree;
-export type { HwPickerTreeProps, HwPickerTreeEmits, HwPickerTreeInstance };
+// index.ts
+import type { App } from 'vue';
+import HwPickerTree from './HwPickerTree.vue';
+
+// 使用install方法，在app.use挂载
+HwPickerTree.install = (app: App) => {
+  app.component(HwPickerTree.__name as string, HwPickerTree); //注册组件
+};
+
+export default HwPickerTree;

package/index.d.ts

@@ -2,7 +2,7 @@ import { App } from 'vue';
 import HwBtn from './HwBtn';
 import HwDraggableBottomPopup from './HwDraggableBottomPopup';
 import HwSelect from './HwSelect';
-import HwPickerTree, { HwPickerTreeProps, HwPickerTreeEmits, HwPickerTreeInstance } from './HwPickerTree';
+import HwPickerTree from './HwPickerTree';
 import HwInput from './HwInput';
 import HwFileUpload from './HwFileUpload';
 import HwCheckbox from './HwCheckbox';
@@ -24,9 +24,6 @@ export {
   HwModal
 };
 
-// 导出组件类型
-export type { HwPickerTreeProps, HwPickerTreeEmits, HwPickerTreeInstance };
-
 // 导出类型定义
 export type { ZPagingInstance } from './types';
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hw-cus-ui",
-  "version": "1.1.21",
+  "version": "1.1.23",
   "description": "使用该组件库需安装uniapp插件@dcloudio/uni-ui",
   "main": "index.ts",
   "scripts": {
@@ -15,7 +15,7 @@
     "@vueuse/core": "^10.0.0"
   },
   "peerDependencies": {
-    "vue": "^3.0.0",
+    "vue": "^3.5.24",
     "sass": "^1.0.0"
   }
 }

package/HwPickerTree/HwPickerTree.d.ts

@@ -1,84 +0,0 @@
-import { DefineComponent } from 'vue';
-
-// HwPickerTree 组件的 Props 接口定义
-export interface HwPickerTreeProps {
-  /** 树形数据范围 */
-  range?: any[];
-  /** 下一级数据范围（用于分页加载） */
-  rangeNext?: any[];
-  /** 请求函数，用于分页加载数据 */
-  request?: Function | null;
-  /** ID 字段键名，默认 'id' */
-  idKey?: string;
-  /** 绑定值，字符串或字符串数组 */
-  modelValue?: string | string[];
-  /** 名称字段键名，默认 'name' */
-  nameKey?: string;
-  /** 值字段键名，默认 'value' */
-  allKey?: string;
-  /** 占位符文本，默认 '请选择' */
-  placeholder?: string;
-  /** 弹窗标题 */
-  title?: string;
-  /** 是否支持多选，默认 true */
-  multiple?: boolean;
-  /** 是否显示搜索框，默认 false */
-  isSearch?: boolean;
-  /** 是否禁用，默认 false */
-  disabled?: boolean;
-  /** 是否级联选择，默认 false */
-  cascade?: boolean;
-  /** 是否显示标签，默认 true */
-  isShowLabel?: boolean;
-  /** 是否可以选择父级，默认 true */
-  selectParent?: boolean;
-  /** 折叠时是否关闭所有已打开的子集，默认 false */
-  foldAll?: boolean;
-  /** 确定按钮颜色，默认 '#007aff' */
-  confirmColor?: string;
-  /** 取消按钮颜色，默认 '#757575' */
-  cancelColor?: string;
-  /** 标题颜色，默认 '#757575' */
-  titleColor?: string;
-  /** 展开时的图标（base64 或 URL） */
-  currentIcon?: string;
-  /** 折叠时的图标（base64 或 URL） */
-  defaultIcon?: string;
-  /** 末级图标（base64 或 URL） */
-  lastIcon?: string;
-}
-
-// HwPickerTree 组件事件定义
-export interface HwPickerTreeEmits {
-  (e: 'cancel'): void;
-  (e: 'confirm', value: any[]): void;
-  (e: 'update:modelValue', value: string | string[]): void;
-}
-
-// HwPickerTree 组件实例方法
-export interface HwPickerTreeInstance {
-  /** 显示树选择器 */
-  _show: () => void;
-  /** 隐藏树选择器 */
-  _hide: () => void;
-}
-
-// HwPickerTree 组件类型声明
-declare const HwPickerTree: DefineComponent<
-  HwPickerTreeProps,
-  {},
-  {},
-  {},
-  {},
-  {},
-  {},
-  {
-    cancel: () => void;
-    confirm: (value: any[]) => void;
-    'update:modelValue': (value: string | string[]) => void;
-  }
-> & {
-  install: (app: any) => void;
-};
-
-export default HwPickerTree;