@fangzhongya/fang-ui 0.1.38 → 0.1.40

package/dist/components/forms/src/setup.d.ts

@@ -2,6 +2,16 @@ import { DataProps } from './data';
 import { UseCssNameReturn } from '../../../hooks/cssname/index';
 import { CSSProperties, Ref, WritableComputedRef, ComputedRef } from 'vue';
 type Emit = (...args: any[]) => void;
+/**
+ * 初始化表单相关配置与逻辑处理
+ *
+ * @param props 表单组件的属性对象，包含表单配置、列表项等信息
+ * @param emit 事件发射器，用于触发自定义事件（如 submit、cancel 等）
+ * @param cs CSS 类名管理工具返回值，用于动态设置样式类名
+ * @param refForm 表单引用对象，通常指向 el-form 或其他表单实例
+ * @param getLocale 国际化文本获取函数，根据 key 获取对应语言的内容
+ * @returns 返回一系列供模板或其他模块使用的响应式数据和方法
+ */
 export declare function setUp(props: DataProps, emit: Emit, cs: UseCssNameReturn, refForm: any, getLocale: Function): {
     dataRules: Ref<ObjAny, ObjAny>;
     dataForm: WritableComputedRef<Record<string, any> | undefined, Record<string, any> | undefined> | Ref<Record<string, any>, Record<string, any>>;

package/dist/components/forms/src/setup.js

@@ -12,7 +12,7 @@ const Components = {
 };
 function setUp(props, emit, cs, refForm, getLocale) {
   const buts = computed(() => {
-    if (typeof props.buts == "undefined") {
+    if (props.buts === void 0) {
       return [
         {
           _id: "2",
@@ -136,12 +136,9 @@ function setUp(props, emit, cs, refForm, getLocale) {
     return rules;
   }
   const dataRules = ref(getRules());
-  watch(
-    () => props.list.length,
-    () => {
-      dataRules.value = getRules();
-    }
-  );
+  watch([() => props.list, () => props.list.length], () => {
+    dataRules.value = getRules();
+  });
   function validate() {
     return new Promise((resolve, reject) => {
       if (refForm.value) {
@@ -164,18 +161,18 @@ function setUp(props, emit, cs, refForm, getLocale) {
           if (callback) {
             callback(list, true);
           }
-          emit("submit", list);
-        }).catch((res) => {
+          emit("submit", list, true);
+        }).catch((error) => {
           if (callback) {
-            callback(res, false);
+            callback(error, false);
           }
-          emit("submit", res);
+          emit("submit", error, false);
         });
       } else {
         if (callback) {
           callback(obj);
         }
-        emit("submit", obj);
+        emit("submit", obj, true, true);
       }
     }).catch(() => {
     });

package/dist/components/forms/src/util.cjs

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const use = require("../../common/use.cjs");
 const judge = require("@fangzhongya/utils/judge/judge");
 const config = require("../common/config.cjs");
 const lineToLargeHump = require("@fangzhongya/utils/name/lineToLargeHump");
+const use = require("../../common/use.cjs");
 function _interopNamespaceDefault(e) {
   const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });
   if (e) {
@@ -40,7 +40,7 @@ function getTrigger(trigger) {
 }
 function setPlaceholder(obj, triggerMap) {
   var _a;
-  const name = obj.labelText ?? use.getLabelText(obj.label);
+  const name = use.getLabelText(obj);
   let trigger = "blur";
   if (typeof obj.compon == "string") {
     if (config.changes.includes(lineToLargeHump.lineToLargeHump(obj.compon))) {
@@ -58,7 +58,7 @@ function getRule(obj, data, refForm, triggerMap) {
   if (typeof multiple != "boolean") {
     multiple = false;
   }
-  const name = obj.labelText ?? use.getLabelText(obj.label);
+  const name = use.getLabelText(obj);
   const param = {
     name,
     multiple,
@@ -125,14 +125,12 @@ function getLinkageJudge(jyjudgev, linkage) {
         const v = judge2 == null ? void 0 : judge2(val, data);
         if (v) {
           callback(new Error(v));
-        } else {
-          if (prop) {
-            refForm == null ? void 0 : refForm.validateField([prop], () => {
-              callback();
-            });
-          } else {
+        } else if (prop) {
+          refForm == null ? void 0 : refForm.validateField([prop], () => {
             callback();
-          }
+          });
+        } else {
+          callback();
         }
       };
     }

package/dist/components/forms/src/util.d.ts

@@ -6,18 +6,23 @@ type Rule = {
 export type Rules = {
     [key: string]: Array<Rule> | Rule;
 };
+/**
+ * 设置对象的占位符文本
+ * @param obj - 列表对象，包含配置信息和组件类型
+ * @param triggerMap - 触发器映射对象，用于根据触发类型获取对应的提示文本前缀
+ */
 export declare function setPlaceholder(obj: ListObj, triggerMap: ObjStr): void;
 /**
  * 后期要实现 v.rule 多匹配，
  * 错误提示自定义
  */
 /**
- * 获取表单校验规则
- * @param {number} trigger 校验触发类型
- * @param {ListObj} obj 表单项配置对象
- * @param {any} data 表单数据
- * @param {any} refForm 表单引用
- * @returns {{ required: boolean, validator: Function, trigger: string }}
+ * 根据传入的对象和配置生成表单验证规则数组
+ * @param obj - 包含组件配置信息的对象，如是否多选、规则等
+ * @param data - 表单数据对象，用于规则判断时使用
+ * @param refForm - 表单引用对象，可能用于联动或自定义校验逻辑
+ * @param triggerMap - 触发器映射对象，包含验证提示语等信息
+ * @returns 返回一个由 Rule 类型组成的数组，表示该字段的所有验证规则
  */
 export declare function getRule(obj: ListObj, data: any, refForm: any, triggerMap: ObjStr): Rule[];
 export {};

package/dist/components/forms/src/util.js

@@ -1,7 +1,7 @@
-import { getLabelText, useHide } from "../../common/use.js";
 import * as judge from "@fangzhongya/utils/judge/judge";
 import { changes } from "../common/config.js";
 import { lineToLargeHump } from "@fangzhongya/utils/name/lineToLargeHump";
+import { getLabelText, useHide } from "../../common/use.js";
 function isValue(value) {
   if (value || value === 0 || value === false) {
     return false;
@@ -21,7 +21,7 @@ function getTrigger(trigger) {
 }
 function setPlaceholder(obj, triggerMap) {
   var _a;
-  const name = obj.labelText ?? getLabelText(obj.label);
+  const name = getLabelText(obj);
   let trigger = "blur";
   if (typeof obj.compon == "string") {
     if (changes.includes(lineToLargeHump(obj.compon))) {
@@ -39,7 +39,7 @@ function getRule(obj, data, refForm, triggerMap) {
   if (typeof multiple != "boolean") {
     multiple = false;
   }
-  const name = obj.labelText ?? getLabelText(obj.label);
+  const name = getLabelText(obj);
   const param = {
     name,
     multiple,
@@ -106,14 +106,12 @@ function getLinkageJudge(jyjudgev, linkage) {
         const v = judge2 == null ? void 0 : judge2(val, data);
         if (v) {
           callback(new Error(v));
-        } else {
-          if (prop) {
-            refForm == null ? void 0 : refForm.validateField([prop], () => {
-              callback();
-            });
-          } else {
+        } else if (prop) {
+          refForm == null ? void 0 : refForm.validateField([prop], () => {
             callback();
-          }
+          });
+        } else {
+          callback();
         }
       };
     }

package/dist/components/forms-div/src/data.cjs

@@ -2,6 +2,12 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const name = "forms-div";
 const dataProps = {
+  index: {
+    type: Array,
+    default() {
+      return [];
+    }
+  },
   /**
    * @props { Object<ObjAny>} options={}
    * 选择数据集合
@@ -37,13 +43,10 @@ const dataProps = {
   },
   /**
    * 传入值
-   * @props { Object } modelValue={} ( )
+   * @props { Object } modelValue ( )
    */
   modelValue: {
-    type: Object,
-    default() {
-      return {};
-    }
+    type: null
   },
   /**
    * @props { Object<ObjStr> } formvalue= ( )

package/dist/components/forms-div/src/data.d.ts

@@ -4,6 +4,25 @@ import { ExtractPropTypes } from 'vue';
  */
 export declare const name = "forms-div";
 export declare const dataProps: {
+    index: {
+        type: {
+            (arrayLength: number): number[];
+            (...items: number[]): number[];
+            new (arrayLength: number): number[];
+            new (...items: number[]): number[];
+            isArray(arg: any): arg is any[];
+            readonly prototype: any[];
+            from<T>(arrayLike: ArrayLike<T>): T[];
+            from<T, U>(arrayLike: ArrayLike<T>, mapfn: (v: T, k: number) => U, thisArg?: any): U[];
+            from<T>(iterable: Iterable<T> | ArrayLike<T>): T[];
+            from<T, U>(iterable: Iterable<T> | ArrayLike<T>, mapfn: (v: T, k: number) => U, thisArg?: any): U[];
+            of<T>(...items: T[]): T[];
+            fromAsync<T>(iterableOrArrayLike: AsyncIterable<T> | Iterable<T | PromiseLike<T>> | ArrayLike<T | PromiseLike<T>>): Promise<T[]>;
+            fromAsync<T, U>(iterableOrArrayLike: AsyncIterable<T> | Iterable<T> | ArrayLike<T>, mapFn: (value: Awaited<T>, index: number) => U, thisArg?: any): Promise<Awaited<U>[]>;
+            readonly [Symbol.species]: ArrayConstructor;
+        };
+        default(): never[];
+    };
     /**
      * @props { Object<ObjAny>} options={}
      * 选择数据集合
@@ -35,11 +54,10 @@ export declare const dataProps: {
     };
     /**
      * 传入值
-     * @props { Object } modelValue={} ( )
+     * @props { Object } modelValue ( )
      */
     modelValue: {
-        type: ObjectConstructor;
-        default(): {};
+        type: null;
     };
     /**
      * @props { Object<ObjStr> } formvalue= ( )

package/dist/components/forms-div/src/data.js

@@ -1,5 +1,11 @@
 const name = "forms-div";
 const dataProps = {
+  index: {
+    type: Array,
+    default() {
+      return [];
+    }
+  },
   /**
    * @props { Object<ObjAny>} options={}
    * 选择数据集合
@@ -35,13 +41,10 @@ const dataProps = {
   },
   /**
    * 传入值
-   * @props { Object } modelValue={} ( )
+   * @props { Object } modelValue ( )
    */
   modelValue: {
-    type: Object,
-    default() {
-      return {};
-    }
+    type: null
   },
   /**
    * @props { Object<ObjStr> } formvalue= ( )

package/dist/components/forms-div/src/index2.cjs

@@ -2,7 +2,6 @@
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
 const vue = require("vue");
 const data = require("./data.cjs");
-const lineToLargeHump = require("@fangzhongya/utils/name/lineToLargeHump");
 const objValue = require("@fangzhongya/utils/basic/object/objValue");
 const index = require("../../../hooks/cssname/index.cjs");
 const use = require("../../common/use.cjs");
@@ -21,6 +20,7 @@ const _sfc_main = vue.defineComponent({
     const prs = index$1.usePropsDefault(data.name, p, data.dataProps);
     const props = prs.listobj;
     const compons = index$2.useComponsGet(config.provides.compons);
+    const form = vue.inject(config.provides.form, {});
     const formvalue = vue.computed(() => {
       const o = {};
       if (typeof props.formvalue === "object") {
@@ -99,7 +99,7 @@ const _sfc_main = vue.defineComponent({
       return result;
     }
     function getSourceObject() {
-      let source = prs.modelValue ?? {};
+      let source = prs.modelValue;
       if (props.orig) {
         source = prs.valueobj ?? {};
       }
@@ -136,10 +136,10 @@ const _sfc_main = vue.defineComponent({
       if (props.computed) {
         handleComputedSet(newValue, v);
       }
-      if (!props.orig) {
-        emit("update:modelValue", v);
+      if (!props.orig && !prop) {
+        emit("update:modelValue", newValue);
       }
-      if (props.compon !== "items") {
+      if (prop) {
         emit("upform", newValue, props, v);
       }
     }
@@ -167,78 +167,49 @@ const _sfc_main = vue.defineComponent({
         }
       }
     }
-    const options = vue.computed(() => {
-      const optionss = prs.optionss;
-      if (typeof props.options === "string") {
-        const value2 = optionss[props.options];
-        if (typeof value2 == "function") {
-          return value2(optionss, value2.value, props) || [];
-        } else {
-          return value2 || [];
-        }
-      } else if (typeof props.options == "function") {
-        return props.options(optionss, value.value, props) || [];
-      } else {
-        return props.options || [];
-      }
-    });
-    const render = () => {
+    const setDom = () => {
+      var _a;
       const compon = props.compon || prs.compon || "input";
       const componValueName = prs.componValueName || "modelValue";
-      const componObj = {
-        ...binds.value,
-        ...use.getOnObjs(
-          props,
-          prs.valueobj ?? value.value,
-          emit,
-          value
-        ),
-        class: cs.z("com"),
-        options: options.value,
-        listobj: props,
-        multiple: props.multiple,
-        optionss: prs.optionss,
-        valueobj: prs.valueobj,
-        [componValueName]: value.value,
-        ["onUpdate:" + componValueName]: (v) => value.value = v,
-        ["onUpform"]: (...arr) => {
-          emit("upform", ...arr);
+      const obj = {
+        ...props,
+        compon,
+        slots: props.slots ?? slots,
+        config: {
+          ...binds.value,
+          index: prs.index,
+          class: [cs.z("com"), ((_a = props.config) == null ? void 0 : _a.class) ?? ""].join(
+            " "
+          ),
+          [componValueName]: value.value,
+          ["onUpdate:" + componValueName]: (v) => value.value = v,
+          ["onUpform"]: (...arr) => {
+            if (props.prop) {
+              emit("upform", ...arr);
+            }
+          }
         }
       };
-      if (typeof compon == "string") {
-        const tcom = lineToLargeHump.lineToLargeHump(compon);
-        if (Object.keys(compons).includes(tcom)) {
-          return vue.h(compons[tcom], componObj, slots);
-        } else {
-          return vue.h(vue.resolveComponent(compon), componObj, slots);
-        }
-      } else if (typeof compon == "function") {
-        return compon(componObj, slots);
-      } else if (vue.isVNode(compon)) {
-        return compon;
-      } else {
-        return vue.h(compon, componObj, slots);
-      }
-    };
-    const setSslot = () => {
-      const slotname = props.slot ?? props.prop;
-      if (slotname) {
-        const slot = slots[slotname];
-        if (slot) {
-          return slot({
-            row: prs.valueobj,
-            value,
-            column: props,
-            options: options.value,
-            multiple: props.multiple,
-            optionss: prs.optionss
-          });
+      return use.useVNodeComponDom(
+        obj,
+        prs.valueobj ?? value.value,
+        slots,
+        emit,
+        {
+          options: prs.optionss,
+          compons,
+          index: prs.index,
+          scope: {
+            $index: prs.index[0] || 0,
+            config: form,
+            options: prs.optionss,
+            value
+          }
         }
-      }
-      return render();
+      );
     };
     return () => {
-      return props.compon ? vue.h("div", { class: cs.z() }, [setSslot()]) : "";
+      return props.compon ? vue.h("div", { class: cs.z() }, [setDom()]) : "";
     };
   }
 });

package/dist/components/forms-div/src/index2.js

@@ -1,9 +1,8 @@
-import { defineComponent, computed, ref, h, resolveComponent, isVNode } from "vue";
+import { defineComponent, inject, computed, ref, h } from "vue";
 import { name, dataProps, dataEmits, dataExpose } from "./data.js";
-import { lineToLargeHump } from "@fangzhongya/utils/name/lineToLargeHump";
 import { setObjValue, getObjValue } from "@fangzhongya/utils/basic/object/objValue";
 import { useCssName } from "../../../hooks/cssname/index.js";
-import { getOnObjs } from "../../common/use.js";
+import { useVNodeComponDom } from "../../common/use.js";
 import { isEqual } from "@fangzhongya/utils/basic/object/isEqual";
 import { usePropsDefault, getProps } from "../../../hooks/props-default/index.js";
 import { useComponsGet } from "../../../hooks/compons/index.js";
@@ -19,6 +18,7 @@ const _sfc_main = defineComponent({
     const prs = usePropsDefault(name, p, dataProps);
     const props = prs.listobj;
     const compons = useComponsGet(provides.compons);
+    const form = inject(provides.form, {});
     const formvalue = computed(() => {
       const o = {};
       if (typeof props.formvalue === "object") {
@@ -97,7 +97,7 @@ const _sfc_main = defineComponent({
       return result;
     }
     function getSourceObject() {
-      let source = prs.modelValue ?? {};
+      let source = prs.modelValue;
       if (props.orig) {
         source = prs.valueobj ?? {};
       }
@@ -134,10 +134,10 @@ const _sfc_main = defineComponent({
       if (props.computed) {
         handleComputedSet(newValue, v);
       }
-      if (!props.orig) {
-        emit("update:modelValue", v);
+      if (!props.orig && !prop) {
+        emit("update:modelValue", newValue);
       }
-      if (props.compon !== "items") {
+      if (prop) {
         emit("upform", newValue, props, v);
       }
     }
@@ -165,78 +165,49 @@ const _sfc_main = defineComponent({
         }
       }
     }
-    const options = computed(() => {
-      const optionss = prs.optionss;
-      if (typeof props.options === "string") {
-        const value2 = optionss[props.options];
-        if (typeof value2 == "function") {
-          return value2(optionss, value2.value, props) || [];
-        } else {
-          return value2 || [];
-        }
-      } else if (typeof props.options == "function") {
-        return props.options(optionss, value.value, props) || [];
-      } else {
-        return props.options || [];
-      }
-    });
-    const render = () => {
+    const setDom = () => {
+      var _a;
       const compon = props.compon || prs.compon || "input";
       const componValueName = prs.componValueName || "modelValue";
-      const componObj = {
-        ...binds.value,
-        ...getOnObjs(
-          props,
-          prs.valueobj ?? value.value,
-          emit,
-          value
-        ),
-        class: cs.z("com"),
-        options: options.value,
-        listobj: props,
-        multiple: props.multiple,
-        optionss: prs.optionss,
-        valueobj: prs.valueobj,
-        [componValueName]: value.value,
-        ["onUpdate:" + componValueName]: (v) => value.value = v,
-        ["onUpform"]: (...arr) => {
-          emit("upform", ...arr);
+      const obj = {
+        ...props,
+        compon,
+        slots: props.slots ?? slots,
+        config: {
+          ...binds.value,
+          index: prs.index,
+          class: [cs.z("com"), ((_a = props.config) == null ? void 0 : _a.class) ?? ""].join(
+            " "
+          ),
+          [componValueName]: value.value,
+          ["onUpdate:" + componValueName]: (v) => value.value = v,
+          ["onUpform"]: (...arr) => {
+            if (props.prop) {
+              emit("upform", ...arr);
+            }
+          }
         }
       };
-      if (typeof compon == "string") {
-        const tcom = lineToLargeHump(compon);
-        if (Object.keys(compons).includes(tcom)) {
-          return h(compons[tcom], componObj, slots);
-        } else {
-          return h(resolveComponent(compon), componObj, slots);
-        }
-      } else if (typeof compon == "function") {
-        return compon(componObj, slots);
-      } else if (isVNode(compon)) {
-        return compon;
-      } else {
-        return h(compon, componObj, slots);
-      }
-    };
-    const setSslot = () => {
-      const slotname = props.slot ?? props.prop;
-      if (slotname) {
-        const slot = slots[slotname];
-        if (slot) {
-          return slot({
-            row: prs.valueobj,
-            value,
-            column: props,
-            options: options.value,
-            multiple: props.multiple,
-            optionss: prs.optionss
-          });
+      return useVNodeComponDom(
+        obj,
+        prs.valueobj ?? value.value,
+        slots,
+        emit,
+        {
+          options: prs.optionss,
+          compons,
+          index: prs.index,
+          scope: {
+            $index: prs.index[0] || 0,
+            config: form,
+            options: prs.optionss,
+            value
+          }
         }
-      }
-      return render();
+      );
     };
     return () => {
-      return props.compon ? h("div", { class: cs.z() }, [setSslot()]) : "";
+      return props.compon ? h("div", { class: cs.z() }, [setDom()]) : "";
     };
   }
 });

package/dist/components/forms-item/src/data.cjs

@@ -2,6 +2,12 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const name = "forms-item";
 const dataProps = {
+  index: {
+    type: Array,
+    default() {
+      return [];
+    }
+  },
   /**
    * @props { Object<ObjAny>} options={}
    * 选择数据集合

package/dist/components/forms-item/src/data.d.ts

@@ -4,6 +4,25 @@ import { ExtractPropTypes } from 'vue';
  */
 export declare const name = "forms-item";
 export declare const dataProps: {
+    index: {
+        type: {
+            (arrayLength: number): number[];
+            (...items: number[]): number[];
+            new (arrayLength: number): number[];
+            new (...items: number[]): number[];
+            isArray(arg: any): arg is any[];
+            readonly prototype: any[];
+            from<T>(arrayLike: ArrayLike<T>): T[];
+            from<T, U>(arrayLike: ArrayLike<T>, mapfn: (v: T, k: number) => U, thisArg?: any): U[];
+            from<T>(iterable: Iterable<T> | ArrayLike<T>): T[];
+            from<T, U>(iterable: Iterable<T> | ArrayLike<T>, mapfn: (v: T, k: number) => U, thisArg?: any): U[];
+            of<T>(...items: T[]): T[];
+            fromAsync<T>(iterableOrArrayLike: AsyncIterable<T> | Iterable<T | PromiseLike<T>> | ArrayLike<T | PromiseLike<T>>): Promise<T[]>;
+            fromAsync<T, U>(iterableOrArrayLike: AsyncIterable<T> | Iterable<T> | ArrayLike<T>, mapFn: (value: Awaited<T>, index: number) => U, thisArg?: any): Promise<Awaited<U>[]>;
+            readonly [Symbol.species]: ArrayConstructor;
+        };
+        default(): never[];
+    };
     /**
      * @props { Object<ObjAny>} options={}
      * 选择数据集合

package/dist/components/forms-item/src/data.js

@@ -1,5 +1,11 @@
 const name = "forms-item";
 const dataProps = {
+  index: {
+    type: Array,
+    default() {
+      return [];
+    }
+  },
   /**
    * @props { Object<ObjAny>} options={}
    * 选择数据集合