bge-ui 1.8.2 → 1.8.3

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", {

package/package.json

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

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() {