@fangzhongya/fang-ui 0.1.34 → 0.1.36

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

@@ -6,116 +6,115 @@ function isValue(value) {
   }
   return true;
 }
-function getRule(name, trigger, obj, data, refForm, getLocale) {
+function getRule(name, trigger, obj, data, refForm, triggerMap) {
   var _a;
   let multiple = obj.multiple ?? ((_a = obj.config) == null ? void 0 : _a.multiple);
-  const rule = obj.rule;
   if (typeof multiple != "boolean") {
     multiple = false;
   }
-  let required = true;
+  const param = {
+    name,
+    multiple,
+    obj,
+    data,
+    refForm,
+    triggerMap
+  };
+  const rule = obj.rule;
+  let verif = triggerMap.verif + name;
+  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),
+          (v == null ? void 0 : v.error) || verif,
+          v == null ? void 0 : v.judge,
+          param
+        )
+      );
+    }
+    return arr;
+  }
   let jyjudgev = "";
-  switch (typeof rule) {
-    case "string":
-      jyjudgev = rule;
-      required = false;
-      break;
-    case "number":
-      required = true;
-      trigger = rule;
-      break;
-    case "boolean":
-      required = true;
-      break;
-    case "object":
-      if (rule) {
-        trigger = rule.type ?? trigger;
-        required = rule.must ?? true;
-        jyjudgev = rule.judge;
-      }
-      break;
-    default:
-      break;
+  let finalTrigger = trigger;
+  let required = true;
+  if (typeof rule === "string") {
+    jyjudgev = rule;
+    required = false;
+  } else if (typeof rule === "number") {
+    finalTrigger = rule;
+  } else if (typeof rule === "boolean") {
+    required = rule;
+  } else if (rule && typeof rule === "object") {
+    finalTrigger = rule.type ?? finalTrigger;
+    required = rule.must;
+    jyjudgev = rule.judge;
+    verif = rule.error || verif;
   }
   required = obj.required ?? required;
-  let inputPrompt = trigger == 1 ? getLocale("form.import") : getLocale("form.select");
-  const verif = getLocale("form.verif");
-  let validator = function(rule2, value, callback) {
+  arr.push(getRuleObj(finalTrigger, required, verif, jyjudgev, param));
+  return arr;
+}
+function getRuleObj(finalTrigger, required, verif, jyjudgev, param) {
+  const { triggerMap, name, multiple, obj, data, refForm } = param;
+  const inputPrompt = triggerMap[finalTrigger + ""] + name;
+  let validator = function(rule, value, callback) {
     callback();
   };
   if (jyjudgev) {
     let isJudgeFailed = function(value) {
       return false;
     };
-    let processCallback = function(callback, value, data2, refForm2, obj2) {
-      callback();
-    };
     if (typeof jyjudgev == "string") {
-      let judgeFun = judge[jyjudgev] ?? function(value) {
-        return true;
-      };
+      const judgeFun = judge[jyjudgev] ?? (() => true);
       isJudgeFailed = function(value) {
         return !judgeFun(value);
       };
-    } else {
-      processCallback = jyjudgev;
     }
     if (required) {
-      validator = function(rule2, value, callback) {
+      validator = function(_rule, value, callback) {
         if (useHide(obj, data.value)) {
           callback();
-        } else if (isValue(value)) {
-          callback(new Error(inputPrompt + name));
-        } else if (multiple && value.length == 0) {
-          callback(new Error(inputPrompt + name));
+        } else if (isValue(value) || multiple && value.length == 0) {
+          callback(new Error(inputPrompt));
         } else if (isJudgeFailed(value)) {
-          callback(new Error(name + verif));
+          callback(new Error(verif));
+        } else if (typeof jyjudgev === "function") {
+          jyjudgev(callback, value, data.value, refForm.value, obj);
         } else {
-          processCallback(
-            callback,
-            value,
-            data.value,
-            refForm.value,
-            obj
-          );
+          callback();
         }
       };
     } else {
-      validator = function(rule2, value, callback) {
+      validator = function(_rule, value, callback) {
         if (useHide(obj, data.value)) {
           callback();
         } else if (isJudgeFailed(value)) {
-          callback(new Error(name + verif));
-        } else {
-          processCallback(
-            callback,
-            value,
-            data.value,
-            refForm.value,
-            obj
-          );
-        }
-      };
-    }
-  } else {
-    if (required) {
-      validator = function(rule2, value, callback) {
-        if (useHide(obj, data.value)) {
-          callback();
-        } else if (isValue(value)) {
-          callback(new Error(inputPrompt + name));
-        } else if (multiple && value.length == 0) {
-          callback(new Error(inputPrompt + name));
+          callback(new Error(verif));
+        } else if (typeof jyjudgev === "function") {
+          jyjudgev(callback, value, data.value, refForm.value, obj);
         } else {
           callback();
         }
       };
     }
+  } else if (required) {
+    validator = function(_rule, value, callback) {
+      if (useHide(obj, data.value)) {
+        callback();
+      } else if (isValue(value) || multiple && value.length == 0) {
+        callback(new Error(inputPrompt));
+      } else {
+        callback();
+      }
+    };
   }
   return {
     required,
     validator,
-    trigger: trigger == 1 ? "blur" : "change"
+    trigger: finalTrigger == 1 ? "blur" : "change"
   };
 }
 export {

package/dist/components/forms-div/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/forms-div/index.d.ts

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

package/dist/components/forms-div/src/index2.cjs

@@ -2,15 +2,14 @@
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
 const vue = require("vue");
 const data = require("./data.cjs");
-require("../../../utils/index.cjs");
+const lineToLargeHump = require("@fangzhongya/utils/name/lineToLargeHump");
+const objValue = require("@fangzhongya/utils/basic/object/objValue");
 const index = require("../../../hooks/cssname/index.cjs");
 const use = require("../../common/use.cjs");
 const isEqual = require("@fangzhongya/utils/basic/object/isEqual");
 const index$1 = require("../../../hooks/props-default/index.cjs");
 const index$2 = require("../../../hooks/compons/index.cjs");
 const config = require("../../forms/common/config.cjs");
-const objValue = require("@fangzhongya/utils/basic/object/objValue");
-const lineToLargeHump = require("@fangzhongya/utils/name/lineToLargeHump");
 const Components = {};
 const _sfc_main = vue.defineComponent({
   components: Components,
@@ -20,120 +19,154 @@ const _sfc_main = vue.defineComponent({
   setup(p, { emit, slots }) {
     const cs = index.useCssName(data.name);
     const prs = index$1.usePropsDefault(data.name, p, data.dataProps);
-    index$1.viewProps(prs, data.name);
     const props = prs.listobj;
     const compons = index$2.useComponsGet(config.provides.compons);
     const formvalue = vue.computed(() => {
       const o = {};
       if (typeof props.formvalue === "object") {
-        Object.keys(props.formvalue).forEach((key) => {
+        for (const key of Object.keys(props.formvalue)) {
           const v = props.formvalue[key];
           o[key] = prs.modelValue[v];
-        });
+        }
       }
       return o;
     });
     const record = vue.ref();
     const setPropComputedValue = (prop, computed2, value2) => {
-      if (!isEqual.isEqual(prop, computed2)) {
-        if (prop !== record.value) {
-          if (props.computed instanceof Array) {
-            props.computed.forEach((k, i) => {
-              if (prop instanceof Array) {
-                value2[k] = prop[i];
-              } else {
-                value2[k] = prop ? prop[k] : void 0;
-              }
-            });
-          } else if (props.computed.set) {
-            props.computed.set(prop, value2, props);
-          }
+      if (isEqual.isEqual(prop, computed2)) {
+        return;
+      }
+      if (prop !== record.value) {
+        handlePropNotEqualRecord(prop, value2);
+      } else {
+        handlePropEqualRecord(computed2, value2);
+      }
+      record.value = prop;
+    };
+    const handlePropNotEqualRecord = (prop, value2) => {
+      if (Array.isArray(props.computed)) {
+        handleArrayComputed(prop, value2);
+      } else if (props.computed.set) {
+        props.computed.set(prop, value2, props);
+      }
+    };
+    const handleArrayComputed = (prop, value2) => {
+      for (let i = 0; i < props.computed.length; i++) {
+        const k = props.computed[i];
+        if (Array.isArray(prop)) {
+          value2[k] = prop[i];
         } else {
-          if (props.pars) {
-            objValue.setObjValue(value2, props.prop, computed2);
-          } else {
-            value2[props.prop] = computed2;
-          }
+          value2[k] = prop ? prop[k] : void 0;
         }
       }
-      record.value = prop;
+    };
+    const handlePropEqualRecord = (computed2, value2) => {
+      if (props.pars) {
+        objValue.setObjValue(value2, props.prop, computed2);
+      } else {
+        value2[props.prop] = computed2;
+      }
     };
     const binds = vue.computed(() => {
       const obj = { ...props.config, ...formvalue.value };
       const binds2 = {};
-      Object.keys(obj).forEach((key) => {
+      for (const key of Object.keys(obj)) {
         const v = obj[key];
         if (v !== void 0) {
           binds2[key] = v;
         }
-      });
+      }
       return binds2;
     });
     const value = vue.computed({
       get() {
-        let v = prs.modelValue ?? {};
-        if (props.orig) {
-          v = prs.valueobj ?? {};
-        }
-        const prop = props.prop;
-        let r = v;
-        if (prop) {
-          let z = v[prop];
-          if (props.pars) {
-            z = objValue.getObjValue(prop, v);
-          }
-          r = z;
-        }
-        if (props.computed) {
-          let c;
-          if (props.computed instanceof Array) {
-            c = props.computed.map((k) => {
-              return v[k];
-            });
-          } else if (props.computed.get) {
-            c = props.computed.get(r, v, props);
-          }
-          if (prop) {
-            setPropComputedValue(r, c, v);
-          }
-          r = c;
-        }
-        return r;
+        return getValue();
       },
       set(value2) {
-        let v = prs.modelValue ?? {};
-        if (props.orig) {
-          v = prs.valueobj ?? {};
-        }
-        const prop = props.prop;
-        if (prop) {
-          if (props.pars) {
-            objValue.setObjValue(v, prop, value2);
-          } else {
-            v[prop] = value2;
-          }
-        }
-        if (props.computed) {
-          if (props.computed instanceof Array) {
-            props.computed.forEach((k, i) => {
-              if (value2 instanceof Array) {
-                v[k] = value2[i];
-              } else {
-                v[k] = value2 ? value2[k] : void 0;
-              }
-            });
-          } else if (props.computed.set) {
-            props.computed.set(value2, v, props);
-          }
-        }
-        if (!props.orig) {
-          emit("update:modelValue", v);
-        }
-        if (props.compon != "items") {
-          emit("upform", value2, props, v);
-        }
+        setValue(value2);
       }
     });
+    function getValue() {
+      const v = getSourceObject();
+      const prop = props.prop;
+      let result = v;
+      if (prop) {
+        result = getPropertyValue(v, prop);
+      }
+      if (props.computed) {
+        result = handleComputedGet(result, v);
+      }
+      return result;
+    }
+    function getSourceObject() {
+      let source = prs.modelValue ?? {};
+      if (props.orig) {
+        source = prs.valueobj ?? {};
+      }
+      return source;
+    }
+    function getPropertyValue(source, prop) {
+      if (props.pars) {
+        return objValue.getObjValue(prop, source);
+      }
+      return source[prop];
+    }
+    function handleComputedGet(currentValue, source) {
+      let computedValue;
+      if (Array.isArray(props.computed)) {
+        computedValue = props.computed.map((k) => source[k]);
+      } else if (props.computed.get) {
+        computedValue = props.computed.get(
+          currentValue,
+          source,
+          props
+        );
+      }
+      if (props.prop && computedValue !== void 0) {
+        setPropComputedValue(currentValue, computedValue, source);
+      }
+      return computedValue;
+    }
+    function setValue(newValue) {
+      const v = getSourceObject();
+      const prop = props.prop;
+      if (prop) {
+        setPropertyValue(v, prop, newValue);
+      }
+      if (props.computed) {
+        handleComputedSet(newValue, v);
+      }
+      if (!props.orig) {
+        emit("update:modelValue", v);
+      }
+      if (props.compon !== "items") {
+        emit("upform", newValue, props, v);
+      }
+    }
+    function setPropertyValue(target, prop, value2) {
+      if (props.pars) {
+        objValue.setObjValue(target, prop, value2);
+      } else {
+        target[prop] = value2;
+      }
+    }
+    function handleComputedSet(value2, target) {
+      if (Array.isArray(props.computed)) {
+        setArrayComputedValue(value2, target);
+      } else if (props.computed.set) {
+        props.computed.set(value2, target, props);
+      }
+    }
+    function setArrayComputedValue(value2, target) {
+      for (let i = 0; i < props.computed.length; i++) {
+        const key = props.computed[i];
+        if (Array.isArray(value2)) {
+          target[key] = value2[i];
+        } else {
+          target[key] = value2 ? value2[key] : void 0;
+        }
+      }
+    }
     const options = vue.computed(() => {
       const optionss = prs.optionss;
       if (typeof props.options === "string") {
@@ -179,14 +212,12 @@ const _sfc_main = vue.defineComponent({
         } else {
           return vue.h(vue.resolveComponent(compon), componObj, slots);
         }
+      } else if (typeof compon == "function") {
+        return compon(componObj, slots);
+      } else if (vue.isVNode(compon)) {
+        return compon;
       } else {
-        if (typeof compon == "function") {
-          return compon(componObj, slots);
-        } else if (vue.isVNode(compon)) {
-          return compon;
-        } else {
-          return vue.h(compon, componObj, slots);
-        }
+        return vue.h(compon, componObj, slots);
       }
     };
     const setSslot = () => {