three-trees-ui 1.0.39 → 1.0.41

package/package.json

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

package/packages/File/src/FileCard.vue

@@ -4,7 +4,7 @@
     class="el-upload-list el-upload-list--picture-card"
     tag="ul"
     v-bind="dragOptions"
-    handle=".handle"
+    handle=".sort_handle"
     @start="isDragging = true"
     @end="isDragging = false"
   >
@@ -44,7 +44,7 @@
         >
           <span
             v-if="sortable && inputWriteable"
-            class="handle"
+            class="sort_handle"
             :title="t('ht.file.sort')"
           >
             <i class="el-icon-rank"></i>

package/packages/File/src/FileList.vue

@@ -4,7 +4,7 @@
     class="file-list__wrap"
     tag="ul"
     v-bind="dragOptions"
-    handle=".handle"
+    handle=".sort_handle"
     @start="isDragging = true"
     @end="isDragging = false"
   >
@@ -21,7 +21,7 @@
           },
         ]"
       >
-        <ht-icon v-if="sortable && inputWriteable" name="sort" class="handle" />
+        <ht-icon v-if="sortable && inputWriteable" name="sort" class="sort_handle" />
         <ht-icon name="file" class="file_icon" />
         <p
           class="file__name"
@@ -154,17 +154,17 @@
           color: $base-color-blue;
           cursor: pointer;
         }
-        .handle {
+        .sort_handle {
           display: initial;
         }
-        .handle + .file_icon {
+        .sort_handle + .file_icon {
           display: none;
         }
       }
       svg {
         margin-right: 5px;
       }
-      .handle {
+      .sort_handle {
         display: none;
         cursor: move;
       }

package/packages/Table/src/Table.vue

@@ -95,7 +95,7 @@
     <el-table
       v-if="!isCardView"
       ref="htTable"
-      v-loading="loading && !noLoading"
+      v-loading="isLoading"
       :stripe="stripe"
       border
       class="ht-table"
@@ -136,7 +136,7 @@
     </el-table>
     <div
       v-else
-      v-loading="loading && !noLoading"
+      v-loading="isLoading"
       class="ht-card"
       :style="{ height: `${tableMaxHeight}` + 'px' }"
     >
@@ -417,6 +417,11 @@
       tablePaginationJustify() {
         return this.$allPaginationJustify || this.paginationJustify
       },
+      isLoading() {
+        return this.$route.name === 'TemplatePreview'
+          ? false
+          : this.loading && !this.noLoading
+      },
     },
     watch: {
       justShowSearch: {
@@ -842,10 +847,13 @@
               this.$refs.toolbarContainer.clientHeight) ||
             0
 
+          // templatePreview 中 nopagination 为 true，且有自定义的分页控件 占用 50
           const paginationPanelHeight =
-            (this.$refs.paginationPanel &&
-              this.$refs.paginationPanel.clientHeight) ||
-            0
+            this.$route.name === 'TemplatePreview' && this.nopagination
+              ? 50
+              : (this.$refs.paginationPanel &&
+                  this.$refs.paginationPanel.clientHeight) ||
+                0
           // 下外边距
           const searchPanelBottom = searchPanelHeight > 0 ? 18 : 0
           const toolbarPanelBottom = toolbarPanelHeight > 0 ? 18 : 0

package/packages/TemplateForm/src/main.vue

@@ -35,7 +35,7 @@
           :disabled="disabled"
           @click="boSave()"
         >
-          保存
+          提交
         </el-button>
         <!-- <el-button
           v-if="action === 'editDraft'"

package/src/mixins/querySqlPreview.js

@@ -584,7 +584,7 @@ export default {
         this.dialogExportVisible = true
       } else {
         // 增加导出字段限制
-        const checkField = this.getCheckField().map((item) => item.value)
+        const checkField = this.getCheckField().map((item) => item.key)
         this.exportData.expField = this.displayFields.filter((item) =>
           checkField.includes(item.fieldName)
         )

package/src/mixins/templatePreview.js

@@ -11,7 +11,7 @@ const { saveAs } = require('file-saver')
 import _ from 'lodash'
 import { decode } from '@/util/base64'
 
-const req = function(url, data = {}, option = {}) {
+const req = function (url, data = {}, option = {}) {
   const requestData = {
     url: url,
     data: data,
@@ -251,7 +251,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)
         }
@@ -260,7 +260,7 @@ export default {
       immediate: true,
     },
     templateInfo: {
-      handler: function(newVal) {
+      handler: function (newVal) {
         if (newVal && newVal.id) {
           let _me = this
           _me.templateInfo = newVal
@@ -380,13 +380,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
@@ -430,9 +430,8 @@ export default {
       if (val) {
         this.$nextTick(() => {
           if (document.getElementById('summaryDiv')) {
-            this.summaryTableHeight = document.getElementById(
-              'summaryDiv'
-            ).clientHeight
+            this.summaryTableHeight =
+              document.getElementById('summaryDiv').clientHeight
           }
         })
       }
@@ -443,7 +442,7 @@ export default {
       //如果当前页面被嵌入iframe里面不显示草稿
       return !this.isJoinFlow
     },
-    navbarCollapseStyle: function() {
+    navbarCollapseStyle: function () {
       if (this.asideShow) {
         return { left: '200px' }
       }
@@ -482,7 +481,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')
@@ -808,7 +807,7 @@ export default {
           this.listSelectable = false
         }
         let _this = this
-        setTimeout(function() {
+        setTimeout(function () {
           let tdDom = _this.$el.querySelector('td.right_menu')
           if (
             !tdDom ||
@@ -913,7 +912,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(() => {
@@ -936,7 +935,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(() => {
@@ -1194,7 +1193,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')
@@ -1234,7 +1233,7 @@ export default {
           .generateAsync({
             type: 'blob',
           })
-          .then(function(content) {
+          .then(function (content) {
             let eleLink = document.createElement('a')
             eleLink.download = '二维码.zip'
             eleLink.style.display = 'none'
@@ -1287,7 +1286,7 @@ export default {
         context.scale(2, 2)
         return html2canvas(document.querySelector(classs), {
           canvas: canvas2,
-        }).then(function(canvas) {
+        }).then(function (canvas) {
           resolve(canvas)
         })
       })
@@ -1329,7 +1328,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
@@ -1352,13 +1351,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()
@@ -1860,18 +1859,10 @@ 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
@@ -1897,18 +1888,10 @@ 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
@@ -1931,19 +1914,12 @@ 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
           }
@@ -2011,7 +1987,7 @@ export default {
       }
     },
     //回车查询
-    searchEnterFun: function(e) {
+    searchEnterFun: function (e) {
       let keyCode = window.event ? e.keyCode : e.which
       if (keyCode == 13) {
         this.search()
@@ -2773,13 +2749,6 @@ export default {
             operation: 'EQUAL',
             relation: 'AND',
           },
-          {
-            property: 'bo_alias_',
-            value: this.templateInfo.boDefAlias,
-            group: 'main',
-            operation: 'EQUAL',
-            relation: 'AND',
-          },
         ],
       }
       this.recordTableLoading = true