marking
/
Learn.Archives.Web
19
0
Fork 0
Code Pull Requests Actions Releases Activity

Compare commits

base: marking:19bdc1dc655385dc78cc084a33ce8cb0ba371a46
Branches Tags
marking:master
marking:dev
marking:staging
..
compare: marking:b56c9f819a17977492a4759076eb51bf16b4bb26
Branches Tags
marking:master
marking:dev
marking:staging

No commits in common. "19bdc1dc655385dc78cc084a33ce8cb0ba371a46" and "b56c9f819a17977492a4759076eb51bf16b4bb26" have entirely different histories.
19bdc1dc65 ... b56c9f819a

2 changed files with 1 additions and 5 deletions
Show Stats Expand all files Collapse all files

5
src/components/hTable/index.vue
View File

@ -44,7 +44,7 @@ const props = defineProps({
default: () => ({}), default: () => ({}),
}, },
}); });
const expands = ref<any[]>();
const table = ref<TableConfig>(props.tableConfig); const table = ref<TableConfig>(props.tableConfig);
const tableShowColumn = ref<Record<string, TableColumn>>(); const tableShowColumn = ref<Record<string, TableColumn>>();
onBeforeMount(() => { onBeforeMount(() => {
@ -338,8 +338,6 @@ function handleReloadPaged(reload = true) {
if (table.value.searchCallback) { if (table.value.searchCallback) {
table.value.searchCallback(table.value.search); table.value.searchCallback(table.value.search);
} }
//如果有展开行 则全部收回
if (table.value.expandColumn) expands.value = [];
fetchPagedData(); fetchPagedData();
} }
// 加载前置数据（如查询条件的下拉选择数据） // 加载前置数据（如查询条件的下拉选择数据）
@ -461,7 +459,6 @@ function fetchPagedData() {
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
@sort-change="sortChange" @sort-change="sortChange"
@expand-change="table.expandChange" @expand-change="table.expandChange"
:expand-row-keys="expands"
> >
<el-table-column v-if="table.selectColumn" type="selection" width="40" /> <el-table-column v-if="table.selectColumn" type="selection" width="40" />
<el-table-column <el-table-column

1
src/views/toschoolinfomanage/addModal.vue
View File

@ -448,7 +448,6 @@ async function onSubmit() {
gradeYear: form.baseInfo.gradeYear, gradeYear: form.baseInfo.gradeYear,
schoolBusinessUser: form.baseInfo.people, schoolBusinessUser: form.baseInfo.people,
startTime: form.baseInfo.date, startTime: form.baseInfo.date,
endTime: form.baseInfo.endTime,
isDiscussion: form.work.talk, isDiscussion: form.work.talk,
discussion: form.work.talkDetail, discussion: form.work.talkDetail,
isClassMeeting: form.work.classMeeting, isClassMeeting: form.work.classMeeting,