mooho-base-admin-plus 2.8.24 → 2.8.26

package/history.md

@@ -165,3 +165,5 @@ mooho-base-admin-plus@2.8.21 - 增加lodop配置
 mooho-base-admin-plus@2.8.22 - 引入default-passive-events阻止警告
 mooho-base-admin-plus@2.8.23 - 修复点击整行选中的bug
 mooho-base-admin-plus@2.8.24 - 优化表格全屏
+mooho-base-admin-plus@2.8.25 - 优化表格全屏
+mooho-base-admin-plus@2.8.26 - 优化表格全屏

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mooho-base-admin-plus",
   "description": "MOOHO basic framework for admin by Vue3",
-  "version": "2.8.24",
+  "version": "2.8.26",
   "author": "jinyifan <jinyifan@mooho.com.cn>",
   "license": "MIT",
   "private": false,

package/src/components/view/modal-table.vue

@@ -3,7 +3,7 @@
     ref="modal"
     v-model="opened"
     scrollable
-    :fullscreen="isFullScreen"
+    :fullscreen="isFullscreen"
     :mask-closable="maskClosable == null ? layout.maskClosable : maskClosable"
     :draggable="draggable == null ? layout.draggable : draggable"
     :sticky="true"
@@ -26,8 +26,8 @@
     </template>
     <template #close>
       <div @click.stop>
-        <Icon v-if="!isFullScreen" style="font-size: 20px; color: #999; position: relative; top: -3px" type="ios-expand" @click="setFullScreen(true)" />
-        <Icon v-if="isFullScreen" style="font-size: 20px; color: #999; position: relative; top: -3px" type="ios-contract" @click="setFullScreen(false)" />
+        <Icon v-if="!isFullscreen" style="font-size: 20px; color: #999; position: relative; top: -3px" type="ios-expand" @click="setFullscreen(true)" />
+        <Icon v-if="isFullscreen" style="font-size: 20px; color: #999; position: relative; top: -3px" type="ios-contract" @click="setFullscreen(false)" />
         <Icon type="ios-close" @click="clickClose()" />
       </div>
     </template>
@@ -157,7 +157,7 @@
     data() {
       return {
         opened: false,
-        isFullScreen: false,
+        isFullscreen: false,
         tableView: {},
         param: {}
       };
@@ -617,11 +617,10 @@
          */
         this.$emit('on-cell-click', row, column, data, event);
       },
-      setFullScreen(isFullScreen) {
-        console.log('setFullScreen', isFullScreen);
-        this.$refs.table.isMaxHight = isFullScreen;
+      setFullscreen(isFullscreen) {
+        this.$refs.table.isMaxHight = isFullscreen;
 
-        this.isFullScreen = isFullScreen;
+        this.isFullscreen = isFullscreen;
       }
     }
   };

package/src/components/view/view-table.vue

@@ -1,5 +1,5 @@
 <template>
-  <div :class="{ 'full-screen': isFullScreen }">
+  <div :class="{ 'full-screen': isFullscreen }">
     <Divider :plain="true" v-if="title != null" dashed orientation="left" size="small">
       <span class="title">{{ title }}</span>
     </Divider>
@@ -73,7 +73,7 @@
                   v-if="settingEnable && allow('permission/tableView')"
                   @click="filterSettingOpen"
                 />
-                <Button v-if="tableView.fullEnable" type="info" title="全屏" custom-icon="fa fa-expand-arrows-alt" size="small" @click="isFullScreen = !isFullScreen" />
+                <Button v-if="tableView.fullEnable" type="info" title="全屏" custom-icon="fa fa-expand-arrows-alt" size="small" @click="isFullscreen = !isFullscreen" />
               </FormItem>
             </Col>
           </slot>
@@ -738,7 +738,7 @@
         commandButtons: [],
         preview: false,
         imageUrl: null,
-        isFullScreen: false,
+        isFullscreen: false,
         isMaxHight: false,
         commandButtonParams: null
       };
@@ -1001,7 +1001,7 @@
             zoom = 1 / window.devicePixelRatio;
           }
 
-          if (this.isFullScreen) {
+          if (this.isFullscreen) {
             return document.body.offsetHeight / zoom - 100 - this.$refs.filterCommand.offsetHeight / zoom;
           }
           if (this.isMaxHight) {