提交

1

src/components/layout/index.tsx

@@ -54,6 +54,7 @@ export default defineComponent({
     });
     const route = useRoute();
     const isDragIng = ref(false);
+    const NPopoverRef = ref()
     const initMoveable = async () => {
       if (document.querySelector('.wrap')) {
         const moveable = new Moveable(document.querySelector('.wrap') as any, {
@@ -98,6 +99,7 @@ export default defineComponent({
               // clientY
             }) => {
               isDragIng.value = true;
+              NPopoverRef.value.setShow(false)
               const subdEl = document.getElementById(
                 `moveNPopover`
               ) as HTMLDivElement;
@@ -319,15 +321,15 @@ export default defineComponent({
     onMounted(() => {
       initMoveable();
       // // initMoveableClass();
-      // const subdEl = document.getElementById(`moveNPopover`) as HTMLDivElement;
+      const subdEl = document.getElementById(`moveNPopover`) as HTMLDivElement;
       // // const classEl = document.getElementById(
       // //   `moveNPopover2`
       // // ) as HTMLDivElement;
-      // initBoxRectInfo(subdEl, boxBoundaryInfo);
+      initBoxRectInfo(subdEl, boxBoundaryInfo);
       // // initBoxRectInfo(classEl, classBoundaryInfo);
-      // initBoundaryWrap(subdEl, boxBoundaryInfo);
+      initBoundaryWrap(subdEl, boxBoundaryInfo);
       // // initBoundaryWrap(classEl, classBoundaryInfo);
-      // window.addEventListener("resize", resetSize);
+      window.addEventListener("resize", resetSize);
     });
 
     const resetSize = ()=>{
@@ -394,22 +396,22 @@ export default defineComponent({
         }
         // rate(target, 0)
       });
-      // target.addEventListener('contextmenu', (event: any) => {
-      //   event.preventDefault();
-      //   dialog.warning({
-      //     title: '提示',
-      //     content: '是否收入托盘',
-      //     positiveText: '确定',
-      //     negativeText: '取消',
-      //     onPositiveClick: () => {
-      //       console.log('确定')
-      //     },
-      //     onNegativeClick: () => {
-      //       console.log('取消')
-      //     }
-      //   })
+      target.addEventListener('contextmenu', (event: any) => {
+        event.preventDefault();
+        dialog.warning({
+          title: '提示',
+          content: '是否收入托盘',
+          positiveText: '确定',
+          negativeText: '取消',
+          onPositiveClick: () => {
+            console.log('确定')
+          },
+          onNegativeClick: () => {
+            console.log('取消')
+          }
+        })
 
-      // });
+      });
 
       actionEnd(target, 'right');
     };
@@ -434,7 +436,7 @@ export default defineComponent({
 
     //  这里是选装的方式
     const actionEnd = (target: any, type: any) => {
-      return
+
       switch (type) {
         case 'left':
           rate(target, '90deg');
@@ -533,6 +535,7 @@ export default defineComponent({
         <NPopover
           raw
           trigger="click"
+          ref={NPopoverRef}
           show-arrow={false}
           placement={directionType.value as 'left' | 'right'}
           v-slots={{

src/views/attend-class/index.tsx

@@ -198,7 +198,7 @@ export default defineComponent({
     const showModalBeat = ref(false);
     const showModalTone = ref(false);
     const showModalTime = ref(false);
-
+    const NPopoverRef = ref()
     const isDragIng = ref(false);
     const initMoveable = async () => {
       if (document.querySelector('.wrap')) {
@@ -244,6 +244,7 @@ export default defineComponent({
               // clientY
             }) => {
               isDragIng.value = true;
+              NPopoverRef.value.setShow(false)
               const subdEl = document.getElementById(
                 `moveNPopover`
               ) as HTMLDivElement;
@@ -356,10 +357,10 @@ export default defineComponent({
       data.classGroupId = props.classGroupId || query.classGroupId;
       initMoveable();
 
-      // const subdEl = document.getElementById(`moveNPopover`) as HTMLDivElement;
-      // initBoxRectInfo(subdEl, boxBoundaryInfo);
+      const subdEl = document.getElementById(`moveNPopover`) as HTMLDivElement;
+      initBoxRectInfo(subdEl, boxBoundaryInfo);
 
-      // initBoundaryWrap(subdEl, boxBoundaryInfo);
+      initBoundaryWrap(subdEl, boxBoundaryInfo);
       window.addEventListener('message', iframeHandle);
       getDetail();
     });
@@ -420,7 +421,6 @@ export default defineComponent({
 
     //  这里是选装的方式
     const actionEnd = (target: any, type: any) => {
-      return
       switch (type) {
         case 'left':
           rate(target, '90deg');
@@ -1247,6 +1247,7 @@ export default defineComponent({
           raw
           trigger="click"
           show-arrow={false}
+          ref={NPopoverRef}
           style="--n-box-shadow: none;"
           placement={directionType.value as 'left' | 'right'}
           v-slots={{