@jari-ace/element-plus-component 0.1.8 → 0.1.10

package/packages/hooks/useBackendValidations.ts

@@ -1,81 +1,81 @@
-import type { FormRules ,FormItemRule} from "element-plus";
-import type { IAceAxios, ValidationError } from "@jari-ace/app-bolts";
-import { createAxiosWithoutCache } from "@jari-ace/app-bolts";
-import { reactive } from "vue";
-
-export type ValidationInstance = {
-    axios: IAceAxios;
-    rules: FormRules;
-    removeFieldError: (prop: string) => void;
-    clearFiledErrors: () => void;
-};
-
-/**
- * 后端校验
- * @param props
- * @param axios
- * @param customRules
- */
-export function useBackendValidations(
-    props: string[],
-    axios?: IAceAxios,
-    customRules?: FormRules,
-): ValidationInstance {
-    const rules = reactive<FormRules>({});
-    let errors: ValidationError[] = [];
-    if (!axios) axios = createAxiosWithoutCache();
-    axios!.setDefaultRequestConfig({
-        validationErrorProcessor: (errs) => {
-            errors = errs;
-        },
-    });
-
-    for (const p of props) {
-        // rules[p] = [
-        const rule = {
-            trigger: "blur",
-            validator: (rule: any, value: any, callback: any) => {
-                if (!errors) return;
-                let hasErr = false;
-                for (const err of errors) {
-                    let fn = err.fieldName;
-                    if (fn?.endsWith("[]")) {
-                        fn = fn.substring(0, fn.length - 2);
-                    }
-                    if (fn === p) {
-                        hasErr = true;
-                        callback(new Error(err.message));
-                    }
-                }
-                if (!hasErr) callback();
-            },
-        };
-
-        if (customRules&&customRules[p]) {
-            //合并数组customRules[p]
-            if (Array.isArray(customRules[p])) {
-                rules[p] = [rule,...customRules[p] as FormItemRule[]];
-            } else {
-                rules[p] = [rule, customRules[p] as FormItemRule];
-            }
-        }else{
-            rules[p] = rule
-        }
-
-
-    }
-    const removeFieldError = (prop: string) => {
-        errors = errors.filter((err) => err.fieldName !== prop);
-    };
-    const clearFiledErrors = () => {
-        errors = [];
-    };
-
-
-    return {
-        removeFieldError,
-        clearFiledErrors,
-        axios,
-        rules,
-    };
-}
+import type { FormRules ,FormItemRule} from "element-plus";
+import type { IAceAxios, ValidationError } from "@jari-ace/app-bolts";
+import { createAxiosWithoutCache } from "@jari-ace/app-bolts";
+import { reactive } from "vue";
+import {mergeRules} from '../utils/formUtils'
+export type ValidationInstance = {
+    axios: IAceAxios;
+    rules: FormRules;
+    removeFieldError: (prop: string) => void;
+    clearFiledErrors: () => void;
+};
+
+/**
+ * 后端校验
+ * @param props
+ * @param axios
+ * @param customRules
+ */
+export function useBackendValidations(
+    props: string[],
+    axios?: IAceAxios,
+    customRules?: FormRules,
+): ValidationInstance {
+    const rules = reactive<FormRules>({});
+    let errors: ValidationError[] = [];
+    if (!axios) axios = createAxiosWithoutCache();
+    axios!.setDefaultRequestConfig({
+        validationErrorProcessor: (errs) => {
+            errors = errs;
+        },
+    });
+
+    for (const p of props) {
+        // rules[p] = [
+        const rule = {
+            trigger: "blur",
+            validator: (rule: any, value: any, callback: any) => {
+                if (!errors) return;
+                let hasErr = false;
+                for (const err of errors) {
+                    let fn = err.fieldName;
+                    if (fn?.endsWith("[]")) {
+                        fn = fn.substring(0, fn.length - 2);
+                    }
+                    if (fn === p) {
+                        hasErr = true;
+                        callback(new Error(err.message));
+                    }
+                }
+                if (!hasErr) callback();
+            },
+        };
+
+        if (customRules&&customRules[p]) {
+            //合并数组customRules[p]
+            if (Array.isArray(customRules[p])) {
+                rules[p] = [rule,...customRules[p] as FormItemRule[]];
+            } else {
+                rules[p] = [rule, customRules[p] as FormItemRule];
+            }
+        }else{
+            rules[p] = rule
+        }
+
+
+    }
+    const removeFieldError = (prop: string) => {
+        errors = errors.filter((err) => err.fieldName !== prop);
+    };
+    const clearFiledErrors = () => {
+        errors = [];
+    };
+
+
+    return {
+        removeFieldError,
+        clearFiledErrors,
+        axios,
+        rules,
+    };
+}

package/packages/hooks/useRealms.ts

@@ -0,0 +1,28 @@
+/**
+ * 用户域列表
+ */
+import {ref} from 'vue';
+import {type AceAxiosRequestConfig, useRealmApi} from '@jari-ace/app-bolts';
+import type {Realm} from '@jari-ace/app-bolts';
+
+const realms = ref<Realm[]>([]);
+
+export function useRealms() {
+    const realmApi = useRealmApi();
+    const getAllRealms = async () => {
+        if(realms.value.length!==0)return;
+        const config = {} as AceAxiosRequestConfig
+        realms.value = await realmApi.getAll(config);
+    };
+
+    const getDefaultRealm = async () => {
+        await getAllRealms()
+        return realms.value.find(r => r.name === 'ace-platform')
+    }
+
+    return {
+        realms,
+        getAllRealms,
+        getDefaultRealm
+    };
+}

package/packages/hooks/useUserRefQuery.ts

@@ -13,6 +13,7 @@ import {
 import type {TreeNodeType} from "./useTreeData";
 import {ALL_DEPARTMENT, NO_DEPARTMENT} from "../components/departmentPicker/src/consts";
 import debounce from "lodash-es/debounce";
+import { useRealms } from "./useRealms";
 
 /**
  * 用户查询hook，当查询参数变化时，会自动查询，订阅结果即可
@@ -132,12 +133,13 @@ export function useUserRefQuery(
         });
     })
 
-    function queryUsers() {
+    async function queryUsers() {
         if (queryPrerequisites && !queryPrerequisites()) {
             return Promise.resolve(undefined);
         }
         if (!queryParams.value.realmId) {
-            return Promise.resolve([] as UserReference[]);
+           const defaultRealm = await useRealms().getDefaultRealm();
+           queryParams.value.realmId = defaultRealm.id;
         }
         const builder = useUserQueryBuilder();
         const qUser = builder.getQEntity();

package/packages/index.ts

@@ -19,3 +19,4 @@ export * from "./directives"
 export * from "./hooks/useDateTimeShortCuts"
 export * from "./components/scrollbar/utils"
 export * from "./hooks/useBridage"
+export * from "./hooks/useRealms"

package/packages/utils/formUtils.ts

@@ -0,0 +1,57 @@
+import {type FormRules,type FormItemRule} from "element-plus";
+
+/**
+ * 合并 rules 方法
+ * 将后端的rules合并到props.rules中
+ */
+export function mergeRules(frontendRules: FormRules, backendRules: FormRules): FormRules {
+    //合并里面的rules
+    let newRules: FormRules = {}
+
+    //浅拷贝
+    frontendRules = {...frontendRules};
+    backendRules = {...backendRules};
+
+    const frontendRulesKey: string[] = Object.keys(frontendRules);
+    const backendRulesKey: string[] = Object.keys(backendRules);
+
+    if (frontendRulesKey.length > 0 && backendRulesKey.length === 0) {
+        return frontendRules;
+    } else if (frontendRulesKey.length === 0 && backendRulesKey.length > 0) {
+        return backendRules;
+    } else if (
+        frontendRulesKey.length === 0 && backendRulesKey.length === 0
+    ) {
+        return {}
+    } else {  //frontendRulesKey 和 backendRulesKey 都有值
+        backendRulesKey.forEach(key => {
+            //frontendRulesKey中是否存在key
+            if (frontendRulesKey.includes(key)) {
+                if (Array.isArray(frontendRules[key]) && Array.isArray(backendRules[key])) {
+                    newRules[key] = [...frontendRules[key] as FormItemRule[], ...backendRules[key] as FormItemRule[]];
+                }
+                //props.rules[key] 为对象 props.validator.rules[key]为数组
+                else if (!Array.isArray(frontendRules[key]) && Array.isArray(backendRules[key])) {
+                    newRules[key] = [frontendRules[key]  as FormItemRule, ...backendRules[key] as FormItemRule[]];
+                }
+                //props.rules[key] 为数组 props.validator.rules[key]为对象
+                else if (Array.isArray(frontendRules[key]) && !Array.isArray(backendRules[key])) {
+                    newRules[key] = [...frontendRules[key] as FormItemRule[], backendRules[key] as FormItemRule];
+                }
+                //判断当前key的值类型是否都为对象
+                else if (!Array.isArray(frontendRules[key]) && !Array.isArray(backendRules[key])) {
+                    newRules[key] = [frontendRules[key] as FormItemRule, backendRules[key] as FormItemRule];
+                }
+            } else {
+                newRules[key] = backendRules[key];
+            }
+            //删除对应的 key
+            delete frontendRules[key];
+            delete backendRules[key];
+        })
+        newRules = {...newRules, ...frontendRules};
+        return newRules;
+    }
+
+
+}