three-trees-ui 1.0.94 → 1.0.96

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "three-trees-ui",
-  "version": "1.0.94",
+  "version": "1.0.96",
   "publicPath": "/ui",
   "author": "hotent",
   "private": false,
@@ -33,9 +33,7 @@
   ],
   "dependencies": {
     "element-resize-detector": "^1.2.3",
-    "v-viewer": "^1.7.4",
-    "vee-validate": "2.1.7",
-    "viewerjs": "^1.11.7"
+    "vee-validate": "2.1.7"
   },
   "peerDependencies": {
     "axios": "^0.21.1",

package/packages/CustomDialog/src/customDialog.vue

@@ -11,7 +11,7 @@
       class="hontent-custom-dialog"
       @opened="afterOpen"
     >
-      <el-container :style="style" style="overflow: auto">
+      <el-scrollbar class="hotent-custom-scrollbar">
         <!-- 组合对话框树 -->
         <el-aside
           v-if="customDialog.style == 2"
@@ -318,6 +318,7 @@
                 :prop="field.field"
                 :label="field.comment"
                 :width="field.width || ''"
+                show-overflow-tooltip
               ></el-table-column>
             </el-table>
           </el-main>
@@ -426,7 +427,7 @@
             </div>
           </el-card>
         </div>
-      </el-container>
+      </el-scrollbar>
       <span slot="footer" class="dialog-footer" style="text-align: center">
         <el-button size="small" type="primary" @click="dialogConfirm">
           确认
@@ -2435,7 +2436,7 @@
     @media (max-width: 1280px) {
       .el-dialog {
         width: 96% !important;
-        margin-top: 2vh !important;
+        margin: auto !important;
       }
     }
     .el-dialog__wrapper {
@@ -2447,8 +2448,9 @@
     }
 
     .el-dialog {
-      height: 90%;
+      max-height: 90%;
       min-height: 400px;
+      margin: auto !important;
     }
     .el-dialog__body .el-container {
       height: 100% !important;
@@ -2673,6 +2675,17 @@
 
 <style lang="scss">
   .hontent-custom-dialog {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    .el-dialog__body {
+      overflow: hidden;
+    }
+    .hotent-custom-scrollbar {
+      height: 100%;
+      display: flex;
+    }
+
     #container {
       display: flex; /*中间弹性盒布局*/
       flex-wrap: nowrap; /*排列不下时不换行*/
@@ -2710,7 +2723,7 @@
       font-size: 16px;
     }
     .el-dialog__footer {
-      padding: 20px 24px 0px;
+      padding: 20px;
     }
   }
 </style>

package/packages/Preview/src/FrameViewer.vue

@@ -4,13 +4,13 @@
       <loading v-if="loading" />
       <div
         v-else-if="contentType.indexOf('image') > -1"
-        v-viewer="{ movable: false }"
         class="frame-viewer__img"
       >
-        <img
+        <el-image
+          style="width: 100px; height: 100px"
           :src="dataSrc"
-          :style="{ height: utils.isMobile() ? 'auto' : '100%' }"
-        />
+          :preview-src-list="[dataSrc]"
+        ></el-image>
       </div>
       <iframe
         v-else
@@ -31,8 +31,6 @@
   import watermark from './watermark'
   import { createObjectURL } from '../../../src/util/brower.js'
   import utils from '../../../src/utils.js'
-  import 'viewerjs/dist/viewer.css'
-  import { directive as viewer } from 'v-viewer'
 
   export default {
     name: 'FrameViewer',
@@ -74,6 +72,7 @@
         loading: false,
         contentType: '',
         utils,
+        srcList: [],
       }
     },
     mounted() {