diff --git a/components.d.ts b/components.d.ts index e7a9d76..61136d3 100644 --- a/components.d.ts +++ b/components.d.ts @@ -11,19 +11,30 @@ declare module 'vue' { BasicModal: typeof import('./src/components/Modal/BasicModal.vue')['default'] DataHeader: typeof import('./src/components/DataHeader/index.vue')['default'] NAvatar: typeof import('naive-ui')['NAvatar'] + NBackTop: typeof import('naive-ui')['NBackTop'] NButton: typeof import('naive-ui')['NButton'] + NCard: typeof import('naive-ui')['NCard'] NCheckbox: typeof import('naive-ui')['NCheckbox'] + NCollapse: typeof import('naive-ui')['NCollapse'] + NCollapseItem: typeof import('naive-ui')['NCollapseItem'] NConfigProvider: typeof import('naive-ui')['NConfigProvider'] + NDatePicker: typeof import('naive-ui')['NDatePicker'] NDialogProvider: typeof import('naive-ui')['NDialogProvider'] NDivider: typeof import('naive-ui')['NDivider'] NDropdown: typeof import('naive-ui')['NDropdown'] + NEllipsis: typeof import('naive-ui')['NEllipsis'] NForm: typeof import('naive-ui')['NForm'] NFormItem: typeof import('naive-ui')['NFormItem'] + NGi: typeof import('naive-ui')['NGi'] + NGrid: typeof import('naive-ui')['NGrid'] + NGridItem: typeof import('naive-ui')['NGridItem'] + NImage: typeof import('naive-ui')['NImage'] NInput: typeof import('naive-ui')['NInput'] NMessageProvider: typeof import('naive-ui')['NMessageProvider'] NModal: typeof import('naive-ui')['NModal'] NNotificationProvider: typeof import('naive-ui')['NNotificationProvider'] NotPassed: typeof import('./src/components/NotPassed.vue')['default'] + NPopconfirm: typeof import('naive-ui')['NPopconfirm'] NPopover: typeof import('naive-ui')['NPopover'] NPopselect: typeof import('naive-ui')['NPopselect'] NProgress: typeof import('naive-ui')['NProgress'] diff --git a/src/layout/components/Header/RecycleModal.vue b/src/layout/components/Header/RecycleModal.vue index b28afdd..9fe847e 100644 --- a/src/layout/components/Header/RecycleModal.vue +++ b/src/layout/components/Header/RecycleModal.vue @@ -122,11 +122,6 @@ const layout = debounce(() => { // } // el.value!.scrollTo({ top: height, behavior: 'instant' }) loading = false -<<<<<<< HEAD -======= - console.log('loading---------------', loading) - console.log('pagination.pageNo---------------', pagination.pageNo) ->>>>>>> test if (pagination.pageNo == 3) { let timer if (timer) @@ -134,10 +129,6 @@ const layout = debounce(() => { timer = setTimeout(() => { isTop.value = false -<<<<<<< HEAD -======= - console.log('isTop.value---------------', isTop.value) ->>>>>>> test }, 1000) } }) @@ -158,10 +149,6 @@ useInfiniteScroll( el as any, () => { loading = false -<<<<<<< HEAD -======= - console.log('加载了000000000000000---------------------------') ->>>>>>> test loadMore() }, { distance: 10, canLoadMore: () => canloadMore }, @@ -170,21 +157,13 @@ useInfiniteScroll( async function featchList() { loading = true try { -<<<<<<< HEAD - const result = await dubiousfilelist({ ...pagination, ...sortObj }) - const { data } = result - canloadMore = data.pages >= pagination.pageNo && data.pages > 0 -======= // const result = await dubiousfilelist({ ...pagination, orderbyname: timeRange.value }) - console.log('pagination.pageNo------------', pagination.pageNo) const result = await dubiousfilelist({ ...pagination, ...sortObj }) // TODO：测试数据 // result.data = Array.from({ length: 30 }) const { data, pageCount } = result // canloadMore = pageCount >= pagination.pageNo && pageCount > 0; canloadMore = data.pages >= pagination.pageNo && data.pages > 0 - console.log('canloadMore------------', canloadMore) ->>>>>>> test return result.data.records } @@ -195,20 +174,12 @@ async function featchList() { } async function loadMore() { -<<<<<<< HEAD -======= - console.log('执行l------------------------', loading, el.value, pagination.pageNo) ->>>>>>> test if (loading || el.value == null) return // loading = true pagination.pageNo = pagination.pageNo + 1 const more = await featchList() -<<<<<<< HEAD -======= - console.log('more------------------------', more) ->>>>>>> test listData.value.push(...more) layout() } @@ -339,11 +310,7 @@ function upHandler(event: MouseEvent) { selectIds.value = [] selectedApproveItems.value.forEach(item => (item.checked = false)) selectedApproveItems.value.length = 0 -<<<<<<< HEAD - listData.value.map((item) => { -======= listData.value.forEach((item) => { ->>>>>>> test item.checked = false }) // batch.value = false; @@ -534,10 +501,6 @@ function approvalHandler(items?: any) { // 任务包图片 => 点击 => 通过/不通过按钮 if (items !== undefined && !(items instanceof PointerEvent)) processItems = [items] -<<<<<<< HEAD -======= - console.log('batch-------------', batch.value, selectedApproveItems.value, processItems) ->>>>>>> test const msg = validate(processItems) if (msg !== null) { @@ -610,10 +573,6 @@ async function refreshHandler(filtersearchId?: any) { useInfiniteScroll( el as any, () => { -<<<<<<< HEAD -======= - console.log('加载了333333333333333333333333---------------------------') ->>>>>>> test loadMore() }, { distance: 10, canLoadMore: () => canloadMore }, @@ -627,19 +586,11 @@ watch(() => show.value, async (newVal) => { pagination.pageNo = 1 const list = await featchList() listData.value = list -<<<<<<< HEAD -======= - console.log('加载了1111111111111---------------------------', listData.value) ->>>>>>> test layout() } }) watch(() => pagination.pageNo, (newVal, oldVal) => { -<<<<<<< HEAD -======= - console.log('加载了22222222222222222---------------------------', newVal, oldVal, canloadMore) ->>>>>>> test if (newVal == oldVal) return @@ -739,11 +690,7 @@ watch(() => pagination.pageNo, (newVal, oldVal) => {
>>>>>> test :class="{ 'grid-item-selected': isSelected(item.pictureId) }" :style="{ height: gridHeight }" class="grid-item" > diff --git a/src/views/final/aside/Aside.vue b/src/views/final/aside/Aside.vue index c2a1bd1..d8ee9e4 100644 --- a/src/views/final/aside/Aside.vue +++ b/src/views/final/aside/Aside.vue @@ -115,39 +115,6 @@ onBeforeMount(async () => { nextTick(() => { finalStore.$subscribe(() => { -<<<<<<< HEAD -======= - // const customConfig = finalStore.getCustomConfig; - // console.log("customConfig订阅aside---------------", customConfig); - // if (customConfig === null) return; - - // const showKeys: string[] = [...customConfig]; - // // const defaultKeys = Object.keys(asideMap).filter( - // // (key) => asideMap[key].isDefaultFilter - // // ); - // // showKeys.unshift(...defaultKeys); - - // Object.keys(asideMap).forEach((key) => { - // // 设置显示的或者默认显示的 - // if (key.startsWith("iz")) - // asideVisible[key] = - // asideMap[key] && (showKeys.includes(key) || asideMap[key].isDefaultFilter); - // }); - - // const items = showKeys.reduce((acc, key) => { - // if (asideMap[key]) { - // const config = { - // key, - // config: asideMap[key], - // }; - // return [...acc, config]; - // } else { - // return acc; - // } - // }, []); - // console.log("showItems111111111---------------", items); - // showItems.value = items; ->>>>>>> test const config = finalStore.getSystemConfig const customConfig = finalStore.getCustomConfig if ( @@ -155,28 +122,11 @@ nextTick(() => { && isEqual(configFilterRef.value, finalStore.getFilterConfig) && customObjRef.value && isEqual(customObjRef.value, customTempObjRef.value) -<<<<<<< HEAD - ) { - return - } - - if (config == null || customConfig == null) { - return - } -======= ) return if (config == null || customConfig == null) return - // console.log("config", config, "customConfig", customConfig); - /* rao - const showKeys = [...customConfig].filter(key => !asideMap[key].isDefaultFilter)// 获取customConfig 非isDefaultFilter的选项 - const defaultKeys = Object.keys(asideMap).filter(key => asideMap[key].isDefaultFilter)// 获取asideMap isDefaultFilter的选项 - showKeys.unshift(...defaultKeys) - */ ->>>>>>> test - const sortKeyList: any = [] finalStore.getFilterConfig.forEach((item: any) => { sortKeyList.push(item?.id) @@ -192,24 +142,15 @@ nextTick(() => { if (customObjRef.value) { // 赋值 Object.keys(customObjRef.value).forEach((key) => { -<<<<<<< HEAD - if (Object.prototype.hasOwnProperty.call(asideMap, key)) { - const str = key.toLowerCase() -======= // if (asideMap.hasOwnProperty(key)) { if (Object.prototype.hasOwnProperty.call(asideMap, key)) { const str = key.toLowerCase() // console.log("customObjRef.value[str]1111111111111", customObjRef.value[str]); ->>>>>>> test if (str == 'izsimilarity') { if (typeof customObjRef.value[str] == 'string') customObjRef.value[str] = customObjRef.value[str].split(',') asideValue[key] = customObjRef.value[str] // 赋值 -<<<<<<< HEAD -======= - console.log('相似度2222222222', asideValue[key]) ->>>>>>> test } else if (str == 'izyear') { if (typeof customObjRef.value[str] == 'string') { @@ -217,27 +158,10 @@ nextTick(() => { time[0] = new Date(time[0]).getTime() time[1] = new Date(time[1]).getTime() customObjRef.value[str] = time -<<<<<<< HEAD - } - asideValue[key] = customObjRef.value[str] // 赋值 - } - else if (customObjRef.value[str]) { - if (typeof customObjRef.value[str] == 'string') { - customObjRef.value[str] = customObjRef.value[str].split(',') - asideValue[key] = customObjRef.value[str] // 赋值 - } - else { - asideValue[key] = customObjRef.value[str] // 赋值 - } -======= } asideValue[key] = customObjRef.value[str] // 赋值 - console.log('时间2222222222', asideValue[key]) } else if (customObjRef.value[str]) { - console.log('customObjRef.value[str]222222', customObjRef.value[str]) - // let list = customObjRef.value[str].split(','); - // console.log("list222222", list); if (typeof customObjRef.value[str] == 'string') { customObjRef.value[str] = customObjRef.value[str].split(',') asideValue[key] = customObjRef.value[str] // 赋值 @@ -245,23 +169,14 @@ nextTick(() => { else { asideValue[key] = customObjRef.value[str] // 赋值 } ->>>>>>> test } else { asideValue[key] = null } - // asideMap[str].defaultValue = customObjRef.value[str];// 赋值 } }) customTempObjRef.value = customObjRef.value -<<<<<<< HEAD - const tempobj = cloneDeep(asideValue) -======= - console.log('asideValue直接处理后的结果', asideValue) - console.log('customTempObjRef.value', customTempObjRef.value) const tempobj = cloneDeep(asideValue) - console.log('tempObj', tempobj) ->>>>>>> test finalStore.setAsideValue(tempobj) } const items = showKeys.reduce((acc, key) => { @@ -275,20 +190,11 @@ nextTick(() => { config: asideMap[str], } return [...acc, o] -<<<<<<< HEAD } else { return acc } }, []) -======= - } - else { - return acc - } - }, []) - console.log('showItems=================================', items) ->>>>>>> test showItems.value = items configFilterRef.value = finalStore.getFilterConfig }) @@ -322,30 +228,17 @@ function scrollHandler(key: string) { } async function filterHandler(searchId: string) { -<<<<<<< HEAD - emitter.emit('filter-final', searchId) - const res = await getFilterList({ userSearchId: searchId }) -======= - // emitter.emit("filter-final", searchId); const res = await getFilterList({ userSearchId: searchId }) // console.log("顾虑结果", res); ->>>>>>> test if (res.code == 'OK') { const obj = res.data customObjRef.value = res.data const showKeys: any[] = [] Object.keys(obj).forEach((key) => { -<<<<<<< HEAD - if (Object.prototype.hasOwnProperty.call(asideMap, key)) - showKeys.push(key) - }) -======= // if (asideMap.hasOwnProperty(key)) { if (Object.prototype.hasOwnProperty.call(asideMap, key)) showKeys.push(key) }) - console.log('showKeys1111111111111111', showKeys) ->>>>>>> test finalStore.setCustomConfig(showKeys) } } @@ -364,10 +257,6 @@ function inputChange(keyword) { emit('inputChange', keyword) } function handleOk(item: any) { -<<<<<<< HEAD -======= - console.log('handleOk', item) ->>>>>>> test if (item) { AdvanceFilterRef.value.setCurrentlySelectedAdvanced(item.searchname) filterHandler(item.id) @@ -379,24 +268,11 @@ function handleOk(item: any) { } function updateComponent(key, e) { -<<<<<<< HEAD - // let tempAsideValue = finalStore.getAsideValue || asideValue; - const tempobj = cloneDeep(asideValue) - tempobj[key] = e - customObjRef.value = tempobj - // asideValue = Object.assign({}, asideValue, tempobj); -======= - console.log('跟新值', key, e) - console.log('tempAsideValue跟新值', finalStore.getAsideValue, asideValue) // let tempAsideValue = finalStore.getAsideValue || asideValue; const tempobj = cloneDeep(asideValue) - console.log(tempobj, 'tempobj') tempobj[key] = e - console.log(tempobj, 'tempobj After') customObjRef.value = tempobj // asideValue = Object.assign({}, asideValue, tempobj); - console.log('asideValue跟新值', tempobj) ->>>>>>> test finalStore.setAsideValue(tempobj) } @@ -412,29 +288,20 @@ function updateComponent(key, e) {
>>>>>> test @show-search="setShowSearch(true)" /> >>>>>> test @show-filter="showModal(filterModalRef)" />
@@ -449,13 +316,9 @@ function updateComponent(key, e) { >>>>>> test @handle-ok="handleOk" />