@fangzhongya/fang-ui 0.1.35 → 0.1.37

package/dist/components/common/list.js

@@ -80,7 +80,7 @@ function comHandle(props2, emit, config) {
   function getValueObjs(v) {
     var _a, _b;
     if (v !== void 0 && v !== null) {
-      if (selectMultiple.value && v instanceof Array) {
+      if (selectMultiple.value && Array.isArray(v)) {
         return (_a = props2.options) == null ? void 0 : _a.filter((o) => {
           return v.includes(useVueValue(o, props2.prop));
         });
@@ -94,15 +94,13 @@ function comHandle(props2, emit, config) {
   function setValue(type) {
     let v = props2.modelValue;
     if (type == 2) {
-      if (!(v instanceof Array)) {
+      if (!Array.isArray(v)) {
         if (v !== void 0 && v !== null && v !== "") {
           v = [v];
         }
       }
-    } else {
-      if (v instanceof Array) {
-        v = v[0];
-      }
+    } else if (Array.isArray(v)) {
+      v = v[0];
     }
     const z = getMultipleValue(v);
     if (z !== value.value) {
@@ -129,7 +127,7 @@ function comHandle(props2, emit, config) {
         selectMultiple.value = true;
         getMultipleValue = (v) => {
           if (config == null ? void 0 : config.getValue) v = config.getValue(v);
-          if (v && v instanceof Array) {
+          if (v && Array.isArray(v)) {
             return v.join(props2.multiple);
           }
           return v;
@@ -175,10 +173,8 @@ function comHandle(props2, emit, config) {
           });
         }
       }
-    } else {
-      if (value.value !== void 0) {
-        value.value = void 0;
-      }
+    } else if (value.value !== void 0) {
+      value.value = void 0;
     }
   }
   return {

package/dist/components/common/urls.cjs

@@ -54,9 +54,13 @@ const props = {
   }
 };
 const emits = [];
+const createAjaxConfig = (overrides = {}) => ({
+  method: "post",
+  ...overrides
+});
 function comHandle(props2, obj) {
   return new Promise((resolve, reject) => {
-    obj = Object.assign({}, props2.param, obj);
+    obj = { ...props2.param, ...obj };
     if (props2.onRequestBefore) {
       obj = props2.onRequestBefore(obj);
     }
@@ -72,12 +76,7 @@ function comHandle(props2, obj) {
           reject(err);
         });
       } else {
-        const param = Object.assign(
-          {
-            method: "post"
-          },
-          props2.ajaxConfig ?? {}
-        );
+        const param = createAjaxConfig(props2.ajaxConfig);
         if (param.method && param.method.toLowerCase() == "get") {
           param.params = obj;
         } else {

package/dist/components/common/urls.js

@@ -52,9 +52,13 @@ const props = {
   }
 };
 const emits = [];
+const createAjaxConfig = (overrides = {}) => ({
+  method: "post",
+  ...overrides
+});
 function comHandle(props2, obj) {
   return new Promise((resolve, reject) => {
-    obj = Object.assign({}, props2.param, obj);
+    obj = { ...props2.param, ...obj };
     if (props2.onRequestBefore) {
       obj = props2.onRequestBefore(obj);
     }
@@ -70,12 +74,7 @@ function comHandle(props2, obj) {
           reject(err);
         });
       } else {
-        const param = Object.assign(
-          {
-            method: "post"
-          },
-          props2.ajaxConfig ?? {}
-        );
+        const param = createAjaxConfig(props2.ajaxConfig);
         if (param.method && param.method.toLowerCase() == "get") {
           param.params = obj;
         } else {

package/dist/components/common/use.cjs

@@ -2,13 +2,11 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const vue = require("vue");
 const shared = require("@vue/shared");
-require("../../utils/index.cjs");
-const isObject = require("@fangzhongya/utils/basic/object/isObject");
 const util = require("../../utils/util.cjs");
-const objValue = require("@fangzhongya/utils/basic/object/objValue");
+const isObject = require("@fangzhongya/utils/basic/object/isObject");
 const lineToLargeHump = require("@fangzhongya/utils/name/lineToLargeHump");
+const objValue = require("@fangzhongya/utils/basic/object/objValue");
 const firstLower = require("@fangzhongya/utils/basic/string/firstLower");
-const isArray = require("@fangzhongya/utils/basic/array/isArray");
 function useVueValue(v, key) {
   if (key && isObject.isObject(v)) {
     if (typeof key == "function") {
@@ -33,63 +31,62 @@ function getFormRule(obj) {
   const prop = obj.prop;
   if (obj.orig) {
     return prop;
-  } else {
-    const farrs = [];
-    util.getFathers(obj, farrs);
-    if (farrs.length > 0) {
-      let fps = [];
-      farrs.forEach((obj2) => {
-        if (obj2.orig) {
-          fps = [];
-        } else {
-          if (obj2.prop) {
-            fps.push(obj2.prop);
-          }
-        }
-      });
-      fps.push(prop);
-      return fps.join(".");
-    } else {
-      return prop;
+  }
+  const farrs = [];
+  util.getFathers(obj, farrs);
+  if (farrs.length === 0) {
+    return prop;
+  }
+  let fps = [];
+  for (const fatherObj of farrs) {
+    if (fatherObj.orig) {
+      fps = [];
+    } else if (fatherObj.prop) {
+      fps.push(fatherObj.prop);
     }
   }
+  fps.push(prop);
+  return fps.join(".");
 }
 function setComputed(obj, v) {
-  if (obj.computed) {
-    if (obj.default) {
-      const value = obj.default;
-      if (obj.computed instanceof Array) {
-        obj.computed.forEach((k, i) => {
-          if (value instanceof Array) {
-            v[k] = value[i];
-          } else {
-            v[k] = value ? value[k] : void 0;
-          }
-        });
-      } else if (obj.computed.set) {
-        obj.computed.set(value, v, obj);
-      }
+  if (!obj.computed) return;
+  if (obj.default) {
+    handleComputedWithDefault(obj, v);
+  } else {
+    handleComputedWithoutDefault(obj, v);
+  }
+}
+function handleComputedWithDefault(obj, v) {
+  const value = obj.default;
+  if (Array.isArray(obj.computed)) {
+    handleArrayComputedWithDefault(obj.computed, value, v);
+  } else if (obj.computed.set) {
+    obj.computed.set(value, v, obj);
+  }
+}
+function handleArrayComputedWithDefault(computed2, value, v) {
+  for (let i = 0; i < computed2.length; i++) {
+    const key = computed2[i];
+    if (Array.isArray(value)) {
+      v[key] = value[i];
     } else {
-      if (obj.prop) {
-        const r = v[obj.prop];
-        if (obj.computed instanceof Array) {
-          v[obj.prop] = obj.computed.map((k) => {
-            return v[k];
-          });
-        } else if (obj.computed.get) {
-          v[obj.prop] = obj.computed.get(r, v, obj);
-        }
-        obj.default = v[obj.prop];
-      } else {
-        if (obj.computed instanceof Array) {
-          obj.default = obj.computed.map((k) => {
-            return v[k];
-          });
-        } else if (obj.computed.get) {
-          obj.default = obj.computed.get(void 0, v, obj);
-        }
-      }
+      v[key] = value ? value[key] : void 0;
+    }
+  }
+}
+function handleComputedWithoutDefault(obj, v) {
+  if (obj.prop) {
+    const currentValue = v[obj.prop];
+    if (Array.isArray(obj.computed)) {
+      v[obj.prop] = obj.computed.map((key) => v[key]);
+    } else if (obj.computed.get) {
+      v[obj.prop] = obj.computed.get(currentValue, v, obj);
     }
+    obj.default = v[obj.prop];
+  } else if (Array.isArray(obj.computed)) {
+    obj.default = obj.computed.map((key) => v[key]);
+  } else if (obj.computed.get) {
+    obj.default = obj.computed.get(void 0, v, obj);
   }
 }
 function setFormDefaultValue(obj, value) {
@@ -108,7 +105,7 @@ function setFormDefaultValue(obj, value) {
   }
 }
 function useHide(v, form) {
-  if (v && v.hide) {
+  if (v == null ? void 0 : v.hide) {
     if (typeof v.hide == "function") {
       return v.hide(form, v);
     } else {
@@ -206,41 +203,40 @@ function getValue(obj, data, index) {
   }
 }
 function setComponString(value, obj, componObj, data, optionss, compons) {
-  if (obj == null ? void 0 : obj.options) {
-    let options = [];
-    const opt = obj.options;
-    if (typeof opt === "string") {
-      const optionsvalue = optionss[opt];
-      if (typeof optionsvalue == "function") {
-        options = optionsvalue(optionss, value, obj, data) || [];
-      } else {
-        options = optionsvalue || [];
-      }
-    } else if (typeof opt == "function") {
-      options = opt(optionss, value, obj, data) || [];
-    } else {
-      options = opt || [];
-    }
-    if (options && options.length > 0) {
-      componObj.options = options;
-    }
-  }
+  processOptions(obj, componObj, optionss, value, data);
   const compon = obj.compon;
   const tcom = lineToLargeHump.lineToLargeHump(compon);
-  if (Object.keys(compons).includes(tcom)) {
-    return vue.h(compons[tcom], componObj, value);
+  return renderComponent(tcom, compon, componObj, value, compons);
+}
+function processOptions(obj, componObj, optionss, value, data) {
+  if (!(obj == null ? void 0 : obj.options)) return;
+  let options = [];
+  const opt = obj.options;
+  if (typeof opt === "string") {
+    const optionsvalue = optionss[opt];
+    options = typeof optionsvalue == "function" ? optionsvalue(optionss, value, obj, data) || [] : optionsvalue || [];
+  } else if (typeof opt == "function") {
+    options = opt(optionss, value, obj, data) || [];
   } else {
-    if (shared.isHTMLTag(compon) || shared.isSVGTag(compon)) {
-      return vue.h(compon, componObj, value);
-    } else {
-      return vue.h(vue.resolveComponent(compon), componObj);
-    }
+    options = opt || [];
+  }
+  if ((options == null ? void 0 : options.length) > 0) {
+    componObj.options = options;
   }
 }
+function renderComponent(tcom, compon, componObj, value, compons) {
+  if (Object.keys(compons).includes(tcom)) {
+    return vue.h(compons[tcom], componObj);
+  }
+  if (shared.isHTMLTag(compon) || shared.isSVGTag(compon)) {
+    return vue.h(compon, componObj, value);
+  }
+  return vue.h(vue.resolveComponent(compon), componObj);
+}
 function getOnObjs(obj, data, emit, ...arrs) {
   const objs = {};
   const es = obj.events || {};
-  Object.keys(es).forEach((key) => {
+  for (const key of Object.keys(es)) {
     let ml = key;
     if (!/on[A-Z]/.test(key)) {
       ml = "on" + lineToLargeHump.lineToLargeHump(key);
@@ -253,7 +249,7 @@ function getOnObjs(obj, data, emit, ...arrs) {
         emit("list-events", es[key] || key, ...v, data, obj, ...arrs);
       }
     };
-  });
+  }
   return objs;
 }
 function useSetSlot(obj, data, slots, index, scope) {
@@ -304,14 +300,12 @@ function useSetCompon(obj, data, optionss, compons, emit, index, scope) {
         optionss,
         compons
       );
+    } else if (typeof obj.compon == "function") {
+      return obj.compon(componObj);
+    } else if (vue.isVNode(obj.compon)) {
+      return obj.compon;
     } 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);
-      }
+      return vue.h(obj.compon, componObj);
     }
   }
 }
@@ -323,69 +317,84 @@ const useGetDomValue = (obj, data, options, index) => {
   return value;
 };
 const useGetDomLabel = (label, obj, data, slots, optionss, compons, emit, index, isComponSelected = (obj2) => true) => {
-  if (label) {
-    if (typeof label == "function") {
-      return label();
-    } else if (vue.isVNode(label)) {
-      return label;
-    } else if (isObject.isObject(label)) {
-      if (isArray.isArray(label)) {
-        return vue.h(
-          "div",
-          {
-            class: "com-lable-array"
-          },
-          label.map((v) => {
-            if (typeof v === "string") {
-              v = {
-                value: v,
-                compon: "div"
-              };
-            }
-            return useSetCompon(
-              v,
-              data,
-              optionss,
-              compons,
-              emit,
-              index
-            );
-          })
-        );
-      } else {
-        label = Object.assign({}, obj, label);
-        const slot = useSetSlot(label, data, slots, index);
-        if (slot) {
-          return slot;
-        }
-        if (label.compon) {
-          if (isComponSelected(obj)) {
-            const column = useSetCompon(
-              label,
-              data,
-              optionss,
-              compons,
-              emit,
-              index
-            );
-            if (column) {
-              return column;
-            }
-          }
-        }
-        return useGetDomValue(label, data, optionss, index);
-      }
+  if (!label) {
+    return label;
+  }
+  if (typeof label === "function") {
+    return label();
+  }
+  if (vue.isVNode(label)) {
+    return label;
+  }
+  if (!isObject.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,
+    compons,
+    emit,
+    index,
+    isComponSelected
+  );
+};
+const renderLabelArray = (labels, data, optionss, 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);
+    })
+  );
+};
+const handleSingleObjectLabel = (label, obj, data, slots, optionss, compons, emit, index, isComponSelected) => {
+  const mergedLabel = { ...obj, ...label };
+  const slot = useSetSlot(mergedLabel, data, slots, index);
+  if (slot) {
+    return slot;
+  }
+  if (mergedLabel.compon && isComponSelected(obj)) {
+    const column = useSetCompon(
+      mergedLabel,
+      data,
+      optionss,
+      compons,
+      emit,
+      index
+    );
+    if (column) {
+      return column;
     }
   }
-  return label;
+  return useGetDomValue(mergedLabel, data, optionss, index);
 };
 function useObjComponSelected(obj, props) {
   const arrs = [obj];
   util.getFathers(obj, arrs);
   let componSelected = props.componSelected;
-  arrs.forEach((v) => {
+  for (const v of arrs) {
     componSelected = v.componSelected ?? componSelected;
-  });
+  }
   return componSelected;
 }
 function usePropsDefault(props, keyObj) {
@@ -403,13 +412,6 @@ function usePropsDefault(props, keyObj) {
     }
   });
 }
-function useAdditional(value, add) {
-  if (typeof value === "string" && typeof add === "string") {
-    return value + add;
-  } else {
-    return vue.h(vue.Fragment, {}, [value, add]);
-  }
-}
 function useLabelAdditional(value, add) {
   if (typeof value === "string" && typeof add === "string") {
     return value + add;
@@ -434,7 +436,7 @@ function getLabelText(label) {
   }
   if (vue.isVNode(label)) {
     return getVNodeContent(label);
-  } else if (label instanceof Array) {
+  } else if (Array.isArray(label)) {
     return label.join("");
   } else {
     return (label == null ? void 0 : label.toString()) || "";
@@ -445,7 +447,6 @@ exports.getLabelText = getLabelText;
 exports.getOnObjs = getOnObjs;
 exports.getVNodeContent = getVNodeContent;
 exports.setFormDefaultValue = setFormDefaultValue;
-exports.useAdditional = useAdditional;
 exports.useGetDomLabel = useGetDomLabel;
 exports.useGetDomValue = useGetDomValue;
 exports.useHide = useHide;

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

@@ -30,7 +30,6 @@ export declare function usePropsDefault(props: any, keyObj: {
  * @param add
  * @returns
  */
-export declare function useAdditional(value: string | VNode, add: string | VNode): string | VNode;
 export declare function useLabelAdditional(value: string | VNode, add: string | VNode): string | VNode;
 /**
  * 获取VNode的展示文本