diff --git a/components/entity/components/ComparisonEntity.vue b/components/entity/components/ComparisonEntity.vue index 3135c28..2d38697 100644 --- a/components/entity/components/ComparisonEntity.vue +++ b/components/entity/components/ComparisonEntity.vue @@ -264,8 +264,8 @@ + + diff --git a/components/search/MyContent.vue b/components/search/MyContent.vue index d7763a0..f5e59db 100644 --- a/components/search/MyContent.vue +++ b/components/search/MyContent.vue @@ -403,10 +403,9 @@ import favoriteApi from "~/apis/favoriteApi"; import researchApi from "~/apis/researchApi"; import { mapState, mapActions } from "pinia"; - -import { useResearchStore } from "~/stores/researchStore"; import { useSearchStore } from "~/stores/searchStore"; -import { useEntityStore } from "~/stores/entityStore"; +import { useEntityStore } from "@search/stores/entityStore"; +import { useAuthStore } from "~/stores/authStore"; export default { props: { @@ -477,8 +476,8 @@ export default { }; }, computed: { - ...mapState(useResearchStore, ["searchActiveTabGetter"]), ...mapState(useSearchStore, ["searchActiveTabGetter"]), + ...mapState(useAuthStore, ["isRealUser"]), }, methods: { ...mapActions(useEntityStore, ["SET_ITEM_ENTITY", "SET_LIST_ENTITY"]), @@ -814,7 +813,7 @@ export default { }, components: { lineContent: defineAsyncComponent(() => - import("~/components/search/view/lineContent.vue") + import("@search/components/search/view/lineContent.vue") ), }, }; diff --git a/components/search/SearchNavigationFilter.vue b/components/search/SearchNavigationFilter.vue index fd1e666..bbcc87a 100644 --- a/components/search/SearchNavigationFilter.vue +++ b/components/search/SearchNavigationFilter.vue @@ -187,8 +187,8 @@ import { mapState, mapActions } from "pinia"; import { useSearchStore } from "~/stores/searchStore"; import { useCommonStore } from "~/stores/commonStore"; -import { useEntityStore } from "~/stores/entityStore"; -import { useListStore } from "~/stores/listStore"; +import { useEntityStore } from "@search/stores/entityStore"; +import { useSearchStore } from "@search/stores/searchStore"; import apis from "~/apis/listApi"; import searchApis from "~/apis/searchApi"; @@ -287,28 +287,26 @@ export default { }; }, computed: { + ...mapState(useCommonStore, ["getPanelStatus", "isSidebarCollapsed"]), ...mapState(useSearchStore, [ "searchListSchemaGetter", "searchListActiveSchemaGetter", "searchListActiveTabGetter", - ]), - ...mapState(useCommonStore, ["getPanelStatus", "isSidebarCollapsed"]), - ...mapState(useListStore, [ + "selectedProjectGetter", "selectedItemGetter", "isReturnFromItemshowPageGetter", ]), }, methods: { - ...mapActions(useCommonStore, ["TOGGLE_PANEL"]), - ...mapActions(useListStore, [ + ...mapActions(useCommonStore, ["TOGGLE_PANEL","checkPermissions"]), + ...mapActions(useSearchStore, [ "SET_SELECTED_PROJECT", "SET_LIST_ID", "SET_LIST", "SET_SELECTED_ITEM", "SET_CHART_DATA", ]), - ...mapActions(useCommonStore, ["checkPermissions"]), clearSearchAndGetList() { this.searchText = ""; this.groups = []; diff --git a/components/search/forms/SearchSubjectForm.vue b/components/search/forms/SearchSubjectForm.vue index 9a4a238..78e9297 100644 --- a/components/search/forms/SearchSubjectForm.vue +++ b/components/search/forms/SearchSubjectForm.vue @@ -176,7 +176,7 @@ import apis from "~/apis/listApi"; import { mapState, mapActions } from "pinia"; import { useAuthStore } from "~/stores/authStore"; -import { useListStore } from "~/stores/listStore"; +import { useSearchStore } from "@search/stores/searchStore"; export default { props: { @@ -263,11 +263,11 @@ export default { }, computed: { ...mapState(useAuthStore, ["isGuest"]), - ...mapState(useListStore, ["selectedProjectGetter", "selectedItemGetter"]), + ...mapState(useSearchStore, ["selectedProjectGetter", "selectedItemGetter"]), }, methods: { - ...mapActions(useListStore, ["SET_SELECTED_PROJECT"]), + ...mapActions(useSearchStore, ["SET_SELECTED_PROJECT"]), pageChanged({ pageNumber, limit }) { let page = paging.pageNumber; diff --git a/components/search/view/CategoryList.vue b/components/search/view/CategoryList.vue index d4b0152..6392fb9 100644 --- a/components/search/view/CategoryList.vue +++ b/components/search/view/CategoryList.vue @@ -89,9 +89,6 @@ import { mapState, mapActions } from "pinia"; import listApis from "~/apis/listApi"; import { useSearchStore } from "~/stores/searchStore"; -// import { useCommonStore } from "~/stores/commonStore"; -// import { useEntityStore } from "~/stores/entityStore"; -import { useListStore } from "~/stores/listStore"; // import { VueTreeList, Tree, TreeNode } from "vue-tree-list"; @@ -133,6 +130,8 @@ export default { // }, }, mounted() { + this.httpService = useNuxtApp()["$http"]; + // فهرست های تنقیح if ( this.searchListActiveTabGetter?.items && @@ -152,6 +151,7 @@ export default { }, data() { return { + httpService: undefined, mainList: "", listSelect: [], filterUrl: "", @@ -205,7 +205,7 @@ export default { // }, }, methods: { - ...mapActions(useListStore, ["SET_SELECTED_PROJECT"]), + ...mapActions(useSearchStore, ["SET_SELECTED_PROJECT"]), callShowCategory() { let newVal = !this.showCategory; this.$emit("show-category", newVal); @@ -282,7 +282,10 @@ export default { this.mainList = res.data; this.treeItems = this.ConvertDataToTree(this.mainList); - this.clickItem(this.treeItems[0]); + + this.$nextTick(() => { + this.clickItem(this.treeItems[0]); + }); } catch (err) {} }, async getListURl(url) { @@ -294,12 +297,7 @@ export default { // url = url.replace("{{sortby}}", sortby); // url = url.replace("{{sortorder}}", sortorder); - try { - const { $api } = useNuxtApp(); - const res = await $api(url, { - baseURL: baseUrl(), - }); - + this.httpService.getRequest(url).then((res) => { if (res?.aggregations?.result) { var lists = []; res.aggregations.result.buckets.forEach((element) => { @@ -313,9 +311,12 @@ export default { }); this.mainList = lists; this.treeItems = this.ConvertDataToTree(this.mainList); - this.clickItem(this.treeItems[0]); + + this.$nextTick(() => { + this.clickItem(this.treeItems[0]); + }); } - } catch (err) {} + }); }, async clickItem(event) { @@ -324,7 +325,10 @@ export default { if (element?.children.length == 0) { this.getChildren(element).then((res) => { element.children = res; - this.$refs.treelist.updateChildren(element, element.children); + + if (this.$refs?.treelist) + this.$refs.treelist.updateChildren(element, element.children); + element.expanded = true; this.addFilter( @@ -379,8 +383,8 @@ export default { method: "POST", }); - let children = this.ConvertDataToTree(res.data, element.id, element); - return children; + let children = this.ConvertDataToTree(res.data, element.id, element); + return children; } catch (err) {} }, @@ -487,6 +491,11 @@ export default { }); }, }, + components: { + MyVueTreeList: defineAsyncComponent(() => + import("@components/other/MyVueTreeList.vue") + ), + }, }; - - diff --git a/mixins/entity/entityTextMixin.js b/mixins/entity/entityTextMixin.js index 5b3fa3d..332abaf 100644 --- a/mixins/entity/entityTextMixin.js +++ b/mixins/entity/entityTextMixin.js @@ -1,4 +1,5 @@ import { mapState, mapActions } from "pinia"; +import { useEntityStore } from "@search/stores/entityStore"; export default { data() { diff --git a/mixins/entity/propertyModalMixin.js b/mixins/entity/propertyModalMixin.js index cd52647..13f5732 100644 --- a/mixins/entity/propertyModalMixin.js +++ b/mixins/entity/propertyModalMixin.js @@ -1,7 +1,7 @@ // import HttpService from "~/services/httpService"; import { mapState, mapActions } from "pinia"; -import { useEntityStore } from "~/stores/entityStore"; -import { useListStore } from "~/stores/listStore"; +import { useEntityStore } from "@search/stores/entityStore"; +import { useSearchStore } from "@search/stores/searchStore"; export default { // mounted() { @@ -31,7 +31,7 @@ export default { ...mapState(useEntityStore, ["activeTabGetter"]), }, methods: { - ...mapActions(useListStore, ["SET_SELECTED_ITEM"]), + ...mapActions(useSearchStore, ["SET_SELECTED_ITEM"]), openModal({ ev, modal, modalTitle, property = null, index = -1 }) { this.modal = modal; this.modal_data.entity = this.entity; diff --git a/mixins/searchMixin.ts b/mixins/searchMixin.ts index b3a10cd..ce81136 100644 --- a/mixins/searchMixin.ts +++ b/mixins/searchMixin.ts @@ -1,5 +1,5 @@ import apis from "~/apis/listApi"; -import { useListStore } from "~/stores/listStore"; +import { useSearchStore } from "@search/stores/searchStore"; interface FormData { id: string | number; @@ -48,7 +48,7 @@ export const moveFromFolderToFolder = async ( cloneId: string | number, toId: string | number ) => { - const myStore = useListStore(); + const myStore = useSearchStore(); const formData = { id: cloneId, newparent: toId ?? 0, @@ -59,7 +59,7 @@ export const moveFromFolderToFolder = async ( }; export const moveFromFolderToRoot = async (cloneId: string | number) => { - const myStore = useListStore(); + const myStore = useSearchStore(); const formData = { id: cloneId, newparent: 0, @@ -73,7 +73,7 @@ export const moveFromRootToFolder = async ( cloneId: string | number, toId: string | number ) => { - const myStore = useListStore(); + const myStore = useSearchStore(); const formData = { id: cloneId, newparent: toId ?? 0, @@ -110,7 +110,7 @@ export const moveItem = async (formData: FormData) => { }; export const addItemToList = async (itemId: string, listId: string) => { - const myStore = useListStore(); + const myStore = useSearchStore(); const payload = { itemid: itemId, listid: listId, @@ -144,7 +144,7 @@ export const updateOrder = async ( listArray: [], index: number ) => { - const myStore = useListStore(); + const myStore = useSearchStore(); const payload = { id: list.id, offset: type === "move-up" ? -1 : 1, diff --git a/pages/search/(show)/[key]/[id]/index.vue b/pages/search/(show)/[key]/[id]/index.vue index e4912ca..b13d0ed 100644 --- a/pages/search/(show)/[key]/[id]/index.vue +++ b/pages/search/(show)/[key]/[id]/index.vue @@ -427,7 +427,7 @@ diff --git a/pages/search/lists.vue b/pages/search/lists.vue index 93fa397..487f353 100644 --- a/pages/search/lists.vue +++ b/pages/search/lists.vue @@ -1,5 +1,5 @@

عدم دسترسی

@@ -505,22 +505,21 @@ - +