|
|
|
@ -10,110 +10,111 @@ import {
|
|
|
|
shallowRef,
|
|
|
|
shallowRef,
|
|
|
|
unref,
|
|
|
|
unref,
|
|
|
|
watch,
|
|
|
|
watch,
|
|
|
|
} from "vue";
|
|
|
|
} from 'vue'
|
|
|
|
import { CustomFilterModalVue, FilterModalVue, NewFilterModalVue } from "./comp/modals";
|
|
|
|
import dayjs from 'dayjs'
|
|
|
|
import Search from "./comp/Search.vue";
|
|
|
|
import { cloneDeep, isEqual } from 'lodash-es'
|
|
|
|
import AdvanceFilter from "./comp/AdvanceFilter.vue";
|
|
|
|
import { CustomFilterModalVue, FilterModalVue, NewFilterModalVue } from './comp/modals'
|
|
|
|
import { getViewportOffset } from "@/utils/domUtils";
|
|
|
|
import Search from './comp/Search.vue'
|
|
|
|
import { useWindowSizeFn } from "@/hooks/event/useWindowSizeFn";
|
|
|
|
import AdvanceFilter from './comp/AdvanceFilter.vue'
|
|
|
|
import { useConfig } from "@/store/modules/asideConfig";
|
|
|
|
import { getViewportOffset } from '@/utils/domUtils'
|
|
|
|
import type { Filter } from "/#/home";
|
|
|
|
import { useWindowSizeFn } from '@/hooks/event/useWindowSizeFn'
|
|
|
|
import type { AsideEntity } from "@/config/aside";
|
|
|
|
import { useConfig } from '@/store/modules/asideConfig'
|
|
|
|
import { asideMap } from "@/config/aside";
|
|
|
|
import type { Filter } from '/#/home'
|
|
|
|
import type { AsideConfig } from "/#/api";
|
|
|
|
import type { AsideEntity } from '@/config/aside'
|
|
|
|
import emitter from "@/utils/mitt";
|
|
|
|
import { asideMap } from '@/config/aside'
|
|
|
|
import { getFilterList } from "@/api/home/main";
|
|
|
|
import type { AsideConfig } from '/#/api'
|
|
|
|
import dayjs from "dayjs";
|
|
|
|
import emitter from '@/utils/mitt'
|
|
|
|
import { cloneDeep, isEqual } from "lodash-es";
|
|
|
|
import { getFilterList } from '@/api/home/main'
|
|
|
|
|
|
|
|
|
|
|
|
const configStore = useConfig();
|
|
|
|
const configStore = useConfig()
|
|
|
|
|
|
|
|
|
|
|
|
// 所有左侧模块的值
|
|
|
|
// 所有左侧模块的值
|
|
|
|
let asideValue: Record<keyof typeof asideMap, any> = reactive({});
|
|
|
|
const asideValue: Record<keyof typeof asideMap, any> = reactive({})
|
|
|
|
// 左侧某个模块是否显示: 显示需同时满足系统配置和个人配置
|
|
|
|
// 左侧某个模块是否显示: 显示需同时满足系统配置和个人配置
|
|
|
|
const asideVisible: Partial<Record<keyof AsideConfig, boolean>> = reactive({});
|
|
|
|
const asideVisible: Partial<Record<keyof AsideConfig, boolean>> = reactive({})
|
|
|
|
// 当前显示的模块，按照数组顺序显示
|
|
|
|
// 当前显示的模块，按照数组顺序显示
|
|
|
|
const showItems = shallowRef<{ key: string; config: AsideEntity }[]>([]);
|
|
|
|
const showItems = shallowRef<{ key: string, config: AsideEntity }[]>([])
|
|
|
|
|
|
|
|
|
|
|
|
Object.keys(asideMap).forEach((key) => {
|
|
|
|
Object.keys(asideMap).forEach((key) => {
|
|
|
|
const entity = asideMap[key];
|
|
|
|
const entity = asideMap[key]
|
|
|
|
const { defaultValue } = entity;
|
|
|
|
const { defaultValue } = entity
|
|
|
|
asideValue[key] = defaultValue;
|
|
|
|
asideValue[key] = defaultValue
|
|
|
|
});
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
|
|
const filterModalRef: any = ref(null);
|
|
|
|
const filterModalRef: any = ref(null)
|
|
|
|
const newFilterModalRef = ref(null);
|
|
|
|
const newFilterModalRef = ref(null)
|
|
|
|
const customModalRef = ref(null);
|
|
|
|
const customModalRef = ref(null)
|
|
|
|
const customObjRef = ref<any>(null); // 获取高级筛选获取的值
|
|
|
|
const customObjRef = ref<any>(null) // 获取高级筛选获取的值
|
|
|
|
const customTempObjRef = ref<any>(null); // 获取高级筛选获取的值(作对比)
|
|
|
|
const customTempObjRef = ref<any>(null) // 获取高级筛选获取的值(作对比)
|
|
|
|
const configFilterRef = ref<any>([]); // 获取排序的值
|
|
|
|
const configFilterRef = ref<any>([]) // 获取排序的值
|
|
|
|
const AdvanceFilterRef: any = ref(null);
|
|
|
|
const AdvanceFilterRef: any = ref(null)
|
|
|
|
|
|
|
|
|
|
|
|
function showModal(modalRef: any) {
|
|
|
|
function showModal(modalRef: any) {
|
|
|
|
const modal = unref(modalRef)! as any;
|
|
|
|
const modal = unref(modalRef)! as any
|
|
|
|
modal.showModal();
|
|
|
|
modal.showModal()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
onMounted(() => {
|
|
|
|
onMounted(() => {
|
|
|
|
nextTick(() => {
|
|
|
|
nextTick(() => {
|
|
|
|
computeSlideHeight();
|
|
|
|
computeSlideHeight()
|
|
|
|
let tempAsideValue = cloneDeep(asideValue);
|
|
|
|
const tempAsideValue = cloneDeep(asideValue)
|
|
|
|
// configStore.setAsideValue(tempAsideValue);
|
|
|
|
// configStore.setAsideValue(tempAsideValue);
|
|
|
|
console.log("asideMap和asideValue", tempAsideValue);
|
|
|
|
console.log('asideMap和asideValue', tempAsideValue)
|
|
|
|
});
|
|
|
|
})
|
|
|
|
});
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
|
|
const collapse = ref(false);
|
|
|
|
const collapse = ref(false)
|
|
|
|
const mousetrap = inject("mousetrap") as any;
|
|
|
|
const mousetrap = inject('mousetrap') as any
|
|
|
|
mousetrap.bind("[", collapseHandler);
|
|
|
|
mousetrap.bind('[', collapseHandler)
|
|
|
|
|
|
|
|
|
|
|
|
function collapseHandler() {
|
|
|
|
function collapseHandler() {
|
|
|
|
collapse.value = !collapse.value;
|
|
|
|
collapse.value = !collapse.value
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
const asideWidth = computed(() => {
|
|
|
|
const asideWidth = computed(() => {
|
|
|
|
return collapse.value ? 0 : 308;
|
|
|
|
return collapse.value ? 0 : 308
|
|
|
|
});
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
|
|
const asideHeight = ref(500);
|
|
|
|
const asideHeight = ref(500)
|
|
|
|
const asideStyle = computed(() => {
|
|
|
|
const asideStyle = computed(() => {
|
|
|
|
return {
|
|
|
|
return {
|
|
|
|
width: `${asideWidth.value}px`,
|
|
|
|
width: `${asideWidth.value}px`,
|
|
|
|
height: `${asideHeight.value}px`,
|
|
|
|
height: `${asideHeight.value}px`,
|
|
|
|
};
|
|
|
|
}
|
|
|
|
});
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
|
|
const collapseIcon = computed(() => {
|
|
|
|
const collapseIcon = computed(() => {
|
|
|
|
return collapse.value ? "expand-cir" : "collapse-cir";
|
|
|
|
return collapse.value ? 'expand-cir' : 'collapse-cir'
|
|
|
|
});
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
|
|
function computeSlideHeight() {
|
|
|
|
function computeSlideHeight() {
|
|
|
|
const headEl = document.querySelector(".aside-header")!;
|
|
|
|
const headEl = document.querySelector('.aside-header')!
|
|
|
|
const { bottomIncludeBody } = getViewportOffset(headEl);
|
|
|
|
const { bottomIncludeBody } = getViewportOffset(headEl)
|
|
|
|
const height = bottomIncludeBody;
|
|
|
|
const height = bottomIncludeBody
|
|
|
|
asideHeight.value = height - 24;
|
|
|
|
asideHeight.value = height - 24
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
useWindowSizeFn(computeSlideHeight, 280);
|
|
|
|
useWindowSizeFn(computeSlideHeight, 280)
|
|
|
|
|
|
|
|
|
|
|
|
onBeforeMount(async () => {
|
|
|
|
onBeforeMount(async () => {
|
|
|
|
configStore.fetchConfig();
|
|
|
|
configStore.fetchConfig()
|
|
|
|
configStore.fetchCustomConfig();
|
|
|
|
configStore.fetchCustomConfig()
|
|
|
|
});
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
|
|
nextTick(() => {
|
|
|
|
nextTick(() => {
|
|
|
|
configStore.$subscribe(() => {
|
|
|
|
configStore.$subscribe(() => {
|
|
|
|
const config = configStore.getConfig;
|
|
|
|
const config = configStore.getConfig
|
|
|
|
const customConfig = configStore.getCustomConfig;
|
|
|
|
const customConfig = configStore.getCustomConfig
|
|
|
|
if (
|
|
|
|
if (
|
|
|
|
configFilterRef.value.length > 0 &&
|
|
|
|
configFilterRef.value.length > 0
|
|
|
|
isEqual(configFilterRef.value, configStore.getFilterConfig) &&
|
|
|
|
&& isEqual(configFilterRef.value, configStore.getFilterConfig)
|
|
|
|
customObjRef.value &&
|
|
|
|
&& customObjRef.value
|
|
|
|
isEqual(customObjRef.value, customTempObjRef.value)
|
|
|
|
&& isEqual(customObjRef.value, customTempObjRef.value)
|
|
|
|
) {
|
|
|
|
)
|
|
|
|
return;
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
|
|
|
if (config == null || customConfig == null) return;
|
|
|
|
if (config == null || customConfig == null)
|
|
|
|
|
|
|
|
return
|
|
|
|
// console.log("config", config, "customConfig", customConfig);
|
|
|
|
// console.log("config", config, "customConfig", customConfig);
|
|
|
|
/* rao
|
|
|
|
/* rao
|
|
|
|
const showKeys = [...customConfig].filter(key => !asideMap[key].isDefaultFilter)// 获取customConfig 非isDefaultFilter的选项
|
|
|
|
const showKeys = [...customConfig].filter(key => !asideMap[key].isDefaultFilter)// 获取customConfig 非isDefaultFilter的选项
|
|
|
|
@ -121,152 +122,169 @@ nextTick(()=>{
|
|
|
|
showKeys.unshift(...defaultKeys)
|
|
|
|
showKeys.unshift(...defaultKeys)
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
let sortKeyList: any = [];
|
|
|
|
const sortKeyList: any = []
|
|
|
|
configStore.getFilterConfig.map((item: any) => {
|
|
|
|
configStore.getFilterConfig.map((item: any) => {
|
|
|
|
sortKeyList.push(item?.id);
|
|
|
|
sortKeyList.push(item?.id)
|
|
|
|
});
|
|
|
|
return item
|
|
|
|
const showKeys = [...sortKeyList];
|
|
|
|
})
|
|
|
|
|
|
|
|
const showKeys = [...sortKeyList]
|
|
|
|
|
|
|
|
|
|
|
|
Object.keys(config).forEach((key) => {
|
|
|
|
Object.keys(config).forEach((key) => {
|
|
|
|
if (key.startsWith("iz") && asideMap[key] !== undefined)
|
|
|
|
if (key.startsWith('iz') && asideMap[key] !== undefined) {
|
|
|
|
asideVisible[key] =
|
|
|
|
asideVisible[key]
|
|
|
|
(showKeys.includes(key) || asideMap[key].isDefaultFilter) && config[key] === "Y";
|
|
|
|
= (showKeys.includes(key) || asideMap[key].isDefaultFilter)
|
|
|
|
});
|
|
|
|
&& config[key] === 'Y'
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
})
|
|
|
|
if (customObjRef.value) {
|
|
|
|
if (customObjRef.value) {
|
|
|
|
// 赋值
|
|
|
|
// 赋值
|
|
|
|
Object.keys(customObjRef.value).map((key) => {
|
|
|
|
Object.keys(customObjRef.value).map((key) => {
|
|
|
|
if (asideMap.hasOwnProperty(key)) {
|
|
|
|
// TODO hasOwnProperty避免直接调用
|
|
|
|
const str = key.toLowerCase();
|
|
|
|
// if (asideMap.hasOwnProperty(key)) {
|
|
|
|
|
|
|
|
if (Object.prototype.hasOwnProperty.call(customObjRef.value, key)) {
|
|
|
|
|
|
|
|
const str = key.toLowerCase()
|
|
|
|
// console.log("customObjRef.value[str]1111111111111", customObjRef.value[str]);
|
|
|
|
// console.log("customObjRef.value[str]1111111111111", customObjRef.value[str]);
|
|
|
|
if (str == "izsimilarity") {
|
|
|
|
if (str == 'izsimilarity') {
|
|
|
|
if (typeof customObjRef.value[str] == "string") {
|
|
|
|
if (typeof customObjRef.value[str] == 'string')
|
|
|
|
customObjRef.value[str] = customObjRef.value[str].split(",");
|
|
|
|
customObjRef.value[str] = customObjRef.value[str].split(',')
|
|
|
|
}
|
|
|
|
|
|
|
|
asideValue[key] = customObjRef.value[str]; // 赋值
|
|
|
|
asideValue[key] = customObjRef.value[str] // 赋值
|
|
|
|
console.log("相似度2222222222", asideValue[key]);
|
|
|
|
console.log('相似度2222222222', asideValue[key])
|
|
|
|
} else if (str == "izyear") {
|
|
|
|
}
|
|
|
|
if (typeof customObjRef.value[str] == "string") {
|
|
|
|
else if (str == 'izyear') {
|
|
|
|
let time = customObjRef.value[str].split("-");
|
|
|
|
if (typeof customObjRef.value[str] == 'string') {
|
|
|
|
time[0] = new Date(time[0]).getTime();
|
|
|
|
const time = customObjRef.value[str].split('-')
|
|
|
|
time[1] = new Date(time[1]).getTime();
|
|
|
|
time[0] = new Date(time[0]).getTime()
|
|
|
|
customObjRef.value[str] = time;
|
|
|
|
time[1] = new Date(time[1]).getTime()
|
|
|
|
}
|
|
|
|
customObjRef.value[str] = time
|
|
|
|
asideValue[key] = customObjRef.value[str]; // 赋值
|
|
|
|
}
|
|
|
|
console.log("时间2222222222", asideValue[key]);
|
|
|
|
asideValue[key] = customObjRef.value[str] // 赋值
|
|
|
|
} else if (str != "izsimilarity" && str != "izyear" && customObjRef.value[str]) {
|
|
|
|
console.log('时间2222222222', asideValue[key])
|
|
|
|
console.log("customObjRef.value[str]222222", customObjRef.value[str]);
|
|
|
|
}
|
|
|
|
|
|
|
|
else if (
|
|
|
|
|
|
|
|
str != 'izsimilarity'
|
|
|
|
|
|
|
|
&& str != 'izyear'
|
|
|
|
|
|
|
|
&& customObjRef.value[str]
|
|
|
|
|
|
|
|
) {
|
|
|
|
|
|
|
|
console.log('customObjRef.value[str]222222', customObjRef.value[str])
|
|
|
|
// let list = customObjRef.value[str].split(',');
|
|
|
|
// let list = customObjRef.value[str].split(',');
|
|
|
|
// console.log("list222222", list);
|
|
|
|
// console.log("list222222", list);
|
|
|
|
asideValue[key] = customObjRef.value[str]; // 赋值
|
|
|
|
asideValue[key] = customObjRef.value[str] // 赋值
|
|
|
|
} else {
|
|
|
|
}
|
|
|
|
asideValue[key] = null;
|
|
|
|
else {
|
|
|
|
|
|
|
|
asideValue[key] = null
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// asideMap[str].defaultValue = customObjRef.value[str];// 赋值
|
|
|
|
// asideMap[str].defaultValue = customObjRef.value[str];// 赋值
|
|
|
|
}
|
|
|
|
}
|
|
|
|
});
|
|
|
|
return key
|
|
|
|
customTempObjRef.value = customObjRef.value;
|
|
|
|
})
|
|
|
|
console.log("asideValue直接处理后的结果", asideValue);
|
|
|
|
customTempObjRef.value = customObjRef.value
|
|
|
|
console.log("customTempObjRef.value", customTempObjRef.value);
|
|
|
|
console.log('asideValue直接处理后的结果', asideValue)
|
|
|
|
let tempobj = cloneDeep(asideValue);
|
|
|
|
console.log('customTempObjRef.value', customTempObjRef.value)
|
|
|
|
console.log("tempObj", tempobj);
|
|
|
|
const tempobj = cloneDeep(asideValue)
|
|
|
|
configStore.setAsideValue(tempobj);
|
|
|
|
console.log('tempObj', tempobj)
|
|
|
|
|
|
|
|
configStore.setAsideValue(tempobj)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// console.log("showKeys", showKeys);
|
|
|
|
// console.log("showKeys", showKeys);
|
|
|
|
const items = showKeys.reduce((acc, key) => {
|
|
|
|
const items = showKeys.reduce((acc, key) => {
|
|
|
|
const currentData = asideMap[key];
|
|
|
|
const currentData = asideMap[key]
|
|
|
|
const render = currentData?.render;
|
|
|
|
const render = currentData?.render
|
|
|
|
if (render !== false) {
|
|
|
|
if (render !== false) {
|
|
|
|
const str = key?.toLowerCase();
|
|
|
|
const str = key?.toLowerCase()
|
|
|
|
|
|
|
|
|
|
|
|
const o = {
|
|
|
|
const o = {
|
|
|
|
key: str,
|
|
|
|
key: str,
|
|
|
|
config: asideMap[str],
|
|
|
|
config: asideMap[str],
|
|
|
|
};
|
|
|
|
|
|
|
|
return [...acc, o];
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
return acc;
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}, []);
|
|
|
|
return [...acc, o]
|
|
|
|
console.log("showItems=================================", items);
|
|
|
|
}
|
|
|
|
showItems.value = items;
|
|
|
|
else {
|
|
|
|
configFilterRef.value = configStore.getFilterConfig;
|
|
|
|
return acc
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
|
|
|
}, [])
|
|
|
|
|
|
|
|
console.log('showItems=================================', items)
|
|
|
|
|
|
|
|
showItems.value = items
|
|
|
|
|
|
|
|
configFilterRef.value = configStore.getFilterConfig
|
|
|
|
})
|
|
|
|
})
|
|
|
|
const asideEnter = ref(false);
|
|
|
|
})
|
|
|
|
|
|
|
|
const asideEnter = ref(false)
|
|
|
|
|
|
|
|
|
|
|
|
const showCollapse = computed(() => {
|
|
|
|
const showCollapse = computed(() => {
|
|
|
|
return collapse.value ? true : asideEnter.value;
|
|
|
|
return collapse.value ? true : asideEnter.value
|
|
|
|
});
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
|
|
const showSearch = ref(false);
|
|
|
|
const showSearch = ref(false)
|
|
|
|
|
|
|
|
|
|
|
|
function setShowSearch(value: boolean) {
|
|
|
|
function setShowSearch(value: boolean) {
|
|
|
|
showSearch.value = value;
|
|
|
|
showSearch.value = value
|
|
|
|
}
|
|
|
|
}
|
|
|
|
const newFilterOk = () => {
|
|
|
|
function newFilterOk() {
|
|
|
|
filterModalRef.value.query(
|
|
|
|
filterModalRef.value.query(
|
|
|
|
filterModalRef.value.pagination.page,
|
|
|
|
filterModalRef.value.pagination.page,
|
|
|
|
filterModalRef.value.pagination.pageSize
|
|
|
|
filterModalRef.value.pagination.pageSize,
|
|
|
|
);
|
|
|
|
)
|
|
|
|
filterModalRef.value.showModal();
|
|
|
|
filterModalRef.value.showModal()
|
|
|
|
};
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// 滚动容器，让key对应模块处于可视区域
|
|
|
|
// 滚动容器，让key对应模块处于可视区域
|
|
|
|
function scrollHandler(key: string) {
|
|
|
|
function scrollHandler(key: string) {
|
|
|
|
const element = document.querySelector(`#${key}`);
|
|
|
|
const element = document.querySelector(`#${key}`)
|
|
|
|
element?.scrollIntoView(true);
|
|
|
|
element?.scrollIntoView(true)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// 选择某个过滤配置，刷新图片墙 -> 筛选搜索条件
|
|
|
|
// 选择某个过滤配置，刷新图片墙 -> 筛选搜索条件
|
|
|
|
async function filterHandler(searchId: string) {
|
|
|
|
async function filterHandler(searchId: string) {
|
|
|
|
// emitter.emit('filter', searchId)
|
|
|
|
// emitter.emit('filter', searchId)
|
|
|
|
const res = await getFilterList({ userSearchId: searchId });
|
|
|
|
const res = await getFilterList({ userSearchId: searchId })
|
|
|
|
// console.log("顾虑结果", res);
|
|
|
|
// console.log("顾虑结果", res);
|
|
|
|
if (res.code == "OK") {
|
|
|
|
if (res.code == 'OK') {
|
|
|
|
let obj = res.data;
|
|
|
|
const obj = res.data
|
|
|
|
customObjRef.value = res.data;
|
|
|
|
customObjRef.value = res.data
|
|
|
|
let showKeys: any[] = [];
|
|
|
|
const showKeys: any[] = []
|
|
|
|
Object.keys(obj).map((key) => {
|
|
|
|
Object.keys(obj).map((key) => {
|
|
|
|
if (asideMap.hasOwnProperty(key)) {
|
|
|
|
// TODO hasOwnProperty避免直接调用
|
|
|
|
showKeys.push(key);
|
|
|
|
// if (asideMap.hasOwnProperty(key)) {
|
|
|
|
}
|
|
|
|
if (Object.prototype.hasOwnProperty.call(asideMap, key))
|
|
|
|
});
|
|
|
|
showKeys.push(key)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return key
|
|
|
|
|
|
|
|
})
|
|
|
|
// console.log(showKeys);
|
|
|
|
// console.log(showKeys);
|
|
|
|
configStore.setCustomConfig(showKeys);
|
|
|
|
configStore.setCustomConfig(showKeys)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
function editFilter(filter: any) {
|
|
|
|
function editFilter(filter: any) {
|
|
|
|
const modal = unref(newFilterModalRef)! as any;
|
|
|
|
const modal = unref(newFilterModalRef)! as any
|
|
|
|
modal.showModal();
|
|
|
|
modal.showModal()
|
|
|
|
modal.edit(filter);
|
|
|
|
modal.edit(filter)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
function updateComponent(key, e) {
|
|
|
|
function updateComponent(key, e) {
|
|
|
|
console.log("跟新值", key, e);
|
|
|
|
console.log('跟新值', key, e)
|
|
|
|
console.log("tempAsideValue跟新值", configStore.getAsideValue, asideValue);
|
|
|
|
console.log('tempAsideValue跟新值', configStore.getAsideValue, asideValue)
|
|
|
|
// let tempAsideValue = configStore.getAsideValue || asideValue;
|
|
|
|
// let tempAsideValue = configStore.getAsideValue || asideValue;
|
|
|
|
let tempobj = cloneDeep(asideValue);
|
|
|
|
const tempobj = cloneDeep(asideValue)
|
|
|
|
console.log(tempobj, "tempobj");
|
|
|
|
console.log(tempobj, 'tempobj')
|
|
|
|
tempobj[key] = e;
|
|
|
|
tempobj[key] = e
|
|
|
|
console.log(tempobj, "tempobj After");
|
|
|
|
console.log(tempobj, 'tempobj After')
|
|
|
|
customObjRef.value = tempobj;
|
|
|
|
customObjRef.value = tempobj
|
|
|
|
// asideValue = Object.assign({}, asideValue, tempobj);
|
|
|
|
// asideValue = Object.assign({}, asideValue, tempobj);
|
|
|
|
console.log("asideValue跟新值", tempobj);
|
|
|
|
console.log('asideValue跟新值', tempobj)
|
|
|
|
configStore.setAsideValue(tempobj);
|
|
|
|
configStore.setAsideValue(tempobj)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
const handleOk = (item: any) => {
|
|
|
|
function handleOk(item: any) {
|
|
|
|
console.log("handleOk", item);
|
|
|
|
console.log('handleOk', item)
|
|
|
|
if (item) {
|
|
|
|
if (item) {
|
|
|
|
AdvanceFilterRef.value.setCurrentlySelectedAdvanced(item.searchname);
|
|
|
|
AdvanceFilterRef.value.setCurrentlySelectedAdvanced(item.searchname)
|
|
|
|
filterHandler(item.id);
|
|
|
|
filterHandler(item.id)
|
|
|
|
} else {
|
|
|
|
}
|
|
|
|
AdvanceFilterRef.value.setCurrentlySelectedAdvanced("高级筛选");
|
|
|
|
else {
|
|
|
|
filterHandler("");
|
|
|
|
AdvanceFilterRef.value.setCurrentlySelectedAdvanced('高级筛选')
|
|
|
|
|
|
|
|
filterHandler('')
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// watch(asideValue, (newVal) => {
|
|
|
|
// watch(asideValue, (newVal) => {
|
|
|
|
// console.log("asideValue处理后", newVal);
|
|
|
|
// console.log("asideValue处理后", newVal);
|
|
|
|
@ -297,22 +315,22 @@ const handleOk = (item: any) => {
|
|
|
|
<!-- 高级筛选 -->
|
|
|
|
<!-- 高级筛选 -->
|
|
|
|
<AdvanceFilter
|
|
|
|
<AdvanceFilter
|
|
|
|
v-show="!showSearch"
|
|
|
|
v-show="!showSearch"
|
|
|
|
|
|
|
|
ref="AdvanceFilterRef"
|
|
|
|
:type="0"
|
|
|
|
:type="0"
|
|
|
|
@select="filterHandler"
|
|
|
|
@select="filterHandler"
|
|
|
|
@update:search="setShowSearch(true)"
|
|
|
|
@update:search="setShowSearch(true)"
|
|
|
|
@show-custom="showModal(customModalRef)"
|
|
|
|
@show-custom="showModal(customModalRef)"
|
|
|
|
@show-filter="showModal(filterModalRef)"
|
|
|
|
@show-filter="showModal(filterModalRef)"
|
|
|
|
ref="AdvanceFilterRef"
|
|
|
|
|
|
|
|
/>
|
|
|
|
/>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
|
|
|
|
|
|
|
|
<component
|
|
|
|
<component
|
|
|
|
:is="item.config.component"
|
|
|
|
:is="item.config?.component"
|
|
|
|
v-for="(item, index) in showItems"
|
|
|
|
v-for="item in showItems"
|
|
|
|
:id="item.key"
|
|
|
|
:id="item.key"
|
|
|
|
:key="item.key"
|
|
|
|
:key="item.key"
|
|
|
|
v-model:value="asideValue[item.key]"
|
|
|
|
v-model:value="asideValue[item.key]"
|
|
|
|
:label="item.config.label"
|
|
|
|
:label="item.config?.label"
|
|
|
|
@update:value="(e) => updateComponent(item.key, e)"
|
|
|
|
@update:value="(e) => updateComponent(item.key, e)"
|
|
|
|
/>
|
|
|
|
/>
|
|
|
|
|
|
|
|
|
|
|
|
@ -321,10 +339,10 @@ const handleOk = (item: any) => {
|
|
|
|
ref="filterModalRef"
|
|
|
|
ref="filterModalRef"
|
|
|
|
@edit-filter="editFilter"
|
|
|
|
@edit-filter="editFilter"
|
|
|
|
@show-new-filter="showModal(newFilterModalRef)"
|
|
|
|
@show-new-filter="showModal(newFilterModalRef)"
|
|
|
|
@handleOk="handleOk"
|
|
|
|
@handle-ok="handleOk"
|
|
|
|
/>
|
|
|
|
/>
|
|
|
|
<!-- 新增过滤 -->
|
|
|
|
<!-- 新增过滤 -->
|
|
|
|
<NewFilterModalVue ref="newFilterModalRef" @onOk="newFilterOk" />
|
|
|
|
<NewFilterModalVue ref="newFilterModalRef" @on-ok="newFilterOk" />
|
|
|
|
<!-- 筛选 -->
|
|
|
|
<!-- 筛选 -->
|
|
|
|
<CustomFilterModalVue ref="customModalRef" />
|
|
|
|
<CustomFilterModalVue ref="customModalRef" />
|
|
|
|
</n-scrollbar>
|
|
|
|
</n-scrollbar>
|
|
|
|
|
