three-trees-ui 1.0.78 → 1.0.79

package/package.json

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

package/packages/OrgPostDialog/src/main.vue

@@ -111,7 +111,7 @@
           ? 'id'
           : this.config && this.config.hasOwnProperty('code')
           ? 'code'
-          : this.selectLabel
+          : 'id'
       },
     },
     mounted() {

package/packages/OrgSelector/src/main.vue

@@ -196,7 +196,7 @@
           ? 'id'
           : this.config && this.config.hasOwnProperty('code')
           ? 'code'
-          : this.selectLabel
+          : 'id'
       },
     },
     watch: {

package/packages/Table/src/Table.vue

@@ -971,11 +971,11 @@
               const {
                 summaryMethod,
                 summaryType,
-                name,
                 tableName,
                 oldTableField,
                 fieldDesc,
               } = tableFieldItem
+              let name = tableFieldItem.fieldsAlias || tableFieldItem.name
               if (!summaryMethod) {
                 sums[index] = ''
                 return
@@ -1036,7 +1036,13 @@
         return hasValueList.length
       },
       getSum(data, field) {
-        const sumResult = data.reduce((pre, cur) => pre + Number(cur[field]), 0)
+        const sumResult = data.reduce((pre, cur) => {
+          if (!isNaN(Number(cur[field]))) {
+            return pre + Number(cur[field])
+          } else {
+            return pre
+          }
+        }, 0)
         return sumResult ? utils.thousandBit(sumResult) : sumResult
       },
       getPropTable(field, tableName, oldTableField) {

package/src/mixins/querySqlPreview.js

@@ -11,6 +11,8 @@ import moment from 'moment'
 export default {
   data() {
     return {
+      bindKey: {},
+      bindValue: {},
       defaultQuerys: [],
       isInit: true,
       bpmRunTime: this.$requestConfig.flowUrl,
@@ -613,8 +615,34 @@ export default {
         alias: this.alias || this.queryView.alias,
         param: dataTemplateQueryVo,
       }
+      // 自定义对话框查询参数修改
+      if (isSearchBtn) {
+        obj.param = this.makeCustomDialogParam(obj.param)
+      }
       this.getQuerySqlViewByPagination(obj, cb)
     },
+    // 高级查询 自定义对话框查询参数修改
+    makeCustomDialogParam(data) {
+      //处理绑定字段
+      this.bindValue = this.searchForm.bindValue || this.bindValue
+      this.bindKey = this.searchForm.bindKey || this.bindKey
+      //记录后再删除
+      delete this.searchForm.bindValue
+      delete this.searchForm.bindKey
+      if (data.queryFilter && data.queryFilter.querys) {
+        data.queryFilter.querys.forEach((k) => {
+          Object.keys(this.bindKey).forEach((key) => {
+            if (key === k.property) {
+              let valueKey = this.bindKey[key]
+              if (this.bindValue[key] && this.bindValue[key][valueKey]) {
+                k.value = this.bindValue[key][valueKey]
+              }
+            }
+          })
+        })
+      }
+      return data
+    },
     getQuerySqlViewByPagination(param, cb) {
       if (this.needRequestTotal) {
         // 调用后端接口更新 tableDataTotal
@@ -697,6 +725,12 @@ export default {
         params = { pageBean: this.pagination, querys }
         return params
       } else {
+        //处理绑定字段
+        this.bindValue = this.searchForm.bindValue || this.bindValue
+        this.bindKey = this.searchForm.bindKey || this.bindKey
+        //记录后再删除
+        delete this.searchForm.bindValue
+        delete this.searchForm.bindKey
         for (var key in this.searchForm) {
           if (
             typeof this.searchForm[key] != 'undefined' &&
@@ -727,7 +761,12 @@ export default {
                   })
                 }
               }
-            } else if (this.searchForm[key].includes(',') && !specialMap[key]) {
+            } else if (
+              this.searchForm[key] &&
+              typeof this.searchForm[key] === 'string' &&
+              this.searchForm[key].includes(',') &&
+              !specialMap[key]
+            ) {
               let arr = this.searchForm[key].split(',')
               for (let i = 0; i < arr.length; i++) {
                 if (
@@ -749,9 +788,20 @@ export default {
                 })
               })
             } else {
+              let value = this.searchForm[key]
+              //在表单列表的查询字段中添加的对话框控件 此处逻辑对应 packages/CustomDialog/src/customDialog.vue:1920行
+              if (
+                this.bindValue &&
+                Object.keys(this.bindValue).length &&
+                this.bindValue[key] &&
+                Object.keys(this.bindKey).length
+              ) {
+                //获得绑定字段的值
+                value = this.bindValue[key][this.bindKey[key]]
+              }
               querys.push({
                 property: key,
-                value: this.searchForm[key],
+                value: value,
                 group: 'main',
                 operation: operationMap[key],
                 relation: 'AND',
@@ -1396,6 +1446,7 @@ export default {
         alias: this.alias || this.queryView.alias,
         param: dataTemplateQueryVo,
       }
+
       this.getQuerySqlViewByPaginationTotal(obj, cb)
     },
     switchPage(type) {

package/src/mixins/templatePreview.js

@@ -12,7 +12,7 @@ import _ from 'lodash'
 import { decode } from '@/util/base64'
 import moment from 'moment'
 
-const req = function (url, data = {}, option = {}) {
+const req = function(url, data = {}, option = {}) {
   const requestData = {
     url: url,
     data: data,
@@ -299,7 +299,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)
         }
@@ -308,7 +308,7 @@ export default {
       immediate: true,
     },
     templateInfo: {
-      handler: async function (newVal) {
+      handler: async function(newVal) {
         if (newVal && newVal.id) {
           let _me = this
           _me.templateInfo = newVal
@@ -428,13 +428,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
@@ -476,8 +476,9 @@ export default {
       if (val) {
         this.$nextTick(() => {
           if (document.getElementById('summaryDiv')) {
-            this.summaryTableHeight =
-              document.getElementById('summaryDiv').clientHeight
+            this.summaryTableHeight = document.getElementById(
+              'summaryDiv'
+            ).clientHeight
           }
         })
       }
@@ -488,7 +489,7 @@ export default {
       //如果当前页面被嵌入iframe里面不显示草稿
       return !this.isJoinFlow
     },
-    navbarCollapseStyle: function () {
+    navbarCollapseStyle: function() {
       if (this.asideShow) {
         return { left: '200px' }
       }
@@ -527,7 +528,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')
@@ -873,7 +874,7 @@ export default {
           this.listSelectable = false
         }
         let _this = this
-        setTimeout(function () {
+        setTimeout(function() {
           let tdDom = _this.$el.querySelector('td.right_menu')
           if (
             !tdDom ||
@@ -978,7 +979,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(() => {
@@ -1001,7 +1002,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(() => {
@@ -1259,7 +1260,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')
@@ -1299,7 +1300,7 @@ export default {
           .generateAsync({
             type: 'blob',
           })
-          .then(function (content) {
+          .then(function(content) {
             let eleLink = document.createElement('a')
             eleLink.download = '二维码.zip'
             eleLink.style.display = 'none'
@@ -1352,7 +1353,7 @@ export default {
         context.scale(2, 2)
         return html2canvas(document.querySelector(classs), {
           canvas: canvas2,
-        }).then(function (canvas) {
+        }).then(function(canvas) {
           resolve(canvas)
         })
       })
@@ -1394,7 +1395,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
@@ -1419,13 +1420,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 ? currentPage : this.lastPage
       this.$refs.multipleTemplateTable.handleFilterChange()
@@ -2196,10 +2197,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
@@ -2225,10 +2234,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
@@ -2251,12 +2268,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
           }
@@ -2324,7 +2348,7 @@ export default {
       }
     },
     //回车查询
-    searchEnterFun: function (e) {
+    searchEnterFun: function(e) {
       let keyCode = window.event ? e.keyCode : e.which
       if (keyCode == 13) {
         this.search()