@fangzhongya/fang-ui 0.1.37 → 0.1.39

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

@@ -2,6 +2,8 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const use = require("../../common/use.cjs");
 const judge = require("@fangzhongya/utils/judge/judge");
+const config = require("../common/config.cjs");
+const lineToLargeHump = require("@fangzhongya/utils/name/lineToLargeHump");
 function _interopNamespaceDefault(e) {
   const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });
   if (e) {
@@ -25,12 +27,38 @@ function isValue(value) {
   }
   return true;
 }
-function getRule(name, trigger, obj, data, refForm, triggerMap) {
+function getTrigger(trigger) {
+  if (trigger === 1) {
+    return "blur";
+  } else if (trigger === 2) {
+    return "change";
+  } else if (trigger === 3) {
+    return ["change", "blur"];
+  } else {
+    return trigger;
+  }
+}
+function setPlaceholder(obj, triggerMap) {
+  var _a;
+  const name = use.getLabelText(obj);
+  let trigger = "blur";
+  if (typeof obj.compon == "string") {
+    if (config.changes.includes(lineToLargeHump.lineToLargeHump(obj.compon))) {
+      trigger = "change";
+    }
+  }
+  const inputPrompt = triggerMap[Array.isArray(trigger) ? trigger[0] : trigger] + name;
+  if (((_a = obj.config) == null ? void 0 : _a.placeholder) === void 0) {
+    obj.config.placeholder = inputPrompt;
+  }
+}
+function getRule(obj, data, refForm, triggerMap) {
   var _a;
   let multiple = obj.multiple ?? ((_a = obj.config) == null ? void 0 : _a.multiple);
   if (typeof multiple != "boolean") {
     multiple = false;
   }
+  const name = use.getLabelText(obj);
   const param = {
     name,
     multiple,
@@ -39,46 +67,85 @@ function getRule(name, trigger, obj, data, refForm, triggerMap) {
     refForm,
     triggerMap
   };
+  let trigger = "blur";
+  if (typeof obj.compon == "string") {
+    if (config.changes.includes(lineToLargeHump.lineToLargeHump(obj.compon))) {
+      trigger = "change";
+    }
+  }
   const rule = obj.rule;
-  let verif = triggerMap.verif + name;
+  let verif = name + triggerMap.verif;
   const arr = [];
   if (Array.isArray(rule)) {
     for (const v of rule) {
       arr.push(
         getRuleObj(
-          (v == null ? void 0 : v.type) ?? trigger,
-          obj.required ?? (v == null ? void 0 : v.must),
+          param,
+          (v == null ? void 0 : v.trigger) ?? trigger,
+          obj.required ?? (v == null ? void 0 : v.required),
           (v == null ? void 0 : v.error) || verif,
-          v == null ? void 0 : v.judge,
-          param
+          getLinkageJudge(v.judge, v.linkage)
         )
       );
     }
     return arr;
   }
   let jyjudgev = "";
-  let finalTrigger = trigger;
-  let required = true;
+  let required = false;
   if (typeof rule === "string") {
+    required = true;
     jyjudgev = rule;
-    required = false;
   } else if (typeof rule === "number") {
-    finalTrigger = rule;
+    required = true;
+    trigger = getTrigger(rule) ?? trigger;
   } else if (typeof rule === "boolean") {
     required = rule;
   } else if (rule && typeof rule === "object") {
-    finalTrigger = rule.type ?? finalTrigger;
-    required = rule.must;
-    jyjudgev = rule.judge;
+    required = rule.required ?? false;
+    trigger = getTrigger(rule.trigger) ?? trigger;
+    jyjudgev = getLinkageJudge(rule.judge, rule.linkage);
     verif = rule.error || verif;
   }
   required = obj.required ?? required;
-  arr.push(getRuleObj(finalTrigger, required, verif, jyjudgev, param));
+  arr.push(getRuleObj(param, trigger, required, verif, jyjudgev));
   return arr;
 }
-function getRuleObj(finalTrigger, required, verif, jyjudgev, param) {
+function getLinkageJudge(jyjudgev, linkage) {
+  if (linkage) {
+    if (typeof linkage == "string") {
+      return function(callback, _val, _data, refForm) {
+        refForm == null ? void 0 : refForm.validateField([linkage], () => {
+          callback();
+        });
+      };
+    } else {
+      const prop = linkage.prop;
+      const judge2 = linkage.judge;
+      return function(callback, val, data, refForm) {
+        const v = judge2 == null ? void 0 : judge2(val, data);
+        if (v) {
+          callback(new Error(v));
+        } else {
+          if (prop) {
+            refForm == null ? void 0 : refForm.validateField([prop], () => {
+              callback();
+            });
+          } else {
+            callback();
+          }
+        }
+      };
+    }
+  }
+  return jyjudgev;
+}
+function getRuleObj(param, trigger, required, verif, jyjudgev) {
+  var _a;
   const { triggerMap, name, multiple, obj, data, refForm } = param;
-  const inputPrompt = triggerMap[finalTrigger + ""] + name;
+  const inputPrompt = triggerMap[Array.isArray(trigger) ? trigger[0] : trigger] + name;
+  if (((_a = obj.config) == null ? void 0 : _a.placeholder) === void 0) {
+    obj.config.placeholder = inputPrompt;
+  }
   let validator = function(rule, value, callback) {
     callback();
   };
@@ -133,7 +200,8 @@ function getRuleObj(finalTrigger, required, verif, jyjudgev, param) {
   return {
     required,
     validator,
-    trigger: finalTrigger == 1 ? "blur" : "change"
+    trigger
   };
 }
 exports.getRule = getRule;
+exports.setPlaceholder = setPlaceholder;

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

@@ -6,17 +6,23 @@ type Rule = {
 export type Rules = {
     [key: string]: Array<Rule> | Rule;
 };
+/**
+ * 设置对象的占位符文本
+ * @param obj - 列表对象，包含配置信息和组件类型
+ * @param triggerMap - 触发器映射对象，用于根据触发类型获取对应的提示文本前缀
+ */
+export declare function setPlaceholder(obj: ListObj, triggerMap: ObjStr): void;
 /**
  * 后期要实现 v.rule 多匹配，
  * 错误提示自定义
  */
 /**
- * 获取表单校验规则
- * @param {number} trigger 校验触发类型
- * @param {ListObj} obj 表单项配置对象
- * @param {any} data 表单数据
- * @param {any} refForm 表单引用
- * @returns {{ required: boolean, validator: Function, trigger: string }}
+ * 根据传入的对象和配置生成表单验证规则数组
+ * @param obj - 包含组件配置信息的对象，如是否多选、规则等
+ * @param data - 表单数据对象，用于规则判断时使用
+ * @param refForm - 表单引用对象，可能用于联动或自定义校验逻辑
+ * @param triggerMap - 触发器映射对象，包含验证提示语等信息
+ * @returns 返回一个由 Rule 类型组成的数组，表示该字段的所有验证规则
  */
-export declare function getRule(name: string, trigger: number, obj: ListObj, data: any, refForm: any, triggerMap: ObjStr): Rule[];
+export declare function getRule(obj: ListObj, data: any, refForm: any, triggerMap: ObjStr): Rule[];
 export {};

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

@@ -1,17 +1,45 @@
-import { useHide } from "../../common/use.js";
+import { getLabelText, useHide } from "../../common/use.js";
 import * as judge from "@fangzhongya/utils/judge/judge";
+import { changes } from "../common/config.js";
+import { lineToLargeHump } from "@fangzhongya/utils/name/lineToLargeHump";
 function isValue(value) {
   if (value || value === 0 || value === false) {
     return false;
   }
   return true;
 }
-function getRule(name, trigger, obj, data, refForm, triggerMap) {
+function getTrigger(trigger) {
+  if (trigger === 1) {
+    return "blur";
+  } else if (trigger === 2) {
+    return "change";
+  } else if (trigger === 3) {
+    return ["change", "blur"];
+  } else {
+    return trigger;
+  }
+}
+function setPlaceholder(obj, triggerMap) {
+  var _a;
+  const name = getLabelText(obj);
+  let trigger = "blur";
+  if (typeof obj.compon == "string") {
+    if (changes.includes(lineToLargeHump(obj.compon))) {
+      trigger = "change";
+    }
+  }
+  const inputPrompt = triggerMap[Array.isArray(trigger) ? trigger[0] : trigger] + name;
+  if (((_a = obj.config) == null ? void 0 : _a.placeholder) === void 0) {
+    obj.config.placeholder = inputPrompt;
+  }
+}
+function getRule(obj, data, refForm, triggerMap) {
   var _a;
   let multiple = obj.multiple ?? ((_a = obj.config) == null ? void 0 : _a.multiple);
   if (typeof multiple != "boolean") {
     multiple = false;
   }
+  const name = getLabelText(obj);
   const param = {
     name,
     multiple,
@@ -20,46 +48,85 @@ function getRule(name, trigger, obj, data, refForm, triggerMap) {
     refForm,
     triggerMap
   };
+  let trigger = "blur";
+  if (typeof obj.compon == "string") {
+    if (changes.includes(lineToLargeHump(obj.compon))) {
+      trigger = "change";
+    }
+  }
   const rule = obj.rule;
-  let verif = triggerMap.verif + name;
+  let verif = name + triggerMap.verif;
   const arr = [];
   if (Array.isArray(rule)) {
     for (const v of rule) {
       arr.push(
         getRuleObj(
-          (v == null ? void 0 : v.type) ?? trigger,
-          obj.required ?? (v == null ? void 0 : v.must),
+          param,
+          (v == null ? void 0 : v.trigger) ?? trigger,
+          obj.required ?? (v == null ? void 0 : v.required),
           (v == null ? void 0 : v.error) || verif,
-          v == null ? void 0 : v.judge,
-          param
+          getLinkageJudge(v.judge, v.linkage)
         )
       );
     }
     return arr;
   }
   let jyjudgev = "";
-  let finalTrigger = trigger;
-  let required = true;
+  let required = false;
   if (typeof rule === "string") {
+    required = true;
     jyjudgev = rule;
-    required = false;
   } else if (typeof rule === "number") {
-    finalTrigger = rule;
+    required = true;
+    trigger = getTrigger(rule) ?? trigger;
   } else if (typeof rule === "boolean") {
     required = rule;
   } else if (rule && typeof rule === "object") {
-    finalTrigger = rule.type ?? finalTrigger;
-    required = rule.must;
-    jyjudgev = rule.judge;
+    required = rule.required ?? false;
+    trigger = getTrigger(rule.trigger) ?? trigger;
+    jyjudgev = getLinkageJudge(rule.judge, rule.linkage);
     verif = rule.error || verif;
   }
   required = obj.required ?? required;
-  arr.push(getRuleObj(finalTrigger, required, verif, jyjudgev, param));
+  arr.push(getRuleObj(param, trigger, required, verif, jyjudgev));
   return arr;
 }
-function getRuleObj(finalTrigger, required, verif, jyjudgev, param) {
+function getLinkageJudge(jyjudgev, linkage) {
+  if (linkage) {
+    if (typeof linkage == "string") {
+      return function(callback, _val, _data, refForm) {
+        refForm == null ? void 0 : refForm.validateField([linkage], () => {
+          callback();
+        });
+      };
+    } else {
+      const prop = linkage.prop;
+      const judge2 = linkage.judge;
+      return function(callback, val, data, refForm) {
+        const v = judge2 == null ? void 0 : judge2(val, data);
+        if (v) {
+          callback(new Error(v));
+        } else {
+          if (prop) {
+            refForm == null ? void 0 : refForm.validateField([prop], () => {
+              callback();
+            });
+          } else {
+            callback();
+          }
+        }
+      };
+    }
+  }
+  return jyjudgev;
+}
+function getRuleObj(param, trigger, required, verif, jyjudgev) {
+  var _a;
   const { triggerMap, name, multiple, obj, data, refForm } = param;
-  const inputPrompt = triggerMap[finalTrigger + ""] + name;
+  const inputPrompt = triggerMap[Array.isArray(trigger) ? trigger[0] : trigger] + name;
+  if (((_a = obj.config) == null ? void 0 : _a.placeholder) === void 0) {
+    obj.config.placeholder = inputPrompt;
+  }
   let validator = function(rule, value, callback) {
     callback();
   };
@@ -114,9 +181,10 @@ function getRuleObj(finalTrigger, required, verif, jyjudgev, param) {
   return {
     required,
     validator,
-    trigger: finalTrigger == 1 ? "blur" : "change"
+    trigger
   };
 }
 export {
-  getRule
+  getRule,
+  setPlaceholder
 };

package/dist/components/forms-item/src/label.cjs

@@ -12,7 +12,6 @@ function render(props, emit, slots, form) {
     const data = props.valueobj;
     const optionss = props.options || {};
     label = use.useGetDomLabel(
-      label,
       props,
       data,
       slots,

package/dist/components/forms-item/src/label.js

@@ -10,7 +10,6 @@ function render(props, emit, slots, form) {
     const data = props.valueobj;
     const optionss = props.options || {};
     label = useGetDomLabel(
-      label,
       props,
       data,
       slots,

package/dist/components/list/index.css

@@ -101,7 +101,7 @@
 }
 .list-div .list-table .list-table-value {
   word-break: break-all;
-  white-space: normal;
+  white-space: pre-wrap;
   max-height: var(--list-row-max-height);
   display: -webkit-box;
   -webkit-line-clamp: var(--list-line-clamp); /* 显示的行数 */

package/dist/components/list/index.scss

@@ -93,7 +93,7 @@ $list: 'list';
 			}
 			.#{z($list, 'table-value')} {
 				word-break: break-all;
-				white-space: normal;
+				white-space: pre-wrap;
 				max-height: var(vdm('row-max-height', $list));
 				display: -webkit-box;
 				-webkit-line-clamp: var(

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

@@ -147,6 +147,9 @@ const dataProps = {
   emptyDisplay: {
     type: String
   },
+  isEmptyStr: {
+    type: Boolean
+  },
   /**
    * @props { String } interval='8px'
    * 查询模式的上下间距

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

@@ -156,6 +156,9 @@ export declare const dataProps: {
     emptyDisplay: {
         type: StringConstructor;
     };
+    isEmptyStr: {
+        type: BooleanConstructor;
+    };
     /**
      * @props { String } interval='8px'
      * 查询模式的上下间距

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

@@ -145,6 +145,9 @@ const dataProps = {
   emptyDisplay: {
     type: String
   },
+  isEmptyStr: {
+    type: Boolean
+  },
   /**
    * @props { String } interval='8px'
    * 查询模式的上下间距

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

@@ -9,19 +9,19 @@ const index$2 = require("../../../hooks/cssname/index.cjs");
 const tooltip = require("../../tables/common/tooltip.cjs");
 const index = require("../../../hooks/props-default/index.cjs");
 const data = require("./data.cjs");
-require("../../tables/common/img.cjs");
-require("../../tables/common/table-but.cjs");
-require("../../tables/common/table-color.cjs");
-require("../../tables/common/table-list.cjs");
-const img_vue_vue_type_script_setup_true_lang = require("../../tables/common/img2.cjs");
-const tableList_vue_vue_type_script_setup_true_lang = require("../../tables/common/table-list2.cjs");
-const tableColor_vue_vue_type_script_setup_true_lang = require("../../tables/common/table-color2.cjs");
-const tableBut_vue_vue_type_script_setup_true_lang = require("../../tables/common/table-but2.cjs");
+require("../../tables/common/com-fig.cjs");
+require("../../tables/common/com-but.cjs");
+require("../../tables/common/com-color.cjs");
+require("../../tables/common/com-lis.cjs");
+const comFig_vue_vue_type_script_setup_true_lang = require("../../tables/common/com-fig2.cjs");
+const comLis_vue_vue_type_script_setup_true_lang = require("../../tables/common/com-lis2.cjs");
+const comColor_vue_vue_type_script_setup_true_lang = require("../../tables/common/com-color2.cjs");
+const comBut_vue_vue_type_script_setup_true_lang = require("../../tables/common/com-but2.cjs");
 const Components = {
-  But: tableBut_vue_vue_type_script_setup_true_lang.default,
-  Color: tableColor_vue_vue_type_script_setup_true_lang.default,
-  List: tableList_vue_vue_type_script_setup_true_lang.default,
-  Img: img_vue_vue_type_script_setup_true_lang.default
+  But: comBut_vue_vue_type_script_setup_true_lang.default,
+  Color: comColor_vue_vue_type_script_setup_true_lang.default,
+  Lis: comLis_vue_vue_type_script_setup_true_lang.default,
+  Fig: comFig_vue_vue_type_script_setup_true_lang.default
 };
 const _sfc_main = vue.defineComponent({
   name: data.name,
@@ -198,17 +198,7 @@ const _sfc_main = vue.defineComponent({
                 width: obj.labelWidth || props.labelWidth
               }
             },
-            [
-              util.setLabel(
-                obj,
-                props,
-                compons,
-                emit,
-                slots,
-                isComponSelected,
-                index2
-              )
-            ]
+            [util.setLabel(obj, props, compons, emit, slots, index2)]
           )
         ]
       );
@@ -251,7 +241,12 @@ const _sfc_main = vue.defineComponent({
               },
               title: obj.title,
               onMouseenter: ($event) => handleCellMouseEnter($event, obj),
-              onMouseleave: handleCellMouseLeave
+              onMouseleave: handleCellMouseLeave,
+              onClick(event) {
+                if (obj.click) {
+                  obj.click(event, props, obj);
+                }
+              }
             },
             [
               util.setSslot(

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

@@ -7,19 +7,19 @@ import { useCssName } from "../../../hooks/cssname/index.js";
 import { hideTooltip, showTooltip } from "../../tables/common/tooltip.js";
 import { usePropsDefault, getProps } from "../../../hooks/props-default/index.js";
 import { name, dataProps, dataExpose, dataEmits } from "./data.js";
-import "../../tables/common/img.js";
-import "../../tables/common/table-but.js";
-import "../../tables/common/table-color.js";
-import "../../tables/common/table-list.js";
-import _sfc_main$1 from "../../tables/common/img2.js";
-import _sfc_main$2 from "../../tables/common/table-list2.js";
-import _sfc_main$3 from "../../tables/common/table-color2.js";
-import _sfc_main$4 from "../../tables/common/table-but2.js";
+import "../../tables/common/com-fig.js";
+import "../../tables/common/com-but.js";
+import "../../tables/common/com-color.js";
+import "../../tables/common/com-lis.js";
+import _sfc_main$1 from "../../tables/common/com-fig2.js";
+import _sfc_main$2 from "../../tables/common/com-lis2.js";
+import _sfc_main$3 from "../../tables/common/com-color2.js";
+import _sfc_main$4 from "../../tables/common/com-but2.js";
 const Components = {
   But: _sfc_main$4,
   Color: _sfc_main$3,
-  List: _sfc_main$2,
-  Img: _sfc_main$1
+  Lis: _sfc_main$2,
+  Fig: _sfc_main$1
 };
 const _sfc_main = defineComponent({
   name,
@@ -196,17 +196,7 @@ const _sfc_main = defineComponent({
                 width: obj.labelWidth || props.labelWidth
               }
             },
-            [
-              setLabel(
-                obj,
-                props,
-                compons,
-                emit,
-                slots,
-                isComponSelected,
-                index
-              )
-            ]
+            [setLabel(obj, props, compons, emit, slots, index)]
           )
         ]
       );
@@ -249,7 +239,12 @@ const _sfc_main = defineComponent({
               },
               title: obj.title,
               onMouseenter: ($event) => handleCellMouseEnter($event, obj),
-              onMouseleave: handleCellMouseLeave
+              onMouseleave: handleCellMouseLeave,
+              onClick(event) {
+                if (obj.click) {
+                  obj.click(event, props, obj);
+                }
+              }
             },
             [
               setSslot(

package/dist/components/list/src/util.cjs

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 require("vue");
 const use = require("../../common/use.cjs");
+const util = require("../../tables/common/util.cjs");
 const setClass = (item, data, index) => {
   const v = data[item.state ?? item.prop];
   if (item.setcss) {
@@ -23,28 +24,34 @@ function setSslot(obj, data, props, compons, emit, slots, isComponSelected, inde
         optionss,
         compons,
         emit,
-        index
+        index,
+        {
+          options: props.options,
+          config: props
+        }
       );
       if (column) {
         return column;
       }
     }
   }
-  return use.useGetDomValue(obj, data, optionss, index) ?? props.emptyDisplay;
+  const domValue = use.useGetDomValue(obj, data, optionss, index);
+  return setDomValue(domValue, props);
 }
-function setLabel(obj, props, compons, emit, slots, isComponSelected, index) {
+function setDomValue(domValue, table) {
+  return (util.setEmptyDisplay(domValue, table.emptyDisplay, table.isEmptyStr) || domValue) ?? "";
+}
+function setLabel(obj, props, compons, emit, slots, index) {
   let label = obj.label ?? "";
   if (label) {
     label = use.useGetDomLabel(
-      label,
       obj,
       props.value,
       slots,
       props.optionss,
       compons,
       emit,
-      index || 0,
-      isComponSelected
+      index || 0
     );
   }
   let colon = props.colon;
@@ -59,5 +66,6 @@ function setLabel(obj, props, compons, emit, slots, isComponSelected, index) {
   return label;
 }
 exports.setClass = setClass;
+exports.setDomValue = setDomValue;
 exports.setLabel = setLabel;
 exports.setSslot = setSslot;

package/dist/components/list/src/util.d.ts

@@ -4,5 +4,6 @@ type Compons = {
 };
 export declare const setClass: (item: ListObj, data: ObjStr, index: number) => any;
 export declare function setSslot(obj: ListObj, data: ObjAny, props: ObjAny, compons: Compons, emit: Function, slots: ObjAny, isComponSelected: Function, index?: number): any;
-export declare function setLabel(obj: ObjAny, props: ObjAny, compons: Compons, emit: Function, slots: ObjAny, isComponSelected: (obj: ObjAny) => boolean, index?: number): any;
+export declare function setDomValue(domValue: any, table: ObjAny): any;
+export declare function setLabel(obj: ObjAny, props: ObjAny, compons: Compons, emit: Function, slots: ObjAny, index?: number): any;
 export {};

package/dist/components/list/src/util.js

@@ -1,5 +1,6 @@
 import "vue";
 import { useSetSlot, useSetCompon, useGetDomValue, useGetDomLabel, useLabelAdditional } from "../../common/use.js";
+import { setEmptyDisplay } from "../../tables/common/util.js";
 const setClass = (item, data, index) => {
   const v = data[item.state ?? item.prop];
   if (item.setcss) {
@@ -21,28 +22,34 @@ function setSslot(obj, data, props, compons, emit, slots, isComponSelected, inde
         optionss,
         compons,
         emit,
-        index
+        index,
+        {
+          options: props.options,
+          config: props
+        }
       );
       if (column) {
         return column;
       }
     }
   }
-  return useGetDomValue(obj, data, optionss, index) ?? props.emptyDisplay;
+  const domValue = useGetDomValue(obj, data, optionss, index);
+  return setDomValue(domValue, props);
 }
-function setLabel(obj, props, compons, emit, slots, isComponSelected, index) {
+function setDomValue(domValue, table) {
+  return (setEmptyDisplay(domValue, table.emptyDisplay, table.isEmptyStr) || domValue) ?? "";
+}
+function setLabel(obj, props, compons, emit, slots, index) {
   let label = obj.label ?? "";
   if (label) {
     label = useGetDomLabel(
-      label,
       obj,
       props.value,
       slots,
       props.optionss,
       compons,
       emit,
-      index || 0,
-      isComponSelected
+      index || 0
     );
   }
   let colon = props.colon;
@@ -58,6 +65,7 @@ function setLabel(obj, props, compons, emit, slots, isComponSelected, index) {
 }
 export {
   setClass,
+  setDomValue,
   setLabel,
   setSslot
 };