three-trees-ui 1.0.1 → 1.0.3

package/package.json

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

package/src/mixins/templatePreview.js

@@ -10,7 +10,7 @@ const axios = require('axios')
 const { saveAs } = require('file-saver')
 import _ from 'lodash'
 
-const req = function (url, data = {}, option = {}) {
+const req = function(url, data = {}, option = {}) {
   const requestData = {
     url: url,
     data: data,
@@ -250,7 +250,7 @@ export default {
       deep: true,
     },
     ents: {
-      handler: function (newVal, oldValue) {
+      handler: function(newVal, oldValue) {
         if (newVal && newVal.length >= 1 && newVal != oldValue) {
           this.getSubData(this, this.refId)
         }
@@ -259,7 +259,7 @@ export default {
       immediate: true,
     },
     templateInfo: {
-      handler: function (newVal) {
+      handler: function(newVal) {
         if (newVal && newVal.id) {
           let _me = this
           _me.templateInfo = newVal
@@ -379,13 +379,13 @@ export default {
       deep: true,
       immediate: true,
     },
-    currentTabName: function (newVal) {
+    currentTabName: function(newVal) {
       if (newVal) {
         this.querySubValue = ''
       }
     },
     rows: {
-      handler: function (newVal) {
+      handler: function(newVal) {
         if (this.templateInfo.defId) {
           let this_ = this
           let boAlias = this.templateInfo.boDefAlias
@@ -429,8 +429,9 @@ export default {
       if (val) {
         this.$nextTick(() => {
           if (document.getElementById('summaryDiv')) {
-            this.summaryTableHeight =
-              document.getElementById('summaryDiv').clientHeight
+            this.summaryTableHeight = document.getElementById(
+              'summaryDiv'
+            ).clientHeight
           }
         })
       }
@@ -441,7 +442,7 @@ export default {
       //如果当前页面被嵌入iframe里面不显示草稿
       return !this.isJoinFlow
     },
-    navbarCollapseStyle: function () {
+    navbarCollapseStyle: function() {
       if (this.asideShow) {
         return { left: '200px' }
       }
@@ -476,7 +477,7 @@ export default {
     })
     this.handelBindFiledValua()
     let this_ = this
-    this.$on('data-reload-success', function () {
+    this.$on('data-reload-success', function() {
       this_.calcScriptBtnPermission()
     })
     this.$emit('afterMounted')
@@ -797,7 +798,7 @@ export default {
           this.listSelectable = false
         }
         let _this = this
-        setTimeout(function () {
+        setTimeout(function() {
           let tdDom = _this.$el.querySelector('td.right_menu')
           if (
             !tdDom ||
@@ -902,7 +903,7 @@ export default {
               selectList[i].selectValue = value
 
               //添加监听
-              pInst.$watch(path, function (newVal, oldVal) {
+              pInst.$watch(path, function(newVal, oldVal) {
                 // 监听中使用间隔请求，减少请求次数
                 clearTimeout(this.timeout)
                 this.timeout = setTimeout(() => {
@@ -925,7 +926,7 @@ export default {
               const value = utils.getValueByPath(pInst, path)
 
               bindList[i].fillValue = value
-              pInst.$watch(path, function (newVal, oldVal) {
+              pInst.$watch(path, function(newVal, oldVal) {
                 // 监听中使用间隔请求，减少请求次数
                 clearTimeout(this.timeout)
                 this.timeout = setTimeout(() => {
@@ -1183,7 +1184,7 @@ export default {
         }
         let msg = document.createElement('canvas')
 
-        this.$qrcode.toCanvas(msg, QRCodeurl, function (error) {
+        this.$qrcode.toCanvas(msg, QRCodeurl, function(error) {
           console.error(error)
         })
         let _canvas = document.createElement('div')
@@ -1223,7 +1224,7 @@ export default {
           .generateAsync({
             type: 'blob',
           })
-          .then(function (content) {
+          .then(function(content) {
             let eleLink = document.createElement('a')
             eleLink.download = '二维码.zip'
             eleLink.style.display = 'none'
@@ -1276,7 +1277,7 @@ export default {
         context.scale(2, 2)
         return html2canvas(document.querySelector(classs), {
           canvas: canvas2,
-        }).then(function (canvas) {
+        }).then(function(canvas) {
           resolve(canvas)
         })
       })
@@ -1318,7 +1319,7 @@ export default {
       // Base64.encode(this.$store.state.login.currentUser.account);
       let msg = document.getElementById('QRCode')
 
-      this.$qrcode.toCanvas(msg, this.QRCodeurl, function (error) {
+      this.$qrcode.toCanvas(msg, this.QRCodeurl, function(error) {
         console.log(error)
       })
       this.QRCodeShow = true
@@ -1341,13 +1342,13 @@ export default {
       this.rowTemplateId = templateId
       this.rowId = id
     },
-    handleSizeChange: function (size) {
+    handleSizeChange: function(size) {
       //每页下拉显示数据
       this.pagination.page = 1
       this.pagination.pageSize = size
       this.$refs.multipleTemplateTable.handleFilterChange()
     },
-    handleCurrentChange: function (currentPage) {
+    handleCurrentChange: function(currentPage) {
       //点击第几页
       this.pagination.page = currentPage
       this.$refs.multipleTemplateTable.handleFilterChange()
@@ -1613,6 +1614,13 @@ export default {
           if (this.templateInfo.summaryRegionHtml) {
             this.loadCompiledCustomSummary()
           }
+          // 修复初始化时 有的表格滚动不到底部的bug
+          this.$nextTick(() => {
+            if (this.pagination.page == 1) {
+              this.$refs.multipleTemplateTable &&
+                this.$refs.multipleTemplateTable.calcTableHeight(300)
+            }
+          })
         })
         .finally(() => {
           this.multipleTemplateTableloading = false
@@ -1838,10 +1846,18 @@ export default {
                 ? operationType[operation]
                 : operation
           } else if (
-            typeof $(searchItems[i]).children().attr('ht-query') != 'undefined'
+            typeof $(searchItems[i])
+              .children()
+              .attr('ht-query') != 'undefined'
           ) {
-            operation = $(searchItems[i]).children().attr('operation')
-            operationMap[$(searchItems[i]).children().attr('ht-query')] =
+            operation = $(searchItems[i])
+              .children()
+              .attr('operation')
+            operationMap[
+              $(searchItems[i])
+                .children()
+                .attr('ht-query')
+            ] =
               typeof operationType[operation] != 'undefined'
                 ? operationType[operation]
                 : operation
@@ -1867,10 +1883,18 @@ export default {
                 ? operationType[operation]
                 : operation
           } else if (
-            typeof $(searchItems[i]).children().attr('ht-query') != 'undefined'
+            typeof $(searchItems[i])
+              .children()
+              .attr('ht-query') != 'undefined'
           ) {
-            operation = $(searchItems[i]).children().attr('type')
-            operationMap[$(searchItems[i]).children().attr('ht-query')] =
+            operation = $(searchItems[i])
+              .children()
+              .attr('type')
+            operationMap[
+              $(searchItems[i])
+                .children()
+                .attr('ht-query')
+            ] =
               typeof operationType[operation] != 'undefined'
                 ? operationType[operation]
                 : operation
@@ -1893,12 +1917,19 @@ export default {
                 ? true
                 : false
           } else if (
-            typeof $(searchItems[i]).children().attr('ht-query') != 'undefined'
+            typeof $(searchItems[i])
+              .children()
+              .attr('ht-query') != 'undefined'
           ) {
             //查询条件字段
-            fieldQueryMap[$(searchItems[i]).children().attr('ht-query')] =
-              typeof $(searchItems[i]).children().attr('special-query') !=
-              'undefined'
+            fieldQueryMap[
+              $(searchItems[i])
+                .children()
+                .attr('ht-query')
+            ] =
+              typeof $(searchItems[i])
+                .children()
+                .attr('special-query') != 'undefined'
                 ? true
                 : false
           }
@@ -1965,7 +1996,7 @@ export default {
       }
     },
     //回车查询
-    searchEnterFun: function (e) {
+    searchEnterFun: function(e) {
       let keyCode = window.event ? e.keyCode : e.which
       if (keyCode == 13) {
         this.search()