Pārlūkot izejas kodu

fix: change bedRoomManager adjust

DESKTOP-USV654P\pc 2 mēneši atpakaļ
vecāks
revīzija
dae660ba27

+ 1 - 1
Makefile

@@ -12,7 +12,7 @@ build:
 
 commit:
 	git add . && \
-	git commit --no-verify -m "fix: change basicData classLessons"
+	git commit --no-verify -m "fix: change bedRoomManager adjust"
 
 checkPre:
 	git checkout pre

+ 3 - 0
src/views/bedRoomManager/adjust/index.vue

@@ -539,6 +539,9 @@
         &-text {
           height: 25px;
           display: block;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
         }
 
         &-number {

+ 6 - 1
src/views/educational/classLessons/components/edit.vue

@@ -122,7 +122,7 @@
     bookName: '',
     baseSemesterId: undefined,
   });
-  const [modalRegister, { closeModal }] = useModalInner(async (data) => {
+  const [modalRegister, { closeModal, setModalProps }] = useModalInner(async (data) => {
     const ids = data.list.map((item) => item.classId);
     semesterId.value = data.selectId;
     classIds.value = ids;
@@ -152,6 +152,8 @@
     const data = getDataSource();
     const ids: any[] = [];
 
+    setModalProps({ loading: true });
+
     if (type.value === 'add') {
       data &&
         data.forEach((item: any) => {
@@ -180,6 +182,7 @@
 
     if (ids.length === 0) {
       createMessage.warning('请选择课程');
+      setModalProps({ loading: false });
       return;
     }
 
@@ -208,6 +211,8 @@
       createMessage.error('添加失败');
     } finally {
       isLoading.value = false;
+
+      setModalProps({ loading: false });
     }
   };
 </script>