Explorar o código

Merge branch 'dev' of http://git.dayaedu.com/huangqiyong/classroom into staging

黄琪勇 hai 8 meses
pai
achega
978374dbc1
Modificáronse 2 ficheiros con 8 adicións e 3 borrados
  1. 5 3
      src/libs/fullscreen.ts
  2. 3 0
      src/views/cloudPractice/cloudPractice.tsx

+ 5 - 3
src/libs/fullscreen.ts

@@ -23,9 +23,11 @@ export const handleFullscreen = (isScreenfull = false, isErr = true) => {
    screenfull.toggle()
 }
 
-screenfull.on("change", () => {
-   isFullscreen.value = screenfull.isFullscreen
-})
+if (screenfull.isEnabled) {
+   screenfull.on("change", () => {
+      isFullscreen.value = screenfull.isFullscreen
+   })
+}
 
 // 禁用f11
 document.addEventListener("keydown", function (event) {

+ 3 - 0
src/views/cloudPractice/cloudPractice.tsx

@@ -894,6 +894,7 @@ export default defineComponent({
                            <div class={styles.searchMore}>
                               <div class={styles.searchSection}>
                                  <Dictionary
+                                    clearable={false}
                                     popperClass="classTypePopper"
                                     v-model={state.subjectId}
                                     height={42}
@@ -907,6 +908,7 @@ export default defineComponent({
                                  />
                                  {state.levelList.length ? (
                                     <Dictionary
+                                       clearable={false}
                                        popperClass="classTypePopper"
                                        v-model={state.levelId}
                                        height={42}
@@ -922,6 +924,7 @@ export default defineComponent({
                                  ) : null}
                                  {state.typeList.length > 0 ? (
                                     <Dictionary
+                                       clearable={false}
                                        popperClass="classTypePopper"
                                        v-model={state.typeId}
                                        height={42}