@fangzhongya/fang-ui 0.1.35 → 0.1.36

package/dist/components/common/use.js

@@ -1,12 +1,10 @@
 import { h, resolveComponent, computed, useAttrs, isVNode, Fragment, render } from "vue";
 import { isHTMLTag, isSVGTag } from "@vue/shared";
-import "../../utils/index.js";
-import { isObject } from "@fangzhongya/utils/basic/object/isObject";
 import { getFathers, getChildrenData } from "../../utils/util.js";
-import { setObjValue, getObjValue } from "@fangzhongya/utils/basic/object/objValue";
+import { isObject } from "@fangzhongya/utils/basic/object/isObject";
 import { lineToLargeHump } from "@fangzhongya/utils/name/lineToLargeHump";
+import { setObjValue, getObjValue } from "@fangzhongya/utils/basic/object/objValue";
 import { firstLower } from "@fangzhongya/utils/basic/string/firstLower";
-import { isArray } from "@fangzhongya/utils/basic/array/isArray";
 function useVueValue(v, key) {
   if (key && isObject(v)) {
     if (typeof key == "function") {
@@ -31,63 +29,62 @@ function getFormRule(obj) {
   const prop = obj.prop;
   if (obj.orig) {
     return prop;
-  } else {
-    const farrs = [];
-    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 = [];
+  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) {
@@ -106,7 +103,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 {
@@ -204,41 +201,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(compon);
+  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 {
+    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 h(compons[tcom], componObj, value);
-  } else {
-    if (isHTMLTag(compon) || isSVGTag(compon)) {
-      return h(compon, componObj, value);
-    } else {
-      return h(resolveComponent(compon), componObj);
-    }
   }
+  if (isHTMLTag(compon) || isSVGTag(compon)) {
+    return h(compon, componObj, value);
+  }
+  return h(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(key);
@@ -251,7 +247,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) {
@@ -302,14 +298,12 @@ function useSetCompon(obj, data, optionss, compons, emit, index, scope) {
         optionss,
         compons
       );
+    } else if (typeof obj.compon == "function") {
+      return obj.compon(componObj);
+    } else if (isVNode(obj.compon)) {
+      return obj.compon;
     } else {
-      if (typeof obj.compon == "function") {
-        return obj.compon(componObj);
-      } else if (isVNode(obj.compon)) {
-        return obj.compon;
-      } else {
-        return h(obj.compon, componObj);
-      }
+      return h(obj.compon, componObj);
     }
   }
 }
@@ -321,69 +315,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 (isVNode(label)) {
-      return label;
-    } else if (isObject(label)) {
-      if (isArray(label)) {
-        return 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 (isVNode(label)) {
+    return label;
+  }
+  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,
+    compons,
+    emit,
+    index,
+    isComponSelected
+  );
+};
+const renderLabelArray = (labels, data, optionss, 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);
+    })
+  );
+};
+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];
   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) {
@@ -401,13 +410,6 @@ function usePropsDefault(props, keyObj) {
     }
   });
 }
-function useAdditional(value, add) {
-  if (typeof value === "string" && typeof add === "string") {
-    return value + add;
-  } else {
-    return h(Fragment, {}, [value, add]);
-  }
-}
 function useLabelAdditional(value, add) {
   if (typeof value === "string" && typeof add === "string") {
     return value + add;
@@ -432,7 +434,7 @@ function getLabelText(label) {
   }
   if (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()) || "";
@@ -444,7 +446,6 @@ export {
   getOnObjs,
   getVNodeContent,
   setFormDefaultValue,
-  useAdditional,
   useGetDomLabel,
   useGetDomValue,
   useHide,

package/dist/components/company-select/index.d.ts

@@ -1,4 +1,5 @@
 import { SFCWithInstall } from '../../utils/vues';
 import { DefineComponent } from 'vue';
 declare const CompanySelect: SFCWithInstall<DefineComponent<{}, {}, any>>;
-export { CompanySelect, CompanySelect as default };
+export { CompanySelect };
+export default CompanySelect;

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

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-require("../../../utils/index.cjs");
 const buildProps = require("../../../utils/vues/buildProps.cjs");
 const definePropType = require("../../../utils/vues/definePropType.cjs");
 const companySelect = {

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

@@ -1,4 +1,3 @@
-import "../../../utils/index.js";
 import { buildProps } from "../../../utils/vues/buildProps.js";
 import { definePropType } from "../../../utils/vues/definePropType.js";
 const companySelect = {

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

@@ -4,10 +4,9 @@ const vue = require("vue");
 const index$3 = require("../../select/index.cjs");
 const index$4 = require("../../option/index.cjs");
 const data = require("./data.cjs");
-require("../../../hooks/index.cjs");
-const index$2 = require("../../../hooks/props-default/index.cjs");
-const index = require("../../../hooks/locale/index.cjs");
 const index$1 = require("../../../hooks/cssname/index.cjs");
+const index = require("../../../hooks/locale/index.cjs");
+const index$2 = require("../../../hooks/props-default/index.cjs");
 const _hoisted_1 = { key: 0 };
 const _sfc_main = /* @__PURE__ */ vue.defineComponent({
   __name: "index",
@@ -18,7 +17,6 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     const cs = index$1.useCssName(data.name);
     const prs = __props;
     const props = index$2.usePropsDefault(data.name, prs, data.dataProps);
-    index$2.viewProps(props, data.name);
     const emit = __emit;
     const mvalue = vue.ref([]);
     vue.watch(
@@ -33,7 +31,10 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       }
     );
     const psprops = vue.computed(() => {
-      return Object.assign({}, data.companySelect, props.props);
+      return {
+        ...data.companySelect,
+        ...props.props
+      };
     });
     const remoteData = vue.ref([]);
     const getList = () => {
@@ -50,7 +51,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         const arrs = props.labels || [];
         if (psprops.value.checkStrictly) {
           const values = [];
-          arrs.forEach((o, index2) => {
+          for (let index2 = 0; index2 < arrs.length; index2++) {
             getOptionsChildren(
               index2,
               (val = []) => {
@@ -58,7 +59,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
               },
               values[index2 - 1]
             );
-          });
+          }
           options.value = values;
         } else {
           const values = arrs.map((o, index2) => {

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

@@ -2,10 +2,9 @@ import { defineComponent, ref, watch, computed, nextTick, createElementBlock, op
 import { Select } from "../../select/index.js";
 import { Option } from "../../option/index.js";
 import { name, dataProps, companySelect, dataExpose, dataEmits } from "./data.js";
-import "../../../hooks/index.js";
-import { usePropsDefault, viewProps, getProps } from "../../../hooks/props-default/index.js";
-import { useLocale } from "../../../hooks/locale/index.js";
 import { useCssName } from "../../../hooks/cssname/index.js";
+import { useLocale } from "../../../hooks/locale/index.js";
+import { usePropsDefault, getProps } from "../../../hooks/props-default/index.js";
 const _hoisted_1 = { key: 0 };
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "index",
@@ -16,7 +15,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const cs = useCssName(name);
     const prs = __props;
     const props = usePropsDefault(name, prs, dataProps);
-    viewProps(props, name);
     const emit = __emit;
     const mvalue = ref([]);
     watch(
@@ -31,7 +29,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
     );
     const psprops = computed(() => {
-      return Object.assign({}, companySelect, props.props);
+      return {
+        ...companySelect,
+        ...props.props
+      };
     });
     const remoteData = ref([]);
     const getList = () => {
@@ -48,7 +49,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         const arrs = props.labels || [];
         if (psprops.value.checkStrictly) {
           const values = [];
-          arrs.forEach((o, index) => {
+          for (let index = 0; index < arrs.length; index++) {
             getOptionsChildren(
               index,
               (val = []) => {
@@ -56,7 +57,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               },
               values[index - 1]
             );
-          });
+          }
           options.value = values;
         } else {
           const values = arrs.map((o, index) => {

package/dist/components/config-provider/index.d.ts

@@ -2,4 +2,5 @@ import { SFCWithInstall } from '../../utils/vues';
 import { DefineComponent } from 'vue';
 export * from './src/export';
 declare const ConfigProvider: SFCWithInstall<DefineComponent<{}, {}, any>>;
-export { ConfigProvider, ConfigProvider as default };
+export { ConfigProvider };
+export default ConfigProvider;

package/dist/components/config-provider/index.scss

@@ -2,4 +2,5 @@
 
 $config-provider: 'config-provider';
 @include b($config-provider) {
+	// 占位符，为将来扩展预留
 }

package/dist/components/date-picker/index.d.ts

@@ -2,4 +2,5 @@ import { SFCWithInstall } from '../../utils/vues';
 import { DefineComponent } from 'vue';
 export * from './src/export';
 declare const DatePicker: SFCWithInstall<DefineComponent<{}, {}, any>>;
-export { DatePicker, DatePicker as default };
+export { DatePicker };
+export default DatePicker;

package/dist/components/date-picker/index.scss

@@ -2,4 +2,5 @@
 
 $date-picker: 'date-picker';
 @include b($date-picker) {
+	// 占位符，为将来扩展预留
 }

package/dist/components/date-picker-panel/index.d.ts

@@ -2,4 +2,5 @@ import { SFCWithInstall } from '../../utils/vues';
 import { DefineComponent } from 'vue';
 export * from './src/export';
 declare const DatePickerPanel: SFCWithInstall<DefineComponent<{}, {}, any>>;
-export { DatePickerPanel, DatePickerPanel as default };
+export { DatePickerPanel };
+export default DatePickerPanel;

package/dist/components/date-picker-panel/index.scss

@@ -2,4 +2,5 @@
 
 $date-picker-panel: 'date-picker-panel';
 @include b($date-picker-panel) {
+	// 占位符，为将来扩展预留
 }

package/dist/components/dates/index.css

@@ -2,7 +2,7 @@
   --on: rgb(91, 189, 246);
   --color-primary: #409eff;
   --bag-primary: #409eff;
-  --bag-primary-text: #fff;
+  --bag-primary-text: #ffffff;
   --border: #eee;
   --layout-panel-gap: 10px;
   --layout-panel-padding: 20px;

package/dist/components/dates/index.d.ts

@@ -1,4 +1,5 @@
 import { SFCWithInstall } from '../../utils/vues';
 import { DefineComponent } from 'vue';
 declare const Dates: SFCWithInstall<DefineComponent<{}, {}, any>>;
-export { Dates, Dates as default };
+export { Dates };
+export default Dates;

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

@@ -17,7 +17,6 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     const cs = index$1.useCssName(data.name);
     const prs = __props;
     const props = index$2.usePropsDefault(data.name, prs, data.dataProps);
-    index$2.viewProps(props, data.name);
     const emit = __emit;
     const { value } = data.dataHandle(props, emit);
     __expose({

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

@@ -2,7 +2,7 @@ import { defineComponent, useAttrs, ref, createElementBlock, openBlock, mergePro
 import { name, dataProps, dataHandle, dataExpose, dataEmits } from "./data.js";
 import { useCssName } from "../../../hooks/cssname/index.js";
 import { useInherit } from "../../../hooks/inherit/index.js";
-import { usePropsDefault, viewProps, getProps } from "../../../hooks/props-default/index.js";
+import { usePropsDefault, getProps } from "../../../hooks/props-default/index.js";
 import { DatePicker } from "../../date-picker/index.js";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   ...{ inheritAttrs: false },
@@ -15,7 +15,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const cs = useCssName(name);
     const prs = __props;
     const props = usePropsDefault(name, prs, dataProps);
-    viewProps(props, name);
     const emit = __emit;
     const { value } = dataHandle(props, emit);
     __expose({

package/dist/components/dates-divide/index.css

@@ -2,7 +2,7 @@
   --on: rgb(91, 189, 246);
   --color-primary: #409eff;
   --bag-primary: #409eff;
-  --bag-primary-text: #fff;
+  --bag-primary-text: #ffffff;
   --border: #eee;
   --layout-panel-gap: 10px;
   --layout-panel-padding: 20px;

package/dist/components/dates-divide/index.d.ts

@@ -1,4 +1,5 @@
 import { SFCWithInstall } from '../../utils/vues';
 import { DefineComponent } from 'vue';
 declare const DatesDivide: SFCWithInstall<DefineComponent<{}, {}, any>>;
-export { DatesDivide, DatesDivide as default };
+export { DatesDivide };
+export default DatesDivide;

package/dist/components/dates-divide/src/data.cjs

@@ -11,7 +11,7 @@ const dataProps = {
    * @props {String, Number, Date, Array} modelValue=[] 时间数据
    */
   modelValue: {
-    type: Array,
+    type: [String, Array],
     default() {
       return [];
     }

package/dist/components/dates-divide/src/data.d.ts

@@ -12,7 +12,7 @@ export declare const dataProps: {
      * @props {String, Number, Date, Array} modelValue=[] 时间数据
      */
     modelValue: {
-        type: {
+        type: (StringConstructor | {
             (arrayLength: number): (string | number | Date)[];
             (...items: (string | number | Date)[]): (string | number | Date)[];
             new (arrayLength: number): (string | number | Date)[];
@@ -27,7 +27,7 @@ export declare const dataProps: {
             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[];
     };
     defaultTime: {