@fangzhongya/fang-ui 0.1.35 → 0.1.37

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

@@ -5,12 +5,11 @@ const config = require("../common/config.cjs");
 const util = require("./util.cjs");
 require("../../../utils/css.cjs");
 const use = require("../../common/use.cjs");
-require("../../../utils/index.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");
 const setObjStyle = require("@fangzhongya/utils/css/setObjStyle");
-const lineToLargeHump = require("@fangzhongya/utils/name/lineToLargeHump");
 const Components = {
   Items: index.FormsItems
 };
@@ -73,10 +72,8 @@ function setUp(props, emit, cs, refForm, getLocale) {
     const width = v.width ?? props.rowWidth;
     if (width) {
       obj.width = width;
-    } else {
-      if (props.column > 1) {
-        obj.width = Number((100 / props.column).toFixed(2)) + "%";
-      }
+    } else if (props.column > 1) {
+      obj.width = Number((100 / props.column).toFixed(2)) + "%";
     }
     if (minWidth) {
       obj.minWidth = minWidth;
@@ -101,6 +98,11 @@ function setUp(props, emit, cs, refForm, getLocale) {
     };
     setListValue(props.list);
   }
+  const triggerMap = {
+    "1": getLocale("form.import"),
+    "2": getLocale("form.select"),
+    verif: getLocale("form.verif")
+  };
   function getRules() {
     const rules = {};
     const setListValue = (arr, listobj) => {
@@ -122,7 +124,7 @@ function setUp(props, emit, cs, refForm, getLocale) {
         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 = (trigger == 1 ? getLocale("form.import") : getLocale("form.select")) + labeltext;
+          obj.config.placeholder = triggerMap[trigger + ""] + labeltext;
         }
         if (((_b = obj.config) == null ? void 0 : _b.clearable) === void 0) {
           obj.config.clearable = true;
@@ -139,7 +141,7 @@ function setUp(props, emit, cs, refForm, getLocale) {
               obj,
               dataForm,
               refForm,
-              getLocale
+              triggerMap
             );
           } else {
             rules[p] = [];
@@ -164,11 +166,11 @@ function setUp(props, emit, cs, refForm, getLocale) {
           if (valid) {
             resolve(dataForm.value);
           } else {
-            reject();
+            reject(new Error(getLocale("form.verif")));
           }
         });
       } else {
-        reject();
+        reject(new Error(getLocale("form.verif")));
       }
     });
   }
@@ -213,12 +215,10 @@ function setUp(props, emit, cs, refForm, getLocale) {
       submitForm();
     } else if (obj._id == 2) {
       closeForm();
+    } else if (obj.click) {
+      obj.click(obj, dataForm.value, index2, event);
     } else {
-      if (obj.click) {
-        obj.click(obj, dataForm.value, index2, event);
-      } else {
-        emit("buts", obj, dataForm.value, index2, event);
-      }
+      emit("buts", obj, dataForm.value, index2, event);
     }
   }
   if (props.query) {

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

@@ -3,12 +3,11 @@ import { provides, changes } from "../common/config.js";
 import { getRule } from "./util.js";
 import "../../../utils/css.js";
 import { setFormDefaultValue, getLabelText, getFormRule } from "../../common/use.js";
-import "../../../utils/index.js";
+import { lineToLargeHump } from "@fangzhongya/utils/name/lineToLargeHump";
 import { computed, provide, isProxy, ref, watch } from "vue";
 import { useCompons } from "../../../hooks/compons/index.js";
 import { FormsItems } from "../../forms-items/index.js";
 import { setObjStyle } from "@fangzhongya/utils/css/setObjStyle";
-import { lineToLargeHump } from "@fangzhongya/utils/name/lineToLargeHump";
 const Components = {
   Items: FormsItems
 };
@@ -71,10 +70,8 @@ function setUp(props, emit, cs, refForm, getLocale) {
     const width = v.width ?? props.rowWidth;
     if (width) {
       obj.width = width;
-    } else {
-      if (props.column > 1) {
-        obj.width = Number((100 / props.column).toFixed(2)) + "%";
-      }
+    } else if (props.column > 1) {
+      obj.width = Number((100 / props.column).toFixed(2)) + "%";
     }
     if (minWidth) {
       obj.minWidth = minWidth;
@@ -99,6 +96,11 @@ function setUp(props, emit, cs, refForm, getLocale) {
     };
     setListValue(props.list);
   }
+  const triggerMap = {
+    "1": getLocale("form.import"),
+    "2": getLocale("form.select"),
+    verif: getLocale("form.verif")
+  };
   function getRules() {
     const rules = {};
     const setListValue = (arr, listobj) => {
@@ -120,7 +122,7 @@ function setUp(props, emit, cs, refForm, getLocale) {
         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 = (trigger == 1 ? getLocale("form.import") : getLocale("form.select")) + labeltext;
+          obj.config.placeholder = triggerMap[trigger + ""] + labeltext;
         }
         if (((_b = obj.config) == null ? void 0 : _b.clearable) === void 0) {
           obj.config.clearable = true;
@@ -137,7 +139,7 @@ function setUp(props, emit, cs, refForm, getLocale) {
               obj,
               dataForm,
               refForm,
-              getLocale
+              triggerMap
             );
           } else {
             rules[p] = [];
@@ -162,11 +164,11 @@ function setUp(props, emit, cs, refForm, getLocale) {
           if (valid) {
             resolve(dataForm.value);
           } else {
-            reject();
+            reject(new Error(getLocale("form.verif")));
           }
         });
       } else {
-        reject();
+        reject(new Error(getLocale("form.verif")));
       }
     });
   }
@@ -211,12 +213,10 @@ function setUp(props, emit, cs, refForm, getLocale) {
       submitForm();
     } else if (obj._id == 2) {
       closeForm();
+    } else if (obj.click) {
+      obj.click(obj, dataForm.value, index, event);
     } else {
-      if (obj.click) {
-        obj.click(obj, dataForm.value, index, event);
-      } else {
-        emit("buts", obj, dataForm.value, index, event);
-      }
+      emit("buts", obj, dataForm.value, index, event);
     }
   }
   if (props.query) {

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

@@ -25,116 +25,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__namespace[jyjudgev] ?? function(value) {
-        return true;
-      };
+      const judgeFun = judge__namespace[jyjudgev] ?? (() => true);
       isJudgeFailed = function(value) {
         return !judgeFun(value);
       };
-    } else {
-      processCallback = jyjudgev;
     }
     if (required) {
-      validator = function(rule2, value, callback) {
+      validator = function(_rule, value, callback) {
         if (use.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 (use.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 (use.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 (use.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"
   };
 }
 exports.getRule = getRule;

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

@@ -18,5 +18,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, getLocale: Function): Rule;
+export declare function getRule(name: string, trigger: number, obj: ListObj, data: any, refForm: any, triggerMap: ObjStr): Rule[];
 export {};

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;