@fangzhongya/fang-ui 0.1.38 → 0.1.40

package/dist/components/common/use.js

@@ -1,4 +1,4 @@
-import { h, resolveComponent, computed, useAttrs, isVNode, Fragment, render } from "vue";
+import { isVNode, h, resolveComponent, computed, Fragment, render } from "vue";
 import { isHTMLTag, isSVGTag } from "@vue/shared";
 import { getFathers, getChildrenData } from "../../utils/util.js";
 import { isObject } from "@fangzhongya/utils/basic/object/isObject";
@@ -88,17 +88,26 @@ function handleComputedWithoutDefault(obj, v) {
   }
 }
 function setFormDefaultValue(obj, value) {
-  let v = getChildrenData(obj, value, true) ?? {};
+  let v = getChildrenData(obj, value);
   if (obj.orig) {
-    v = value;
+    v = value ?? {};
   }
   setComputed(obj, v);
   const prop = obj.prop;
   if (prop) {
-    if (obj.pars) {
-      setObjValue(v, prop, getObjValue(prop, v) ?? obj.default);
+    if (v) {
+      if (obj.pars) {
+        setObjValue(v, prop, getObjValue(prop, v) ?? obj.default);
+      } else {
+        v[prop] = v[prop] ?? obj.default;
+      }
     } else {
-      v[prop] = v[prop] ?? obj.default;
+      v = getChildrenData(obj, value, true);
+      if (obj.pars) {
+        setObjValue(v, prop, getObjValue(prop, v) ?? obj.default);
+      } else {
+        v[prop] = v[prop] ?? obj.default;
+      }
     }
   }
 }
@@ -148,48 +157,46 @@ function getValueObjs(value, multiple, options, config) {
     return value;
   }
 }
-function setOptionsValue(value, obj, data, optionss = {}) {
-  let options = [];
-  if (obj == null ? void 0 : obj.options) {
-    const opt = obj.options;
-    if (typeof opt === "string") {
-      const value2 = optionss[opt];
-      if (typeof value2 == "function") {
-        options = value2(optionss, value2, obj, data) || [];
-      } else {
-        options = value2 || [];
-      }
-    } else if (typeof opt == "function") {
-      options = opt(optionss, value, obj, data) || [];
-    } else {
-      options = opt || [];
-    }
-  }
-  return getValueObjs(value, obj.multiple, options, obj.config);
+function setOptionsValue(value, obj, data, options = {}) {
+  return getValueObjs(
+    value,
+    obj.multiple,
+    processOptions(value, obj, data, options),
+    obj.config
+  );
 }
 function setValue(value, obj, data) {
-  let v = getChildrenData(obj, data) ?? {};
+  let v = getChildrenData(obj, data);
   if (obj.orig) {
     v = data ?? {};
   }
   const prop = obj.prop;
   if (prop) {
-    if (obj.pars) {
-      setObjValue(v, prop, value);
+    if (v) {
+      if (obj.pars) {
+        setObjValue(v, prop, value);
+      } else {
+        v[prop] = value;
+      }
     } else {
-      v[prop] = value;
+      v = getChildrenData(obj, data, true);
+      if (obj.pars) {
+        setObjValue(v, prop, value);
+      } else {
+        v[prop] = value;
+      }
     }
   }
 }
 function getValue(obj, data, index) {
   const prop = obj.prop;
-  const cdata = getChildrenData(obj, data, true) ?? {};
+  const cdata = getChildrenData(obj, data);
   let cellValue;
   if (prop) {
     if (obj.pars) {
       cellValue = getObjValue(prop, cdata);
     } else {
-      cellValue = cdata[prop];
+      cellValue = cdata == null ? void 0 : cdata[prop];
     }
   } else {
     cellValue = obj.value;
@@ -200,36 +207,51 @@ function getValue(obj, data, index) {
     return cellValue ?? obj.default;
   }
 }
-function setComponString(value, obj, componObj, data, optionss, compons) {
-  processOptions(obj, componObj, optionss, value, data);
+function setComponString(value, obj, componObj, compons) {
   const compon = obj.compon;
   const tcom = lineToLargeHump(compon);
-  return renderComponent(tcom, compon, componObj, value, compons);
+  return renderComponent(obj, tcom, compon, componObj, value, compons);
 }
-function processOptions(obj, componObj, optionss, value, data) {
-  if (!(obj == null ? void 0 : obj.options)) return;
-  let options = [];
+function processOptions(value, obj, data, options) {
+  if (!(obj == null ? void 0 : obj.options)) return [];
+  let option = [];
   const opt = obj.options;
   if (typeof opt === "string") {
-    const optionsvalue = optionss[opt];
-    options = typeof optionsvalue == "function" ? optionsvalue(optionss, value, obj, data) || [] : optionsvalue || [];
+    const optionsvalue = options[opt];
+    option = typeof optionsvalue == "function" ? optionsvalue(options, value, obj, data) || [] : optionsvalue || [];
   } else if (typeof opt == "function") {
-    options = opt(optionss, value, obj, data) || [];
+    option = opt(options, value, obj, data) || [];
   } else {
-    options = opt || [];
+    option = opt || [];
   }
-  if ((options == null ? void 0 : options.length) > 0) {
-    componObj.options = options;
+  return option;
+}
+function setSlots(obj) {
+  const slots = obj.slots;
+  if (isVNode(slots)) {
+    return {
+      default: () => slots
+    };
+  } else if (typeof slots === "function") {
+    return {
+      default: slots
+    };
+  } else if (isObject(slots)) {
+    return slots;
+  } else if (slots) {
+    return {
+      default: () => slots
+    };
   }
 }
-function renderComponent(tcom, compon, componObj, value, compons) {
+function renderComponent(obj, tcom, compon, componObj, value, compons) {
   if (Object.keys(compons).includes(tcom)) {
-    return h(compons[tcom], componObj);
+    return h(compons[tcom], componObj, setSlots(obj));
   }
   if (isHTMLTag(compon) || isSVGTag(compon)) {
     return h(compon, componObj, value);
   }
-  return h(resolveComponent(compon), componObj);
+  return h(resolveComponent(compon), componObj, setSlots(obj));
 }
 function getOnObjs(obj, data, emit, ...arrs) {
   const objs = {};
@@ -250,7 +272,7 @@ function getOnObjs(obj, data, emit, ...arrs) {
   }
   return objs;
 }
-function useSetSlot(obj, data, slots, index, scope) {
+function useSetSlot(obj, data, slots, options, emit, index, scope) {
   const slotname = obj.slot ?? obj.prop;
   if (slotname) {
     const slot = slots[slotname];
@@ -263,50 +285,61 @@ function useSetSlot(obj, data, slots, index, scope) {
           setValue(value2, obj, data);
         }
       });
+      const componObj = getComponObj(
+        value.value,
+        obj,
+        data,
+        options,
+        emit,
+        scope
+      );
       return slot({
-        comscope: scope,
         column: obj,
         row: data,
         value,
-        index
+        index,
+        ...componObj
       });
     }
   }
 }
-function useSetCompon(obj, data, optionss, compons, emit, index, scope) {
+function getComponObj(value, obj, data, options, emit, scope) {
+  const componValueName = obj.componValueName || "modelValue";
+  const componObj = {
+    // ...attrs,
+    [componValueName]: value,
+    ["onUpdate:" + componValueName]: (v) => setValue(v, obj, data),
+    listobj: obj,
+    valueobj: data,
+    comscope: scope,
+    ...obj.config,
+    ...getOnObjs(obj, data, emit, scope)
+  };
+  if (obj.multiple) {
+    componObj.multiple = obj.multiple;
+  }
+  const option = processOptions(value, obj, data, options);
+  if (option.length > 0) {
+    componObj.options = option;
+  }
+  return componObj;
+}
+function useSetCompon(obj, data, options, compons, emit, index, scope) {
   if (obj.compon) {
     const value = getValue(obj, data, index);
-    const componValueName = obj.componValueName || "modelValue";
-    const attrs = useAttrs();
-    const componObj = {
-      ...attrs,
-      ...obj.config,
-      ...getOnObjs(obj, data, emit, scope),
-      [componValueName]: value,
-      ["onUpdate:" + componValueName]: (v) => setValue(v, obj, data),
-      listobj: obj,
-      valueobj: data,
-      comscope: scope
-    };
-    if (obj.multiple) {
-      componObj.multiple = obj.multiple;
-    }
-    if (typeof obj.compon == "string") {
-      return setComponString(
-        value,
-        obj,
-        componObj,
-        data,
-        optionss,
-        compons
-      );
-    } else if (typeof obj.compon == "function") {
-      return obj.compon(componObj);
-    } else if (isVNode(obj.compon)) {
-      return obj.compon;
-    } else {
-      return h(obj.compon, componObj);
-    }
+    const componObj = getComponObj(value, obj, data, options, emit, scope);
+    return useGetCompon(obj.compon, componObj, obj, compons, value);
+  }
+}
+function useGetCompon(compon, componObj, obj, compons, value) {
+  if (typeof compon == "string") {
+    return setComponString(value, obj, componObj, compons);
+  } else if (typeof compon == "function") {
+    return compon(componObj, setSlots(obj));
+  } else if (isVNode(compon)) {
+    return compon;
+  } else {
+    return h(compon, componObj, setSlots(obj));
   }
 }
 const useGetDomValue = (obj, data, options, index) => {
@@ -316,7 +349,8 @@ const useGetDomValue = (obj, data, options, index) => {
   }
   return value;
 };
-const useGetDomLabel = (label, obj, data, slots, optionss, compons, emit, index, isComponSelected = (obj2) => true) => {
+const useGetDomLabel = (obj, data, slots, options, compons, emit, index) => {
+  const label = obj.label;
   if (!label) {
     return label;
   }
@@ -329,65 +363,47 @@ const useGetDomLabel = (label, obj, data, slots, optionss, compons, emit, index,
   if (!isObject(label)) {
     return label;
   }
-  return handleObjectLabel(
-    label,
-    obj,
-    data,
-    slots,
-    optionss,
-    compons,
-    emit,
-    index,
-    isComponSelected
-  );
-};
-const handleObjectLabel = (label, obj, data, slots, optionss, compons, emit, index, isComponSelected) => {
   if (Array.isArray(label)) {
-    return renderLabelArray(label, data, optionss, compons, emit, index);
-  }
-  return handleSingleObjectLabel(
-    label,
-    obj,
-    data,
-    slots,
-    optionss,
+    return renderLabelArray(label, data, options, compons, emit, index);
+  }
+  return useVNodeComponDom(label, data, slots, emit, {
+    options,
     compons,
-    emit,
-    index,
-    isComponSelected
-  );
+    index
+  });
 };
-const renderLabelArray = (labels, data, optionss, compons, emit, index) => {
+const renderLabelArray = (labels, data, options, compons, emit, index) => {
   return h(
     "div",
     { class: "com-lable-array" },
     labels.map((v) => {
       const labelObj = typeof v === "string" ? { value: v, compon: "div" } : v;
-      return useSetCompon(labelObj, data, optionss, compons, emit, index);
+      return useSetCompon(labelObj, data, options, compons, emit, index);
     })
   );
 };
-const handleSingleObjectLabel = (label, obj, data, slots, optionss, compons, emit, index, isComponSelected) => {
-  const mergedLabel = { ...obj, ...label };
-  const slot = useSetSlot(mergedLabel, data, slots, index);
+function useVNodeComponDom(obj, data, slots, emit, config) {
+  const { options, compons, index, scope } = config;
+  const slot = useSetSlot(obj, data, slots, options, emit, index, scope);
   if (slot) {
     return slot;
   }
-  if (mergedLabel.compon && isComponSelected(obj)) {
+  if (obj.compon) {
     const column = useSetCompon(
-      mergedLabel,
+      obj,
       data,
-      optionss,
+      options,
       compons,
       emit,
-      index
+      index,
+      scope
     );
     if (column) {
       return column;
     }
   }
-  return useGetDomValue(mergedLabel, data, optionss, index);
-};
+  return useGetDomValue(obj, data, options, index);
+}
 function useObjComponSelected(obj, props) {
   const arrs = [obj];
   getFathers(obj, arrs);
@@ -426,28 +442,39 @@ function getVNodeContent(vnode) {
   render(null, container);
   return textContent;
 }
-function getLabelText(label) {
-  if (typeof label == "undefined") {
-    return "";
-  } else if (typeof label == "string") {
-    return label;
-  } else if (typeof label == "function") {
-    label = label();
+function getLabelText(obj) {
+  if (obj.labelText) {
+    return obj.labelText;
+  }
+  if (!obj.label) {
+    const farrs = [];
+    getFathers(obj, farrs);
+    farrs.reverse();
+    for (const v of farrs) {
+      if (v.labelText) {
+        return v.labelText;
+      } else if (v.label) {
+        obj = v;
+        break;
+      }
+    }
   }
+  const label = useGetDomLabel(obj, {}, {}, {}, {}, () => {
+  }, 0);
   if (isVNode(label)) {
     return getVNodeContent(label);
-  } else if (Array.isArray(label)) {
-    return label.join("");
   } else {
     return (label == null ? void 0 : label.toString()) || "";
   }
 }
 export {
+  getComponObj,
   getFormRule,
   getLabelText,
   getOnObjs,
   getVNodeContent,
   setFormDefaultValue,
+  useGetCompon,
   useGetDomLabel,
   useGetDomValue,
   useHide,
@@ -457,5 +484,6 @@ export {
   useSetCompon,
   useSetSlot,
   useSetValue,
+  useVNodeComponDom,
   useVueValue
 };

package/dist/components/company-select/src/index2.cjs

@@ -71,8 +71,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     }
     function getArrKyeObj(arr, key, value) {
       if (arr) {
-        for (let index2 = 0; index2 < arr.length; index2++) {
-          const element = arr[index2];
+        for (const element of arr) {
           if (element[key] === value) {
             return element;
           }

package/dist/components/company-select/src/index2.js

@@ -69,8 +69,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     }
     function getArrKyeObj(arr, key, value) {
       if (arr) {
-        for (let index = 0; index < arr.length; index++) {
-          const element = arr[index];
+        for (const element of arr) {
           if (element[key] === value) {
             return element;
           }

package/dist/components/double/src/index2.cjs

@@ -201,9 +201,9 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       clearTimeout(timeout);
     }
     vue.onMounted(() => {
-      if (window) {
+      if (globalThis) {
         console.log("onMounted");
-        window.addEventListener("click", () => {
+        globalThis.addEventListener("click", () => {
           console.log("click");
           isfocus.value = false;
         });

package/dist/components/double/src/index2.js

@@ -199,9 +199,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       clearTimeout(timeout);
     }
     onMounted(() => {
-      if (window) {
+      if (globalThis) {
         console.log("onMounted");
-        window.addEventListener("click", () => {
+        globalThis.addEventListener("click", () => {
           console.log("click");
           isfocus.value = false;
         });

package/dist/components/forms/index.css

@@ -49,6 +49,24 @@
   display: grid;
 }
 
+.forms-items {
+  width: 100%;
+}
+.forms-items.row {
+  display: flex;
+  flex-direction: row;
+}
+.forms-items.column {
+  display: flex;
+  flex-direction: column;
+}
+.forms-items-li.no-error {
+  --el-color-danger: var(--el-border-color);
+}
+.forms-items-li.no-error .el-input__wrapper.is-focus {
+  --el-color-danger: var(--el-input-focus-border);
+}
+
 .double {
   width: 100%;
   display: inline-flex;

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

@@ -44,6 +44,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     function setKey(value, index2) {
       return [index2, value.label, value.prop, value.compon].join(",");
     }
+    const onUpform = (...arr) => emit("upform", ...arr);
     __expose({
       /**
        * @expose { Element } dom
@@ -104,7 +105,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
             "label-position": vue.unref(props).labelPosition == "auto" ? void 0 : vue.unref(props).labelPosition,
             ref_key: "refForm",
             ref: refForm,
-            onSubmit: _cache[4] || (_cache[4] = vue.withModifiers(() => {
+            onSubmit: _cache[2] || (_cache[2] = vue.withModifiers(() => {
             }, ["prevent"]))
           }), {
             default: vue.withCtx(() => [
@@ -122,11 +123,12 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
                   (item == null ? void 0 : item.isdiv) ? (vue.openBlock(), vue.createBlock(vue.unref(index$5.FormsDiv), {
                     key: 0,
                     listobj: item,
+                    index: [index2],
                     optionss: vue.unref(props).options,
                     valueobj: vue.unref(dataForm),
                     modelValue: vue.unref(dataForm),
                     "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => vue.isRef(dataForm) ? dataForm.value = $event : null),
-                    onUpform: _cache[1] || (_cache[1] = (...arr) => emit("upform", ...arr))
+                    onUpform
                   }, vue.createSlots({ _: 2 }, [
                     vue.renderList(Object.keys(vue.unref(slots)), (k) => {
                       return {
@@ -136,14 +138,15 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
                         ])
                       };
                     })
-                  ]), 1032, ["listobj", "optionss", "valueobj", "modelValue"])) : (vue.openBlock(), vue.createBlock(vue.unref(index$6.FormsItem), {
+                  ]), 1032, ["listobj", "index", "optionss", "valueobj", "modelValue"])) : (vue.openBlock(), vue.createBlock(vue.unref(index$6.FormsItem), {
                     key: 1,
                     listobj: item,
+                    index: [index2],
                     optionss: vue.unref(props).options,
                     valueobj: vue.unref(dataForm),
                     modelValue: vue.unref(dataForm),
-                    "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => vue.isRef(dataForm) ? dataForm.value = $event : null),
-                    onUpform: _cache[3] || (_cache[3] = (...arr) => emit("upform", ...arr))
+                    "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => vue.isRef(dataForm) ? dataForm.value = $event : null),
+                    onUpform
                   }, vue.createSlots({ _: 2 }, [
                     vue.renderList(Object.keys(vue.unref(slots)), (k) => {
                       return {
@@ -153,7 +156,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
                         ])
                       };
                     })
-                  ]), 1032, ["listobj", "optionss", "valueobj", "modelValue"]))
+                  ]), 1032, ["listobj", "index", "optionss", "valueobj", "modelValue"]))
                 ], 6)), [
                   [vue.vShow, !vue.unref(use.useHide)(item, vue.unref(dataForm))]
                 ]);

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

@@ -42,6 +42,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     function setKey(value, index) {
       return [index, value.label, value.prop, value.compon].join(",");
     }
+    const onUpform = (...arr) => emit("upform", ...arr);
     __expose({
       /**
        * @expose { Element } dom
@@ -102,7 +103,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             "label-position": unref(props).labelPosition == "auto" ? void 0 : unref(props).labelPosition,
             ref_key: "refForm",
             ref: refForm,
-            onSubmit: _cache[4] || (_cache[4] = withModifiers(() => {
+            onSubmit: _cache[2] || (_cache[2] = withModifiers(() => {
             }, ["prevent"]))
           }), {
             default: withCtx(() => [
@@ -120,11 +121,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                   (item == null ? void 0 : item.isdiv) ? (openBlock(), createBlock(unref(FormsDiv), {
                     key: 0,
                     listobj: item,
+                    index: [index],
                     optionss: unref(props).options,
                     valueobj: unref(dataForm),
                     modelValue: unref(dataForm),
                     "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => isRef(dataForm) ? dataForm.value = $event : null),
-                    onUpform: _cache[1] || (_cache[1] = (...arr) => emit("upform", ...arr))
+                    onUpform
                   }, createSlots({ _: 2 }, [
                     renderList(Object.keys(unref(slots)), (k) => {
                       return {
@@ -134,14 +136,15 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                         ])
                       };
                     })
-                  ]), 1032, ["listobj", "optionss", "valueobj", "modelValue"])) : (openBlock(), createBlock(unref(FormsItem), {
+                  ]), 1032, ["listobj", "index", "optionss", "valueobj", "modelValue"])) : (openBlock(), createBlock(unref(FormsItem), {
                     key: 1,
                     listobj: item,
+                    index: [index],
                     optionss: unref(props).options,
                     valueobj: unref(dataForm),
                     modelValue: unref(dataForm),
-                    "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => isRef(dataForm) ? dataForm.value = $event : null),
-                    onUpform: _cache[3] || (_cache[3] = (...arr) => emit("upform", ...arr))
+                    "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => isRef(dataForm) ? dataForm.value = $event : null),
+                    onUpform
                   }, createSlots({ _: 2 }, [
                     renderList(Object.keys(unref(slots)), (k) => {
                       return {
@@ -151,7 +154,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                         ])
                       };
                     })
-                  ]), 1032, ["listobj", "optionss", "valueobj", "modelValue"]))
+                  ]), 1032, ["listobj", "index", "optionss", "valueobj", "modelValue"]))
                 ], 6)), [
                   [vShow, !unref(useHide)(item, unref(dataForm))]
                 ]);

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

@@ -14,7 +14,7 @@ const Components = {
 };
 function setUp(props, emit, cs, refForm, getLocale) {
   const buts = vue.computed(() => {
-    if (typeof props.buts == "undefined") {
+    if (props.buts === void 0) {
       return [
         {
           _id: "2",
@@ -138,12 +138,9 @@ function setUp(props, emit, cs, refForm, getLocale) {
     return rules;
   }
   const dataRules = vue.ref(getRules());
-  vue.watch(
-    () => props.list.length,
-    () => {
-      dataRules.value = getRules();
-    }
-  );
+  vue.watch([() => props.list, () => props.list.length], () => {
+    dataRules.value = getRules();
+  });
   function validate() {
     return new Promise((resolve, reject) => {
       if (refForm.value) {
@@ -166,18 +163,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(() => {
     });