@jari-ace/element-plus-component 0.2.1 → 0.2.2

package/packages/hooks/useUserRefQuery.ts

@@ -1,232 +1,232 @@
-import {ref, watch} from 'vue';
-import {
-    type BooleanResultExpression,
-    createAxiosWithoutCache,
-    type IAceAxios,
-    QUser,
-    type SortDescriptor,
-    useLoading,
-    type UserReference,
-    useUserApi,
-    useUserQueryBuilder
-} from "@jari-ace/app-bolts";
-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，当查询参数变化时，会自动查询，订阅结果即可
- * @param queryPrerequisites 执行查询的前提条件，只有此方法返回true时，查询才会执行
- * @param customFilter 自定义查询过滤条件，可以通过这个回调方法，通过程序方式添加自定义的过滤条件
- * @param onQueryResultReturned 查询成功时的回调方法，接收Page<UserReference>类型参数
- * @param scroll 是否滚动模式，滚动模式下，翻页后新页数据会追加到queryState.users集合中，而不是直接赋予queryState.users
- * @param axios 自定义axios实例
- * @param notPaged 不分页
- */
-export function useUserRefQuery(
-    queryPrerequisites?: () => boolean,
-    customFilter?: (qUser: InstanceType<typeof QUser>) => BooleanResultExpression,
-    onQueryResultReturned?: (result?: UserReference[], paramsChanged?: boolean) => void,
-    scroll?: boolean,
-    axios?: IAceAxios,
-    notPaged?: boolean) {
-    const queryParams = ref<{
-        /**
-         * 用户域Id查询参数
-         */
-        realmId?: string,
-        /**
-         * 部门查询参数
-         */
-        currentDept?: TreeNodeType,
-        /**
-         * 用户姓名、用户名或用户拼音过滤参数
-         */
-        name?: string,
-        /**
-         * 排序描述符
-         */
-        currentSort?: SortDescriptor,
-        /**
-         * 用户组查询参数
-         */
-        currentGroup?: TreeNodeType,
-        /**
-         * 自定义组查询参数
-         */
-        currentCustomGroup?: TreeNodeType,
-        /**
-         * 密级过滤
-         */
-        classificationLevel?: number,
-    }>({})
-
-    const pageParams = ref<{
-        /**
-         * 当前页码
-         */
-        currentPage: number,
-        /**
-         * 页内数据行数
-         */
-        pageSize: number
-    }>({
-        currentPage: 1,
-        pageSize: 50
-    })
-
-    const queryResult = ref<{
-        /**
-         * 总数据量
-         */
-        total: number,
-        /**
-         * 查询结果集
-         */
-        users: UserReference[]
-    }>({
-        total: 0,
-        users: []
-    })
-
-    if (!axios) axios = createAxiosWithoutCache();
-    const userApi = useUserApi(axios);
-    const loading = useLoading(axios);
-    const queryParamChanged = ref<boolean>(false)
-
-    function doQuery() {
-        queryUsers().then(r => {
-            if (onQueryResultReturned) {
-                onQueryResultReturned(r, queryParamChanged.value);
-            }
-            queryParamChanged.value = false;
-        })
-    }
-
-    const debounceDoQuery = debounce(doQuery, 300)
-
-    function queryOnParamsChanged() {
-        queryResult.value.total = 0;
-        queryResult.value.users = [];
-        if (pageParams.value.currentPage !== 1) {
-            pageParams.value.currentPage = 1;
-        } else {
-            debounceDoQuery();
-        }
-    }
-
-    watch(queryParams, () => {
-        queryParamChanged.value = true;
-        queryOnParamsChanged();
-    }, {
-        deep: true
-    })
-
-    watch(() => pageParams.value.pageSize, () => {
-        queryParamChanged.value = true;
-        queryOnParamsChanged();
-    })
-
-    watch(() => pageParams.value.currentPage, () => {
-        queryUsers().then(r => {
-            if (onQueryResultReturned) {
-                onQueryResultReturned(r, queryParamChanged.value);
-            }
-            queryParamChanged.value = false;
-        });
-    })
-
-    async function queryUsers() {
-        if (queryPrerequisites && !queryPrerequisites()) {
-            return Promise.resolve(undefined);
-        }
-        if (!queryParams.value.realmId) {
-           const defaultRealm = await useRealms().getDefaultRealm();
-           queryParams.value.realmId = defaultRealm.id;
-        }
-        const builder = useUserQueryBuilder();
-        const qUser = builder.getQEntity();
-        builder.and(qUser.realm.id.eq(queryParams.value.realmId)).and(qUser.recycled.eq(false));
-        const currentDept = queryParams.value.currentDept;
-        if (currentDept) {
-            // 1=1 and user.department.id = currentDepartmentId
-            if (currentDept.id == NO_DEPARTMENT) {
-                builder.and(qUser.department.isNull())
-            } else if (currentDept.id !== ALL_DEPARTMENT) {
-                builder.and(qUser.department.sortPath.startWith(currentDept.sortPath));
-            }
-        }
-        const classificationLevel = queryParams.value.classificationLevel;
-        if (classificationLevel) {
-            builder.and(qUser.classifiedLevel.loe(classificationLevel))
-        }
-        const currentGroup = queryParams.value.currentGroup;
-        if (currentGroup) {
-            builder.and(qUser.userGroups.any().group.sortPath.startWith(currentGroup.sortPath));
-        }
-        const currentCustomGroup = queryParams.value.currentCustomGroup;
-        if (currentCustomGroup) {
-            builder.and(qUser.customGroups.any().customGroup.sortPath
-                             .startWith(currentCustomGroup.sortPath));
-        }
-        const name = queryParams.value.name;
-        if (name) {
-            // and (user.username like %nameQuery% or user.fullName like %nameQuery% or user.pinYinName like %nameQuery%
-            const queryText = "%" + name.split('').join('%') + "%"
-            builder.and(qUser.username.like(queryText)
-                             .or(qUser.fullName.like(queryText))
-                             .or(qUser.pinYinName.like(queryText))
-                             .or(qUser.mobile.like(queryText)))
-        }
-        if (customFilter) {
-            builder.and(customFilter(qUser));
-        }
-        const currentSort = queryParams.value.currentSort;
-        if (currentSort) {
-            builder.orderBy(currentSort)
-        }
-        const filter = builder.build();
-        if (notPaged) {
-            return userApi.queryUserRefs(filter).then(res => {
-                queryResult.value.users = res;
-                return res;
-            })
-        } else {
-            const currentPage = pageParams.value.currentPage - 1;
-            return userApi.queryUserRefsPaged(filter, currentPage, pageParams.value.pageSize)
-                          .then(res => {
-                              if (scroll && currentPage > 0) {
-                                  queryResult.value.users.push(...res.content);
-                              } else {
-                                  queryResult.value.users = res.content;
-                              }
-                              queryResult.value.total = res.totalElements;
-                              return res.content;
-                          })
-        }
-    }
-
-    return {
-        /**
-         * 查询的参数
-         */
-        queryParams,
-        /**
-         * 分页参数
-         */
-        pageParams,
-        /**
-         * 查询结果
-         */
-        queryResult,
-        /**
-         * 查询方法
-         */
-        queryUsers,
-        /**
-         * loading状态
-         */
-        loading
-    }
-}
+import {ref, watch} from 'vue';
+import {
+    type BooleanResultExpression,
+    createAxiosWithoutCache,
+    type IAceAxios,
+    QUser,
+    type SortDescriptor,
+    useLoading,
+    type UserReference,
+    useUserApi,
+    useUserQueryBuilder
+} from "@jari-ace/app-bolts";
+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，当查询参数变化时，会自动查询，订阅结果即可
+ * @param queryPrerequisites 执行查询的前提条件，只有此方法返回true时，查询才会执行
+ * @param customFilter 自定义查询过滤条件，可以通过这个回调方法，通过程序方式添加自定义的过滤条件
+ * @param onQueryResultReturned 查询成功时的回调方法，接收Page<UserReference>类型参数
+ * @param scroll 是否滚动模式，滚动模式下，翻页后新页数据会追加到queryState.users集合中，而不是直接赋予queryState.users
+ * @param axios 自定义axios实例
+ * @param notPaged 不分页
+ */
+export function useUserRefQuery(
+    queryPrerequisites?: () => boolean,
+    customFilter?: (qUser: InstanceType<typeof QUser>) => BooleanResultExpression,
+    onQueryResultReturned?: (result?: UserReference[], paramsChanged?: boolean) => void,
+    scroll?: boolean,
+    axios?: IAceAxios,
+    notPaged?: boolean) {
+    const queryParams = ref<{
+        /**
+         * 用户域Id查询参数
+         */
+        realmId?: string,
+        /**
+         * 部门查询参数
+         */
+        currentDept?: TreeNodeType,
+        /**
+         * 用户姓名、用户名或用户拼音过滤参数
+         */
+        name?: string,
+        /**
+         * 排序描述符
+         */
+        currentSort?: SortDescriptor,
+        /**
+         * 用户组查询参数
+         */
+        currentGroup?: TreeNodeType,
+        /**
+         * 自定义组查询参数
+         */
+        currentCustomGroup?: TreeNodeType,
+        /**
+         * 密级过滤
+         */
+        classificationLevel?: number,
+    }>({})
+
+    const pageParams = ref<{
+        /**
+         * 当前页码
+         */
+        currentPage: number,
+        /**
+         * 页内数据行数
+         */
+        pageSize: number
+    }>({
+        currentPage: 1,
+        pageSize: 50
+    })
+
+    const queryResult = ref<{
+        /**
+         * 总数据量
+         */
+        total: number,
+        /**
+         * 查询结果集
+         */
+        users: UserReference[]
+    }>({
+        total: 0,
+        users: []
+    })
+
+    if (!axios) axios = createAxiosWithoutCache();
+    const userApi = useUserApi(axios);
+    const loading = useLoading(axios);
+    const queryParamChanged = ref<boolean>(false)
+
+    function doQuery() {
+        queryUsers().then(r => {
+            if (onQueryResultReturned) {
+                onQueryResultReturned(r, queryParamChanged.value);
+            }
+            queryParamChanged.value = false;
+        })
+    }
+
+    const debounceDoQuery = debounce(doQuery, 300)
+
+    function queryOnParamsChanged() {
+        queryResult.value.total = 0;
+        queryResult.value.users = [];
+        if (pageParams.value.currentPage !== 1) {
+            pageParams.value.currentPage = 1;
+        } else {
+            debounceDoQuery();
+        }
+    }
+
+    watch(queryParams, () => {
+        queryParamChanged.value = true;
+        queryOnParamsChanged();
+    }, {
+        deep: true
+    })
+
+    watch(() => pageParams.value.pageSize, () => {
+        queryParamChanged.value = true;
+        queryOnParamsChanged();
+    })
+
+    watch(() => pageParams.value.currentPage, () => {
+        queryUsers().then(r => {
+            if (onQueryResultReturned) {
+                onQueryResultReturned(r, queryParamChanged.value);
+            }
+            queryParamChanged.value = false;
+        });
+    })
+
+    async function queryUsers() {
+        if (queryPrerequisites && !queryPrerequisites()) {
+            return Promise.resolve(undefined);
+        }
+        if (!queryParams.value.realmId) {
+           const defaultRealm = await useRealms().getDefaultRealm();
+           queryParams.value.realmId = defaultRealm.id;
+        }
+        const builder = useUserQueryBuilder();
+        const qUser = builder.getQEntity();
+        builder.and(qUser.realm.id.eq(queryParams.value.realmId)).and(qUser.recycled.eq(false));
+        const currentDept = queryParams.value.currentDept;
+        if (currentDept) {
+            // 1=1 and user.department.id = currentDepartmentId
+            if (currentDept.id == NO_DEPARTMENT) {
+                builder.and(qUser.department.isNull())
+            } else if (currentDept.id !== ALL_DEPARTMENT) {
+                builder.and(qUser.department.sortPath.startWith(currentDept.sortPath));
+            }
+        }
+        const classificationLevel = queryParams.value.classificationLevel;
+        if (classificationLevel) {
+            builder.and(qUser.classifiedLevel.loe(classificationLevel))
+        }
+        const currentGroup = queryParams.value.currentGroup;
+        if (currentGroup) {
+            builder.and(qUser.userGroups.any().group.sortPath.startWith(currentGroup.sortPath));
+        }
+        const currentCustomGroup = queryParams.value.currentCustomGroup;
+        if (currentCustomGroup) {
+            builder.and(qUser.customGroups.any().customGroup.sortPath
+                             .startWith(currentCustomGroup.sortPath));
+        }
+        const name = queryParams.value.name;
+        if (name) {
+            // and (user.username like %nameQuery% or user.fullName like %nameQuery% or user.pinYinName like %nameQuery%
+            const queryText = "%" + name.split('').join('%') + "%"
+            builder.and(qUser.username.like(queryText)
+                             .or(qUser.fullName.like(queryText))
+                             .or(qUser.pinYinName.like(queryText))
+                             .or(qUser.mobile.like(queryText)))
+        }
+        if (customFilter) {
+            builder.and(customFilter(qUser));
+        }
+        const currentSort = queryParams.value.currentSort;
+        if (currentSort) {
+            builder.orderBy(currentSort)
+        }
+        const filter = builder.build();
+        if (notPaged) {
+            return userApi.queryUserRefs(filter).then(res => {
+                queryResult.value.users = res;
+                return res;
+            })
+        } else {
+            const currentPage = pageParams.value.currentPage - 1;
+            return userApi.queryUserRefsPaged(filter, currentPage, pageParams.value.pageSize)
+                          .then(res => {
+                              if (scroll && currentPage > 0) {
+                                  queryResult.value.users.push(...res.content);
+                              } else {
+                                  queryResult.value.users = res.content;
+                              }
+                              queryResult.value.total = res.totalElements;
+                              return res.content;
+                          })
+        }
+    }
+
+    return {
+        /**
+         * 查询的参数
+         */
+        queryParams,
+        /**
+         * 分页参数
+         */
+        pageParams,
+        /**
+         * 查询结果
+         */
+        queryResult,
+        /**
+         * 查询方法
+         */
+        queryUsers,
+        /**
+         * loading状态
+         */
+        loading
+    }
+}

package/packages/index.ts

@@ -1,24 +1,24 @@
-import {type App, type Plugin} from "vue";
-import * as components from "./components";
-import {installDirectives} from "./directives";
-
-export * from "./components";
-export const AceVueUI: Plugin = {
-    install(app: App<Element>) {
-        for (const [key, comp] of Object.entries(components)) {
-            app.component(key, comp);
-        }
-        installDirectives(app)
-    },
-};
-
-export * from "./hooks/useBackendValidations"
-export * from "./hooks/useTreeData"
-export * from "./hooks/useAppInstances"
-export * from "./directives"
-export * from "./hooks/useDateTimeShortCuts"
-export * from "./components/scrollbar/utils"
-export * from "./hooks/useBridage"
-export * from "./hooks/useRealms"
-export * from "./hooks/useUserRefQuery"
-export * from "./hooks/useClassificationLevels"
+import {type App, type Plugin} from "vue";
+import * as components from "./components";
+import {installDirectives} from "./directives";
+
+export * from "./components";
+export const AceVueUI: Plugin = {
+    install(app: App<Element>) {
+        for (const [key, comp] of Object.entries(components)) {
+            app.component(key, comp);
+        }
+        installDirectives(app)
+    },
+};
+
+export * from "./hooks/useBackendValidations"
+export * from "./hooks/useTreeData"
+export * from "./hooks/useAppInstances"
+export * from "./directives"
+export * from "./hooks/useDateTimeShortCuts"
+export * from "./components/scrollbar/utils"
+export * from "./hooks/useBridage"
+export * from "./hooks/useRealms"
+export * from "./hooks/useUserRefQuery"
+export * from "./hooks/useClassificationLevels"

package/packages/list.json

@@ -1,8 +1,8 @@
-[
-    {
-      "compName": "DemoComponent",
-      "compZhName": "示例",
-      "compDesc": "这是一个示例组件",
-      "compClassName": "button"
-    }
+[
+    {
+      "compName": "DemoComponent",
+      "compZhName": "示例",
+      "compDesc": "这是一个示例组件",
+      "compClassName": "button"
+    }
   ]

package/packages/types/custom.d.ts

@@ -1,13 +1,13 @@
-type ShortcutHandlerType = (event: KeyboardEvent) => void;
-
-interface ShortcutHandlerStackItem {
-    keys: string;
-    el: HTMLElement;
-    handler: ShortcutHandlerType;
-    prev?: ShortcutHandlerStackItem
-}
-
-interface HTMLElement {
-    __vueShortcutHandler__?: ShortcutHandlerStackItem;
-    __visibilityObserver__?: IntersectionObserver;
-}
+type ShortcutHandlerType = (event: KeyboardEvent) => void;
+
+interface ShortcutHandlerStackItem {
+    keys: string;
+    el: HTMLElement;
+    handler: ShortcutHandlerType;
+    prev?: ShortcutHandlerStackItem
+}
+
+interface HTMLElement {
+    __vueShortcutHandler__?: ShortcutHandlerStackItem;
+    __visibilityObserver__?: IntersectionObserver;
+}

package/packages/types/window.d.ts

@@ -1,16 +1,16 @@
-import {type GlobalData, Jari, type MicroAppContext} from "@jari-ace/app-bolts";
-
-
-declare global {
-    interface Window {
-        appContext?: MicroAppContext;
-        microApp?: {
-            getGlobalData: () => GlobalData;
-            addGlobalDataListener: (data: (data: MicroAppContext) => void) => void;
-            addDataListener:any
-        } & any,
-        __MICRO_APP_ENVIRONMENT__: boolean,
-        rawWindow: Window,
-        appDescriptor: Jari.Ace.ApplicationDescriptor;
-    }
-}
+import {type GlobalData, Jari, type MicroAppContext} from "@jari-ace/app-bolts";
+
+
+declare global {
+    interface Window {
+        appContext?: MicroAppContext;
+        microApp?: {
+            getGlobalData: () => GlobalData;
+            addGlobalDataListener: (data: (data: MicroAppContext) => void) => void;
+            addDataListener:any
+        } & any,
+        __MICRO_APP_ENVIRONMENT__: boolean,
+        rawWindow: Window,
+        appDescriptor: Jari.Ace.ApplicationDescriptor;
+    }
+}

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;
+    }
+
+
+}