@fangzhongya/fang-ui 0.1.37 → 0.1.38

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/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,

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,

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,5 +1,5 @@
 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;
 export declare function setUp(props: DataProps, emit: Emit, cs: UseCssNameReturn, refForm: any, getLocale: Function): {

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] = [];
           }

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 = obj.labelText ?? use.getLabelText(obj.label);
+  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 = obj.labelText ?? use.getLabelText(obj.label);
   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,6 +6,7 @@ type Rule = {
 export type Rules = {
     [key: string]: Array<Rule> | Rule;
 };
+export declare function setPlaceholder(obj: ListObj, triggerMap: ObjStr): void;
 /**
  * 后期要实现 v.rule 多匹配，
  * 错误提示自定义
@@ -18,5 +19,5 @@ export type Rules = {
  * @param {any} refForm 表单引用
  * @returns {{ required: boolean, validator: Function, trigger: string }}
  */
-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 = obj.labelText ?? getLabelText(obj.label);
+  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 = obj.labelText ?? getLabelText(obj.label);
   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/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'
    * 查询模式的上下间距