bge-ui 1.8.2 → 1.8.4

package/dist/datePicker/components/ActionRow.vue.d.ts

@@ -297,7 +297,7 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<{
         default: null;
     };
     placeholder: {
-        type: PropType<string>;
+        type: PropType<string | string[]>;
         default: string;
     };
     hideInputIcon: {
@@ -755,7 +755,7 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<{
         default: null;
     };
     placeholder: {
-        type: PropType<string>;
+        type: PropType<string | string[]>;
         default: string;
     };
     hideInputIcon: {
@@ -930,7 +930,7 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<{
     timePicker: boolean;
     locale: string;
     autocomplete: string;
-    placeholder: string;
+    placeholder: string | string[];
     actionRow: ActionRowData;
     monthPicker: boolean;
     yearPicker: boolean;

package/dist/datePicker/components/DatePicker/DatePicker.vue.d.ts

@@ -303,7 +303,7 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<{
         default: null;
     };
     placeholder: {
-        type: import("vue").PropType<string>;
+        type: import("vue").PropType<string | string[]>;
         default: string;
     };
     hideInputIcon: {
@@ -811,7 +811,7 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<{
         default: null;
     };
     placeholder: {
-        type: import("vue").PropType<string>;
+        type: import("vue").PropType<string | string[]>;
         default: string;
     };
     hideInputIcon: {
@@ -996,7 +996,7 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<{
     timePicker: boolean;
     locale: string;
     autocomplete: string;
-    placeholder: string;
+    placeholder: string | string[];
     actionRow: ActionRowData;
     monthPicker: boolean;
     yearPicker: boolean;

package/dist/datePicker/components/DatePicker/DpCalendar.vue.d.ts

@@ -298,7 +298,7 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<{
         default: null;
     };
     placeholder: {
-        type: PropType<string>;
+        type: PropType<string | string[]>;
         default: string;
     };
     hideInputIcon: {
@@ -770,7 +770,7 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<{
         default: null;
     };
     placeholder: {
-        type: PropType<string>;
+        type: PropType<string | string[]>;
         default: string;
     };
     hideInputIcon: {
@@ -959,7 +959,7 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<{
     timePicker: boolean;
     locale: string;
     autocomplete: string;
-    placeholder: string;
+    placeholder: string | string[];
     actionRow: ActionRowData;
     monthPicker: boolean;
     yearPicker: boolean;

package/dist/datePicker/components/DatePicker/DpHeader.vue.d.ts

@@ -298,7 +298,7 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<{
         default: null;
     };
     placeholder: {
-        type: PropType<string>;
+        type: PropType<string | string[]>;
         default: string;
     };
     hideInputIcon: {
@@ -773,7 +773,7 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<{
         default: null;
     };
     placeholder: {
-        type: PropType<string>;
+        type: PropType<string | string[]>;
         default: string;
     };
     hideInputIcon: {
@@ -963,7 +963,7 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<{
     timePicker: boolean;
     locale: string;
     autocomplete: string;
-    placeholder: string;
+    placeholder: string | string[];
     actionRow: ActionRowData;
     monthPicker: boolean;
     yearPicker: boolean;

package/dist/datePicker/components/DatepickerInput.vue.d.ts

@@ -265,7 +265,7 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<{
         default: null;
     };
     placeholder: {
-        type: PropType<string>;
+        type: PropType<string | string[]>;
         default: string;
     };
     hideInputIcon: {
@@ -703,7 +703,7 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<{
         default: null;
     };
     placeholder: {
-        type: PropType<string>;
+        type: PropType<string | string[]>;
         default: string;
     };
     hideInputIcon: {
@@ -887,7 +887,7 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<{
     timePicker: boolean;
     locale: string;
     autocomplete: string;
-    placeholder: string;
+    placeholder: string | string[];
     actionRow: ActionRowData;
     monthPicker: boolean;
     yearPicker: boolean;

package/dist/datePicker/components/DatepickerMenu.vue.d.ts

@@ -294,7 +294,7 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<{
         default: null;
     };
     placeholder: {
-        type: PropType<string>;
+        type: PropType<string | string[]>;
         default: string;
     };
     hideInputIcon: {
@@ -761,7 +761,7 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<{
         default: null;
     };
     placeholder: {
-        type: PropType<string>;
+        type: PropType<string | string[]>;
         default: string;
     };
     hideInputIcon: {
@@ -945,7 +945,7 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<{
     timePicker: boolean;
     locale: string;
     autocomplete: string;
-    placeholder: string;
+    placeholder: string | string[];
     actionRow: ActionRowData;
     monthPicker: boolean;
     yearPicker: boolean;

package/dist/datePicker/components/MonthPicker/MonthPicker.vue.d.ts

@@ -296,7 +296,7 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<{
         default: null;
     };
     placeholder: {
-        type: import("vue").PropType<string>;
+        type: import("vue").PropType<string | string[]>;
         default: string;
     };
     hideInputIcon: {
@@ -776,7 +776,7 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<{
         default: null;
     };
     placeholder: {
-        type: import("vue").PropType<string>;
+        type: import("vue").PropType<string | string[]>;
         default: string;
     };
     hideInputIcon: {
@@ -950,7 +950,7 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<{
     timePicker: boolean;
     locale: string;
     autocomplete: string;
-    placeholder: string;
+    placeholder: string | string[];
     actionRow: ActionRowData;
     monthPicker: boolean;
     yearPicker: boolean;

package/dist/datePicker/components/QuarterPicker/QuarterPicker.vue.d.ts

@@ -296,7 +296,7 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<{
         default: null;
     };
     placeholder: {
-        type: import("vue").PropType<string>;
+        type: import("vue").PropType<string | string[]>;
         default: string;
     };
     hideInputIcon: {
@@ -758,7 +758,7 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<{
         default: null;
     };
     placeholder: {
-        type: import("vue").PropType<string>;
+        type: import("vue").PropType<string | string[]>;
         default: string;
     };
     hideInputIcon: {
@@ -929,7 +929,7 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<{
     timePicker: boolean;
     locale: string;
     autocomplete: string;
-    placeholder: string;
+    placeholder: string | string[];
     actionRow: ActionRowData;
     monthPicker: boolean;
     yearPicker: boolean;

package/dist/datePicker/components/TimePicker/TimeInput.vue.d.ts

@@ -298,7 +298,7 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<{
         default: null;
     };
     placeholder: {
-        type: PropType<string>;
+        type: PropType<string | string[]>;
         default: string;
     };
     hideInputIcon: {
@@ -784,7 +784,7 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<{
         default: null;
     };
     placeholder: {
-        type: PropType<string>;
+        type: PropType<string | string[]>;
         default: string;
     };
     hideInputIcon: {
@@ -988,7 +988,7 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<{
     timePicker: boolean;
     locale: string;
     autocomplete: string;
-    placeholder: string;
+    placeholder: string | string[];
     actionRow: ActionRowData;
     monthPicker: boolean;
     yearPicker: boolean;

package/dist/datePicker/components/TimePicker/TimePicker.vue.d.ts

@@ -298,7 +298,7 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<{
         default: null;
     };
     placeholder: {
-        type: PropType<string>;
+        type: PropType<string | string[]>;
         default: string;
     };
     hideInputIcon: {
@@ -774,7 +774,7 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<{
         default: null;
     };
     placeholder: {
-        type: PropType<string>;
+        type: PropType<string | string[]>;
         default: string;
     };
     hideInputIcon: {
@@ -968,7 +968,7 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<{
     timePicker: boolean;
     locale: string;
     autocomplete: string;
-    placeholder: string;
+    placeholder: string | string[];
     actionRow: ActionRowData;
     monthPicker: boolean;
     yearPicker: boolean;

package/dist/datePicker/components/TimePicker/TimePickerSolo.vue.d.ts

@@ -296,7 +296,7 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<{
         default: null;
     };
     placeholder: {
-        type: import("vue").PropType<string>;
+        type: import("vue").PropType<string | string[]>;
         default: string;
     };
     hideInputIcon: {
@@ -760,7 +760,7 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<{
         default: null;
     };
     placeholder: {
-        type: import("vue").PropType<string>;
+        type: import("vue").PropType<string | string[]>;
         default: string;
     };
     hideInputIcon: {
@@ -930,7 +930,7 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<{
     timePicker: boolean;
     locale: string;
     autocomplete: string;
-    placeholder: string;
+    placeholder: string | string[];
     actionRow: ActionRowData;
     monthPicker: boolean;
     yearPicker: boolean;

package/dist/datePicker/components/YearPicker/YearPicker.vue.d.ts

@@ -296,7 +296,7 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<{
         default: null;
     };
     placeholder: {
-        type: import("vue").PropType<string>;
+        type: import("vue").PropType<string | string[]>;
         default: string;
     };
     hideInputIcon: {
@@ -753,7 +753,7 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<{
         default: null;
     };
     placeholder: {
-        type: import("vue").PropType<string>;
+        type: import("vue").PropType<string | string[]>;
         default: string;
     };
     hideInputIcon: {
@@ -922,7 +922,7 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<{
     timePicker: boolean;
     locale: string;
     autocomplete: string;
-    placeholder: string;
+    placeholder: string | string[];
     actionRow: ActionRowData;
     monthPicker: boolean;
     yearPicker: boolean;

package/dist/datePicker/components/shared/YearModePicker.vue.d.ts

@@ -318,7 +318,7 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<{
         default: null;
     };
     placeholder: {
-        type: PropType<string>;
+        type: PropType<string | string[]>;
         default: string;
     };
     hideInputIcon: {
@@ -787,7 +787,7 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<{
         default: null;
     };
     placeholder: {
-        type: PropType<string>;
+        type: PropType<string | string[]>;
         default: string;
     };
     hideInputIcon: {
@@ -954,7 +954,7 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<{
     timePicker: boolean;
     locale: string;
     autocomplete: string;
-    placeholder: string;
+    placeholder: string | string[];
     actionRow: ActionRowData;
     monthPicker: boolean;
     yearPicker: boolean;

package/dist/datePicker/datePicker.vue.d.ts

@@ -265,7 +265,7 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<{
         default: null;
     };
     placeholder: {
-        type: import("vue").PropType<string>;
+        type: import("vue").PropType<string | string[]>;
         default: string;
     };
     hideInputIcon: {
@@ -365,7 +365,9 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<{
         default: boolean;
     };
     actionRow: {
-        type: import("vue").PropType<ActionRowData>;
+        type: import("vue").PropType<ActionRowData>; /**
+         * Called when select button is clicked, emit update for the modelValue
+         */
         default: () => {};
     };
     focusStartDate: {
@@ -719,7 +721,7 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<{
         default: null;
     };
     placeholder: {
-        type: import("vue").PropType<string>;
+        type: import("vue").PropType<string | string[]>;
         default: string;
     };
     hideInputIcon: {
@@ -819,7 +821,9 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<{
         default: boolean;
     };
     actionRow: {
-        type: import("vue").PropType<ActionRowData>;
+        type: import("vue").PropType<ActionRowData>; /**
+         * Called when select button is clicked, emit update for the modelValue
+         */
         default: () => {};
     };
     focusStartDate: {
@@ -908,7 +912,7 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<{
     timePicker: boolean;
     locale: string;
     autocomplete: string;
-    placeholder: string;
+    placeholder: string | string[];
     actionRow: ActionRowData;
     monthPicker: boolean;
     yearPicker: boolean;

package/dist/datePicker/index.vue.d.ts

@@ -296,7 +296,7 @@ declare const _default: import("vue").DefineComponent<{
         default: null;
     };
     placeholder: {
-        type: import("vue").PropType<string>;
+        type: import("vue").PropType<string | string[]>;
         default: string;
     };
     hideInputIcon: {
@@ -745,7 +745,7 @@ declare const _default: import("vue").DefineComponent<{
         default: null;
     };
     placeholder: {
-        type: import("vue").PropType<string>;
+        type: import("vue").PropType<string | string[]>;
         default: string;
     };
     hideInputIcon: {
@@ -911,7 +911,7 @@ declare const _default: import("vue").DefineComponent<{
     timePicker: boolean;
     locale: string;
     autocomplete: string;
-    placeholder: string;
+    placeholder: string | string[];
     actionRow: ActionRowData;
     monthPicker: boolean;
     yearPicker: boolean;

package/dist/datePicker/props.d.ts

@@ -267,7 +267,7 @@ export declare const AllProps: {
         default: null;
     };
     placeholder: {
-        type: PropType<string>;
+        type: PropType<string | string[]>;
         default: string;
     };
     hideInputIcon: {
@@ -713,7 +713,7 @@ export declare const PickerBaseProps: {
         default: null;
     };
     placeholder: {
-        type: PropType<string>;
+        type: PropType<string | string[]>;
         default: string;
     };
     hideInputIcon: {

package/dist/form/index.vue.d.ts

@@ -1,6 +1,6 @@
 declare function validate(callback: any): Promise<any>;
-declare function resetFields(): void;
-declare function clearValidate(): void;
+declare function resetFields(): Promise<void>;
+declare function clearValidate(): Promise<void>;
 declare function validateField(): void;
 declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<{
     inline: BooleanConstructor;

package/dist/index.js

@@ -4,7 +4,7 @@ var __publicField = (obj, key, value) => {
   __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
   return value;
 };
-import { defineComponent, resolveComponent, openBlock, createElementBlock, normalizeClass, createElementVNode, createVNode, renderSlot, normalizeStyle, createStaticVNode, provide, reactive, toRefs, ref, watch, unref, getCurrentScope, onScopeDispose, readonly, computed, getCurrentInstance, onMounted, useSlots, inject, createTextVNode, toDisplayString, createCommentVNode, TransitionGroup, withCtx, createBlock, withModifiers, withDirectives, cloneVNode, Fragment, Text, Comment, onUnmounted, h, Transition, vShow, onBeforeMount, nextTick, Teleport, resolveDynamicComponent, shallowReactive, render as render$7, isVNode, vModelCheckbox, renderList, toRef, useAttrs, normalizeProps, mergeProps, onBeforeUpdate, withKeys, createSlots, guardReactiveProps, isRef } from "vue";
+import { defineComponent, resolveComponent, openBlock, createElementBlock, normalizeClass, createElementVNode, createVNode, renderSlot, normalizeStyle, createStaticVNode, provide, reactive, toRefs, ref, watch, unref, getCurrentScope, onScopeDispose, readonly, computed, getCurrentInstance, onMounted, useSlots, inject, createTextVNode, toDisplayString, createCommentVNode, TransitionGroup, withCtx, nextTick, createBlock, withModifiers, withDirectives, cloneVNode, Fragment, Text, Comment, onUnmounted, h, Transition, vShow, onBeforeMount, Teleport, resolveDynamicComponent, shallowReactive, render as render$7, isVNode, vModelCheckbox, renderList, toRef, useAttrs, normalizeProps, mergeProps, onBeforeUpdate, withKeys, createSlots, guardReactiveProps, isRef } from "vue";
 const _hoisted_1$2e = ["disabled"];
 const _hoisted_2$1U = { class: "loading-icon" };
 const _sfc_main$2o = /* @__PURE__ */ defineComponent({
@@ -4891,11 +4891,24 @@ const _sfc_main$x = /* @__PURE__ */ defineComponent({
         return callback && callback(true, validationErrors);
       return callback(false, validationErrors);
     }
-    function resetFields() {
-      console.log("resetFields");
+    async function resetFields() {
+      if (!props.model) {
+        return;
+      }
+      for (const field of fields) {
+        try {
+          await field.resetField();
+        } catch (errors2) {
+        }
+      }
     }
-    function clearValidate() {
-      console.log("clearValidate");
+    async function clearValidate() {
+      for (const field of fields) {
+        try {
+          await field.clearValidate();
+        } catch (errors2) {
+        }
+      }
     }
     function validateField() {
       console.log("validateField");
@@ -6288,6 +6301,7 @@ const _sfc_main$w = /* @__PURE__ */ defineComponent({
   },
   setup(__props) {
     const props = __props;
+    let initialValue = void 0;
     const labelSlot = useSlots().label;
     const isShowLabel = computed(() => {
       return !!labelSlot || props.label;
@@ -6302,6 +6316,7 @@ const _sfc_main$w = /* @__PURE__ */ defineComponent({
     const validateMessage = ref("");
     const validateState = ref("");
     const formItemRef = ref();
+    let isResettingField = false;
     const fieldValue = computed(() => {
       const model = formContext == null ? void 0 : formContext.model;
       if (!model || !props.prop) {
@@ -6373,7 +6388,7 @@ const _sfc_main$w = /* @__PURE__ */ defineComponent({
       }).map(({ trigger: trigger2, ...rule }) => rule);
     };
     const validate = async (trigger, callback) => {
-      if (!props.prop) {
+      if (isResettingField || !props.prop) {
         return false;
       }
       const hasCallback = isFunction2(callback);
@@ -6396,11 +6411,26 @@ const _sfc_main$w = /* @__PURE__ */ defineComponent({
         return hasCallback ? false : Promise.reject(fields);
       });
     };
+    const clearValidate = async () => {
+      setValidationState("");
+      validateMessage.value = "";
+      isResettingField = false;
+    };
+    const resetField = async () => {
+      const model = formContext == null ? void 0 : formContext.model;
+      if (!model || !props.prop)
+        return;
+      isResettingField = true;
+      model[props.prop] = JSON.parse(JSON.stringify(initialValue));
+      await nextTick();
+      clearValidate();
+      isResettingField = false;
+    };
     const context = reactive({
       ...toRefs(props),
       $el: formItemRef,
       validateState,
-      // resetField,
+      resetField,
       // clearValidate,
       validate
     });
@@ -6414,6 +6444,7 @@ const _sfc_main$w = /* @__PURE__ */ defineComponent({
     );
     onMounted(() => {
       formContext == null ? void 0 : formContext.addField(context);
+      initialValue = fieldValue.value ? JSON.parse(JSON.stringify(fieldValue.value)) : "";
     });
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock("div", {
@@ -17434,7 +17465,7 @@ const AllProps = {
   minTime: { type: Object, default: null },
   maxTime: { type: Object, default: null },
   name: { type: String, default: null },
-  placeholder: { type: String, default: "" },
+  placeholder: { type: [String, Array], default: "" },
   hideInputIcon: { type: Boolean, default: false },
   clearable: { type: Boolean, default: true },
   state: { type: Boolean, default: null },
@@ -22923,15 +22954,29 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
   props: {
     ...PickerBaseProps
   },
-  emits: [
-    "input",
-    "change",
-    "update:modelValue"
-  ],
+  emits: ["input", "change", "update:modelValue"],
   setup(__props, { emit: __emit }) {
     const props = __props;
     const datePickerRef = ref();
     const date4 = ref();
+    const rangePlaceholders = computed(() => {
+      if (Array.isArray(props.placeholder)) {
+        return [
+          props.placeholder[0] || "开始日期",
+          props.placeholder[1] || "结束日期"
+        ];
+      }
+      if (props.placeholder) {
+        return [props.placeholder, props.placeholder];
+      }
+      return ["开始日期", "结束日期"];
+    });
+    const singlePlaceholder = computed(() => {
+      if (Array.isArray(props.placeholder)) {
+        return props.placeholder[0] || "选择日期";
+      }
+      return props.placeholder || "选择日期";
+    });
     const isStartFocus = ref(false);
     const isEndFocus = ref(false);
     function toggle(type4) {
@@ -22949,10 +22994,13 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
     function inputValueCallback(val) {
       inputValue.value = val.split(" - ");
     }
-    watch(() => props.modelValue, (val) => {
-      date4.value = val;
-      formItemContext && formItemContext.validate && formItemContext.validate().catch((err) => err);
-    });
+    watch(
+      () => props.modelValue,
+      (val) => {
+        date4.value = val;
+        formItemContext && formItemContext.validate && formItemContext.validate().catch((err) => err);
+      }
+    );
     watch(date4, (val) => {
       emit("input", val);
       emit("change", val);
@@ -22988,7 +23036,7 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
               class: normalizeClass(["bge-datepicker__input", { focus: isStartFocus.value, inputed: !!(date4.value && date4.value[0]) }]),
               onClick: _cache[1] || (_cache[1] = ($event) => isStartFocus.value = true)
             }, [
-              createTextVNode(toDisplayString(inputValue.value && inputValue.value[0] || "结束日期") + " ", 1),
+              createTextVNode(toDisplayString(inputValue.value && inputValue.value[0] || rangePlaceholders.value[0]) + " ", 1),
               createVNode(_component_MonoClose, {
                 class: "bge-datepicker__close",
                 onClick: _cache[0] || (_cache[0] = withModifiers(($event) => close(), ["stop"]))
@@ -23000,7 +23048,7 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
               class: normalizeClass(["bge-datepicker__input", { focus: isEndFocus.value, inputed: !!(date4.value && date4.value[1]) }]),
               onClick: _cache[3] || (_cache[3] = ($event) => isEndFocus.value = true)
             }, [
-              createTextVNode(toDisplayString(inputValue.value && inputValue.value[1] || "结束日期") + " ", 1),
+              createTextVNode(toDisplayString(inputValue.value && inputValue.value[1] || rangePlaceholders.value[1]) + " ", 1),
               createVNode(_component_MonoClose, {
                 class: "bge-datepicker__close",
                 onClick: _cache[2] || (_cache[2] = withModifiers(($event) => close(), ["stop"]))
@@ -23012,7 +23060,7 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
               class: normalizeClass(["bge-datepicker__input", { focus: isStartFocus.value, inputed: !!date4.value }]),
               onClick: _cache[5] || (_cache[5] = ($event) => isStartFocus.value = true)
             }, [
-              createTextVNode(toDisplayString(inputValue.value && inputValue.value[0] || "选择日期") + " ", 1),
+              createTextVNode(toDisplayString(inputValue.value && inputValue.value[0] || singlePlaceholder.value) + " ", 1),
               createVNode(_component_MonoClose, {
                 class: "bge-datepicker__close",
                 onClick: _cache[4] || (_cache[4] = withModifiers(($event) => close(), ["stop"]))
@@ -23026,7 +23074,7 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const UiDatePicker = /* @__PURE__ */ _export_sfc(_sfc_main$3, [["__scopeId", "data-v-a163f1fb"]]);
+const UiDatePicker = /* @__PURE__ */ _export_sfc(_sfc_main$3, [["__scopeId", "data-v-a817b926"]]);
 const _sfc_main$2 = /* @__PURE__ */ defineComponent({
   __name: "index",
   props: {

package/dist/style.css

@@ -1746,7 +1746,7 @@ to {
 }
 .bge-option.active[data-v-8a6e1228] {
   color: var(--tc-title);
-}.bge-datepicker[data-v-a163f1fb] {
+}.bge-datepicker[data-v-a817b926] {
   width: 100%;
   display: flex;
   align-items: center;
@@ -1757,7 +1757,7 @@ to {
   font-weight: 500;
   cursor: pointer;
 }
-.bge-datepicker .bge-datepicker__input[data-v-a163f1fb] {
+.bge-datepicker .bge-datepicker__input[data-v-a817b926] {
   font-size: 12px;
   line-height: 20px;
   font-weight: 500;
@@ -1771,32 +1771,32 @@ to {
   flex: 1;
   border-radius: var(--radius-small, 4px);
 }
-.bge-datepicker .bge-datepicker__input .bge-datepicker__icon[data-v-a163f1fb],
-.bge-datepicker .bge-datepicker__input .bge-datepicker__close[data-v-a163f1fb] {
+.bge-datepicker .bge-datepicker__input .bge-datepicker__icon[data-v-a817b926],
+.bge-datepicker .bge-datepicker__input .bge-datepicker__close[data-v-a817b926] {
   font-size: 16px !important;
   color: var(--tc-quaternary);
 }
-.bge-datepicker .bge-datepicker__input .bge-datepicker__icon[data-v-a163f1fb]:hover,
-.bge-datepicker .bge-datepicker__input .bge-datepicker__close[data-v-a163f1fb]:hover {
+.bge-datepicker .bge-datepicker__input .bge-datepicker__icon[data-v-a817b926]:hover,
+.bge-datepicker .bge-datepicker__input .bge-datepicker__close[data-v-a817b926]:hover {
   color: var(--tc-title);
 }
-.bge-datepicker .bge-datepicker__input .bge-datepicker__close[data-v-a163f1fb] {
+.bge-datepicker .bge-datepicker__input .bge-datepicker__close[data-v-a817b926] {
   display: none;
 }
-.bge-datepicker .bge-datepicker__input[data-v-a163f1fb]:hover {
+.bge-datepicker .bge-datepicker__input[data-v-a817b926]:hover {
   background: var(--bg-opacity-hover);
   border: solid 1px transparent;
 }
-.bge-datepicker .bge-datepicker__input.focus[data-v-a163f1fb] {
+.bge-datepicker .bge-datepicker__input.focus[data-v-a817b926] {
   border: solid 1px var(--tc-theme);
 }
-.bge-datepicker .bge-datepicker__input.inputed[data-v-a163f1fb] {
+.bge-datepicker .bge-datepicker__input.inputed[data-v-a817b926] {
   color: var(--tc-title);
 }
-.bge-datepicker .bge-datepicker__input.inputed:hover .bge-datepicker__close[data-v-a163f1fb] {
+.bge-datepicker .bge-datepicker__input.inputed:hover .bge-datepicker__close[data-v-a817b926] {
   display: block;
 }
-.bge-datepicker .bge-datepicker__input.inputed:hover .bge-datepicker__icon[data-v-a163f1fb] {
+.bge-datepicker .bge-datepicker__input.inputed:hover .bge-datepicker__icon[data-v-a817b926] {
   display: none;
 }.bge-switch[data-v-e973c7de] {
   width: 38px;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bge-ui",
-  "version": "1.8.2",
+  "version": "1.8.4",
   "description": "",
   "type": "module",
   "main": "./src/index.ts",

package/src/datePicker/index.vue

@@ -1,25 +1,56 @@
 <template>
-  <DatePicker ref="datePickerRef" v-model="date" :range="props.range" :multi-calendars="props.range" :enableTimePicker="false" :clearable="false" @open="() => toggle('open')" locale="zh-CN" @closed="() => toggle('close')" @input-value="inputValueCallback" dark auto-apply>
+  <DatePicker
+    ref="datePickerRef"
+    v-model="date"
+    :range="props.range"
+    :multi-calendars="props.range"
+    :enableTimePicker="false"
+    :clearable="false"
+    @open="() => toggle('open')"
+    locale="zh-CN"
+    @closed="() => toggle('close')"
+    @input-value="inputValueCallback"
+    dark
+    auto-apply
+  >
     <template #dp-input>
       <template v-if="props.range">
         <div class="bge-datepicker">
-          <div class="bge-datepicker__input" :class="{focus: isStartFocus, inputed: !!(date && date[0])}" @click="isStartFocus = true">
-            {{inputValue && inputValue[0] || '结束日期'}}
-            <MonoClose class="bge-datepicker__close" @click.stop="close('start')" />
+          <div
+            class="bge-datepicker__input"
+            :class="{ focus: isStartFocus, inputed: !!(date && date[0]) }"
+            @click="isStartFocus = true"
+          >
+            {{ (inputValue && inputValue[0]) || rangePlaceholders[0] }}
+            <MonoClose
+              class="bge-datepicker__close"
+              @click.stop="close('start')"
+            />
             <MonoCalendar class="bge-datepicker__icon" />
           </div>
           -
-          <div class="bge-datepicker__input" :class="{focus: isEndFocus, inputed: !!(date && date[1])}" @click="isEndFocus = true">
-            {{inputValue && inputValue[1] || '结束日期'}}
-            <MonoClose class="bge-datepicker__close" @click.stop="close('end')" />
+          <div
+            class="bge-datepicker__input"
+            :class="{ focus: isEndFocus, inputed: !!(date && date[1]) }"
+            @click="isEndFocus = true"
+          >
+            {{ (inputValue && inputValue[1]) || rangePlaceholders[1] }}
+            <MonoClose
+              class="bge-datepicker__close"
+              @click.stop="close('end')"
+            />
             <MonoCalendar class="bge-datepicker__icon" />
           </div>
         </div>
       </template>
       <template v-else>
         <div class="bge-datepicker">
-          <div class="bge-datepicker__input" :class="{focus: isStartFocus, inputed: !!(date)}" @click="isStartFocus = true">
-            {{inputValue && inputValue[0] || '选择日期'}}
+          <div
+            class="bge-datepicker__input"
+            :class="{ focus: isStartFocus, inputed: !!date }"
+            @click="isStartFocus = true"
+          >
+            {{ (inputValue && inputValue[0]) || singlePlaceholder }}
             <MonoClose class="bge-datepicker__close" @click.stop="close()" />
             <MonoCalendar class="bge-datepicker__icon" />
           </div>
@@ -29,27 +60,46 @@
   </DatePicker>
 </template>
 <script lang="ts" setup>
-import DatePicker from './datePicker.vue'
-import { PickerBaseProps } from './props'
-import { ref, onMounted, watch, inject } from 'vue'
+import DatePicker from "./datePicker.vue";
+import { PickerBaseProps } from "./props";
+import { ref, onMounted, watch, inject, computed } from "vue";
 const props = defineProps({
-    ...PickerBaseProps,
+  ...PickerBaseProps,
 });
 
-const datePickerRef = ref()
+const datePickerRef = ref();
 const date = ref<any>();
-const isStartFocus = ref(false)
-const isEndFocus = ref(false)
+const rangePlaceholders = computed(() => {
+  if (Array.isArray(props.placeholder)) {
+    return [
+      props.placeholder[0] || "开始日期",
+      props.placeholder[1] || "结束日期",
+    ];
+  }
+  if (props.placeholder) {
+    return [props.placeholder, props.placeholder];
+  }
+  return ["开始日期", "结束日期"];
+});
+
+const singlePlaceholder = computed(() => {
+  if (Array.isArray(props.placeholder)) {
+    return props.placeholder[0] || "选择日期";
+  }
+  return props.placeholder || "选择日期";
+});
+const isStartFocus = ref(false);
+const isEndFocus = ref(false);
 
 function toggle(type: string) {
-  if (type === 'close') {
-    isStartFocus.value = false
-    isEndFocus.value = false
+  if (type === "close") {
+    isStartFocus.value = false;
+    isEndFocus.value = false;
   }
 }
 
 function close(type?: string) {
-  date.value = undefined
+  date.value = undefined;
   // if (type === 'start') {
   //   date.value[0] = undefined
   // } else if (type === 'end') {
@@ -59,100 +109,101 @@ function close(type?: string) {
   // }
 }
 
-const emit = defineEmits([
-  'input',
-  'change',
-  'update:modelValue'
-])
+const emit = defineEmits(["input", "change", "update:modelValue"]);
 
-const inputValue = ref()
+const inputValue = ref();
 
-const formItemContextKey = 'bge-form-item-context'
+const formItemContextKey = "bge-form-item-context";
 
-const formItemContext: any = inject(formItemContextKey, undefined)
+const formItemContext: any = inject(formItemContextKey, undefined);
 
 function inputValueCallback(val: string) {
-  inputValue.value = val.split(' - ')
+  inputValue.value = val.split(" - ");
 }
 
-watch(() => props.modelValue, (val) => {
-  date.value = val
-  formItemContext && formItemContext.validate && formItemContext.validate().catch((err: any) => (err))
-})
+watch(
+  () => props.modelValue,
+  (val) => {
+    date.value = val;
+    formItemContext &&
+      formItemContext.validate &&
+      formItemContext.validate().catch((err: any) => err);
+  }
+);
 
 watch(date, (val) => {
-  emit('input', val)
-  emit('change', val)
-  emit('update:modelValue', val)
-})
+  emit("input", val);
+  emit("change", val);
+  emit("update:modelValue", val);
+});
 
 onMounted(() => {
   if (props.modelValue) {
-    date.value = props.modelValue
-  } 
-})
+    date.value = props.modelValue;
+  }
+});
 </script>
 <style lang="scss" scoped>
-  .bge-datepicker {
-    width: 100%;
+.bge-datepicker {
+  width: 100%;
+  display: flex;
+  align-items: center;
+  gap: 4px;
+  color: var(--tc-quaternary);
+  font-size: 14px;
+  line-height: 24px;
+  font-weight: 500;
+  cursor: pointer;
+
+  .bge-datepicker__input {
+    font-size: 12px;
+    line-height: 20px;
+    font-weight: 500;
+    padding: 4px 12px;
     display: flex;
     align-items: center;
-    gap: 4px;
-    color: var(--tc-quaternary);
-    font-size: 14px;
-    line-height: 24px;
-    font-weight: 500;
-    cursor: pointer;
-
-    .bge-datepicker__input {
-      font-size: 12px;
-      line-height: 20px;
-      font-weight: 500;
-      padding: 4px 12px;
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-      gap: 8px;
-      background: var(--bg-opacity);
-      border: solid 1px transparent;
-      flex: 1;
-      border-radius: var(--radius-small, 4px);
-
-      .bge-datepicker__icon,
-      .bge-datepicker__close {
-        font-size: 16px !important;
-        color: var(--tc-quaternary);
+    justify-content: space-between;
+    gap: 8px;
+    background: var(--bg-opacity);
+    border: solid 1px transparent;
+    flex: 1;
+    border-radius: var(--radius-small, 4px);
+
+    .bge-datepicker__icon,
+    .bge-datepicker__close {
+      font-size: 16px !important;
+      color: var(--tc-quaternary);
 
-        &:hover {
-          color: var(--tc-title);
-        }
+      &:hover {
+        color: var(--tc-title);
       }
+    }
 
-      .bge-datepicker__close {
-        display: none;
-      }
+    .bge-datepicker__close {
+      display: none;
+    }
 
-      &:hover {
-        background: var(--bg-opacity-hover);
-        border: solid 1px transparent;
-      }
+    &:hover {
+      background: var(--bg-opacity-hover);
+      border: solid 1px transparent;
+    }
 
-      &.focus {
-        border: solid 1px var(--tc-theme);
-      }
+    &.focus {
+      border: solid 1px var(--tc-theme);
+    }
 
-      &.inputed {
-        color: var(--tc-title);
+    &.inputed {
+      color: var(--tc-title);
 
-        &:hover {
-          .bge-datepicker__close {
-            display: block;
-          }
-          .bge-datepicker__icon {
-            display: none;
-          }
+      &:hover {
+        .bge-datepicker__close {
+          display: block;
+        }
+        .bge-datepicker__icon {
+          display: none;
         }
       }
     }
-  } 
-</style>
+  }
+}
+</style>

package/src/datePicker/props.ts

@@ -118,7 +118,7 @@ export const AllProps = {
     minTime: { type: Object as PropType<Partial<TimeModel>>, default: null },
     maxTime: { type: Object as PropType<Partial<TimeModel>>, default: null },
     name: { type: String as PropType<string>, default: null },
-    placeholder: { type: String as PropType<string>, default: '' },
+    placeholder: { type: [String, Array] as PropType<string | string[]>, default: '' },
     hideInputIcon: { type: Boolean as PropType<boolean>, default: false },
     clearable: { type: Boolean as PropType<boolean>, default: true },
     state: { type: Boolean as PropType<boolean | null>, default: null },

package/src/form/form-item.vue

@@ -19,7 +19,7 @@
   </div>
 </template>
 <script setup lang="ts">
-import { computed, inject, onMounted, provide, reactive, ref, toRefs, useSlots } from 'vue'
+import { computed, inject, nextTick, onMounted, provide, reactive, ref, toRefs, useSlots } from 'vue'
 import { refDebounced } from '@vueuse/core'
 import AsyncValidator from 'async-validator'
 
@@ -31,7 +31,7 @@ const props = defineProps({
   required: Boolean,
   rules: [Array, Object]
 })
-
+let initialValue: any = undefined
 const labelSlot = useSlots().label
 const isShowLabel = computed(() => {
   return !!labelSlot || props.label
@@ -179,11 +179,32 @@ const validate: any = async (trigger: any, callback: any) => {
     })
 }
 
+const clearValidate = async () => {
+  setValidationState('')
+  validateMessage.value = ''
+  isResettingField = false
+}
+
+const resetField = async () => {
+  const model = formContext?.model
+  if (!model || !props.prop) return
+
+  // prevent validation from being triggered
+  isResettingField = true
+
+  model[props.prop as any] = JSON.parse(JSON.stringify(initialValue))
+
+  await nextTick()
+  clearValidate()
+
+  isResettingField = false
+}
+
 const context: any = reactive({
   ...toRefs(props),
   $el: formItemRef,
   validateState,
-  // resetField,
+  resetField,
   // clearValidate,
   validate,
 })
@@ -205,6 +226,7 @@ const shouldShowError = computed(
 
 onMounted(() => {
   formContext?.addField(context)
+  initialValue = fieldValue.value ? JSON.parse(JSON.stringify(fieldValue.value)) : ''
 })
 </script>
 <style lang="scss">

package/src/form/index.vue

@@ -41,12 +41,25 @@ async function validate(callback: any) {
 
   return callback(false, validationErrors)
 }
-function resetFields() {
-  console.log('resetFields')
+async function resetFields() {
+  if (!props.model) {
+    return
+  }
+  for (const field of fields) {
+    try {
+      await field.resetField()
+    } catch (errors) {
+    }
+  }
 }
 
-function clearValidate() {
-  console.log('clearValidate')
+async function clearValidate() {
+  for (const field of fields) {
+    try {
+      await field.clearValidate()
+    } catch (errors) {
+    }
+  }
 }
 
 function validateField() {