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

package/packages/components/enumPicker/src/EnumPicker.vue

@@ -1,103 +1,103 @@
-<script setup lang="ts">
-import type { EnumValueDefinition } from '@jari-ace/app-bolts';
-
-import { computed, ref, watch } from 'vue';
-
-import { createAxiosWithoutCache } from '@jari-ace/app-bolts';
-import { useEnumApi } from '@jari-ace/app-bolts';
-import { ElOption, ElSelect } from 'element-plus';
-// 遍历出EnumValueDefinition类型的KEY 并排除掉
-type KeyFields = 'id' | 'text' | 'value';
-
-interface ModelValue {
-    value?: string;
-    text?: string;
-    id?: string;
-}
-const props = withDefaults(
-    defineProps<{
-        clearable?: boolean; // 是否可清空
-        filterable?: boolean; // 是否可筛选
-        keyField?: KeyFields;
-        multiple?: boolean; // 是否多选
-        name: string; // 枚举名称，用于获取枚举数据
-        serviceName: string;
-    }>(),
-    {
-        multiple: false,
-        clearable: true,
-        filterable: true,
-        keyField: 'value',
-    },
-);
-
-const enums = ref<EnumValueDefinition[]>([]);
-const loading = ref<boolean>(false);
-const model = defineModel<ModelValue[]>({
-    default: () => [],
-});
-
-const axios = createAxiosWithoutCache();
-const api = useEnumApi(axios);
-async function loadData() {
-    if (!props.name || !props.serviceName) return;
-    loading.value = true;
-    api
-        .queryByName(props.serviceName, props.name)
-        .then((res) => {
-            enums.value = res.values;
-        })
-        .finally(() => {
-            loading.value = false;
-        });
-}
-
-const modelValue = computed((): string | string[] | undefined => {
-    if (props.multiple) {
-        return model.value.map((m) => m[props.keyField] as string) || [];
-    } else {
-        if (model.value[0] !== undefined) {
-            return model.value[0][props.keyField];
-        }
-    }
-    return '';
-});
-
-const handleChange = (value: string | string[]) => {
-    if (typeof value === 'string') {
-        const obj = enums.value.find((e) => e[props.keyField] === value);
-        model.value = obj ? [obj] : [];
-    } else {
-        model.value = enums.value.filter((e) => value.includes(e[props.keyField]));
-    }
-};
-
-// function filter(queryName: string) {
-//   bindingChannels.value = channels.value?.filter(c => c.name.indexOf(queryName) > -1) ?? [];
-// }
-
-loadData();
-
-watch(() => props.name, loadData);
-watch(() => props.serviceName, loadData);
-</script>
-
-<template>
-    <ElSelect
-        v-loading="loading"
-        :model-value="modelValue"
-        :filterable="props.filterable"
-        :multiple="props.multiple"
-        :clearable="props.clearable"
-        @change="handleChange"
-    >
-        <ElOption
-            v-for="item in enums"
-            :key="item.id"
-            :value="item[props.keyField]"
-            :label="item.text"
-        />
-    </ElSelect>
-</template>
-
-<style scoped lang="scss"></style>
+<script setup lang="ts">
+import type { EnumValueDefinition } from '@jari-ace/app-bolts';
+
+import { computed, ref, watch } from 'vue';
+
+import { createAxiosWithoutCache } from '@jari-ace/app-bolts';
+import { useEnumApi } from '@jari-ace/app-bolts';
+import { ElOption, ElSelect } from 'element-plus';
+// 遍历出EnumValueDefinition类型的KEY 并排除掉
+type KeyFields = 'id' | 'text' | 'value';
+
+interface ModelValue {
+    value?: string;
+    text?: string;
+    id?: string;
+}
+const props = withDefaults(
+    defineProps<{
+        clearable?: boolean; // 是否可清空
+        filterable?: boolean; // 是否可筛选
+        keyField?: KeyFields;
+        multiple?: boolean; // 是否多选
+        name: string; // 枚举名称，用于获取枚举数据
+        serviceName: string;
+    }>(),
+    {
+        multiple: false,
+        clearable: true,
+        filterable: true,
+        keyField: 'value',
+    },
+);
+
+const enums = ref<EnumValueDefinition[]>([]);
+const loading = ref<boolean>(false);
+const model = defineModel<ModelValue[]>({
+    default: () => [],
+});
+
+const axios = createAxiosWithoutCache();
+const api = useEnumApi(axios);
+async function loadData() {
+    if (!props.name || !props.serviceName) return;
+    loading.value = true;
+    api
+        .queryByName(props.serviceName, props.name)
+        .then((res) => {
+            enums.value = res.values;
+        })
+        .finally(() => {
+            loading.value = false;
+        });
+}
+
+const modelValue = computed((): string | string[] | undefined => {
+    if (props.multiple) {
+        return model.value.map((m) => m[props.keyField] as string) || [];
+    } else {
+        if (model.value[0] !== undefined) {
+            return model.value[0][props.keyField];
+        }
+    }
+    return '';
+});
+
+const handleChange = (value: string | string[]) => {
+    if (typeof value === 'string') {
+        const obj = enums.value.find((e) => e[props.keyField] === value);
+        model.value = obj ? [obj] : [];
+    } else {
+        model.value = enums.value.filter((e) => value.includes(e[props.keyField]));
+    }
+};
+
+// function filter(queryName: string) {
+//   bindingChannels.value = channels.value?.filter(c => c.name.indexOf(queryName) > -1) ?? [];
+// }
+
+loadData();
+
+watch(() => props.name, loadData);
+watch(() => props.serviceName, loadData);
+</script>
+
+<template>
+    <ElSelect
+        v-loading="loading"
+        :model-value="modelValue"
+        :filterable="props.filterable"
+        :multiple="props.multiple"
+        :clearable="props.clearable"
+        @change="handleChange"
+    >
+        <ElOption
+            v-for="item in enums"
+            :key="item.id"
+            :value="item[props.keyField]"
+            :label="item.text"
+        />
+    </ElSelect>
+</template>
+
+<style scoped lang="scss"></style>

package/packages/components/inputI18n/InputI18n.vue

@@ -1,7 +1,11 @@
 <script setup lang="ts">
 import {ElInput, ElOption, ElSelect} from "element-plus";
 import {nextTick, onUnmounted, ref, watch} from "vue"
-import {createAxios, useAppMessageApi, useLoginUser} from "@jari-ace/app-bolts";
+import {
+    createAxiosWithoutCache,
+    useAppMessageApi,
+    useLoginUser
+} from "@jari-ace/app-bolts";
 import MessageEditor from "./I18nBundleEditor.vue"
 import {trim} from "lodash-es";
 import {useAppInstances} from "../../hooks/useAppInstances";
@@ -20,7 +24,7 @@ const props = withDefaults(defineProps<{
 const model = defineModel<string>({
     default: ""
 })
-const axios = createAxios()
+const axios = createAxiosWithoutCache()
 const api = useAppMessageApi(axios)
 const locale = useLoginUser().locale
 const messageKeys = ref<string[]>()

package/packages/components/userPicker/src/UserPicker.vue

@@ -31,12 +31,12 @@ import {JaUserSelectDialog} from "../../userSelectDialog";
 import {JaScrollbar} from "../../scrollbar";
 import CustomGroupManager from "./CustomGroupManager.vue";
 import JaUserList from "./JaUserList.vue";
-
+import {useRealms} from '../../../hooks/useRealms'
 const props = defineProps({
     /**
      * 可选择用户的用户域ID
      */
-    realmId: {type: String, required: false, default: 1},
+    realmId: {type: String, required: false},
     /**
      * 弹出下拉选框的快捷键
      */
@@ -65,13 +65,15 @@ const props = defineProps({
      */
     maxHeight: {type: [Number, String], required: false},
 })
+
 const localRealmId = ref<string>();
 
-function loadRealmId() {
+async function loadRealmId() {
     if (props.realmId) {
         localRealmId.value = props.realmId;
     } else {
-        localRealmId.value = useLoginUser().realmId;
+        const defaultRealm = await useRealms().getDefaultRealm();
+        localRealmId.value = defaultRealm.id;
     }
 }
 
@@ -126,8 +128,8 @@ function switchUserSelect(u: UserReference) {
 
 
 function onPopoverShow() {
-    if (!queryParams.value.realmId || queryParams.value.realmId !== localRealmId.value) {
-        queryParams.value.realmId = localRealmId.value
+    if (props.realmId) {
+        queryParams.value.realmId = props.realmId
     }
     if (queryParams.value.name && queryParams.value.name.length > minLengthToTriggerUserQuery) {
         queryParams.value.name = undefined;

package/packages/components/userSelectDialog/src/userSelectDialog.vue

@@ -37,12 +37,13 @@ import {JaButton} from "../../button";
 import throttle from "lodash-es/throttle";
 import {JaUserGroupTree} from "../../userGroupTree";
 import {JaCustomGroupTree} from "../../customGroupTree";
+import { useRealms } from "../../../hooks/useRealms";
 //#region Props和Const声明和初始化
 const props = defineProps({
     /**
      * 可选择用户的用户域ID
      */
-    realmId: {type: String, required: true, default: 1},
+    realmId: {type: String, required: false},
     /**
      * 是否多选模式
      */
@@ -59,12 +60,20 @@ const selectedUsers = defineModel<UserReference[] | UserReference | null>({
     required: true
 });
 const localRealmId = ref<string>();
-const login = useLoginUser();
-if (props.realmId) {
-    localRealmId.value = props.realmId;
-} else {
-    localRealmId.value = login.realmId;
+
+
+async function loadRealmId() {
+    if (props.realmId) {
+        localRealmId.value = props.realmId;
+    } else {
+        const defaultRealm = await useRealms().getDefaultRealm();
+        localRealmId.value = defaultRealm.id;
+    }
 }
+
+loadRealmId()
+
+
 if (props.multiple) {
     if (!selectedUsers.value) {
         selectedUsers.value = [];
@@ -256,8 +265,7 @@ function switchSelectOnlyView() {
 }
 
 function onOpen() {
-    if (!userQuery.queryParams.value.realmId || userQuery.queryParams.value.realmId
-        !== localRealmId.value) {
+    if (!userQuery.queryParams.value.realmId && localRealmId.value) {
         userQuery.queryParams.value.realmId = localRealmId.value;
     }
 

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"