cnhis-design-vue 3.1.5-beta.12 → 3.1.5-beta.13

package/es/packages/scale-view/src/hooks/scaleview-computed2.mjs

@@ -42,9 +42,9 @@ const ScaleViewComputed = (props, state, config) => {
     };
   });
   const handlePageClass = computed(() => {
-    if (props.type == "customList" && !state.noBtn)
+    if (props.type == "customList" && !props.noBtn)
       return false;
-    if (!state.noBtn && !props.hideBtn)
+    if (!props.noBtn && !props.hideBtn)
       return false;
     return true;
   });
@@ -71,13 +71,13 @@ const ScaleViewComputed = (props, state, config) => {
   const isPreviewScale = computed(() => {
     var _a;
     let guage_id = (_a = state.ids) == null ? void 0 : _a.guage_id;
-    return guage_id && state.noBtn;
+    return guage_id && props.noBtn;
   });
   const showEvaluateEntry = computed(() => {
-    return !isPreviewScale.value && state.showEvaluatePage && state.showEvaluateSettingWrap && !state.isFinished && !state.noBtn && !props.hideBtn;
+    return !isPreviewScale.value && state.showEvaluatePage && state.showEvaluateSettingWrap && !state.isFinished && !props.noBtn && !props.hideBtn;
   });
   const showEvaluateCoundownPage = computed(() => {
-    return !isPreviewScale.value && !showEvaluateEntry.value && state.showEvaluateCountdownWrap && !state.isFinished && !state.noBtn && !props.hideBtn;
+    return !isPreviewScale.value && !showEvaluateEntry.value && state.showEvaluateCountdownWrap && !state.isFinished && !props.noBtn && !props.hideBtn;
   });
   const hasEvaluateResultSetting = computed(() => {
     let { evaluateResultSetting = {} } = state.config;
@@ -98,9 +98,9 @@ const ScaleViewComputed = (props, state, config) => {
   });
   const showSaveBtn = computed(() => {
     if (!hasEvaluateResultSetting.value && !hasDefault.value) {
-      return !state.noBtn && !props.hideBtn;
+      return !props.noBtn && !props.hideBtn;
     }
-    return !state.noBtn && !props.hideBtn && !state.isFinished;
+    return !props.noBtn && !props.hideBtn && !state.isFinished;
   });
   const componentDisable = computed(() => {
     if (!hasEvaluateResultSetting.value && !hasDefault.value) {

package/es/packages/scale-view/src/hooks/scaleview-init2.mjs

@@ -170,7 +170,8 @@ const ScaleViewInit = (props, state, emit, config) => {
       }
     });
   };
-  const handleRelationLogic = (list, relationLogicObj) => {
+  const handleRelationLogic = (list, item) => {
+    let relationLogicObj = vexutils.isString(item.relationLogic) ? JSON.parse(item.relationLogic) : item.relationLogic;
     let { condition } = relationLogicObj || {};
     if (!condition || !condition.length)
       return;
@@ -190,6 +191,7 @@ const ScaleViewInit = (props, state, emit, config) => {
         c.value = replaceConditionItem(matchItem.options, value);
       }
     });
+    item.relationLogic = relationLogicObj;
   };
   const handleFrontAddress = (list) => {
     if (!list || !list.length)
@@ -338,8 +340,7 @@ const ScaleViewInit = (props, state, emit, config) => {
       return item;
     });
     return results.map((item) => {
-      let relationLogicObj = vexutils.isString(item.relationLogic) ? JSON.parse(item.relationLogic) : item.relationLogic;
-      handleRelationLogic(list, relationLogicObj);
+      handleRelationLogic(list, item);
       handLenextLogic(item);
       if (item.type === "CHECKBOX_BLOCK" && item.dbValue && !Array.isArray(item.dbValue) && props.type === "customList") {
         item.dbValue = item.dbValue.split(",").filter((ii) => !!ii);

package/es/packages/scale-view/src/hooks/scaleview-validate2.mjs

@@ -4,70 +4,6 @@ import { ScaleViewComputed } from './scaleview-computed2.mjs';
 
 const ScaleViewValidate = (props, state, config) => {
   const { formKey } = ScaleViewComputed(props, state, config);
-  const formatRules = (formArray) => {
-    const rules = {};
-    formArray.forEach((item) => {
-      let newTitle = formKey(item);
-      if (newTitle.includes(".")) {
-        newTitle = newTitle.replace(/\./g, "~-~");
-      }
-      rules[newTitle] = [];
-      if (item.required) {
-        rules[newTitle].push({ required: item.required, message: "\u5FC5\u586B", trigger: "change" });
-      }
-      if (item.type == "MOBILE" && item.validation) {
-        rules[newTitle].push({
-          pattern: /^1[3456789]\d{9}$/,
-          message: "\u683C\u5F0F\u9519\u8BEF",
-          trigger: "blur"
-        });
-      } else if (item.type == "ID_CARD" && item.validation) {
-        rules[newTitle].push({
-          pattern: /^\d{6}(((19|20)\d{2}(0[1-9]|1[0-2])(0[1-9]|[1-2][0-9]|3[0-1])\d{3}([0-9]|x|X))|(\d{2}(0[1-9]|1[0-2])(0[1-9]|[1-2][0-9]|3[0-1])\d{3}))$/,
-          message: "\u683C\u5F0F\u9519\u8BEF",
-          trigger: "blur"
-        });
-      } else if (item.type == "ADDRESS" && item.required) {
-        if (handleAddressType(item)) {
-          rules[newTitle].push({
-            validator: checkAdress,
-            trigger: "change"
-          });
-        }
-      } else if (item.type == "LABEL" && item.required) {
-        rules[newTitle].push({
-          validator: checkLabel,
-          trigger: "change"
-        });
-      } else if (item.type == "DATETIME" && props.type == "customList") {
-        let dateMaxType = handleDateMaxType(item);
-        if (!dateMaxType)
-          return;
-        let obj = {
-          1: "checkDateMaxCur",
-          2: "checkDateMaxSet",
-          3: "checkDateMaxOther"
-        };
-        rules[newTitle].push({
-          validator: (rule, value) => obj[dateMaxType](rule, value, item),
-          trigger: "change"
-        });
-      } else if (item.type === "RADIO_BLOCK") {
-        state.choiceComObj[formKey(item)] = {};
-        rules[newTitle].push({
-          validator: (rule, value) => checkRadio(rule, value, item),
-          trigger: "change"
-        });
-      } else if (item.type === "CHECKBOX_BLOCK") {
-        state.choiceComObj[formKey(item)] = {};
-        rules[newTitle].push({
-          validator: (rule, value) => checkCheckbox(rule, value, item),
-          trigger: "change"
-        });
-      }
-    });
-    return rules;
-  };
   const handleAddressType = (item) => {
     let setObj = { addressType: "province-city-district-address" };
     if (vexutils.isJSON(item.setting)) {
@@ -156,6 +92,91 @@ const ScaleViewValidate = (props, state, config) => {
     }
     return true;
   };
+  const checkType = (val) => {
+    return Object.prototype.toString.call(val);
+  };
+  const validateRequired = (rule, value) => {
+    let type = checkType(value);
+    if (type == "[object Object]") {
+      if (value && Object.keys(value).length)
+        return true;
+    } else if (type == "[object Array]") {
+      if (value && value.length)
+        return true;
+    } else if (type == "[object Number]") {
+      if (value || value === 0)
+        return true;
+    } else {
+      if (value)
+        return true;
+    }
+    return new Error("\u5FC5\u586B");
+  };
+  const filterArr = ["LABEL", "ADDRESS"];
+  const formatRules = (formArray) => {
+    const rules = {};
+    formArray.forEach((item) => {
+      let newTitle = item.val_key;
+      if (newTitle.includes(".")) {
+        newTitle = newTitle.replace(/\./g, "~-~");
+      }
+      rules[newTitle] = [];
+      if (item.required && !filterArr.includes(item.type)) {
+        rules[newTitle].push({ required: item.required, message: "\u5FC5\u586B", trigger: "change", validator: validateRequired });
+      }
+      if (item.type == "MOBILE" && item.validation) {
+        rules[newTitle].push({
+          pattern: /^1[3456789]\d{9}$/,
+          message: "\u683C\u5F0F\u9519\u8BEF",
+          trigger: "blur"
+        });
+      } else if (item.type == "ID_CARD" && item.validation) {
+        rules[newTitle].push({
+          pattern: /^\d{6}(((19|20)\d{2}(0[1-9]|1[0-2])(0[1-9]|[1-2][0-9]|3[0-1])\d{3}([0-9]|x|X))|(\d{2}(0[1-9]|1[0-2])(0[1-9]|[1-2][0-9]|3[0-1])\d{3}))$/,
+          message: "\u683C\u5F0F\u9519\u8BEF",
+          trigger: "blur"
+        });
+      } else if (item.type == "ADDRESS" && item.required) {
+        if (handleAddressType(item)) {
+          rules[newTitle].push({
+            validator: checkAdress,
+            trigger: "change"
+          });
+        }
+      } else if (item.type == "LABEL" && item.required) {
+        rules[newTitle].push({
+          validator: checkLabel,
+          trigger: "change"
+        });
+      } else if (item.type == "DATETIME" && props.type == "customList") {
+        let dateMaxType = handleDateMaxType(item);
+        if (!dateMaxType)
+          return;
+        let obj = {
+          1: "checkDateMaxCur",
+          2: "checkDateMaxSet",
+          3: "checkDateMaxOther"
+        };
+        rules[newTitle].push({
+          validator: (rule, value) => obj[dateMaxType](rule, value, item),
+          trigger: "change"
+        });
+      } else if (item.type === "RADIO_BLOCK") {
+        state.choiceComObj[formKey(item)] = {};
+        rules[newTitle].push({
+          validator: (rule, value) => checkRadio(rule, value, item),
+          trigger: "change"
+        });
+      } else if (item.type === "CHECKBOX_BLOCK") {
+        state.choiceComObj[formKey(item)] = {};
+        rules[newTitle].push({
+          validator: (rule, value) => checkCheckbox(rule, value, item),
+          trigger: "change"
+        });
+      }
+    });
+    return rules;
+  };
   return {
     formatRules
   };

package/es/packages/scale-view/style/index.css

@@ -3,6 +3,10 @@
   flex-wrap: wrap;
   width: 100%;
 }
+.c-choice-wrap .n-radio-input {
+  width: 14px;
+  height: 14px;
+}
 .c-choice-wrap .scale-choice-img-wrap {
   display: inline-block;
   position: relative;
@@ -70,18 +74,18 @@
   align-items: center;
   margin: 4px 0;
 }
-.c-choice-wrap label :deep(.n-radio__label) {
+.c-choice-wrap label .n-radio__label {
   flex: 1;
   display: inline-flex;
   align-items: center;
   white-space: normal;
 }
-.c-choice-wrap > :deep(.n-checkbox) {
+.c-choice-wrap > .n-checkbox {
   display: inline-flex;
   align-items: center;
   margin: 4px 0;
 }
-.c-choice-wrap > :deep(.n-checkbox) .n-checkbox__label {
+.c-choice-wrap > .n-checkbox .n-checkbox__label {
   flex: 1;
   display: inline-flex;
   align-items: center;
@@ -113,7 +117,7 @@
   box-sizing: border-box;
   color: rgba(0, 0, 0, 0.65);
 }
-.c-scale :deep(.n-form-item-label) {
+.c-scale .n-form-item-label {
   font-weight: 700;
 }
 .c-scale .scale-container {
@@ -142,7 +146,7 @@
   border-radius: 10px;
   background-color: #dbdcdc;
 }
-.c-scale :deep(.no-data-tip) {
+.c-scale .no-data-tip {
   width: 100%;
   height: 100%;
 }
@@ -213,10 +217,10 @@
 .rich-text-content {
   word-break: break-all;
 }
-.rich-text-content :deep(p) {
+.rich-text-content p {
   margin-bottom: 0;
 }
-.rich-text-content :deep(img) {
+.rich-text-content img {
   max-width: 100%;
 }
 .n-dialog.n-modal.c-evatip-dialog-wrap {
@@ -513,6 +517,9 @@
   width: 100%;
   text-align: left;
 }
+.c-scale .n-form-item {
+  --n-label-height: unset !important;
+}
 .no-data-tip {
   display: flex;
   flex-direction: column;
@@ -599,13 +606,13 @@
   width: 100%;
   cursor: pointer;
 }
-.c-map-container :deep(.n-input.map-input) .n-input__prefix {
+.c-map-container .n-input.map-input .n-input__prefix {
   transform: rotate(180deg);
 }
-.c-map-container :deep(.n-input.map-input) .n-input__prefix .n-icon {
+.c-map-container .n-input.map-input .n-input__prefix .n-icon {
   color: rgba(0, 0, 0, 0.65);
 }
-.c-map-container :deep(.n-input.map-input).n-input--disabled .n-input__input-el {
+.c-map-container .n-input.map-input.n-input--disabled .n-input__input-el {
   color: rgba(0, 0, 0, 0.65);
   background-color: #fff;
   cursor: pointer;
@@ -616,33 +623,33 @@
 .c-scale-upload {
   width: 100%;
 }
-.c-scale-upload :deep(.n-upload-file-list) {
+.c-scale-upload .n-upload-file-list {
   display: flex;
 }
-.c-scale-upload :deep(.n-upload-file-list) .n-upload-file .n-upload-file-info .n-upload-file-info__action.n-upload-file-info__action--image-card-type {
+.c-scale-upload .n-upload-file-list .n-upload-file .n-upload-file-info .n-upload-file-info__action.n-upload-file-info__action--image-card-type {
   box-sizing: border-box;
   background: rgba(0, 0, 0, 0.5);
 }
-.c-scale-upload :deep(.n-upload-file-list) .n-upload-file .n-upload-file-info .n-upload-file-info__action.n-upload-file-info__action--image-card-type span.n-button__icon {
+.c-scale-upload .n-upload-file-list .n-upload-file .n-upload-file-info .n-upload-file-info__action.n-upload-file-info__action--image-card-type span.n-button__icon {
   color: #fff;
 }
-.c-scale-upload :deep(.n-upload-file-list) .n-upload-trigger.n-upload-trigger--image-card {
+.c-scale-upload .n-upload-file-list .n-upload-trigger.n-upload-trigger--image-card {
   width: 184px;
   height: 184px;
   border-color: #d5d5d5;
   background-color: #fafafa;
 }
-.c-scale-upload :deep(.n-upload-file-list) .n-upload-file.n-upload-file--image-card-type {
+.c-scale-upload .n-upload-file-list .n-upload-file.n-upload-file--image-card-type {
   width: 184px;
   height: 184px;
   padding: 8px;
   border-color: #d5d5d5;
   background-color: #fafafa;
 }
-.c-scale-upload :deep(.n-upload-file-list) .n-upload-file.n-upload-file--image-card-type .n-image {
+.c-scale-upload .n-upload-file-list .n-upload-file.n-upload-file--image-card-type .n-image {
   height: 100%;
 }
-.c-scale-upload :deep(.n-upload-file-list) .n-upload-file.n-upload-file--image-card-type img {
+.c-scale-upload .n-upload-file-list .n-upload-file.n-upload-file--image-card-type img {
   object-fit: cover !important;
 }
 .c-scale-upload .upload-img-wrap {
@@ -664,15 +671,15 @@
 .c-scale-upload.scale-upload-file .dragger-upload-text {
   color: rgba(0, 0, 0, 0.65);
 }
-.c-scale-upload.scale-upload-file :deep(.n-upload-file-list) {
+.c-scale-upload.scale-upload-file .n-upload-file-list {
   display: flex;
   flex-direction: column;
   width: 100%;
 }
-.c-scale-upload.scale-upload-file :deep(.n-upload-file-list) .n-upload-file {
+.c-scale-upload.scale-upload-file .n-upload-file-list .n-upload-file {
   width: 100%;
 }
-.c-scale-upload.scale-upload-file :deep(.n-upload-trigger) {
+.c-scale-upload.scale-upload-file .n-upload-trigger {
   width: 100%;
   background: #fafafa;
   border-color: #d5d5d5;

package/es/packages/scale-view/style/index.less

@@ -2,6 +2,10 @@
   display: flex;
   flex-wrap: wrap;
   width: 100%;
+  .n-radio-input {
+    width: 14px;
+    height: 14px;
+  }
   .scale-choice-img-wrap {
     display: inline-block;
     position: relative;
@@ -74,14 +78,14 @@
     display: inline-flex;
     align-items: center;
     margin: 4px 0;
-    :deep(.n-radio__label) {
+    .n-radio__label {
       flex: 1;
       display: inline-flex;
       align-items: center;
       white-space: normal;
     }
   }
-  > :deep(.n-checkbox) {
+  > .n-checkbox {
     display: inline-flex;
     align-items: center;
     margin: 4px 0;
@@ -118,7 +122,7 @@
   padding-bottom: 50px;
   box-sizing: border-box;
   color: rgba(0, 0, 0, 0.65);
-  :deep(.n-form-item-label) {
+  .n-form-item-label {
     font-weight: 700;
   }
   .scale-container {
@@ -149,7 +153,7 @@
       background-color: #dbdcdc;
     }
   }
-  :deep(.no-data-tip) {
+  .no-data-tip {
     width: 100%;
     height: 100%;
   }
@@ -221,10 +225,10 @@
 }
 .rich-text-content {
   word-break: break-all;
-  :deep(p) {
+  p {
     margin-bottom: 0;
   }
-  :deep(img) {
+  img {
     max-width: 100%;
   }
 }
@@ -536,6 +540,9 @@
     width: 100%;
     text-align: left;
   }
+  .n-form-item {
+    --n-label-height: unset !important;
+  }
 }
 
 .no-data-tip {
@@ -627,7 +634,7 @@
 .c-map-container {
   width: 100%;
   cursor: pointer;
-  :deep(.n-input.map-input) {
+  .n-input.map-input {
     .n-input__prefix {
       transform: rotate(180deg);
       .n-icon {
@@ -648,7 +655,7 @@
 
 .c-scale-upload {
   width: 100%;
-  :deep(.n-upload-file-list) {
+  .n-upload-file-list {
     display: flex;
     .n-upload-file .n-upload-file-info .n-upload-file-info__action.n-upload-file-info__action--image-card-type {
       box-sizing: border-box;
@@ -699,7 +706,7 @@
     .dragger-upload-text {
       color: rgba(0, 0, 0, 0.65)
     }
-    :deep(.n-upload-file-list) {
+    .n-upload-file-list {
       display: flex;
       flex-direction: column;
       width: 100%;
@@ -708,7 +715,7 @@
       }
 
     }
-    :deep(.n-upload-trigger)  {
+    .n-upload-trigger {
       width: 100%;
       background: #fafafa;
       border-color: #d5d5d5;

package/es/packages/select-person/src/SelectPerson.vue.d.ts

@@ -320,6 +320,7 @@ declare const _default: import("vue").DefineComponent<{
             textColorDisabledPrimary: string;
             textColorTextPrimary: string;
             textColorTextHoverPrimary: string;
+            /** 提交映射 */
             textColorTextPressedPrimary: string;
             textColorTextFocusPrimary: string;
             textColorTextDisabledPrimary: string;
@@ -1668,9 +1669,7 @@ declare const _default: import("vue").DefineComponent<{
         onInput: import("vue").PropType<import("naive-ui/es/input/src/interface").OnUpdateValue>;
         onFocus: import("vue").PropType<import("naive-ui/es/_utils").MaybeArray<(e: FocusEvent) => void>>;
         onBlur: import("vue").PropType<import("naive-ui/es/_utils").MaybeArray<(e: FocusEvent) => void>>;
-        onClick: import("vue").PropType<import("naive-ui/es/_utils").MaybeArray<(e: MouseEvent) => void>>; /**
-         * 过滤默认值的右边展示
-         */
+        onClick: import("vue").PropType<import("naive-ui/es/_utils").MaybeArray<(e: MouseEvent) => void>>;
         onChange: import("vue").PropType<import("naive-ui/es/input/src/interface").OnUpdateValue>;
         onClear: import("vue").PropType<import("naive-ui/es/_utils").MaybeArray<(e: MouseEvent) => void>>;
         status: import("vue").PropType<import("naive-ui/es/form/src/interface").FormValidationStatus>;
@@ -2113,7 +2112,7 @@ declare const _default: import("vue").DefineComponent<{
             '--n-height': string;
             '--n-padding-left': string;
             '--n-padding-right': string;
-            '--n-text-color': string; /** 提交映射 */
+            '--n-text-color': string;
             '--n-caret-color': string;
             '--n-text-decoration-color': string;
             '--n-border': string;

package/es/packages/select-person/src/SelectPerson.vue_vue_type_script_setup_true_lang.mjs

@@ -1,4 +1,4 @@
-import { defineComponent, ref, reactive, computed, nextTick, watch, onMounted, openBlock, createElementBlock, createVNode, unref, withCtx, createElementVNode, createCommentVNode, createTextVNode, toDisplayString, createBlock, withDirectives, vShow, mergeProps, renderSlot, Fragment, renderList, normalizeClass } from 'vue';
+import { defineComponent, ref, reactive, computed, nextTick, watch, onMounted, openBlock, createElementBlock, createVNode, unref, withCtx, createElementVNode, createCommentVNode, withKeys, createTextVNode, toDisplayString, createBlock, withDirectives, vShow, mergeProps, renderSlot, Fragment, renderList, normalizeClass } from 'vue';
 import { useMessage, NSpin, NInputGroup, NInput, NButton, NCheckbox, NTree, NIcon, NTooltip } from 'naive-ui';
 import { CloseCircleSharp } from '@vicons/ionicons5';
 import vexutils from 'cnhis-design-vue/es/src/utils/vexutils';
@@ -350,12 +350,13 @@ var script = /* @__PURE__ */ defineComponent({
     const generateDataList = (data, dataList) => {
       for (let i = 0; i < data.length; i++) {
         const node = data[i];
-        dataList.push({
-          parentId: getParentId(node),
-          ...node
-        });
         if (node.children) {
           generateDataList(node.children, dataList);
+        } else {
+          dataList.push({
+            parentId: getParentId(node),
+            ...node
+          });
         }
       }
     };
@@ -504,28 +505,24 @@ var script = /* @__PURE__ */ defineComponent({
       });
     };
     const staticDataSearch = () => {
+      state.expandedKeys = [];
       if (!state.title) {
         state.treeData.main = JSON.parse(JSON.stringify(props.data));
         return;
       }
-      let copyData = JSON.parse(JSON.stringify(state.treeData.main));
-      filterTree({
+      let copyData = JSON.parse(JSON.stringify(props.data));
+      state.treeData.main = filterTree({
         value: state.title,
         data: copyData,
-        prop: "title"
-      });
-      const expandedKeys = [];
-      vexutils.searchTree(copyData, (item) => {
-        var _a;
-        if (item.visible) {
-          expandedKeys.push(item.key);
-        }
-        if ((_a = item.children) == null ? void 0 : _a.length) {
-          item.children = item.children.filter((child) => child.visible);
+        prop: "title",
+        filter: true,
+        callback: (child) => {
+          var _a;
+          child.visible && ((_a = child.children) == null ? void 0 : _a.length) && state.expandedKeys.push(child.key);
         }
-      });
-      state.treeData.main = copyData;
-      state.expandedKeys = expandedKeys;
+      }) || [];
+      state.dataList.main = [];
+      generateDataList(state.treeData.main, state.dataList.main);
     };
     const onExpand = (expandedKeys) => {
       state.expandedKeys = expandedKeys;
@@ -546,10 +543,23 @@ var script = /* @__PURE__ */ defineComponent({
         state.indeterminate = false;
         state.singleChecked = false;
       } else {
-        let keyArr = state.treeData.main.map((item) => item.key);
-        let keyArrTemp = keyArr.filter((item) => checkedKeys.indexOf(item) !== -1);
-        state.indeterminate = !(keyArr.length == keyArrTemp.length);
-        state.singleChecked = keyArr.length == keyArrTemp.length;
+        const getAllKeys = (tree) => {
+          if (!(tree == null ? void 0 : tree.length))
+            return 0;
+          let n = 0;
+          tree.forEach((item) => {
+            var _a;
+            if (!((_a = item == null ? void 0 : item.children) == null ? void 0 : _a.length)) {
+              n++;
+            } else {
+              n += getAllKeys(item.children);
+            }
+          });
+          return n;
+        };
+        let keys = getAllKeys(state.treeData.main);
+        state.indeterminate = !(keys == state.checkedKeys.main.length);
+        state.singleChecked = keys == state.checkedKeys.main.length;
       }
     };
     const addCheckedkeysMain = (keys) => {
@@ -590,9 +600,9 @@ var script = /* @__PURE__ */ defineComponent({
     };
     const radioChange = (checked) => {
       if (searchTreeVisable.value) {
-        state.singleChecked = checked;
-      } else {
         state.searchChecked = checked;
+      } else {
+        state.singleChecked = checked;
       }
       checkAll(checked ? 1 : 2);
     };
@@ -601,6 +611,8 @@ var script = /* @__PURE__ */ defineComponent({
         return false;
       if (type == 1) {
         state.expandedKeys = [];
+        state.dataList.main = [];
+        generateDataList(state.treeData.main, state.dataList.main);
         state.checkedKeys.main = dataListMainKeys.value;
       } else if (type == 2) {
         state.checkedKeys.main = [];
@@ -775,8 +787,11 @@ var script = /* @__PURE__ */ defineComponent({
       immediate: true
     });
     watch(() => state.checkedKeys.main, (val) => {
-      isAllCheck(val);
-      isSearchAllCheck();
+      if (!searchTreeVisable.value) {
+        isAllCheck(val);
+      } else {
+        isSearchAllCheck();
+      }
       emit("check", val);
     }, {
       immediate: true,
@@ -806,8 +821,9 @@ var script = /* @__PURE__ */ defineComponent({
             clearable: "",
             value: state.title,
             "onUpdate:value": _cache[0] || (_cache[0] = ($event) => state.title = $event),
-            placeholder: __props.searchPlaceholder
-          }, null, 8, ["value", "placeholder"]), createVNode(unref(NButton), {
+            placeholder: __props.searchPlaceholder,
+            onKeyup: withKeys(searchClick, ["enter", "native"])
+          }, null, 8, ["value", "placeholder", "onKeyup"]), createVNode(unref(NButton), {
             type: "primary",
             onClick: searchClick
           }, {
@@ -826,15 +842,15 @@ var script = /* @__PURE__ */ defineComponent({
         }, 8, ["checked", "indeterminate"])) : (openBlock(), createBlock(unref(NCheckbox), {
           key: 1,
           checked: state.singleChecked,
-          "onUpdate:checked": [_cache[2] || (_cache[2] = ($event) => state.singleChecked = $event), radioChange],
-          indeterminate: state.searchIndeterminate
+          indeterminate: state.searchIndeterminate,
+          "onUpdate:checked": radioChange
         }, {
           default: withCtx(() => [_hoisted_5]),
           _: 1
         }, 8, ["checked", "indeterminate"])), createCommentVNode(' <div v-show="state.search.status == 3 || (state.search.status == 0 && state.treeData.main && state.treeData.main.length == 0)" class="no-data-tips">\r\n            \u67E5\u65E0\u7ED3\u679C\r\n          </div> '), createCommentVNode(" main tree "), withDirectives(createVNode(unref(NTree), {
           class: "main-tree-container",
           "checked-keys": state.checkedKeys.main,
-          "onUpdate:checked-keys": _cache[3] || (_cache[3] = ($event) => state.checkedKeys.main = $event),
+          "onUpdate:checked-keys": _cache[2] || (_cache[2] = ($event) => state.checkedKeys.main = $event),
           "expanded-keys": state.expandedKeys,
           checkable: "",
           cascade: "",

package/es/packages/select-person/src/utils/index.d.ts

@@ -1,4 +1,4 @@
-export function filterTree({ value, data, prop, filter, filterXor, children, visible, filterChildren, callback }: {
+export declare const filterTree: ({ value, data, prop, filter, filterXor, children, visible, filterChildren, callback }: {
     value?: string | undefined;
     data?: any[] | undefined;
     prop?: string | undefined;
@@ -7,6 +7,6 @@ export function filterTree({ value, data, prop, filter, filterXor, children, vis
     children?: string | undefined;
     visible?: string | undefined;
     filterChildren?: boolean | undefined;
-    callback?: null | undefined;
-}): any;
-export function deepTraversalFirst(node: any, nodeList?: any[]): any[];
+    callback?: Function | undefined;
+}) => any[] | undefined;
+export declare const deepTraversalFirst: (node: any, nodeList?: any[]) => any[];