|
|
@@ -34,6 +34,16 @@ interface TitleMsg {
|
|
|
questionType:number
|
|
|
}
|
|
|
|
|
|
+interface TableColumn {
|
|
|
+ name:string,
|
|
|
+ label:string,
|
|
|
+ width:string,
|
|
|
+ fixed:string,
|
|
|
+ align:string,
|
|
|
+ minWdth:string,
|
|
|
+ custom:boolean,
|
|
|
+}
|
|
|
+
|
|
|
const props = defineProps({
|
|
|
titleMsg:{
|
|
|
type:Object as () => TitleMsg,
|
|
|
@@ -46,42 +56,28 @@ const props = defineProps({
|
|
|
allowEdit:{
|
|
|
type:Boolean,
|
|
|
required:true
|
|
|
+ },
|
|
|
+ customTableColumns:{
|
|
|
+ type:Array<TableColumn>,
|
|
|
+ default:()=>[]
|
|
|
+ },
|
|
|
+ defaultTableData:{
|
|
|
+ type:Array,
|
|
|
+ default:()=>[]
|
|
|
}
|
|
|
})
|
|
|
|
|
|
const emit = defineEmits(['questionAnswerChange'])
|
|
|
const isFinishEdit = defineModel('isFinishEdit') //是否已经编辑完成,
|
|
|
|
|
|
-// 模拟数据
|
|
|
-const tableData = ref([
|
|
|
- {
|
|
|
- teacher:'班主任',
|
|
|
- a:false,
|
|
|
- b:false,
|
|
|
- c:false,
|
|
|
- d:false,
|
|
|
- },
|
|
|
- {
|
|
|
- teacher:'班主任',
|
|
|
- a:false,
|
|
|
- b:false,
|
|
|
- c:false,
|
|
|
- d:false,
|
|
|
- },
|
|
|
- {
|
|
|
- teacher:'班主任',
|
|
|
- a:false,
|
|
|
- b:false,
|
|
|
- c:false,
|
|
|
- d:false,
|
|
|
- },
|
|
|
- {
|
|
|
- teacher:'班主任',
|
|
|
- a:false,
|
|
|
- b:false,
|
|
|
- c:false,
|
|
|
- d:false,
|
|
|
- },
|
|
|
+const tableData = ref<any[]>([
|
|
|
+ // {
|
|
|
+ // teacher:'班主任',
|
|
|
+ // a:false,
|
|
|
+ // b:false,
|
|
|
+ // c:false,
|
|
|
+ // d:false,
|
|
|
+ // },
|
|
|
])
|
|
|
|
|
|
|
|
|
@@ -92,7 +88,7 @@ const HandleCheck = (row,key,val)=>{
|
|
|
}
|
|
|
|
|
|
watch(()=>tableData.value,(newVal)=>{
|
|
|
- console.log('当前表格数据变化了')
|
|
|
+ console.log('当前表格数据变化了',newVal)
|
|
|
let isFinish = true
|
|
|
newVal.map(row=>{
|
|
|
// 选项没有被勾选
|
|
|
@@ -107,7 +103,26 @@ watch(()=>tableData.value,(newVal)=>{
|
|
|
// 当前问卷没有全部填写完成
|
|
|
isFinishEdit.value = false
|
|
|
}
|
|
|
-},{deep:true})
|
|
|
+},{deep:true,immediate:true})
|
|
|
+
|
|
|
+watch(()=>props.defaultTableData,(newVal)=>{
|
|
|
+ console.log('传递的表数据变化了---',newVal)
|
|
|
+ tableData.value = newVal
|
|
|
+},{immediate:true,deep:true})
|
|
|
+
|
|
|
+watch(()=>props.customTableColumns,(newVal)=>{
|
|
|
+ tableColumns.value = [
|
|
|
+ {
|
|
|
+ name:'teacher',
|
|
|
+ label:'',
|
|
|
+ width:'100',
|
|
|
+ fixed:'',
|
|
|
+ align:'center',
|
|
|
+ minWdth:'',
|
|
|
+ },
|
|
|
+ ...newVal
|
|
|
+ ]
|
|
|
+},{immediate:true})
|
|
|
|
|
|
</script>
|
|
|
|