three-trees-ui 1.0.54 → 1.0.56

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "three-trees-ui",
-  "version": "1.0.54",
+  "version": "1.0.56",
   "publicPath": "/ui",
   "author": "hotent",
   "private": false,

package/packages/CustomDialog/src/customDialog.vue

@@ -1094,6 +1094,9 @@
             this.$el,
             'data-index'
           )
+          if (!thisIndex) {
+            thisIndex = utils.getSubScopeElAndIndex(this.$parent.$el).index
+          }
           parentIndex = utils.getSomeAttributeFromParentElement(
             this.$parent.$parent.$el,
             'data-index'

package/packages/Preview/src/FrameViewer.vue

@@ -3,8 +3,8 @@
     <div class="frame-container__body">
       <loading v-if="loading" />
       <div
-        class="frame-viewer__img"
         v-else-if="contentType.indexOf('image') > -1"
+        class="frame-viewer__img"
       >
         <img
           :src="dataSrc"
@@ -103,6 +103,9 @@
 
               console.log('createObjectURL(new Blob([data]))')
             }
+            if (this.mode === 'pdf') {
+              this.dataSrc += '#toolbar=0'
+            }
           })
           .catch((err) => {
             this.$emit('preview-error', err)

package/packages/Preview/src/main.vue

@@ -12,16 +12,16 @@
     <loading v-if="loading" />
     <fill-page v-if="errorMessage" type="2" :tip="errorMessage" />
     <!-- 预览pdf.word等文件格式 -->
-    <pdf-viewer
+    <!-- <pdf-viewer
       v-else-if="mode == 'pdf'"
       :src="src"
       :headers="headerVal"
       :watermark="watermark"
       :watermark-options="watermarkOptions"
       @preview-error="handlePreviewErr"
-    />
+    /> -->
     <frame-viewer
-      v-else-if="mode == 'html' || mode == 'picture'"
+      v-if="mode == 'pdf' || mode == 'html' || mode == 'picture'"
       :src="src"
       :mode="mode"
       :headers="headerVal"
@@ -164,14 +164,14 @@
       }
     },
     computed: {
-      headerVal: function () {
+      headerVal: function() {
         return this.headers
           ? this.headers
           : this.$requestConfig.header
           ? this.$requestConfig.header()
           : null
       },
-      titleVal: function () {
+      titleVal: function() {
         return this.tempTitle ? this.tempTitle : this.title
       },
     },

package/packages/Table/src/Table.vue

@@ -862,13 +862,10 @@
               this.$refs.toolbarContainer.clientHeight) ||
             0
 
-          // templatePreview 中 nopagination 为 true，且有自定义的分页控件 占用 65
           const paginationPanelHeight =
-            this.$route.name === 'TemplatePreview' && this.nopagination
-              ? 65
-              : (this.$refs.paginationPanel &&
-                  this.$refs.paginationPanel.clientHeight) ||
-                0
+            (this.$refs.paginationPanel &&
+              this.$refs.paginationPanel.clientHeight) ||
+            0
           // 下外边距
           const searchPanelBottom = searchPanelHeight > 0 ? 18 : 0
           const toolbarPanelBottom = toolbarPanelHeight > 0 ? 18 : 0

package/src/mixins/onlineSubtable.js

@@ -105,6 +105,9 @@ export default {
       if (newOne.id_) {
         delete newOne.id_
       }
+      if (newOne.id) {
+        delete newOne.id
+      }
       if (newOne.sub_row_readonly) {
         delete newOne.sub_row_readonly
       }