vft 0.0.362 → 0.0.363

package/es/components/super-form/super-form.vue.js

@@ -1,4 +1,4 @@
-import f from "./super-form.vue2.js";
+import _sfc_main from "./super-form.vue2.js";
 export {
-  f as default
+  _sfc_main as default
 };

package/es/components/super-form/super-form.vue2.js

@@ -1,25 +1,21 @@
-import { defineComponent as j, useAttrs as ne, reactive as le, ref as i, computed as p, unref as o, watch as h, nextTick as re, useSlots as ue, createBlock as u, createCommentVNode as K, openBlock as l, mergeProps as y, withKeys as ie, withModifiers as me, withCtx as v, renderSlot as O, normalizeProps as U, createElementBlock as fe, Fragment as pe, renderList as W, createSlots as ce, resolveDynamicComponent as A, h as de } from "vue";
-import { VftCol as Be } from "../col/index.js";
-import { VftForm as he } from "../form/index.js";
-import { VftRow as ye } from "../row/index.js";
-import { useTimeoutFn as ve, useDebounceFn as be } from "@vueuse/core";
-import { cloneDeep as ge, isEqual as Fe, pick as we, deepMerge as Re } from "@vft/utils";
-import "../config-provider/hooks/use-global-config.js";
-import "lodash-es";
-import { useNamespace as Se } from "../../hooks/use-namespace/index.js";
-import "../../hooks/use-model-toggle/index.js";
-import "@popperjs/core";
-import "../../hooks/use-z-index/index.js";
-import Ce from "./super-form-action.vue2.js";
-import ke from "./super-form-item.vue2.js";
-import { useAutoFocus as Oe } from "./use/use-auto-focus.js";
-import { createFormContext as Ae } from "./use/use-form-context.js";
-import { useFormEvents as Ee } from "./use/use-form-events.js";
-import { useFormValues as Pe } from "./use/use-form-values.js";
-const Ve = j({
+import { defineComponent, useAttrs, reactive, ref, computed, unref, watch, nextTick, useSlots, createBlock, createCommentVNode, openBlock, mergeProps, withKeys, withModifiers, withCtx, renderSlot, normalizeProps, createElementBlock, Fragment, renderList, createSlots, resolveDynamicComponent, h } from "vue";
+import { VftCol } from "../col/index.js";
+import { VftForm } from "../form/index.js";
+import { VftRow } from "../row/index.js";
+import { cloneDeep, isEqual, pick, deepMerge } from "@vft/utils";
+import { useTimeoutFn, useDebounceFn } from "@vueuse/core";
+import _sfc_main$2 from "./super-form-action.vue2.js";
+import _sfc_main$1 from "./super-form-item.vue2.js";
+import { useAutoFocus } from "./use/use-auto-focus.js";
+import { createFormContext } from "./use/use-form-context.js";
+import { useFormEvents } from "./use/use-form-events.js";
+import { useFormValues } from "./use/use-form-values.js";
+import { useNamespace } from "../../hooks/use-namespace/index.js";
+const __default__ = defineComponent({
   name: "vft-super-form"
-}), Qe = /* @__PURE__ */ j({
-  ...Ve,
+});
+const _sfc_main = /* @__PURE__ */ defineComponent({
+  ...__default__,
   props: {
     size: {
       default: "default"
@@ -35,12 +31,12 @@ const Ve = j({
     },
     autoSetPlaceHolder: {
       type: Boolean,
-      default: !0
+      default: true
     },
     schemas: {},
     autoFocusFirstItem: {
       type: Boolean,
-      default: !1
+      default: false
     },
     submitOnReset: {
       type: Boolean
@@ -49,22 +45,22 @@ const Ve = j({
     fieldMapToTime: {},
     autoSubmitOnEnter: {
       type: Boolean,
-      default: !0
+      default: true
     },
     rulesMessageJoinLabel: {
       type: Boolean,
-      default: !0
+      default: true
     },
     submitOnChange: {
       type: Boolean
     },
     showActionButtonGroup: {
       type: Boolean,
-      default: !0
+      default: true
     },
     autoCleanErrorMessage: {
       type: Boolean,
-      default: !0
+      default: true
     },
     beforeSubmitFunc: {},
     submitFunc: {},
@@ -73,28 +69,28 @@ const Ve = j({
     },
     compFullWidth: {
       type: Boolean,
-      default: !1
+      default: false
     },
     actionInline: {
       type: Boolean,
-      default: !1
+      default: false
     },
     resetFunc: {},
     customLayout: {
       type: Boolean,
-      default: !1
+      default: false
     },
     showResetButton: {
       type: Boolean,
-      default: !1
+      default: false
     },
     showSubmitButton: {
       type: Boolean,
-      default: !0
+      default: true
     },
     showCommonButton: {
       type: Boolean,
-      default: !1
+      default: false
     },
     resetButtonOptions: {},
     submitButtonOptions: {},
@@ -130,15 +126,15 @@ const Ve = j({
     },
     showMessage: {
       type: Boolean,
-      default: !0
+      default: true
     },
     validateOnRuleChange: {
       type: Boolean,
-      default: !0
+      default: true
     },
     hideRequiredAsterisk: {
       type: Boolean,
-      default: !1
+      default: false
     },
     scrollToError: {
       type: Boolean
@@ -148,185 +144,237 @@ const Ve = j({
     }
   },
   emits: ["register", "reset", "submit", "field-value-change"],
-  setup(J, {
-    expose: Q,
-    emit: X
+  setup(__props, {
+    expose: __expose,
+    emit: __emit
   }) {
-    const Y = Se("super-form"), E = J, P = X, Z = ne(), r = le({}), b = i({}), c = i(!1), d = i({}), V = i(), g = i(null), I = i(), t = p(() => ({
-      ...E,
-      ...o(d)
-    })), m = p(() => ({
-      ...Z,
-      ...E,
-      ...o(t)
-    })), n = p(() => {
-      const e = o(V);
-      return ge(e);
-    }), {
-      handleFormValues: M,
-      initDefault: _
-    } = Pe({
-      getProps: t,
-      defaultValueRef: b,
-      getSchema: n,
-      formModel: r
+    const ns = useNamespace("super-form");
+    const props = __props;
+    const emit = __emit;
+    const attrs = useAttrs();
+    const formModel = reactive({});
+    const defaultValueRef = ref({});
+    const isInitedDefaultRef = ref(false);
+    const propsRef = ref({});
+    const schemaRef = ref();
+    const formElRef = ref(null);
+    const initValues = ref();
+    const getProps = computed(() => {
+      return {
+        ...props,
+        ...unref(propsRef)
+      };
+    });
+    const getBindValue = computed(() => ({
+      ...attrs,
+      ...props,
+      ...unref(getProps)
+    }));
+    const getSchema = computed(() => {
+      const schemas = unref(schemaRef);
+      return cloneDeep(schemas);
+    });
+    const {
+      handleFormValues,
+      initDefault
+    } = useFormValues({
+      getProps,
+      defaultValueRef,
+      getSchema,
+      formModel
     });
-    Oe({
-      getSchema: n,
-      getProps: t,
-      isInitedDefault: c,
-      formElRef: g
+    useAutoFocus({
+      getSchema,
+      getProps,
+      isInitedDefault: isInitedDefaultRef,
+      formElRef
     });
     const {
-      handleSubmit: f,
-      setFieldsValue: F,
-      clearValidate: D,
-      validate: T,
-      validateField: q,
-      getFieldsValue: w,
-      updateSchema: R,
-      resetSchema: B,
-      appendSchemaByField: L,
-      removeSchemaByField: $,
-      resetFields: S,
-      scrollToField: ee,
-      getFieldValue: N,
-      setFormItemError: x
-    } = Ee({
-      emit: P,
-      getProps: t,
-      formModel: r,
-      getSchema: n,
-      defaultValueRef: b,
-      formElRef: g,
-      schemaRef: V,
-      handleFormValues: M,
-      initValues: I
+      handleSubmit,
+      setFieldsValue,
+      clearValidate,
+      validate,
+      validateField,
+      getFieldsValue,
+      updateSchema,
+      resetSchema,
+      appendSchemaByField,
+      removeSchemaByField,
+      resetFields,
+      scrollToField,
+      getFieldValue,
+      setFormItemError
+    } = useFormEvents({
+      emit,
+      getProps,
+      formModel,
+      getSchema,
+      defaultValueRef,
+      formElRef,
+      schemaRef,
+      handleFormValues,
+      initValues
     });
-    Ae({
-      resetAction: S,
-      submitAction: f
-    }), h(() => o(t).model, () => {
+    createFormContext({
+      resetAction: resetFields,
+      submitAction: handleSubmit
+    });
+    watch(() => unref(getProps).model, () => {
       const {
-        model: e
-      } = o(t);
-      e && F(e);
+        model
+      } = unref(getProps);
+      if (!model) return;
+      setFieldsValue(model);
     }, {
-      immediate: !0
-    }), h(() => o(t).schemas, (e, a) => {
-      Fe(e, a) || B(e ?? []);
-    }), h(() => n.value, (e) => {
-      re(() => {
-      }), !o(c) && e?.length && (_(), c.value = !0, t.value?.watchDataIsChange && ve(() => {
-        I.value = w();
-      }, 40));
-    }), h(() => r, be(() => {
-      o(t).submitOnChange && f();
+      immediate: true
+    });
+    watch(() => unref(getProps).schemas, (schemas, oldSchemas) => {
+      if (!isEqual(schemas, oldSchemas)) {
+        resetSchema(schemas ?? []);
+      }
+    });
+    watch(() => getSchema.value, (schema) => {
+      nextTick(() => {
+      });
+      if (unref(isInitedDefaultRef)) {
+        return;
+      }
+      if (schema?.length) {
+        initDefault();
+        isInitedDefaultRef.value = true;
+        if (getProps.value?.watchDataIsChange) {
+          useTimeoutFn(() => {
+            initValues.value = getFieldsValue();
+          }, 40);
+        }
+      }
+    });
+    watch(() => formModel, useDebounceFn(() => {
+      unref(getProps).submitOnChange && handleSubmit();
     }, 300), {
-      deep: !0
+      deep: true
     });
-    async function G(e) {
-      d.value = Re(o(d) || {}, e), c.value || (B(d.value?.schemas ?? []), _());
+    async function setProps(formProps) {
+      propsRef.value = deepMerge(unref(propsRef) || {}, formProps);
+      if (!isInitedDefaultRef.value) {
+        resetSchema(propsRef.value?.schemas ?? []);
+        initDefault();
+      }
     }
-    function te(e, a, s) {
-      r[e] = a, s && s.itemProps;
+    function setFormModel(key, value, schema) {
+      formModel[key] = value;
     }
-    function oe(e) {
+    function handleEnterPress(e) {
       const {
-        autoSubmitOnEnter: a
-      } = o(t);
-      if (a && e.key === "Enter" && e.target && e.target instanceof HTMLElement) {
-        const s = e.target;
-        s && s.tagName && s.tagName.toUpperCase() === "INPUT" && f();
+        autoSubmitOnEnter
+      } = unref(getProps);
+      if (!autoSubmitOnEnter) return;
+      if (e.key === "Enter" && e.target && e.target instanceof HTMLElement) {
+        const target = e.target;
+        if (target && target.tagName && target.tagName.toUpperCase() === "INPUT") {
+          handleSubmit();
+        }
       }
     }
-    const H = {
-      getFieldsValue: w,
-      getFieldValue: N,
-      setFieldsValue: F,
-      resetFields: S,
-      updateSchema: R,
-      resetSchema: B,
-      setProps: G,
-      removeSchemaByField: $,
-      appendSchemaByField: L,
-      clearValidate: D,
-      validateField: q,
-      setFormItemError: x,
-      validate: T,
-      submit: f,
-      scrollToField: ee
+    const formActionType = {
+      getFieldsValue,
+      getFieldValue,
+      setFieldsValue,
+      resetFields,
+      updateSchema,
+      resetSchema,
+      setProps,
+      removeSchemaByField,
+      appendSchemaByField,
+      clearValidate,
+      validateField,
+      setFormItemError,
+      validate,
+      submit: handleSubmit,
+      scrollToField
     };
-    P("register", H);
-    const ae = p(() => we(t.value, ["showResetButton", "showCommonButton", "showSubmitButton", "resetButtonOptions", "submitButtonOptions", "commonButtonOptions", "actionRowOptions", "actionSpan", "submitResetReverse"])), C = ue(), k = (e) => e ? de(Ce, ae.value, {
-      resetBefore: (a) => C.resetBefore?.(a),
-      submitBefore: (a) => C.submitBefore?.(a),
-      submitAfter: (a) => C.submitAfter?.(a)
-    }) : null;
-    return Q({
-      getFieldsValue: w,
-      getFieldValue: N,
-      setFieldsValue: F,
-      resetFields: S,
-      updateSchema: R,
-      resetSchema: B,
-      setProps: G,
-      removeSchemaByField: $,
-      appendSchemaByField: L,
-      clearValidate: D,
-      validateField: q,
-      validate: T,
-      submit: f,
-      getSchema: n,
-      setFormItemError: x,
-      formModel: p(() => M(r))
-    }), (e, a) => n.value?.length ? (l(), u(o(he), y({
-      key: 0
-    }, m.value, {
-      ref_key: "formElRef",
-      ref: g,
-      class: o(Y).b(),
-      model: r,
-      onSubmit: a[0] || (a[0] = me(() => {
-      }, ["prevent"])),
-      onKeypress: ie(oe, ["enter"])
-    }), {
-      default: v(() => [n.value?.length ? (l(), u(o(ye), U(y({
+    emit("register", formActionType);
+    const getFormActionBindProps = computed(() => pick(getProps.value, ["showResetButton", "showCommonButton", "showSubmitButton", "resetButtonOptions", "submitButtonOptions", "commonButtonOptions", "actionRowOptions", "actionSpan", "submitResetReverse"]));
+    const slots = useSlots();
+    const renderFormAction = (show) => {
+      if (!show) return null;
+      return h(_sfc_main$2, getFormActionBindProps.value, {
+        resetBefore: (data) => slots.resetBefore?.(data),
+        submitBefore: (data) => slots.submitBefore?.(data),
+        submitAfter: (data) => slots.submitAfter?.(data)
+      });
+    };
+    __expose({
+      getFieldsValue,
+      getFieldValue,
+      setFieldsValue,
+      resetFields,
+      updateSchema,
+      resetSchema,
+      setProps,
+      removeSchemaByField,
+      appendSchemaByField,
+      clearValidate,
+      validateField,
+      validate,
+      submit: handleSubmit,
+      getSchema,
+      setFormItemError,
+      formModel: computed(() => handleFormValues(formModel))
+    });
+    return (_ctx, _cache) => {
+      return getSchema.value?.length ? (openBlock(), createBlock(unref(VftForm), mergeProps({
         key: 0
-      }, m.value?.rowProps)), {
-        default: v(() => [O(e.$slots, "formHeader"), (l(!0), fe(pe, null, W(n.value, (s) => (l(), u(ke, {
-          key: s.field,
-          "form-action-type": H,
-          schema: s,
-          "form-props": t.value,
-          "all-default-values": b.value,
-          "form-model": r,
-          "set-form-model": te,
-          "update-schema": o(R)
-        }, ce({
-          _: 2
-        }, [W(Object.keys(e.$slots), (z) => ({
-          name: z,
-          fn: v((se) => [O(e.$slots, z, y({
-            ref_for: !0
-          }, se || {}))])
-        }))]), 1032, ["schema", "form-props", "all-default-values", "form-model", "update-schema"]))), 128)), t.value?.customLayout ? (l(), u(A(k(t.value?.showActionButtonGroup && t.value?.actionInline)), {
-          key: 1
-        })) : (l(), u(o(Be), U(y({
+      }, getBindValue.value, {
+        ref_key: "formElRef",
+        ref: formElRef,
+        class: unref(ns).b(),
+        model: formModel,
+        onSubmit: _cache[0] || (_cache[0] = withModifiers(() => {
+        }, ["prevent"])),
+        onKeypress: withKeys(handleEnterPress, ["enter"])
+      }), {
+        default: withCtx(() => [getSchema.value?.length ? (openBlock(), createBlock(unref(VftRow), normalizeProps(mergeProps({
           key: 0
-        }, m.value?.quickColSpan ? {
-          span: Math.ceil(24 / m.value?.quickColSpan),
-          ...m.value?.baseColProps
-        } : {})), {
-          default: v(() => [(l(), u(A(k(t.value?.showActionButtonGroup && t.value?.actionInline))))]),
-          _: 1
-        }, 16))]),
+        }, getBindValue.value?.rowProps)), {
+          default: withCtx(() => [renderSlot(_ctx.$slots, "formHeader"), (openBlock(true), createElementBlock(Fragment, null, renderList(getSchema.value, (schema) => {
+            return openBlock(), createBlock(_sfc_main$1, {
+              key: schema.field,
+              "form-action-type": formActionType,
+              schema,
+              "form-props": getProps.value,
+              "all-default-values": defaultValueRef.value,
+              "form-model": formModel,
+              "set-form-model": setFormModel,
+              "update-schema": unref(updateSchema)
+            }, createSlots({
+              _: 2
+            }, [renderList(Object.keys(_ctx.$slots), (item) => {
+              return {
+                name: item,
+                fn: withCtx((data) => [renderSlot(_ctx.$slots, item, mergeProps({
+                  ref_for: true
+                }, data || {}))])
+              };
+            })]), 1032, ["schema", "form-props", "all-default-values", "form-model", "update-schema"]);
+          }), 128)), !getProps.value?.customLayout ? (openBlock(), createBlock(unref(VftCol), normalizeProps(mergeProps({
+            key: 0
+          }, getBindValue.value?.quickColSpan ? {
+            span: Math.ceil(24 / getBindValue.value?.quickColSpan),
+            ...getBindValue.value?.baseColProps
+          } : {})), {
+            default: withCtx(() => [(openBlock(), createBlock(resolveDynamicComponent(renderFormAction(getProps.value?.showActionButtonGroup && getProps.value?.actionInline))))]),
+            _: 1
+          }, 16)) : (openBlock(), createBlock(resolveDynamicComponent(renderFormAction(getProps.value?.showActionButtonGroup && getProps.value?.actionInline)), {
+            key: 1
+          }))]),
+          _: 3
+        }, 16)) : createCommentVNode("", true), (openBlock(), createBlock(resolveDynamicComponent(renderFormAction(getProps.value?.showActionButtonGroup && !getProps.value?.actionInline)))), renderSlot(_ctx.$slots, "formFooter")]),
         _: 3
-      }, 16)) : K("", !0), (l(), u(A(k(t.value?.showActionButtonGroup && !t.value?.actionInline)))), O(e.$slots, "formFooter")]),
-      _: 3
-    }, 16, ["class", "model"])) : K("", !0);
+      }, 16, ["class", "model"])) : createCommentVNode("", true);
+    };
   }
 });
 export {
-  Qe as default
+  _sfc_main as default
 };

package/es/components/super-form/types.js

@@ -1 +1 @@
-import "./component-map.js";
+

package/es/components/super-form/use/helper.js

@@ -1,37 +1,61 @@
-import { isNumber as n } from "@vft/utils";
-import { FormCompEnum as e, isInput as u } from "../component-map.js";
-function T(r, E = "") {
-  return E = (E || "").replace(":", "") || "", [
-    e.INPUT,
-    e.INPUT_NUMBER,
-    e.TEXTAREA,
-    e.AUTOCOMPLETE
-  ].includes(r) ? "请输入" + E : [e.PASSWORD].includes(r) ? "请输入密码" : [
-    e.SELECT,
-    e.RADIO,
-    e.RADIO_SINGLE,
-    e.RADIO_BUTTON,
-    e.Cascader,
-    e.ColorPicker,
-    e.CHECKBOX,
-    e.CHECKBOX_BUTTON
-  ].includes(r) ? "请选择" + E : [e.CHECKBOX_SINGLE].includes(r) ? "请勾选" + E : [e.SEARCH].includes(r) ? "请输入要搜索的内容" : [e.INPUT_TAG].includes(r) ? "请输入标签内容" : [e.Upload].includes(r) ? "请选择上传文件" : [e.Slider].includes(r) ? "请拖动滑块" : [
-    e.TIME_PICKER,
-    e.YEAR_PICKER,
-    e.MONTH_PICKER,
-    e.DATE_PICKER,
-    e.DATES_PICKER,
-    e.DATETIME_PICKER,
-    e.WEEK_PICKER,
-    e.DATETIMERANGE_PICKER,
-    e.DATERANGE_PICKER,
-    e.MONTHRANGE_PICKER
-  ].includes(r) ? "请选择时间" : "";
+import { isNumber } from "@vft/utils";
+import { isInput, FormCompEnum } from "../component-map.js";
+function createPlaceholderMessage(type, label = "") {
+  label = (label || "").replace(":", "") || "";
+  if ([
+    FormCompEnum.INPUT,
+    FormCompEnum.INPUT_NUMBER,
+    FormCompEnum.TEXTAREA,
+    FormCompEnum.AUTOCOMPLETE
+  ].includes(type)) {
+    return "请输入" + label;
+  } else if ([FormCompEnum.PASSWORD].includes(type)) {
+    return "请输入密码";
+  } else if ([
+    FormCompEnum.SELECT,
+    FormCompEnum.RADIO,
+    FormCompEnum.RADIO_SINGLE,
+    FormCompEnum.RADIO_BUTTON,
+    FormCompEnum.Cascader,
+    FormCompEnum.ColorPicker,
+    FormCompEnum.CHECKBOX,
+    FormCompEnum.CHECKBOX_BUTTON
+  ].includes(type)) {
+    return "请选择" + label;
+  } else if ([FormCompEnum.CHECKBOX_SINGLE].includes(type)) {
+    return "请勾选" + label;
+  } else if ([FormCompEnum.SEARCH].includes(type)) {
+    return "请输入要搜索的内容";
+  } else if ([FormCompEnum.INPUT_TAG].includes(type)) {
+    return "请输入标签内容";
+  } else if ([FormCompEnum.Upload].includes(type)) {
+    return "请选择上传文件";
+  } else if ([FormCompEnum.Slider].includes(type)) {
+    return "请拖动滑块";
+  } else if ([
+    FormCompEnum.TIME_PICKER,
+    FormCompEnum.YEAR_PICKER,
+    FormCompEnum.MONTH_PICKER,
+    FormCompEnum.DATE_PICKER,
+    FormCompEnum.DATES_PICKER,
+    FormCompEnum.DATETIME_PICKER,
+    FormCompEnum.WEEK_PICKER,
+    FormCompEnum.DATETIMERANGE_PICKER,
+    FormCompEnum.DATERANGE_PICKER,
+    FormCompEnum.MONTHRANGE_PICKER
+  ].includes(type)) {
+    return "请选择时间";
+  }
+  return "";
 }
-function s(r, E) {
-  return r && u(r) && E && n(E) ? `${E}` : E;
+function handleInputNumberValue(type, val) {
+  if (!type) return val;
+  if (isInput(type)) {
+    return val && isNumber(val) ? `${val}` : val;
+  }
+  return val;
 }
 export {
-  T as createPlaceholderMessage,
-  s as handleInputNumberValue
+  createPlaceholderMessage,
+  handleInputNumberValue
 };