mooho-base-admin-plus 2.8.22 → 2.8.24

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mooho-base-admin-plus",
   "description": "MOOHO basic framework for admin by Vue3",
-  "version": "2.8.22",
+  "version": "2.8.24",
   "author": "jinyifan <jinyifan@mooho.com.cn>",
   "license": "MIT",
   "private": false,
@@ -17,7 +17,6 @@
     "axios": "^1.6.7",
     "ckeditor4-integrations-common": "^1.0.0",
     "date-fns": "^2.9.0",
-    "default-passive-events": "^2.0.0",
     "echarts": "^5.3.2",
     "file-saver": "^2.0.2",
     "js-cookie": "^3.0.1",

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="isFullscreen = !isFullscreen" />
-        <Icon v-if="isFullscreen" style="font-size: 20px; color: #999; position: relative; top: -3px" type="ios-contract" @click="isFullscreen = !isFullscreen" />
+        <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: {}
       };
@@ -616,6 +616,12 @@
          * 点击单元格时触发
          */
         this.$emit('on-cell-click', row, column, data, event);
+      },
+      setFullScreen(isFullScreen) {
+        console.log('setFullScreen', isFullScreen);
+        this.$refs.table.isMaxHight = isFullScreen;
+
+        this.isFullScreen = isFullScreen;
       }
     }
   };

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

@@ -161,6 +161,7 @@
                 :placeholder="column.description"
                 @on-change="onDataChange(rowData(row, index), column)"
                 @on-blur="onBlur(rowData(row, index), column)"
+                @click.stop
               />
             </template>
             <template v-else-if="column.controlType === 'TextArea'">
@@ -174,6 +175,7 @@
                 :rows="column.controlHeight / 20"
                 :maxlength="column.maxLength"
                 :placeholder="column.description"
+                @click.stop
               />
             </template>
             <template v-else-if="column.controlType === 'NumberInput'">
@@ -191,6 +193,7 @@
                 :min="column.minValue"
                 @on-change="onDataChange(rowData(row, index), column)"
                 @on-blur="onBlur(rowData(row, index), column)"
+                @click.stop
               />
             </template>
             <template v-else-if="column.controlType === 'Select'">
@@ -204,6 +207,7 @@
                 :placeholder="column.description"
                 :transfer="true"
                 @on-change="selected => onSelectDataChange(rowData(row, index), column, selected)"
+                @click.stop
               >
                 <Option v-for="item in getDataSource(rowData(row, index), column)" :key="item.id" :value="item.id">{{ item.name }}</Option>
               </Select>
@@ -220,6 +224,7 @@
                 :placeholder="column.description"
                 :transfer="true"
                 @on-change="selected => onSelectDataChange(rowData(row, index), column, selected)"
+                @click.stop
               >
                 <Option v-for="item in getDataSource(rowData(row, index), column)" :key="item.id" :value="item.id">{{ item.name }}</Option>
               </Select>
@@ -274,6 +279,7 @@
                 :param="getParam(rowData(row, index), column, parentData)"
                 :controlWidth="column.controlWidth == null ? null : column.controlWidth - 8"
                 @on-change="selected => onSelectDataChange(rowData(row, index), column, selected)"
+                @click.stop
               ></dialog-select>
             </template>
             <template v-else-if="column.controlType === 'MultiDialogSelect'">
@@ -289,6 +295,7 @@
                 :param="getParam(rowData(row, index), column, parentData)"
                 :controlWidth="column.controlWidth == null ? null : column.controlWidth - 8"
                 @on-change="selected => onSelectDataChange(rowData(row, index), column, selected)"
+                @click.stop
               ></dialog-select>
             </template>
             <template v-else-if="column.controlType === 'SelectWithOther'">
@@ -312,6 +319,7 @@
                   :placeholder="column.description"
                   :transfer="true"
                   @on-change="selected => onSelectDataChange(rowData(row, index), column, selected)"
+                  @click.stop
                 >
                   <Option v-for="item in getDataSource(rowData(row, index), column)" :key="item.id" :value="item.id">{{ item.name }}</Option>
                   <Option key="__Other" value="__Other">{{ !!(column.pattern || '').trim() ? column.pattern : $t('Front_Label_Others') }}</Option>
@@ -331,6 +339,7 @@
                   :placeholder="column.description"
                   @on-change="onDataChange(rowData(row, index), column)"
                   @on-blur="onBlur(rowData(row, index), column)"
+                  @click.stop
                 />
               </div>
             </template>
@@ -349,6 +358,7 @@
                     onDataChange(rowData(row, index), column);
                   }
                 "
+                @click.stop
               ></DatePicker>
             </template>
             <template v-else-if="column.controlType === 'DateRange'">
@@ -362,6 +372,7 @@
                 :style="{ width: column.controlWidth == null ? null : column.controlWidth - 8 + 'px' }"
                 :transfer="true"
                 @on-change="onDataChange(rowData(row, index), column)"
+                @click.stop
               ></DatePicker>
             </template>
             <template v-else-if="column.controlType === 'Time'">
@@ -379,6 +390,7 @@
                     onDataChange(rowData(row, index), column);
                   }
                 "
+                @click.stop
               ></TimePicker>
             </template>
             <template v-else-if="column.controlType === 'Check'">
@@ -387,6 +399,7 @@
                 @update:model-value="$event => setData(rowData(row, index), column.code, $event)"
                 :disabled="isReadonly(rowData(row, index), column)"
                 @on-change="onDataChange(rowData(row, index), column)"
+                @click.stop
               />
             </template>
             <template v-else-if="column.controlType === 'Switch'">
@@ -395,6 +408,7 @@
                 @update:model-value="$event => setData(rowData(row, index), column.code, $event)"
                 :disabled="isReadonly(rowData(row, index), column)"
                 @on-change="onDataChange(rowData(row, index), column)"
+                @click.stop
               />
             </template>
             <template v-else-if="column.controlType === 'Radio'">
@@ -402,6 +416,7 @@
                 :model-value="parseData(rowData(row, index), column.code)"
                 @update:model-value="$event => setData(rowData(row, index), column.code, $event)"
                 @on-change="selected => onSelectDataChange(rowData(row, index), column, selected)"
+                @click.stop
               >
                 <Radio v-for="item in getDataSource(rowData(row, index), column)" :key="item.id" :label="item.id" :disabled="isReadonly(rowData(row, index), column)">
                   <span>{{ item.name }}</span>
@@ -413,6 +428,7 @@
                 :model-value="parseArrayData(rowData(row, index), column.code)"
                 @update:model-value="$event => setArrayData(rowData(row, index), column.code, $event)"
                 @on-change="onDataChange(rowData(row, index), column)"
+                @click.stop
               >
                 <Checkbox v-for="item in getDataSource(rowData(row, index), column)" :key="item.id" :label="item.id" :disabled="isReadonly(rowData(row, index), column)">
                   <span>{{ item.name }}</span>
@@ -454,6 +470,7 @@
                 :style="{ width: column.controlWidth == null ? null : column.controlWidth - 8 + 'px' }"
                 :max="column.MaxValue"
                 :min="column.MinValue"
+                @click.stop
               />
               <Slider
                 v-if="!readonly && !column.isReadonly"
@@ -463,6 +480,7 @@
                 :style="{ width: column.controlWidth == null ? null : column.controlWidth - 8 + 'px' }"
                 :max="column.maxValue"
                 :min="column.minValue"
+                @click.stop
               />
               <Input
                 v-if="isReadonly(rowData(row, index), column)"
@@ -472,6 +490,7 @@
                 :model-value="parseData(rowData(row, index), column.code)"
                 :style="{ width: column.controlWidth == null ? '100px' : column.controlWidth + 'px' }"
                 :placeholder="column.description"
+                @click.stop
               />
             </template>
             <template v-else-if="column.controlType === 'Placeholder'"></template>
@@ -720,6 +739,7 @@
         preview: false,
         imageUrl: null,
         isFullScreen: false,
+        isMaxHight: false,
         commandButtonParams: null
       };
     },
@@ -983,6 +1003,9 @@
 
           if (this.isFullScreen) {
             return document.body.offsetHeight / zoom - 100 - this.$refs.filterCommand.offsetHeight / zoom;
+          }
+          if (this.isMaxHight) {
+            return document.body.offsetHeight / zoom - 120 - this.$refs.filterCommand.offsetHeight / zoom;
           } else {
             return document.body.offsetHeight / zoom - 350;
           }

package/src/index.js

@@ -36,7 +36,7 @@ import router, { initRouter } from './router';
 import showFormat from './libs/showFormat';
 
 // 阻止Passive Event Listeners警告
-import 'default-passive-events';
+//import 'default-passive-events';
 
 // API
 import modelApi from './api/model';