@fangzhongya/fang-ui 0.1.37 → 0.1.39

package/dist/components/box-adjust/src/data.cjs

@@ -20,7 +20,7 @@ const dataProps = buildProps.buildProps({
     type: Boolean
   },
   /**
-   * @props { Boolean } max= ( )
+   * @props { Boolean } isMax= ( )
    * 是否显示最大化
    */
   isMax: {
@@ -28,7 +28,7 @@ const dataProps = buildProps.buildProps({
   },
   /**
    * @props { Boolean } max= ( )
-   * 是否要最大化
+   * 是否最大化
    */
   max: {
     type: Boolean

package/dist/components/box-adjust/src/data.d.ts

@@ -20,7 +20,7 @@ export declare const dataProps: {
         type: BooleanConstructor;
     };
     /**
-     * @props { Boolean } max= ( )
+     * @props { Boolean } isMax= ( )
      * 是否显示最大化
      */
     isMax: {
@@ -28,7 +28,7 @@ export declare const dataProps: {
     };
     /**
      * @props { Boolean } max= ( )
-     * 是否要最大化
+     * 是否最大化
      */
     max: {
         type: BooleanConstructor;

package/dist/components/box-adjust/src/data.js

@@ -18,7 +18,7 @@ const dataProps = buildProps({
     type: Boolean
   },
   /**
-   * @props { Boolean } max= ( )
+   * @props { Boolean } isMax= ( )
    * 是否显示最大化
    */
   isMax: {
@@ -26,7 +26,7 @@ const dataProps = buildProps({
   },
   /**
    * @props { Boolean } max= ( )
-   * 是否要最大化
+   * 是否最大化
    */
   max: {
     type: Boolean

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

@@ -1,3 +1,10 @@
+/**
+ * 设置样式函数，用于根据配置对象生成最终的样式对象
+ * @param v - 列表对象，包含样式配置信息
+ * @param data - 数据对象，用于样式函数计算
+ * @param props - 属性对象，包含默认的样式配置
+ * @returns 返回合并后的样式对象
+ */
 export declare function setStyles(v: ListObj, data: ObjStr, props: ObjAny): string | {
     [key: string]: string | number;
 };

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

@@ -71,6 +71,13 @@ export declare const emits: string[];
 type HandleConfig = {
     getValue: <T>(v: T) => T;
 };
+/**
+ * select选择的通用处理
+ * @param props 组件属性
+ * @param emit 触发事件
+ * @param config 	{ getValue: (v: T) => T } 获取值处理函数
+ * @returns
+ */
 export declare function comHandle(props: any, emit: any, config?: HandleConfig): {
     setMultipleValue: (v: any) => any;
     getMultipleValue: (v: any) => any;

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

@@ -51,5 +51,11 @@ export declare const props: {
 };
 export declare const emits: never[];
 export type UrlProps = ExtractPropTypes<typeof props>;
+/**
+ * 处理通用请求逻辑的函数
+ * @param props 包含请求配置信息的对象
+ * @param obj 额外的参数对象
+ * @returns 返回一个Promise，解析后的数据结果
+ */
 export declare function comHandle(props: UrlProps, obj: ObjAny): ObjAny;
 export declare const expose: {};

package/dist/components/common/use.cjs

@@ -150,7 +150,7 @@ function getValueObjs(value, multiple, options, config) {
     return value;
   }
 }
-function setOptionsValue(value, obj, data, optionss) {
+function setOptionsValue(value, obj, data, optionss = {}) {
   let options = [];
   if (obj == null ? void 0 : obj.options) {
     const opt = obj.options;
@@ -284,13 +284,15 @@ function useSetCompon(obj, data, optionss, compons, emit, index, scope) {
       ...attrs,
       ...obj.config,
       ...getOnObjs(obj, data, emit, scope),
-      multiple: obj.multiple,
       [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,
@@ -316,7 +318,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, optionss, compons, emit, index) => {
+  const label = obj.label;
   if (!label) {
     return label;
   }
@@ -329,32 +332,17 @@ const useGetDomLabel = (label, obj, data, slots, optionss, compons, emit, index,
   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(
+  return handleObjectLabel(
     label,
-    obj,
     data,
     slots,
     optionss,
     compons,
     emit,
-    index,
-    isComponSelected
+    index
   );
 };
 const renderLabelArray = (labels, data, optionss, compons, emit, index) => {
@@ -367,15 +355,14 @@ const renderLabelArray = (labels, 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);
+const handleObjectLabel = (label, data, slots, optionss, compons, emit, index) => {
+  const slot = useSetSlot(label, data, slots, index);
   if (slot) {
     return slot;
   }
-  if (mergedLabel.compon && isComponSelected(obj)) {
+  if (label.compon) {
     const column = useSetCompon(
-      mergedLabel,
+      label,
       data,
       optionss,
       compons,
@@ -386,7 +373,7 @@ const handleSingleObjectLabel = (label, obj, data, slots, optionss, compons, emi
       return column;
     }
   }
-  return useGetDomValue(mergedLabel, data, optionss, index);
+  return useGetDomValue(label, data, optionss, index);
 };
 function useObjComponSelected(obj, props) {
   const arrs = [obj];
@@ -426,18 +413,14 @@ function getVNodeContent(vnode) {
   vue.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;
   }
+  const label = useGetDomLabel(obj, {}, {}, {}, {}, () => {
+  }, 0);
   if (vue.isVNode(label)) {
     return getVNodeContent(label);
-  } else if (Array.isArray(label)) {
-    return label.join("");
   } else {
     return (label == null ? void 0 : label.toString()) || "";
   }

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

@@ -1,25 +1,111 @@
 import { Component, VNode } from 'vue';
+/**
+ * 根据指定的键或函数从对象中提取值
+ * @param v - 要处理的值，通常是一个对象
+ * @param key - 字符串类型的属性名或函数，用于提取值
+ * @returns 如果key是函数则返回函数执行结果，如果key是字符串则返回对象对应属性值，否则返回原值
+ */
 export declare function useVueValue(v: any, key: string | Function): any;
+/**
+ * 设置对象属性值的工具函数
+ * @param v - 要设置值的目标对象
+ * @param key - 属性名或设置函数，可以是字符串或函数类型
+ * @param value - 要设置的值
+ * @returns 返回修改后的对象
+ */
 export declare function useSetValue(v: any, key: string | Function, value: any): any;
+/**
+ * 获取表单规则路径
+ * @param obj - 包含属性和父子关系的对象
+ * @returns 返回格式化的属性路径字符串
+ */
 export declare function getFormRule(obj: ListObj): string | undefined;
+/**
+ * 设置表单默认值
+ * @param obj - 列表对象，包含表单配置信息
+ * @param value - 表单值对象，用于设置默认值的数据源
+ */
 export declare function setFormDefaultValue(obj: ListObj, value: ObjAny): void;
+/**
+ * 判断列表对象是否应该隐藏
+ * @param v - 列表对象，可能包含hide属性
+ * @param form - 表单数据，可选参数，用于hide函数的计算
+ * @returns 返回是否隐藏的布尔值，如果v.hide是函数则执行函数返回结果，如果是布尔值则直接返回，否则返回false
+ */
 export declare function useHide(v: ListObj, form?: any): boolean;
+/**
+ * 获取事件处理对象集合
+ * @param obj - 包含事件配置的对象
+ * @param data - 数据对象
+ * @param emit - 事件发射函数
+ * @param arrs - 额外的参数数组
+ * @returns 返回一个包含事件处理函数的对象
+ */
 export declare function getOnObjs(obj: ListObj, data: ObjAny, emit: Function, ...arrs: any[]): {
     [key: string]: (...arr: any[]) => void;
 };
 type Compons = {
     [key: string]: Component;
 };
+/**
+ * 设置并渲染插槽内容的自定义hook函数
+ *
+ * @param obj - 列表对象配置，包含插槽名称或属性名
+ * @param data - 数据对象，用于获取和设置值
+ * @param slots - 插槽映射对象，存储可用的插槽函数
+ * @param index - 可选的索引值，用于数据定位
+ * @param scope - 可选的作用域对象，传递给插槽函数
+ * @returns 插槽函数执行结果或undefined
+ */
 export declare function useSetSlot(obj: ListObj, data: ObjAny, slots: ObjAny, index?: number, scope?: ObjAny): any;
+/**
+ * 根据配置对象设置组件
+ * @param obj - 列表对象配置，包含组件相关配置信息
+ * @param data - 数据对象，用于获取和设置组件值
+ * @param optionss - 选项配置对象
+ * @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;
+/**
+ * 获取DOM元素的值
+ * @param obj - 列表对象配置
+ * @param data - 数据对象
+ * @param options - 选项配置对象
+ * @param index - 可选的索引值
+ * @returns 返回处理后的值
+ */
 export declare const useGetDomValue: (obj: ListObj, data: ObjAny, options: ObjAny, index?: number) => any;
-export declare const useGetDomLabel: (label: string | ListObj | VNode | Function | undefined, obj: ListObj, data: ObjAny, slots: ObjAny, optionss: ObjAny, compons: Compons, emit: Function, index: number, isComponSelected?: (obj: ListObj) => boolean) => any;
+/**
+ * 获取DOM标签的处理函数
+ * @param obj - 包含label属性的对象
+ * @param data - 数据对象
+ * @param slots - 插槽对象
+ * @param optionss - 选项配置对象
+ * @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;
+/**
+ * 获取对象及其父级链中选中的组件
+ * @param obj - 当前列表对象
+ * @param props - 包含组件选择状态的属性对象
+ * @returns 返回在对象层级链中找到的选中组件，如果没有则返回默认选中组件
+ */
 export declare function useObjComponSelected(obj: ListObj, props: ObjAny): any;
 /**
  * 设置获取默认值
- * @param props
- * @param keyObj
- * @returns
+ * 创建一个代理对象，用于处理属性默认值
+ * 当访问的属性值为undefined时，会调用对应的默认值函数来获取默认值
+ *
+ * @param props 原始属性对象
+ * @param keyObj 包含属性键和对应默认值函数的对象
+ * @returns 返回一个代理对象，支持默认值处理
  */
 export declare function usePropsDefault(props: any, keyObj: {
     [key: string]: () => any;
@@ -42,5 +128,5 @@ export declare function getVNodeContent(vnode: VNode): string;
  * @param label
  * @returns
  */
-export declare function getLabelText(label: string | ListObj | VNode | Function | undefined): string;
+export declare function getLabelText(obj: ListObj): string;
 export {};

package/dist/components/common/use.js

@@ -148,7 +148,7 @@ function getValueObjs(value, multiple, options, config) {
     return value;
   }
 }
-function setOptionsValue(value, obj, data, optionss) {
+function setOptionsValue(value, obj, data, optionss = {}) {
   let options = [];
   if (obj == null ? void 0 : obj.options) {
     const opt = obj.options;
@@ -282,13 +282,15 @@ function useSetCompon(obj, data, optionss, compons, emit, index, scope) {
       ...attrs,
       ...obj.config,
       ...getOnObjs(obj, data, emit, scope),
-      multiple: obj.multiple,
       [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,
@@ -314,7 +316,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, optionss, compons, emit, index) => {
+  const label = obj.label;
   if (!label) {
     return label;
   }
@@ -327,32 +330,17 @@ 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(
+  return handleObjectLabel(
     label,
-    obj,
     data,
     slots,
     optionss,
     compons,
     emit,
-    index,
-    isComponSelected
+    index
   );
 };
 const renderLabelArray = (labels, data, optionss, compons, emit, index) => {
@@ -365,15 +353,14 @@ const renderLabelArray = (labels, 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);
+const handleObjectLabel = (label, data, slots, optionss, compons, emit, index) => {
+  const slot = useSetSlot(label, data, slots, index);
   if (slot) {
     return slot;
   }
-  if (mergedLabel.compon && isComponSelected(obj)) {
+  if (label.compon) {
     const column = useSetCompon(
-      mergedLabel,
+      label,
       data,
       optionss,
       compons,
@@ -384,7 +371,7 @@ const handleSingleObjectLabel = (label, obj, data, slots, optionss, compons, emi
       return column;
     }
   }
-  return useGetDomValue(mergedLabel, data, optionss, index);
+  return useGetDomValue(label, data, optionss, index);
 };
 function useObjComponSelected(obj, props) {
   const arrs = [obj];
@@ -424,18 +411,14 @@ 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;
   }
+  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()) || "";
   }

package/dist/components/dates2/src/data.cjs

@@ -24,7 +24,7 @@ const dataProps = {
     type: Array
   },
   /**
-   * @props {String, Number, Date, Array} modelValue/v-model 时间数据
+   * @props {String, Number, Date, Array} modelValue 时间数据
    */
   modelValue: {
     type: [String, Number, Date, Array]

package/dist/components/dates2/src/data.d.ts

@@ -58,7 +58,7 @@ export declare const dataProps: {
         };
     };
     /**
-     * @props {String, Number, Date, Array} modelValue/v-model 时间数据
+     * @props {String, Number, Date, Array} modelValue 时间数据
      */
     modelValue: {
         type: (DateConstructor | StringConstructor | NumberConstructor | {

package/dist/components/dates2/src/data.js

@@ -22,7 +22,7 @@ const dataProps = {
     type: Array
   },
   /**
-   * @props {String, Number, Date, Array} modelValue/v-model 时间数据
+   * @props {String, Number, Date, Array} modelValue 时间数据
    */
   modelValue: {
     type: [String, Number, Date, Array]

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

@@ -5,7 +5,6 @@ const config = require("../common/config.cjs");
 const util = require("./util.cjs");
 require("../../../utils/css.cjs");
 const use = require("../../common/use.cjs");
-const lineToLargeHump = require("@fangzhongya/utils/name/lineToLargeHump");
 const vue = require("vue");
 const index$1 = require("../../../hooks/compons/index.cjs");
 const index = require("../../forms-items/index.cjs");
@@ -99,15 +98,15 @@ function setUp(props, emit, cs, refForm, getLocale) {
     setListValue(props.list);
   }
   const triggerMap = {
-    "1": getLocale("form.import"),
-    "2": getLocale("form.select"),
+    blur: getLocale("form.import"),
+    change: getLocale("form.select"),
     verif: getLocale("form.verif")
   };
   function getRules() {
     const rules = {};
     const setListValue = (arr, listobj) => {
       arr == null ? void 0 : arr.forEach((obj) => {
-        var _a, _b;
+        var _a;
         if (listobj) {
           obj.father = obj.father ?? listobj;
         }
@@ -115,34 +114,20 @@ function setUp(props, emit, cs, refForm, getLocale) {
           setListValue(obj.children, obj);
         }
         use.setFormDefaultValue(obj, dataForm.value);
-        let trigger = 1;
-        if (typeof obj.compon == "string") {
-          if (config.changes.includes(lineToLargeHump.lineToLargeHump(obj.compon))) {
-            trigger = 2;
-          }
-        }
         obj.config = obj.config ?? {};
-        const labeltext = obj.labelText ?? use.getLabelText(obj.label);
-        if (((_a = obj.config) == null ? void 0 : _a.placeholder) === void 0) {
-          obj.config.placeholder = triggerMap[trigger + ""] + labeltext;
-        }
-        if (((_b = obj.config) == null ? void 0 : _b.clearable) === void 0) {
+        if (((_a = obj.config) == null ? void 0 : _a.clearable) === void 0) {
           obj.config.clearable = true;
         }
+        if (!obj.rule) {
+          util.setPlaceholder(obj, triggerMap);
+        }
         if (obj.prop) {
           const p = use.getFormRule(obj) ?? obj.prop;
           obj.__prop = p;
           if (obj.rules) {
             rules[p] = obj.rules;
           } else if (obj.rule) {
-            rules[p] = util.getRule(
-              labeltext,
-              trigger,
-              obj,
-              dataForm,
-              refForm,
-              triggerMap
-            );
+            rules[p] = util.getRule(obj, dataForm, refForm, triggerMap);
           } else {
             rules[p] = [];
           }

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

@@ -1,7 +1,17 @@
 import { DataProps } from './data';
-import { UseCssNameReturn } from '../../../hooks/cssname';
+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

@@ -1,9 +1,8 @@
 import { dataHandle } from "./data.js";
-import { provides, changes } from "../common/config.js";
-import { getRule } from "./util.js";
+import { provides } from "../common/config.js";
+import { setPlaceholder, getRule } from "./util.js";
 import "../../../utils/css.js";
-import { setFormDefaultValue, getLabelText, getFormRule } from "../../common/use.js";
-import { lineToLargeHump } from "@fangzhongya/utils/name/lineToLargeHump";
+import { setFormDefaultValue, getFormRule } from "../../common/use.js";
 import { computed, provide, isProxy, ref, watch } from "vue";
 import { useCompons } from "../../../hooks/compons/index.js";
 import { FormsItems } from "../../forms-items/index.js";
@@ -97,15 +96,15 @@ function setUp(props, emit, cs, refForm, getLocale) {
     setListValue(props.list);
   }
   const triggerMap = {
-    "1": getLocale("form.import"),
-    "2": getLocale("form.select"),
+    blur: getLocale("form.import"),
+    change: getLocale("form.select"),
     verif: getLocale("form.verif")
   };
   function getRules() {
     const rules = {};
     const setListValue = (arr, listobj) => {
       arr == null ? void 0 : arr.forEach((obj) => {
-        var _a, _b;
+        var _a;
         if (listobj) {
           obj.father = obj.father ?? listobj;
         }
@@ -113,34 +112,20 @@ function setUp(props, emit, cs, refForm, getLocale) {
           setListValue(obj.children, obj);
         }
         setFormDefaultValue(obj, dataForm.value);
-        let trigger = 1;
-        if (typeof obj.compon == "string") {
-          if (changes.includes(lineToLargeHump(obj.compon))) {
-            trigger = 2;
-          }
-        }
         obj.config = obj.config ?? {};
-        const labeltext = obj.labelText ?? getLabelText(obj.label);
-        if (((_a = obj.config) == null ? void 0 : _a.placeholder) === void 0) {
-          obj.config.placeholder = triggerMap[trigger + ""] + labeltext;
-        }
-        if (((_b = obj.config) == null ? void 0 : _b.clearable) === void 0) {
+        if (((_a = obj.config) == null ? void 0 : _a.clearable) === void 0) {
           obj.config.clearable = true;
         }
+        if (!obj.rule) {
+          setPlaceholder(obj, triggerMap);
+        }
         if (obj.prop) {
           const p = getFormRule(obj) ?? obj.prop;
           obj.__prop = p;
           if (obj.rules) {
             rules[p] = obj.rules;
           } else if (obj.rule) {
-            rules[p] = getRule(
-              labeltext,
-              trigger,
-              obj,
-              dataForm,
-              refForm,
-              triggerMap
-            );
+            rules[p] = getRule(obj, dataForm, refForm, triggerMap);
           } else {
             rules[p] = [];
           }