@fangzhongya/fang-ui 0.1.39 → 0.1.41

package/dist/components/common/use.cjs

@@ -90,17 +90,26 @@ function handleComputedWithoutDefault(obj, v) {
   }
 }
 function setFormDefaultValue(obj, value) {
-  let v = util.getChildrenData(obj, value, true) ?? {};
+  let v = util.getChildrenData(obj, value);
   if (obj.orig) {
-    v = value;
+    v = value ?? {};
   }
   setComputed(obj, v);
   const prop = obj.prop;
   if (prop) {
-    if (obj.pars) {
-      objValue.setObjValue(v, prop, objValue.getObjValue(prop, v) ?? obj.default);
+    if (v) {
+      if (obj.pars) {
+        objValue.setObjValue(v, prop, objValue.getObjValue(prop, v) ?? obj.default);
+      } else {
+        v[prop] = v[prop] ?? obj.default;
+      }
     } else {
-      v[prop] = v[prop] ?? obj.default;
+      v = util.getChildrenData(obj, value, true);
+      if (obj.pars) {
+        objValue.setObjValue(v, prop, objValue.getObjValue(prop, v) ?? obj.default);
+      } else {
+        v[prop] = v[prop] ?? obj.default;
+      }
     }
   }
 }
@@ -150,48 +159,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 = util.getChildrenData(obj, data) ?? {};
+  let v = util.getChildrenData(obj, data);
   if (obj.orig) {
     v = data ?? {};
   }
   const prop = obj.prop;
   if (prop) {
-    if (obj.pars) {
-      objValue.setObjValue(v, prop, value);
+    if (v) {
+      if (obj.pars) {
+        objValue.setObjValue(v, prop, value);
+      } else {
+        v[prop] = value;
+      }
     } else {
-      v[prop] = value;
+      v = util.getChildrenData(obj, data, true);
+      if (obj.pars) {
+        objValue.setObjValue(v, prop, value);
+      } else {
+        v[prop] = value;
+      }
     }
   }
 }
 function getValue(obj, data, index) {
   const prop = obj.prop;
-  const cdata = util.getChildrenData(obj, data, true) ?? {};
+  const cdata = util.getChildrenData(obj, data);
   let cellValue;
   if (prop) {
     if (obj.pars) {
       cellValue = objValue.getObjValue(prop, cdata);
     } else {
-      cellValue = cdata[prop];
+      cellValue = cdata == null ? void 0 : cdata[prop];
     }
   } else {
     cellValue = obj.value;
@@ -202,36 +209,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.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 (vue.isVNode(slots)) {
+    return {
+      default: () => slots
+    };
+  } else if (typeof slots === "function") {
+    return {
+      default: slots
+    };
+  } else if (isObject.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 vue.h(compons[tcom], componObj);
+    return vue.h(compons[tcom], componObj, setSlots(obj));
   }
   if (shared.isHTMLTag(compon) || shared.isSVGTag(compon)) {
     return vue.h(compon, componObj, value);
   }
-  return vue.h(vue.resolveComponent(compon), componObj);
+  return vue.h(vue.resolveComponent(compon), componObj, setSlots(obj));
 }
 function getOnObjs(obj, data, emit, ...arrs) {
   const objs = {};
@@ -252,63 +274,74 @@ 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];
     if (slot) {
-      const value = vue.computed({
+      let value = (scope == null ? void 0 : scope.value) ?? vue.computed({
         get() {
           return getValue(obj, data, index);
         },
-        set(value2) {
-          setValue(value2, obj, data);
+        set(v) {
+          setValue(v, obj, data);
         }
       });
+      const componObj = getComponObj(
+        value == null ? void 0 : 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 = vue.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 (vue.isVNode(obj.compon)) {
-      return obj.compon;
-    } else {
-      return vue.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 (vue.isVNode(compon)) {
+    return compon;
+  } else {
+    return vue.h(compon, componObj, setSlots(obj));
   }
 }
 const useGetDomValue = (obj, data, options, index) => {
@@ -318,7 +351,7 @@ const useGetDomValue = (obj, data, options, index) => {
   }
   return value;
 };
-const useGetDomLabel = (obj, data, slots, optionss, compons, emit, index) => {
+const useGetDomLabel = (obj, data, slots, options, compons, emit, index) => {
   const label = obj.label;
   if (!label) {
     return label;
@@ -333,48 +366,46 @@ const useGetDomLabel = (obj, data, slots, optionss, compons, emit, index) => {
     return label;
   }
   if (Array.isArray(label)) {
-    return renderLabelArray(label, data, optionss, compons, emit, index);
+    return renderLabelArray(label, data, options, compons, emit, index);
   }
-  return handleObjectLabel(
-    label,
-    data,
-    slots,
-    optionss,
+  return useVNodeComponDom(label, data, slots, emit, {
+    options,
     compons,
-    emit,
     index
-  );
+  });
 };
-const renderLabelArray = (labels, data, optionss, compons, emit, index) => {
+const renderLabelArray = (labels, data, options, compons, emit, index) => {
   return vue.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 handleObjectLabel = (label, data, slots, optionss, compons, emit, index) => {
-  const slot = useSetSlot(label, 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 (label.compon) {
+  if (obj.compon) {
     const column = useSetCompon(
-      label,
+      obj,
       data,
-      optionss,
+      options,
       compons,
       emit,
-      index
+      index,
+      scope
     );
     if (column) {
       return column;
     }
   }
-  return useGetDomValue(label, data, optionss, index);
-};
+  return useGetDomValue(obj, data, options, index);
+}
 function useObjComponSelected(obj, props) {
   const arrs = [obj];
   util.getFathers(obj, arrs);
@@ -417,6 +448,19 @@ function getLabelText(obj) {
   if (obj.labelText) {
     return obj.labelText;
   }
+  if (!obj.label) {
+    const farrs = [];
+    util.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 (vue.isVNode(label)) {
@@ -425,11 +469,13 @@ function getLabelText(obj) {
     return (label == null ? void 0 : label.toString()) || "";
   }
 }
+exports.getComponObj = getComponObj;
 exports.getFormRule = getFormRule;
 exports.getLabelText = getLabelText;
 exports.getOnObjs = getOnObjs;
 exports.getVNodeContent = getVNodeContent;
 exports.setFormDefaultValue = setFormDefaultValue;
+exports.useGetCompon = useGetCompon;
 exports.useGetDomLabel = useGetDomLabel;
 exports.useGetDomValue = useGetDomValue;
 exports.useHide = useHide;
@@ -439,4 +485,5 @@ exports.usePropsDefault = usePropsDefault;
 exports.useSetCompon = useSetCompon;
 exports.useSetSlot = useSetSlot;
 exports.useSetValue = useSetValue;
+exports.useVNodeComponDom = useVNodeComponDom;
 exports.useVueValue = useVueValue;

package/dist/components/common/use.d.ts

@@ -57,19 +57,26 @@ type Compons = {
  * @param scope - 可选的作用域对象，传递给插槽函数
  * @returns 插槽函数执行结果或undefined
  */
-export declare function useSetSlot(obj: ListObj, data: ObjAny, slots: ObjAny, index?: number, scope?: ObjAny): any;
+export declare function useSetSlot(obj: ListObj, data: ObjAny, slots: ObjAny, options: ObjAny, emit: Function, index?: number | number[], scope?: ObjAny): any;
+export declare function getComponObj(value: any, obj: ListObj, data: ObjAny, options: ObjAny, emit: Function, scope?: ObjAny): {
+    [x: string]: any;
+    listobj: ListObj;
+    valueobj: ObjAny;
+    comscope: ObjAny | undefined;
+};
 /**
  * 根据配置对象设置组件
  * @param obj - 列表对象配置，包含组件相关配置信息
  * @param data - 数据对象，用于获取和设置组件值
- * @param optionss - 选项配置对象
+ * @param options - 选项配置对象
  * @param compons - 组件集合
  * @param emit - 事件发射函数
  * @param index - 索引值，可选参数
  * @param scope - 作用域对象，可选参数
  * @returns 返回创建的组件节点或组件调用结果
  */
-export declare function useSetCompon(obj: ListObj, data: ObjAny, optionss: ObjAny, compons: Compons, emit: Function, index?: number, scope?: ObjAny): any;
+export declare function useSetCompon(obj: ListObj, data: ObjAny, options: ObjAny, compons: Compons, emit: Function, index?: number | number[], scope?: ObjAny): any;
+export declare function useGetCompon(compon: any, componObj: ObjAny, obj: ListObj, compons: Compons, value: any): any;
 /**
  * 获取DOM元素的值
  * @param obj - 列表对象配置
@@ -78,19 +85,32 @@ export declare function useSetCompon(obj: ListObj, data: ObjAny, optionss: ObjAn
  * @param index - 可选的索引值
  * @returns 返回处理后的值
  */
-export declare const useGetDomValue: (obj: ListObj, data: ObjAny, options: ObjAny, index?: number) => any;
+export declare const useGetDomValue: (obj: ListObj, data: ObjAny, options: ObjAny, index?: number | number[]) => any;
 /**
  * 获取DOM标签的处理函数
  * @param obj - 包含label属性的对象
  * @param data - 数据对象
  * @param slots - 插槽对象
- * @param optionss - 选项配置对象
+ * @param options - 选项配置对象
  * @param compons - 组件对象
  * @param emit - 事件发射函数
  * @param index - 索引值
  * @returns 返回处理后的标签内容，可能是字符串、VNode或渲染后的数组/对象
  */
-export declare const useGetDomLabel: (obj: ListObj, data: ObjAny, slots: ObjAny, optionss: ObjAny, compons: Compons, emit: Function, index: number) => any;
+export declare const useGetDomLabel: (obj: ListObj, data: ObjAny, slots: ObjAny, options: ObjAny, compons: Compons, emit: Function, index: number) => any;
+/**
+ * 根据配置对象处理虚拟节点的组件或DOM渲染
+ * @param obj - 列表对象配置，包含标签和组件信息
+ * @param data - 数据对象，用于渲染的数据源
+ * @param slots - 插槽配置对象
+ * @param options - 选项配置对象
+ * @param compons - 组件集合
+ * @param emit - 事件发射函数
+ * @param index - 当前项的索引
+ * @param config - 可选的额外配置对象
+ * @returns 处理后的虚拟节点、组件或DOM值
+ */
+export declare function useVNodeComponDom(obj: ListObj, data: ObjAny, slots: ObjAny, emit: Function, config: ObjAny): any;
 /**
  * 获取对象及其父级链中选中的组件
  * @param obj - 当前列表对象