Browse Source

修改显示问题

lex 11 months ago
parent
commit
1a9d9cfa3b

+ 3 - 2
src/components/pagination/index.tsx

@@ -44,7 +44,7 @@ export default defineComponent({
       type: Array as PropType<any>,
       default: () => [10, 20, 30, 40]
     },
-    pageSlot:{
+    pageSlot: {
       type: Number,
       default: 9
     }
@@ -69,6 +69,7 @@ export default defineComponent({
     }
     // 当前分页大小发生改变时的回调函数
     const onUpdatePageSize = (pageSize: number) => {
+      emit('update:page', 1)
       emit('update:pageSize', pageSize)
       emit('list')
 
@@ -168,7 +169,7 @@ export default defineComponent({
         pageSizes={props.pageSizes}
         onUpdatePage={onUpdatePage}
         onUpdatePageSize={onUpdatePageSize}
-        pageSlot = {props.pageSlot}
+        pageSlot={props.pageSlot}
       ></NPagination>
     )
   }

+ 2 - 1
src/views/educational-manage/component/material-list.tsx

@@ -76,7 +76,7 @@ export default defineComponent({
         category.list = data?.rows || []
       } catch {}
     }
-    provide('categoryList', category)
+    // provide('categoryList', category)
     // 声部
     const subjects = reactive({
       list: [] as any
@@ -438,6 +438,7 @@ export default defineComponent({
             <AddMaterial
               item={state.materail}
               isLook={state.isLook}
+              categoryList={category.list}
               onClose={() => {
                 state.visiableCity = false
               }}

+ 3 - 3
src/views/educational-manage/model/addMaterial.tsx

@@ -28,7 +28,7 @@ import SelectMusicSheet from './selectMusicSheet'
 export default defineComponent({
   name: 'addMaterial',
   emits: ['handleSuccess', 'close'],
-  props: ['item', 'isLook'],
+  props: ['item', 'isLook', 'categoryList'],
   setup(props, { emit }) {
     const message = useMessage()
     const loading = ref(false)
@@ -125,7 +125,7 @@ export default defineComponent({
         }
       ]
     }
-    const categoryList = inject('categoryList', { list: [] }).list || []
+    // const categoryList = inject('categoryList', { list: [] }).list || []
     const submit = () => {
       formRef.value?.validate(async (err) => {
         if (!err) {
@@ -194,7 +194,7 @@ export default defineComponent({
                 <NCascader
                   v-model:value={saveModel.materialCategoryId}
                   placeholder="请选择素材分类"
-                  options={categoryList}
+                  options={props.categoryList}
                   checkStrategy="child"
                   childrenField="subMaterialCategoryList"
                   expandTrigger="hover"