bkui-vue 0.0.1-beta.84 → 0.0.1-beta.85

package/dist/index.esm.js

@@ -33,7 +33,7 @@ var __publicField = (obj, key, value) => {
   __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
   return value;
 };
-import { createVNode, h as h$1, mergeProps, defineComponent, reactive, ref, computed, watch, onMounted, onBeforeUnmount, getCurrentInstance, nextTick, Transition, provide, inject, createTextVNode, withDirectives, vShow, isVNode, Fragment, toRefs, customRef, onBeforeMount, toRef, vModelText, resolveDirective, watchEffect, onUpdated, render, onUnmounted, Teleport, withModifiers } from "vue";
+import { inject, createVNode, h as h$1, mergeProps, defineComponent, reactive, ref, computed, watch, onMounted, onBeforeUnmount, getCurrentInstance, nextTick, Transition, provide, createTextVNode, withDirectives, vShow, isVNode, Fragment, toRefs, customRef, onBeforeMount, toRef, vModelText, resolveDirective, watchEffect, onUpdated, render, onUnmounted, Teleport, toRaw, withModifiers } from "vue";
 var reset = "";
 var alert = "";
 var affix = "";
@@ -1292,7 +1292,7 @@ function orderModifiers(modifiers) {
     }));
   }, []);
 }
-function debounce(fn2) {
+function debounce$1(fn2) {
   var pending;
   return function() {
     if (!pending) {
@@ -1406,7 +1406,7 @@ function popperGenerator(generatorOptions) {
           }
         }
       },
-      update: debounce(function() {
+      update: debounce$1(function() {
         return new Promise(function(resolve) {
           instance.forceUpdate();
           resolve(state);
@@ -1454,12 +1454,6 @@ var defaultModifiers = [eventListeners, popperOffsets$1, computeStyles$1, applyS
 var createPopper = /* @__PURE__ */ popperGenerator({
   defaultModifiers
 });
-function isNullOrUndef(value) {
-  return value === null || typeof value === "undefined";
-}
-function isEmpty(value, IncludeNullUndefined = true) {
-  return value === "" || (IncludeNullUndefined ? isNullOrUndef(value) : false);
-}
 function isArray(value) {
   if (Array.isArray(value)) {
     return true;
@@ -2322,6 +2316,10 @@ class PropTypes extends propTypesNS {
     });
   }
 }
+const formKey = Symbol("form");
+const formItemKey = Symbol("formItem");
+const useForm = () => inject(formKey);
+const useFormItem = () => inject(formItemKey, EMPTY_OBJ);
 function classes(dynamicCls, constCls = "") {
   return Object.entries(dynamicCls).filter((entry) => entry[1]).map((entry) => entry[0]).join(" ").concat(constCls ? ` ${constCls}` : "");
 }
@@ -2350,6 +2348,34 @@ const withInstallProps = (component, childComponents, isProps = false) => {
 function resolveClassName(clsName, prefix = "bk") {
   return `${prefix}-${clsName}`;
 }
+function debounce(delay = 300, fn2, immediate = false) {
+  let timeout;
+  let result;
+  const debounced = function() {
+    const ctx = this;
+    const args = arguments;
+    if (timeout)
+      clearTimeout(timeout);
+    if (immediate) {
+      const applyImmediate = !timeout;
+      timeout = setTimeout(() => {
+        timeout = null;
+      }, delay);
+      if (applyImmediate)
+        result = fn2.apply(ctx, args);
+    } else {
+      timeout = setTimeout(() => {
+        fn2.apply(ctx, args);
+      }, delay);
+    }
+    return result;
+  };
+  debounced.cancel = function() {
+    clearTimeout(timeout);
+    timeout = null;
+  };
+  return debounced;
+}
 function filterProperty(data2, filter) {
   return JSON.parse(JSON.stringify(data2, (key, value) => {
     if (filter.includes(key)) {
@@ -2840,6 +2866,7 @@ var Component$C = defineComponent({
     };
   },
   render() {
+    var _a, _b;
     if (!this.state.visible) {
       return null;
     }
@@ -2847,7 +2874,7 @@ var Component$C = defineComponent({
     const closeButtonClasses = classes({
       "bk-alert-close": true,
       "close-text": renderCloseText,
-      "icon-close": !renderCloseText
+      "bk-alert-close-icon": !renderCloseText
     });
     const typeClass = classes({
       "bk-alert": true,
@@ -2863,12 +2890,12 @@ var Component$C = defineComponent({
       "class": "bk-alert-content"
     }, [createVNode("div", {
       "class": "bk-alert-title"
-    }, [this.title]), createVNode("div", {
+    }, [this.$slots.title ? this.$slots.title() : this.title]), createVNode("div", {
       "class": "bk-alert-description"
-    }, null)]), this.closable && createVNode("span", {
+    }, [(_b = (_a = this.$slots).default) == null ? void 0 : _b.call(_a)])]), this.closable && createVNode("span", {
       "class": closeButtonClasses,
       "onClick": this.handleClose
-    }, [this.closeText])])]);
+    }, [this.closeText ? this.closeText : createVNode(closeLine, null, null)])])]);
   }
 });
 const BkAlert = withInstall(Component$C);
@@ -6925,7 +6952,7 @@ var lodash = { exports: {} };
       function isElement2(value) {
         return isObjectLike(value) && value.nodeType === 1 && !isPlainObject2(value);
       }
-      function isEmpty2(value) {
+      function isEmpty(value) {
         if (value == null) {
           return true;
         }
@@ -8055,7 +8082,7 @@ var lodash = { exports: {} };
       lodash2.isBuffer = isBuffer;
       lodash2.isDate = isDate2;
       lodash2.isElement = isElement2;
-      lodash2.isEmpty = isEmpty2;
+      lodash2.isEmpty = isEmpty;
       lodash2.isEqual = isEqual;
       lodash2.isEqualWith = isEqualWith;
       lodash2.isError = isError;
@@ -8983,6 +9010,7 @@ var Component$u = defineComponent({
   props: inputType,
   emits: inputEmitEventsType,
   setup(props, ctx) {
+    const formItem = useFormItem();
     const isFocused = ref(false);
     const isCNInput = ref(false);
     const isTextArea = computed(() => props.type === "textarea");
@@ -9035,20 +9063,25 @@ var Component$u = defineComponent({
       clear
     });
     function clear() {
+      var _a2;
       ctx.emit(EVENTS$2.UPDATE, "");
       ctx.emit(EVENTS$2.CHANGE, "");
       ctx.emit(EVENTS$2.CLEAR);
+      (_a2 = formItem == null ? void 0 : formItem.validate) == null ? void 0 : _a2.call(formItem, "change");
     }
     function handleFocus(e) {
       isFocused.value = true;
       ctx.emit(EVENTS$2.FOCUS, e);
     }
     function handleBlur(e) {
+      var _a2;
       isFocused.value = false;
       ctx.emit(EVENTS$2.BLUR, e);
+      (_a2 = formItem == null ? void 0 : formItem.validate) == null ? void 0 : _a2.call(formItem, "blur");
     }
     function eventHandler(eventName) {
       return (e) => {
+        var _a2;
         if (e.code === "Enter" || e.key === "Enter" || e.keyCode === 13) {
           ctx.emit(EVENTS$2.ENTER, e.target.value, e);
         }
@@ -9058,6 +9091,9 @@ var Component$u = defineComponent({
           ctx.emit(EVENTS$2.UPDATE, isNumberInput.value ? +e.target.value : e.target.value);
         }
         ctx.emit(eventName, e.target.value, e);
+        if (eventName === EVENTS$2.INPUT) {
+          (_a2 = formItem == null ? void 0 : formItem.validate) == null ? void 0 : _a2.call(formItem, "change");
+        }
       };
     }
     const [handleKeyup, handleKeydown, handleKeyPress, handlePaste, handleChange, handleInput] = [EVENTS$2.KEYUP, EVENTS$2.KEYDOWN, EVENTS$2.KEYPRESS, EVENTS$2.PASTE, EVENTS$2.CHANGE, EVENTS$2.INPUT].map(eventHandler);
@@ -9270,6 +9306,7 @@ const useCheckbox = () => {
     props,
     emit
   } = currentInstance;
+  const formItem = useFormItem();
   const checkboxGroup = inject(checkboxGroupKey, EMPTY_OBJ);
   const isGroup = !isEmptyObj(checkboxGroup);
   const isChecked = ref(props.checked);
@@ -9299,6 +9336,7 @@ const useCheckbox = () => {
     isChecked.value = value;
   };
   const handleChange = (event) => {
+    var _a;
     if (isDisabled.value) {
       return;
     }
@@ -9310,6 +9348,7 @@ const useCheckbox = () => {
     if (isGroup) {
       checkboxGroup.handleChange();
     }
+    (_a = formItem == null ? void 0 : formItem.validate) == null ? void 0 : _a.call(formItem, "change");
     nextTick(() => {
       if ($targetInput.checked !== isChecked.value) {
         $targetInput.checked = isChecked.value;
@@ -10485,6 +10524,7 @@ const useRadio = () => {
     props,
     emit
   } = currentInstance;
+  const formItem = useFormItem();
   const radioGroup = inject(radioGroupKey, EMPTY_OBJ);
   const isGroup = !isEmptyObj(radioGroup);
   const isChecked = ref(props.checked);
@@ -10512,6 +10552,7 @@ const useRadio = () => {
     isChecked.value = value;
   };
   const handleChange = (event) => {
+    var _a;
     if (isDisabled.value) {
       return;
     }
@@ -10523,6 +10564,7 @@ const useRadio = () => {
     if (isGroup) {
       radioGroup.handleChange(currentInstance.proxy);
     }
+    (_a = formItem == null ? void 0 : formItem.validate) == null ? void 0 : _a.call(formItem, "change");
     nextTick(() => {
       if ($targetInput.checked !== isChecked.value) {
         $targetInput.checked = isChecked.value;
@@ -10791,12 +10833,15 @@ var Component$i = defineComponent({
   setup(props, {
     emit
   }) {
+    const formItem = useFormItem();
     const hoverRate = ref(0);
     const chooseRate = (val) => {
+      var _a;
       if (!props.editable)
         return;
       emit("update:modelValue", val);
       emit("change", val);
+      (_a = formItem == null ? void 0 : formItem.validate) == null ? void 0 : _a.call(formItem, "change");
     };
     const changeHover = (val) => {
       hoverRate.value = val;
@@ -11133,7 +11178,7 @@ var BkOption = defineComponent({
   name: "Option",
   props: {
     value: PropTypes.any,
-    label: PropTypes.string,
+    label: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
     disabled: PropTypes.bool.def(false)
   },
   setup(props) {
@@ -11862,6 +11907,7 @@ var Component$f = defineComponent({
       multipleMode,
       allowCreate
     } = toRefs(props);
+    const formItem = useFormItem();
     const inputRef = ref();
     const popoverRef = ref();
     const selectTagInputRef = ref();
@@ -11971,10 +12017,12 @@ var Component$f = defineComponent({
       searchLoading
     } = useRemoteSearch(isRemoteSearch.value ? remoteMethod.value : defaultSearchMethod, initActiveOptionValue);
     const emitChange = (val) => {
+      var _a;
       if (val === modelValue.value)
         return;
       emit("change", val);
       emit("update:modelValue", val);
+      (_a = formItem == null ? void 0 : formItem.validate) == null ? void 0 : _a.call(formItem, "change");
     };
     const handleTogglePopover = () => {
       if (isDisabled.value)
@@ -11988,7 +12036,7 @@ var Component$f = defineComponent({
       searchKey.value = value;
     };
     const handleInputEnter = (value, e) => {
-      if (!allowCreate.value || !value || filterable.value && options.value.find((data3) => toLowerCase(data3.label) === toLowerCase(value)))
+      if (!allowCreate.value || !value || filterable.value && options.value.find((data3) => toLowerCase(String(data3.label)) === toLowerCase(value)))
         return;
       const data2 = optionsMap.value.get(value);
       if (data2)
@@ -12605,6 +12653,7 @@ var Component$c = defineComponent({
   setup(props, {
     emit
   }) {
+    const formItem = useFormItem();
     const isLoading = ref(false);
     const isChecked = computed(() => props.trueValue === localValue.value);
     const isModelValue = ref(props.modelValue !== false);
@@ -12646,8 +12695,10 @@ var Component$c = defineComponent({
       const lastValue = isChecked.value ? props.falseValue : props.trueValue;
       const lastChecked = !isChecked.value;
       const trigger = () => {
+        var _a;
         emit("update:modelValue", lastValue);
         emit("change", lastChecked);
+        (_a = formItem == null ? void 0 : formItem.validate) == null ? void 0 : _a.call(formItem, "change");
       };
       let goodJob = true;
       if (typeof props.preCheck === "function") {
@@ -12777,7 +12828,7 @@ function computedVirtualIndex(lineHeight, callback, pagination2, el, event) {
   }
   if (elScrollTop !== scrollTop || targetStartIndex !== startIndex || targetEndIndex !== endIndex) {
     const bottom2 = el.scrollHeight - el.offsetHeight - el.scrollTop;
-    typeof callback === "function" && callback(event, targetStartIndex, targetEndIndex, elScrollTop, translateY, elScrollLeft, { bottom: bottom2 });
+    typeof callback === "function" && callback(event, targetStartIndex, targetEndIndex, elScrollTop, translateY, elScrollLeft, { bottom: bottom2 >= 0 ? bottom2 : 0 });
   }
 }
 function visibleRender(e, wrapper, binding) {
@@ -12786,7 +12837,7 @@ function visibleRender(e, wrapper, binding) {
     const elScrollTop = wrapper.scrollTop;
     const elScrollLeft = wrapper.scrollLeft;
     const bottom2 = wrapper.scrollHeight - wrapper.offsetHeight - wrapper.scrollTop;
-    handleScrollCallback(e, null, null, elScrollTop, elScrollTop, elScrollLeft, { bottom: bottom2 });
+    handleScrollCallback(e, null, null, elScrollTop, elScrollTop, elScrollLeft, { bottom: bottom2 >= 0 ? bottom2 : 0 });
     return;
   }
   const { startIndex, endIndex, groupItemCount, count, scrollTop } = pagination2;
@@ -12982,6 +13033,7 @@ var EMITEVENTS = /* @__PURE__ */ ((EMITEVENTS2) => {
   EMITEVENTS2["PAGE_LIMIT_CHANGE"] = "pageLimitChange";
   EMITEVENTS2["PAGE_VALUE_CHANGE"] = "pageValueChange";
   EMITEVENTS2["SETTING_CHANGE"] = "settingChange";
+  EMITEVENTS2["SCROLL_BOTTOM"] = "scrollBottom";
   return EMITEVENTS2;
 })(EMITEVENTS || {});
 const EMPTY$1 = (..._args) => true;
@@ -12993,7 +13045,8 @@ const EMIT_EVENT_TYPES = {
   ["rowDblClick"]: EMPTY$1,
   ["pageLimitChange"]: EMPTY$1,
   ["pageValueChange"]: EMPTY$1,
-  ["settingChange"]: EMPTY$1
+  ["settingChange"]: EMPTY$1,
+  ["scrollBottom"]: EMPTY$1
 };
 const resolvePropVal = (prop, key, args) => {
   if (Object.prototype.hasOwnProperty.call(prop, key)) {
@@ -13147,6 +13200,18 @@ const getRowText = (row, key, column) => {
   }
   return row[key];
 };
+const formatPropAsArray = (prop, args) => {
+  if (Array.isArray(prop)) {
+    return prop;
+  }
+  if (typeof prop === "string" || typeof prop === "object") {
+    return [prop];
+  }
+  if (typeof prop === "function") {
+    return formatPropAsArray(Reflect.apply(prop, globalThis, args), args);
+  }
+  return [];
+};
 const resolveActiveColumns = (props) => {
   if (props.columnPick !== "disabled") {
     if (props.columnPick === "multi") {
@@ -13507,7 +13572,11 @@ const tableProps = {
     limit: PropTypes.number.def(void 0),
     size: PropTypes.size(["small", "default", "large"]).def("default"),
     sizeList: PropTypes.shape([]).def(void 0)
-  })]).def(false)
+  })]).def(false),
+  rowClass: PropTypes.oneOfType([PropTypes.string, PropTypes.object, PropTypes.func]).def({}),
+  rowStyle: PropTypes.oneOfType([PropTypes.string, PropTypes.object, PropTypes.func]).def({}),
+  cellStyle: PropTypes.oneOfType([PropTypes.string, PropTypes.object, PropTypes.func]).def({}),
+  cellClass: PropTypes.oneOfType([PropTypes.string, PropTypes.object, PropTypes.func]).def({})
 };
 function _isSlot$2(s2) {
   return typeof s2 === "function" || Object.prototype.toString.call(s2) === "[object Object]" && !isVNode(s2);
@@ -13748,14 +13817,6 @@ var useSmallList = () => {
     }
     localCurrent.value = localCurrent.value + 1;
   };
-  const setSelection = () => {
-    nextTick(() => {
-      inputRef.value.focus();
-      const range = window.getSelection();
-      range.selectAllChildren(inputRef.value);
-      range.collapseToEnd();
-    });
-  };
   const handlePageEditorFocus = () => {
     isFocused.value = true;
   };
@@ -13773,13 +13834,11 @@ var useSmallList = () => {
       return;
     }
     inputMemo = value;
-    setSelection();
   };
   const handlePageEditorKeydown = (event) => {
     if (["Enter", "NumpadEnter"].includes(event.code)) {
       event.preventDefault();
       handlePageEditorBlur();
-      setSelection();
     }
   };
   const handlePageChange = (item) => {
@@ -14538,25 +14597,31 @@ class TableRender {
       getFixedColumnStyleResolve
     } = useFixedColumn(this.props, this.colgroups);
     return createVNode("tbody", null, [rows.map((row, rowIndex) => {
-      const rowStyle = {
+      const rowStyle = [...formatPropAsArray(this.props.rowStyle, [row, rowIndex, this]), {
         "--row-height": `${this.getRowHeight(row, rowIndex)}px`
-      };
+      }];
+      const rowClass = [...formatPropAsArray(this.props.rowClass, [row, rowIndex, this])];
       const {
         resolveFixedColumnStyle,
         fixedoffset
       } = getFixedColumnStyleResolve();
       return createVNode("tr", {
         "style": rowStyle,
+        "class": rowClass,
         "onClick": (e) => this.handleRowClick(e, row, rowIndex, rows),
         "onDblclick": (e) => this.handleRowDblClick(e, row, rowIndex, rows)
-      }, [this.filterColgroups.map((column, index) => createVNode("td", {
-        "class": this.getColumnClass(column, index),
-        "style": resolveFixedColumnStyle(column, fixedoffset),
-        "colspan": 1,
-        "rowspan": 1
-      }, [createVNode("div", {
-        "class": "cell"
-      }, [this.renderCell(row, column, rowIndex, rows)])]))]);
+      }, [this.filterColgroups.map((column, index) => {
+        const cellStyle = [resolveFixedColumnStyle(column, fixedoffset), ...formatPropAsArray(this.props.cellStyle, [column, index, row, rowIndex, this])];
+        const cellClass = [this.getColumnClass(column, index), ...formatPropAsArray(this.props.cellClass, [column, index, row, rowIndex, this])];
+        return createVNode("td", {
+          "class": cellClass,
+          "style": cellStyle,
+          "colspan": 1,
+          "rowspan": 1
+        }, [createVNode("div", {
+          "class": "cell"
+        }, [this.renderCell(row, column, rowIndex, rows)])]);
+      })]);
     })]);
   }
   handleRowClick(e, row, index, rows) {
@@ -14668,7 +14733,9 @@ const useClass = (props, root, reactiveProp, pageData) => {
   const updateBorderClass = (root2) => {
     if (root2) {
       const tableBody = root2.querySelector(".bk-table-body table");
-      hasScrollY.value = tableBody.offsetHeight > root2.offsetHeight;
+      if (tableBody) {
+        hasScrollY.value = tableBody.offsetHeight > root2.offsetHeight;
+      }
     }
   };
   return {
@@ -14799,6 +14866,8 @@ var Component$9 = defineComponent({
       });
     });
     const handleScrollChanged = (args) => {
+      var _a2;
+      const preBottom = (_a2 = reactiveProp.pos.bottom) != null ? _a2 : 0;
       const pagination2 = args[1];
       const {
         translateX,
@@ -14808,6 +14877,17 @@ var Component$9 = defineComponent({
       reactiveProp.scrollTranslateY = translateY;
       reactiveProp.scrollTranslateX = translateX;
       reactiveProp.pos = pos;
+      const {
+        bottom: bottom2
+      } = pos;
+      if (bottom2 <= 2 && preBottom !== bottom2) {
+        debounce(60, () => {
+          ctx.emit(EMITEVENTS.SCROLL_BOTTOM, __spreadProps(__spreadValues({}, pos), {
+            translateX,
+            translateY
+          }));
+        }, true)();
+      }
     };
     onMounted(() => {
       observerIns = observerResize(root.value, () => {
@@ -14833,6 +14913,13 @@ var Component$9 = defineComponent({
       [resolveClassName("table-body-content")]: true,
       "with-virtual-render": props.virtualEnabled
     };
+    const resizeColumnClass = {
+      [resolveClassName("drag-column")]: true,
+      "offset-x": true
+    };
+    const loadingRowClass = {
+      [resolveClassName("table-loading_bottom")]: true
+    };
     return () => createVNode("div", {
       "class": tableClass.value,
       "style": wrapperStyle.value,
@@ -14859,8 +14946,10 @@ var Component$9 = defineComponent({
       createVNode("div", {
         "class": fixedWrapperClass
       }, [renderFixedColumns(), createVNode("div", {
-        "class": "bk-drag-column offset-x",
+        "class": resizeColumnClass,
         "style": dragOffsetXStyle.value
+      }, null), createVNode("div", {
+        "class": loadingRowClass
       }, null)]),
       createVNode("div", {
         "class": footerClass.value
@@ -15050,6 +15139,7 @@ var Component$8 = defineComponent({
   setup(props, {
     emit
   }) {
+    const formItem = useFormItem();
     const state = reactive({
       isEdit: false,
       isHover: false,
@@ -15334,6 +15424,7 @@ var Component$8 = defineComponent({
     };
     const handleBlur = () => {
       timer.value = setTimeout(() => {
+        var _a;
         const inputValue = curInputValue.value;
         clearInput();
         state.isEdit = false;
@@ -15360,6 +15451,7 @@ var Component$8 = defineComponent({
         }
         popoverProps.isShow = false;
         emit("blur", inputValue, tagList.value);
+        (_a = formItem == null ? void 0 : formItem.validate) == null ? void 0 : _a.call(formItem, "blur");
       }, 50);
     };
     const handleTagSelected = (item, type, e) => {
@@ -15383,9 +15475,11 @@ var Component$8 = defineComponent({
       tagInputRef.value.style.width = `${INPUT_MIN_WIDTH}px`;
     };
     const handleChange = (type, data2) => {
+      var _a;
       emit("change", tagList.value);
       emit(type, data2);
       emit("update:modelValue", tagList.value);
+      (_a = formItem == null ? void 0 : formItem.validate) == null ? void 0 : _a.call(formItem, "change");
     };
     const handleClear = (e) => {
       e.stopPropagation();
@@ -20474,6 +20568,7 @@ var Component$5 = defineComponent({
     slots,
     emit
   }) {
+    const formItem = useFormItem();
     const isRange = props.type.includes("range");
     const emptyArray = isRange ? [null, null] : [null];
     let initialValue = isAllEmptyArr((isRange ? props.modelValue : [props.modelValue]) || []) ? emptyArray : parseDate(props.modelValue, props.type, props.multiple, props.format);
@@ -20673,11 +20768,12 @@ var Component$5 = defineComponent({
     };
     const emitChange = (type) => {
       nextTick(() => {
-        var _a;
+        var _a, _b;
         emit("change", publicStringValue.value, type);
         emit("update:modelValue", publicVModelValue.value);
+        (_a = formItem == null ? void 0 : formItem.validate) == null ? void 0 : _a.call(formItem, "change");
         if (props.type.indexOf("time") < 0) {
-          (_a = inputRef == null ? void 0 : inputRef.value) == null ? void 0 : _a.blur();
+          (_b = inputRef == null ? void 0 : inputRef.value) == null ? void 0 : _b.blur();
         }
       });
     };
@@ -20714,7 +20810,7 @@ var Component$5 = defineComponent({
       (_a = pickerPanelRef == null ? void 0 : pickerPanelRef.value) == null ? void 0 : _a.reset();
     };
     const handleBlur = (e) => {
-      var _a;
+      var _a, _b;
       if (state.internalFocus) {
         state.internalFocus = false;
         return;
@@ -20728,6 +20824,7 @@ var Component$5 = defineComponent({
       state.internalValue = state.internalValue.slice();
       reset2();
       (_a = pickerPanelRef == null ? void 0 : pickerPanelRef.value) == null ? void 0 : _a.onToggleVisibility(false);
+      (_b = formItem == null ? void 0 : formItem.validate) == null ? void 0 : _b.call(formItem, "blur");
     };
     const handleKeydown = (e) => {
       const {
@@ -20995,359 +21092,169 @@ var Component$5 = defineComponent({
   }
 });
 const BkDatePicker = withInstall(Component$5);
-({
-  title: Array,
-  extCls: PropTypes.string,
-  settingKey: PropTypes.string,
-  displayKey: PropTypes.string,
-  searchPlaceholder: PropTypes.string,
-  showOverflowTips: PropTypes.bool,
-  searchable: PropTypes.bool,
-  sortKey: PropTypes.string,
-  sortable: PropTypes.bool,
-  sourceList: Array,
-  targetList: Array,
-  emptyContent: Array
-});
+var ArrayType = /* @__PURE__ */ ((ArrayType2) => {
+  ArrayType2["OBJECT_ARRAY"] = "objectArray";
+  ArrayType2["BASE_ARRAY"] = "baseArray";
+  ArrayType2["NOT_ARRAY"] = "notArray";
+  return ArrayType2;
+})(ArrayType || {});
+const transferProps = {
+  title: PropTypes.arrayOf(PropTypes.string).def([]),
+  extCls: PropTypes.string.def(""),
+  searchPlaceholder: PropTypes.string.def(""),
+  settingKey: PropTypes.string.def("id"),
+  displayKey: PropTypes.string.def("value"),
+  sortKey: PropTypes.string.def("value"),
+  showOverflowTips: PropTypes.bool.def(false),
+  searchable: PropTypes.bool.def(false),
+  sortable: PropTypes.bool.def(false),
+  sourceList: PropTypes.arrayOf(PropTypes.any).def([]),
+  targetList: PropTypes.arrayOf(PropTypes.any).def([]),
+  emptyContent: PropTypes.arrayOf(PropTypes.string).def([])
+};
+function useTransferData(sourceData, targetList, settingCode) {
+  const selectList = ref([]);
+  const selectedList = ref([]);
+  const transformData = () => {
+    sourceData.value.forEach((s2) => {
+      const keyId = s2[settingCode.value];
+      if (targetList.value.includes(keyId)) {
+        selectedList.value.push(s2);
+      } else {
+        selectList.value.push(s2);
+      }
+    });
+  };
+  transformData();
+  watch(() => [sourceData, targetList, settingCode], transformData);
+  return {
+    selectList,
+    selectedList
+  };
+}
+function useSelectListSearch(selectList, displayCode) {
+  const selectSearchQuery = ref("");
+  const selectListSearch = computed(() => {
+    return selectList.value.filter((select2) => {
+      const val = select2[displayCode.value];
+      if (val instanceof Object)
+        return false;
+      return val.toString().includes(selectSearchQuery.value);
+    });
+  });
+  return {
+    selectSearchQuery,
+    selectListSearch
+  };
+}
 var Component$4 = defineComponent({
   name: "Transfer",
-  props: {
-    title: {
-      type: Array,
-      default: () => []
-    },
-    extCls: {
-      type: String,
-      default: ""
-    },
-    searchPlaceholder: {
-      type: String,
-      default: ""
-    },
-    settingKey: {
-      type: String,
-      default: "id"
-    },
-    displayKey: {
-      type: String,
-      default: "value"
-    },
-    sortKey: {
-      type: String,
-      default: ""
-    },
-    showOverflowTips: {
-      type: Boolean,
-      default: false
-    },
-    searchable: {
-      type: Boolean,
-      default: false
-    },
-    sortable: {
-      type: Boolean,
-      default: false
-    },
-    sourceList: {
-      type: Array,
-      default: () => []
-    },
-    targetList: {
-      type: Array,
-      default: () => []
-    },
-    emptyContent: {
-      type: Array,
-      default: () => []
-    }
-  },
-  emits: ["change"],
-  slots: ["left-header", "right-header", "source-option", "target-option", "left-empty-content", "right-empty-content"],
+  props: transferProps,
+  emits: ["change", "update:targetList"],
   setup(props, {
     emit
   }) {
-    let sortList = [];
-    let sortCode = props.sortKey;
-    let isSortFlag = props.sortable;
-    const keyword = ref("");
-    const transferRef = ref(null);
-    const dataList = ref([]);
-    const hasSelectedList = ref([]);
-    const leftHoverIndex = ref(-1);
-    const rightHoverIndex = ref(-1);
-    const typeFlag = computed(() => {
-      if (!props.sourceList || !Array.isArray(props.sourceList)) {
-        return "empty";
-      }
-      const str = props.sourceList.toString();
-      if (str.indexOf("[object Object]") !== -1) {
-        return true;
-      }
-      return false;
-    });
-    const settingCode = computed(() => {
-      if (!typeFlag.value) {
-        return "index";
-      }
-      return props.settingKey;
-    });
-    const displayCode = computed(() => {
-      if (!typeFlag.value) {
-        return "value";
-      }
-      return props.displayKey;
-    });
-    const displayDataList = computed(() => {
-      if (keyword.value) {
-        return dataList.value.filter((item) => !isEmpty(item[displayCode.value]) && String(item[displayCode.value]).indexOf(keyword.value) > -1);
-      }
-      return dataList.value;
-    });
-    watch(() => props.sourceList, () => {
-      if (typeFlag.value !== "empty") {
-        initData();
-        initSort();
+    const sourceListType = computed(() => {
+      if (Array.isArray(props.sourceList)) {
+        const isObjectArray = props.sourceList.every((s2) => s2.toString().includes("[object Object]"));
+        return isObjectArray ? ArrayType.OBJECT_ARRAY : ArrayType.BASE_ARRAY;
+      }
+      return ArrayType.NOT_ARRAY;
+    });
+    const settingCode = computed(() => sourceListType.value === ArrayType.BASE_ARRAY ? "value" : props.settingKey);
+    const displayCode = computed(() => sourceListType.value === ArrayType.BASE_ARRAY ? "value" : props.displayKey);
+    const sortCode = computed(() => props.sortKey || displayCode.value);
+    const sourceData = computed(() => {
+      switch (sourceListType.value) {
+        case ArrayType.BASE_ARRAY:
+          return [...new Set(props.sourceList)].map((s2) => ({
+            value: s2
+          }));
+        case ArrayType.OBJECT_ARRAY:
+          return [...props.sourceList];
+        default:
+          return [];
       }
-    }, {
-      deep: true
-    });
-    watch(() => props.targetList, () => {
-      initData();
-      initSort();
-    }, {
-      deep: true
-    });
-    watch(() => [displayCode.value, settingCode.value], () => {
-      initData();
     });
-    watch(() => props.sortKey, (value) => {
-      sortCode = value;
-      initSort();
-    });
-    watch(() => props.sortable, (value) => {
-      isSortFlag = value;
-      initSort();
+    const {
+      targetList
+    } = toRefs(props);
+    const {
+      selectList,
+      selectedList
+    } = useTransferData(sourceData, targetList, settingCode);
+    const {
+      selectSearchQuery,
+      selectListSearch
+    } = useSelectListSearch(selectList, displayCode);
+    const selectListSort = computed(() => {
+      return [...selectListSearch.value].sort((a2, b2) => {
+        const va = a2[sortCode.value];
+        const vb = b2[sortCode.value];
+        return va > vb ? 1 : -1;
+      });
     });
-    const initData = () => {
-      if (typeFlag.value !== "empty") {
-        if (!typeFlag.value) {
-          generalInit();
-        } else {
-          init();
-        }
-      }
-    };
-    const generalInit = () => {
-      if (!props.targetList.length || props.targetList.length > props.sourceList.length) {
-        const list = [];
-        for (let i = 0; i < props.sourceList.length; i++) {
-          list.push({
-            index: i,
-            value: props.sourceList[i]
-          });
-        }
-        dataList.value = [...list];
-        hasSelectedList.value.splice(0, hasSelectedList.value.length, ...[]);
-        emit("change", dataList.value, [], []);
-      } else {
-        const list = [];
-        const valueList = [];
-        for (let i = 0; i < props.sourceList.length; i++) {
-          list.push({
-            index: i,
-            value: props.sourceList[i]
-          });
-        }
-        props.targetList.forEach((target) => {
-          const matchItem = list.find((val) => val.value === target);
-          if (matchItem) {
-            valueList.push(matchItem);
-          }
-        });
-        hasSelectedList.value = [...valueList];
-        const result = list.filter((item1) => valueList.every((item2) => item2.index !== item1.index));
-        dataList.value = [...result];
-        emit("change", dataList.value, [...handleListFormat(hasSelectedList.value, false)], []);
-      }
-    };
-    const init = () => {
-      if (!props.targetList.length || props.targetList.length > props.sourceList.length) {
-        dataList.value.splice(0, dataList.value.length, ...props.sourceList);
-        hasSelectedList.value = [];
-        emit("change", dataList.value, [], []);
-      } else {
-        const result = props.sourceList.filter((item1) => props.targetList.every((item2) => item2 !== item1[settingCode.value]));
-        const hasTempList = [];
-        props.sourceList.forEach((item1) => {
-          props.targetList.forEach((item2) => {
-            if (item1[settingCode.value] === item2) {
-              hasTempList.push(item1);
-            }
-          });
-        });
-        hasSelectedList.value = [...hasTempList];
-        dataList.value = [...result];
-        const list = [...handleListFormat(hasSelectedList.value)];
-        emit("change", dataList.value, hasSelectedList.value, list);
-      }
-    };
-    const initSort = () => {
-      let templateList = [];
-      if (!typeFlag.value) {
-        sortCode = isSortFlag ? "index" : "";
-        for (let k2 = 0; k2 < props.sourceList.length; k2++) {
-          templateList.push({
-            index: k2,
-            value: props.sourceList[k2]
-          });
-        }
-      } else {
-        if (!isSortFlag) {
-          sortCode = "";
-        }
-        templateList = [...props.sourceList];
-      }
-      if (sortCode) {
-        const arr = [];
-        templateList.forEach((item) => {
-          arr.push(item[sortCode]);
-        });
-        sortList = [...arr];
-        if (sortList.length === props.sourceList.length) {
-          const list = [...dataList.value];
-          dataList.value = [...sortDataList(list, sortCode, sortList)];
-        }
-      }
-    };
-    const handleItemChange = () => {
-      const sourceList = dataList.value;
-      const targetList = !typeFlag.value ? [...handleListFormat(hasSelectedList.value, false)] : hasSelectedList.value;
-      const targetValueList = !typeFlag.value ? [] : [...handleListFormat(hasSelectedList.value)];
-      emit("change", sourceList, targetList, targetValueList);
-    };
-    const handleListFormat = (list, objectType = true) => {
-      const templateList = [];
-      if (!list.length) {
-        return [];
-      }
-      const dataList2 = [...list];
-      dataList2.forEach((item) => {
-        if (objectType) {
-          for (const [key, value] of Object.entries(item)) {
-            if (key === settingCode.value) {
-              templateList.push(value);
-            }
-          }
-        } else {
-          templateList.push(item.value);
-        }
+    const selectedListSort = computed(() => {
+      return [...selectedList.value].sort((a2, b2) => {
+        const va = a2[sortCode.value];
+        const vb = b2[sortCode.value];
+        return va > vb ? 1 : -1;
       });
-      return templateList;
-    };
+    });
     const allToRight = () => {
-      leftHoverIndex.value = -1;
-      const curDisplayDataList = displayDataList.value;
-      const selectedList = hasSelectedList.value;
-      curDisplayDataList.forEach((transferItem) => {
-        selectedList.push(transferItem);
-        removeFromDataList(transferItem);
-      });
-      if (sortList.length === props.sourceList.length) {
-        hasSelectedList.value = [...sortDataList(selectedList, sortCode, sortList)];
-      } else {
-        hasSelectedList.value = [...selectedList];
-      }
-      handleItemChange();
+      selectList.value = [];
+      selectedList.value = [...sourceData.value];
+      handleEmitUpdateTargetList();
     };
     const allToLeft = () => {
-      rightHoverIndex.value = -1;
-      const selectedList = hasSelectedList.value;
-      const curDataList = dataList.value;
-      while (selectedList.length) {
-        const transferItem = selectedList.shift();
-        curDataList.push(transferItem);
-        if (sortList.length === props.sourceList.length) {
-          dataList.value = [...sortDataList(curDataList, sortCode, sortList)];
-        } else {
-          dataList.value = [...curDataList];
-        }
-      }
-      handleItemChange();
+      selectList.value = [...sourceData.value];
+      selectedList.value = [];
+      handleEmitUpdateTargetList();
+    };
+    const handleItemClick = (itemKey, isLeft) => {
+      const from = isLeft ? selectList : selectedList;
+      const to = isLeft ? selectedList : selectList;
+      const index = from.value.findIndex((item) => item[settingCode.value] === itemKey);
+      to.value.push(...from.value.splice(index, 1));
+      handleEmitUpdateTargetList();
+    };
+    const handleEmitUpdateTargetList = () => {
+      const restList = selectList.value.map((item) => item[settingCode.value]);
+      const targetList2 = selectedList.value.map((item) => item[settingCode.value]);
+      emit("update:targetList", targetList2);
+      emit("change", sourceListType.value === ArrayType.BASE_ARRAY ? restList : selectList.value.map((v2) => toRaw(v2)), sourceListType.value === ArrayType.BASE_ARRAY ? targetList2 : selectedList.value.map((v2) => toRaw(v2)), targetList2);
     };
-    const sortDataList = (list, key, sortList2) => {
-      const arr = sortList2;
-      return list.sort((a2, b2) => arr.indexOf(a2[key]) - arr.indexOf(b2[key]) >= 0);
-    };
-    const removeFromDataList = (removeItem) => {
-      dataList.value = dataList.value.filter((item) => item[settingCode.value] !== removeItem[settingCode.value]);
-    };
-    const handleItemMouseEvent = (type, event, isLeft, index) => {
-      event.preventDefault();
-      event.stopPropagation();
-      const hoverIndex = type === "over" ? index : -1;
-      isLeft ? leftHoverIndex.value = hoverIndex : rightHoverIndex.value = hoverIndex;
-    };
-    const handleItemClick = (event, index, isLeft) => {
-      event.preventDefault();
-      event.stopPropagation();
-      isLeft ? leftHoverIndex.value = -1 : rightHoverIndex.value = -1;
-      const transferItem = isLeft ? displayDataList.value[index] : hasSelectedList.value.splice(index, 1)[0];
-      const selectedList = isLeft ? hasSelectedList.value : dataList.value;
-      selectedList.push(transferItem);
-      isLeft && removeFromDataList(transferItem);
-      const newList = sortList.length === props.sourceList.length ? [...sortDataList(selectedList, sortCode, sortList)] : [...selectedList];
-      isLeft ? hasSelectedList.value = [...newList] : dataList.value = [...newList];
-      handleItemChange();
-    };
-    if (typeFlag.value !== "empty") {
-      if (!typeFlag.value) {
-        generalInit();
-      } else {
-        init();
-      }
-      initSort();
-    }
     return {
-      keyword,
-      transferRef,
-      dataList,
+      selectSearchQuery,
+      selectListSearch,
+      selectedList,
+      selectListSort,
+      selectedListSort,
+      settingCode,
+      displayCode,
       allToRight,
       allToLeft,
-      displayDataList,
-      displayCode,
-      leftHoverIndex,
-      rightHoverIndex,
-      handleItemMouseEvent,
-      handleItemClick,
-      hasSelectedList
+      handleItemClick
     };
   },
   render() {
-    const {
-      extCls,
-      title,
-      emptyContent,
-      searchable,
-      searchPlaceholder
-    } = this.$props;
+    const leftList = this.sortable ? this.selectListSort : this.selectListSearch;
+    const rightList = this.sortable ? this.selectedListSort : this.selectedList;
     const getHeaderHtml = (dirct) => {
       var _a, _b;
       const isLeft = dirct === "left-header";
-      const titleText = isLeft ? `${(_a = title[0]) != null ? _a : "\u5DE6\u4FA7\u5217\u8868"}` : `${(_b = title[1]) != null ? _b : "\u53F3\u4FA7\u5217\u8868"}`;
-      const isDisabled = isLeft ? !this.dataList.length : !this.hasSelectedList.length;
+      const titleText = isLeft ? `${(_a = this.title[0]) != null ? _a : "\u5DE6\u4FA7\u5217\u8868"}` : `${(_b = this.title[1]) != null ? _b : "\u53F3\u4FA7\u5217\u8868"}`;
+      const isDisabled = isLeft ? !leftList.length : !rightList.length;
       const headerClick = () => {
-        if (isLeft && this.dataList.length) {
-          this.allToRight();
-        }
-        if (!isLeft && this.hasSelectedList.length) {
-          this.allToLeft();
-        }
+        if (isDisabled)
+          return;
+        isLeft ? this.allToRight() : this.allToLeft();
       };
       return this.$slots[dirct] ? createVNode("div", {
         "class": "slot-header"
       }, [this.$slots[dirct]()]) : createVNode("div", {
         "class": "header"
-      }, [`${titleText}\uFF08\u5171${this.dataList.length}\u6761\uFF09`, createVNode("span", {
+      }, [`${titleText}\uFF08\u5171${isLeft ? leftList.length : rightList.length}\u6761\uFF09`, createVNode("span", {
         "class": {
           disabled: isDisabled
         },
@@ -21357,20 +21264,19 @@ var Component$4 = defineComponent({
     const getEmptyHtml = (dirct) => {
       var _a;
       const isLeft = dirct === "left-empty-content";
-      const emptyText = (_a = isLeft ? emptyContent[0] : emptyContent[1]) != null ? _a : isLeft ? "\u65E0\u6570\u636E" : "\u672A\u9009\u62E9\u4EFB\u4F55\u9879";
+      const emptyText = (_a = isLeft ? this.emptyContent[0] : this.emptyContent[1]) != null ? _a : isLeft ? "\u65E0\u6570\u636E" : "\u672A\u9009\u62E9\u4EFB\u4F55\u9879";
       return this.$slots[dirct] ? createVNode("div", null, [this.$slots[dirct]()]) : createVNode("div", {
         "class": "empty"
       }, [emptyText]);
     };
-    const getDefaultListHtml = (item, index, isLeft = true) => {
-      const hoverIndex = isLeft ? this.leftHoverIndex : this.rightHoverIndex;
+    const getDefaultListHtml = (item, isLeft = true) => {
       return createVNode("div", {
         "class": "item-content"
       }, [createVNode("span", {
         "class": "content-text",
         "title": item[this.displayCode]
       }, [item[this.displayCode]]), createVNode("span", {
-        "class": ["icon-wrapper", index === hoverIndex ? "hover" : ""]
+        "class": "icon-wrapper"
       }, [isLeft ? createVNode(arrowsRight, {
         "class": "bk-icon"
       }, null) : createVNode(error, {
@@ -21379,33 +21285,30 @@ var Component$4 = defineComponent({
     };
     const getListContentHtml = (dirct) => {
       const isLeft = dirct === "left";
-      const list = isLeft ? this.displayDataList : this.hasSelectedList;
+      const list = isLeft ? leftList : rightList;
       const slotName = isLeft ? "source-option" : "target-option";
       const emptySlotName = isLeft ? "left-empty-content" : "right-empty-content";
       return list.length ? createVNode("ul", {
-        "class": ["content", searchable && isLeft ? "is-search" : ""]
-      }, [list.map((item, index) => {
+        "class": ["content", this.searchable && isLeft ? "is-search" : ""]
+      }, [list.map((item) => {
         var _a, _b, _c;
         return createVNode("li", {
-          "key": index,
-          "class": [!!this.$slots[slotName] ? "custom-item" : ""],
-          "onClick": (event) => this.handleItemClick(event, index, isLeft),
-          "onMouseover": (event) => this.handleItemMouseEvent("over", event, isLeft, index),
-          "onMouseleave": (event) => this.handleItemMouseEvent("leave", event, isLeft, index)
-        }, [(_c = (_b = (_a = this.$slots)[slotName]) == null ? void 0 : _b.call(_a, item)) != null ? _c : getDefaultListHtml(item, index, isLeft)]);
+          "key": item[this.settingCode],
+          "class": [this.$slots[slotName] ? "custom-item" : ""],
+          "onClick": () => this.handleItemClick(item[this.settingCode], isLeft)
+        }, [(_c = (_b = (_a = this.$slots)[slotName]) == null ? void 0 : _b.call(_a, item)) != null ? _c : getDefaultListHtml(item, isLeft)]);
       })]) : getEmptyHtml(emptySlotName);
     };
     return createVNode("div", {
-      "class": ["bk-transfer", extCls],
-      "ref": "transferRef"
+      "class": ["bk-transfer", this.extCls]
     }, [createVNode("div", {
       "class": "source-list"
-    }, [getHeaderHtml("left-header"), searchable && createVNode(BkInput, {
-      "modelValue": this.keyword,
-      "onUpdate:modelValue": ($event) => this.keyword = $event,
+    }, [getHeaderHtml("left-header"), this.searchable && createVNode(BkInput, {
+      "modelValue": this.selectSearchQuery,
+      "onUpdate:modelValue": ($event) => this.selectSearchQuery = $event,
       "class": "transfer-search-input",
       "clearable": true,
-      "placeholder": searchPlaceholder || "\u8BF7\u8F93\u5165\u641C\u7D22\u5173\u952E\u5B57",
+      "placeholder": this.searchPlaceholder || "\u8BF7\u8F93\u5165\u641C\u7D22\u5173\u952E\u5B57",
       "type": "search",
       "left-icon": "bk-icon icon-search"
     }, null), getListContentHtml("left")]), createVNode("div", {
@@ -21505,7 +21408,7 @@ const treeProps = {
   draggable: PropTypes.bool.def(false),
   dragSort: PropTypes.bool.def(false),
   selectable: PropTypes.bool.def(true),
-  selected: PropTypes.oneOfType([PropTypes.string, PropTypes.number, PropTypes.object]).def(null),
+  selected: PropTypes.oneOfType([PropTypes.string, null, PropTypes.number, PropTypes.object]).def(null),
   autoCheckChildren: PropTypes.bool.def(true)
 };
 var useEmpty = (props, {
@@ -22739,15 +22642,12 @@ var ComposeFormItem = defineComponent({
     }, childrenArr);
   }
 });
-const formKey$1 = Symbol("form");
-const getFormKey = () => formKey$1;
-const formKey = getFormKey();
 const formProps = {
   formType: PropTypes.oneOf(["default", "vertical"]).def("default"),
   labelWidth: PropTypes.oneOfType([Number, String]),
   labelPosition: PropTypes.oneOf(["left", "center", "right"]),
   model: PropTypes.object,
-  rules: PropTypes.array
+  rules: PropTypes.object
 };
 var Form = defineComponent({
   name: "Form",
@@ -22831,9 +22731,9 @@ var Form = defineComponent({
     }, [(_b = (_a = this.$slots).default) == null ? void 0 : _b.call(_a)]);
   }
 });
-var validator = {
+var defaultValidator = {
   required: (value) => {
-    console.log("required");
+    console.log("required", value, value !== "" && value !== void 0 && value !== null);
     return value !== "" && value !== void 0 && value !== null;
   },
   min: (value, min2) => {
@@ -22851,6 +22751,10 @@ var validator = {
   maxlength: (value, maxlength) => {
     console.log("maxlength");
     return value.length <= maxlength;
+  },
+  pattern: (value, pattern) => {
+    console.log("pattern");
+    return pattern.test(value);
   }
 };
 const formItemProps = {
@@ -22873,35 +22777,35 @@ const getRulesFromProps = (props) => {
   const rules = [];
   if (props.required) {
     rules.push({
-      validator: validator.required,
+      validator: defaultValidator.required,
       message: `${props.label}\u4E0D\u80FD\u4E3A\u7A7A`,
       trigger: "blur"
     });
   }
   if (props.email) {
     rules.push({
-      validator: validator.email,
+      validator: defaultValidator.email,
       message: `${props.label}\u683C\u5F0F\u4E0D\u6B63\u786E`,
       trigger: "blur"
     });
   }
   if (Number(props.max) > -1) {
     rules.push({
-      validator: (value) => validator.max(value, props.max),
+      validator: (value) => defaultValidator.max(value, props.max),
       message: `${props.label}\u6700\u5927\u503C${props.max}`,
       trigger: "blur"
     });
   }
   if (Number(props.min) > -1) {
     rules.push({
-      validator: (value) => validator.min(value, props.min),
+      validator: (value) => defaultValidator.min(value, props.min),
       message: `${props.label}\u6700\u5C0F\u503C${props.min}`,
       trigger: "blur"
     });
   }
   if (Number(props.maxlength) > -1) {
     rules.push({
-      validator: (value) => validator.maxlength(value, props.maxlength),
+      validator: (value) => defaultValidator.maxlength(value, props.maxlength),
       message: `${props.label}\u6700\u5927\u957F\u5EA6${props.maxlength}`,
       trigger: "blur"
     });
@@ -22909,27 +22813,32 @@ const getRulesFromProps = (props) => {
   return rules;
 };
 const mergeRules = (configRules, propsRules) => {
-  const formatConfigRules = configRules.map((rule) => {
+  const formatConfigRules = configRules.reduce((result, rule) => {
     let rulevalidator;
     if (rule.required) {
-      rulevalidator = validator.required;
+      rulevalidator = defaultValidator.required;
     } else if (rule.email) {
-      rulevalidator = validator.email;
+      rulevalidator = defaultValidator.email;
     } else if (Number(rule.max) > -1) {
-      rulevalidator = (value) => validator.max(value, rule.max);
+      rulevalidator = (value) => defaultValidator.max(value, rule.max);
     } else if (Number(rule.min) > -1) {
-      rulevalidator = (value) => validator.min(value, rule.max);
+      rulevalidator = (value) => defaultValidator.min(value, rule.max);
     } else if (Number(rule.maxlength) > -1) {
-      rulevalidator = (value) => validator.min(value, rule.max);
+      rulevalidator = (value) => defaultValidator.min(value, rule.max);
+    } else if (Object.prototype.toString.call(rule.pattern) === "[object RegExp]") {
+      rulevalidator = (value) => defaultValidator.pattern(value, rule.pattern);
+    } else if (Object.prototype.toString.call(rule.validator) === "[object Function]") {
+      rulevalidator = rule.validator;
     } else {
-      rulevalidator = () => true;
+      return result;
     }
-    return {
+    result.push({
       validator: rulevalidator,
       message: rule.message,
       trigger: rule.trigger
-    };
-  });
+    });
+    return result;
+  }, []);
   return [...propsRules, ...formatConfigRules];
 };
 const getTriggerRules = (trigger, rules) => rules.reduce((result, rule) => {
@@ -22956,7 +22865,7 @@ var FormItem = defineComponent({
       isError: false,
       errorMessage: ""
     });
-    const form2 = inject(formKey);
+    const form2 = useForm();
     const isForm = Boolean(form2);
     const labelStyles = computed(() => {
       const styles = {
@@ -22989,6 +22898,7 @@ var FormItem = defineComponent({
         rules = props.rules;
       }
       rules = getTriggerRules(trigger, mergeRules(rules, getRulesFromProps(props)));
+      console.log(rules);
       const value = form2.props.model[props.property];
       const doValidate = (() => {
         let stepIndex = -1;
@@ -23022,6 +22932,10 @@ var FormItem = defineComponent({
       state.isError = false;
       state.errorMessage = "";
     };
+    provide(formItemKey, __spreadProps(__spreadValues({}, props), {
+      validate,
+      clearValidate
+    }));
     onMounted(() => {
       if (isForm) {
         form2.register(currentInstance.proxy);