@jari-ace/element-plus-component 0.1.1 → 0.1.6

package/dist/hooks/useBackendValidations.d.ts

@@ -6,5 +6,11 @@ export type ValidationInstance = {
     removeFieldError: (prop: string) => void;
     clearFiledErrors: () => void;
 };
-export declare function useBackendValidations<T>(props: string[], axios?: IAceAxios): ValidationInstance;
+/**
+ * 后端校验
+ * @param props
+ * @param axios
+ * @param customRules
+ */
+export declare function useBackendValidations(props: string[], axios?: IAceAxios, customRules?: FormRules): ValidationInstance;
 //# sourceMappingURL=useBackendValidations.d.ts.map

package/dist/hooks/useBackendValidations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useBackendValidations.d.ts","sourceRoot":"","sources":["../../packages/hooks/useBackendValidations.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,cAAc,CAAC;AAC5C,OAAO,KAAK,EAAC,SAAS,EAAkB,MAAM,qBAAqB,CAAC;AAIpE,MAAM,MAAM,kBAAkB,GAAG;IAC7B,KAAK,EAAE,SAAS,CAAC;IACjB,KAAK,EAAE,SAAS,CAAC;IACjB,gBAAgB,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACzC,gBAAgB,EAAE,MAAM,IAAI,CAAC;CAChC,CAAC;AAEF,wBAAgB,qBAAqB,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,KAAK,CAAC,EAAE,SAAS,GAAG,kBAAkB,CA0C/F"}
+{"version":3,"file":"useBackendValidations.d.ts","sourceRoot":"","sources":["../../packages/hooks/useBackendValidations.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAe,MAAM,cAAc,CAAC;AAC3D,OAAO,KAAK,EAAE,SAAS,EAAmB,MAAM,qBAAqB,CAAC;AAItE,MAAM,MAAM,kBAAkB,GAAG;IAC7B,KAAK,EAAE,SAAS,CAAC;IACjB,KAAK,EAAE,SAAS,CAAC;IACjB,gBAAgB,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACzC,gBAAgB,EAAE,MAAM,IAAI,CAAC;CAChC,CAAC;AAEF;;;;;GAKG;AACH,wBAAgB,qBAAqB,CACjC,KAAK,EAAE,MAAM,EAAE,EACf,KAAK,CAAC,EAAE,SAAS,EACjB,WAAW,CAAC,EAAE,SAAS,GACxB,kBAAkB,CA0DpB"}

package/dist/hooks/useBackendValidations.js

@@ -1,6 +1,12 @@
 import { createAxiosWithoutCache } from "@jari-ace/app-bolts";
 import { reactive } from "vue";
-export function useBackendValidations(props, axios) {
+/**
+ * 后端校验
+ * @param props
+ * @param axios
+ * @param customRules
+ */
+export function useBackendValidations(props, axios, customRules) {
     const rules = reactive({});
     let errors = [];
     if (!axios)
@@ -11,7 +17,8 @@ export function useBackendValidations(props, axios) {
         },
     });
     for (const p of props) {
-        rules[p] = {
+        // rules[p] = [
+        const rule = {
             trigger: "blur",
             validator: (rule, value, callback) => {
                 if (!errors)
@@ -31,6 +38,18 @@ export function useBackendValidations(props, axios) {
                     callback();
             },
         };
+        if (customRules && customRules[p]) {
+            //合并数组customRules[p]
+            if (Array.isArray(customRules[p])) {
+                rules[p] = [rule, ...customRules[p]];
+            }
+            else {
+                rules[p] = [rule, customRules[p]];
+            }
+        }
+        else {
+            rules[p] = rule;
+        }
     }
     const removeFieldError = (prop) => {
         errors = errors.filter((err) => err.fieldName !== prop);

package/dist/hooks/useBackendValidations.js.map

@@ -1 +1 @@
-{"version":3,"file":"useBackendValidations.js","sourceRoot":"","sources":["../../packages/hooks/useBackendValidations.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,uBAAuB,EAAC,MAAM,qBAAqB,CAAC;AAC5D,OAAO,EAAC,QAAQ,EAAC,MAAM,KAAK,CAAC;AAS7B,MAAM,UAAU,qBAAqB,CAAI,KAAe,EAAE,KAAiB;IACvE,MAAM,KAAK,GAAG,QAAQ,CAAY,EAAE,CAAC,CAAC;IACtC,IAAI,MAAM,GAAsB,EAAE,CAAC;IACnC,IAAI,CAAC,KAAK;QAAE,KAAK,GAAG,uBAAuB,EAAE,CAAC;IAC9C,KAAM,CAAC,uBAAuB,CAAC;QAC3B,wBAAwB,EAAE,CAAC,IAAI,EAAE,EAAE;YAC/B,MAAM,GAAG,IAAI,CAAC;QAClB,CAAC;KACJ,CAAC,CAAC;IAEH,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE,CAAC;QACpB,KAAK,CAAC,CAAC,CAAC,GAAG;YACP,OAAO,EAAE,MAAM;YACf,SAAS,EAAE,CAAC,IAAS,EAAE,KAAU,EAAE,QAAa,EAAE,EAAE;gBAChD,IAAI,CAAC,MAAM;oBAAE,OAAO;gBACpB,IAAI,MAAM,GAAG,KAAK,CAAC;gBACnB,KAAK,MAAM,GAAG,IAAI,MAAM,EAAE,CAAC;oBACvB,IAAI,EAAE,GAAG,GAAG,CAAC,SAAS,CAAC;oBACvB,IAAI,EAAE,EAAE,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;wBACrB,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;oBACxC,CAAC;oBACD,IAAI,EAAE,KAAK,CAAC,EAAE,CAAC;wBACX,MAAM,GAAG,IAAI,CAAA;wBACb,QAAQ,CAAC,IAAI,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC;oBACrC,CAAC;gBACL,CAAC;gBACD,IAAI,CAAC,MAAM;oBAAE,QAAQ,EAAE,CAAC;YAC5B,CAAC;SACJ,CAAC;IACN,CAAC;IACD,MAAM,gBAAgB,GAAG,CAAC,IAAY,EAAE,EAAE;QACtC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,SAAS,KAAK,IAAI,CAAC,CAAC;IAC5D,CAAC,CAAC;IACF,MAAM,gBAAgB,GAAG,GAAG,EAAE;QAC1B,MAAM,GAAG,EAAE,CAAA;IACf,CAAC,CAAC;IACF,OAAO;QACH,gBAAgB;QAChB,gBAAgB;QAChB,KAAK;QACL,KAAK;KACR,CAAC;AACN,CAAC"}
+{"version":3,"file":"useBackendValidations.js","sourceRoot":"","sources":["../../packages/hooks/useBackendValidations.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AAC9D,OAAO,EAAE,QAAQ,EAAE,MAAM,KAAK,CAAC;AAS/B;;;;;GAKG;AACH,MAAM,UAAU,qBAAqB,CACjC,KAAe,EACf,KAAiB,EACjB,WAAuB;IAEvB,MAAM,KAAK,GAAG,QAAQ,CAAY,EAAE,CAAC,CAAC;IACtC,IAAI,MAAM,GAAsB,EAAE,CAAC;IACnC,IAAI,CAAC,KAAK;QAAE,KAAK,GAAG,uBAAuB,EAAE,CAAC;IAC9C,KAAM,CAAC,uBAAuB,CAAC;QAC3B,wBAAwB,EAAE,CAAC,IAAI,EAAE,EAAE;YAC/B,MAAM,GAAG,IAAI,CAAC;QAClB,CAAC;KACJ,CAAC,CAAC;IAEH,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE,CAAC;QACpB,eAAe;QACf,MAAM,IAAI,GAAG;YACT,OAAO,EAAE,MAAM;YACf,SAAS,EAAE,CAAC,IAAS,EAAE,KAAU,EAAE,QAAa,EAAE,EAAE;gBAChD,IAAI,CAAC,MAAM;oBAAE,OAAO;gBACpB,IAAI,MAAM,GAAG,KAAK,CAAC;gBACnB,KAAK,MAAM,GAAG,IAAI,MAAM,EAAE,CAAC;oBACvB,IAAI,EAAE,GAAG,GAAG,CAAC,SAAS,CAAC;oBACvB,IAAI,EAAE,EAAE,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;wBACrB,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;oBACxC,CAAC;oBACD,IAAI,EAAE,KAAK,CAAC,EAAE,CAAC;wBACX,MAAM,GAAG,IAAI,CAAC;wBACd,QAAQ,CAAC,IAAI,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC;oBACrC,CAAC;gBACL,CAAC;gBACD,IAAI,CAAC,MAAM;oBAAE,QAAQ,EAAE,CAAC;YAC5B,CAAC;SACJ,CAAC;QAEF,IAAI,WAAW,IAAE,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC;YAC9B,oBAAoB;YACpB,IAAI,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;gBAChC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,EAAC,GAAG,WAAW,CAAC,CAAC,CAAmB,CAAC,CAAC;YAC1D,CAAC;iBAAM,CAAC;gBACJ,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC,CAAiB,CAAC,CAAC;YACtD,CAAC;QACL,CAAC;aAAI,CAAC;YACF,KAAK,CAAC,CAAC,CAAC,GAAG,IAAI,CAAA;QACnB,CAAC;IAGL,CAAC;IACD,MAAM,gBAAgB,GAAG,CAAC,IAAY,EAAE,EAAE;QACtC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,SAAS,KAAK,IAAI,CAAC,CAAC;IAC5D,CAAC,CAAC;IACF,MAAM,gBAAgB,GAAG,GAAG,EAAE;QAC1B,MAAM,GAAG,EAAE,CAAC;IAChB,CAAC,CAAC;IAGF,OAAO;QACH,gBAAgB;QAChB,gBAAgB;QAChB,KAAK;QACL,KAAK;KACR,CAAC;AACN,CAAC"}

package/dist/hooks/useUserRefQuery.d.ts

@@ -29,7 +29,7 @@ export declare function useUserRefQuery(queryPrerequisites?: () => boolean, cust
         name?: string;
         currentSort?: {
             field: string;
-            order: "" | "asc" | "desc";
+            order: "" | "desc" | "asc";
         };
         currentGroup?: {
             label?: string;
@@ -94,7 +94,7 @@ export declare function useUserRefQuery(queryPrerequisites?: () => boolean, cust
         name?: string;
         currentSort?: {
             field: string;
-            order: "" | "asc" | "desc";
+            order: "" | "desc" | "asc";
         };
         currentGroup?: {
             label?: string;