three-trees-ui 1.0.31 → 1.0.32

package/src/mixins/templatePreview.js

@@ -9,6 +9,7 @@ import $ from 'jquery'
 const axios = require('axios')
 const { saveAs } = require('file-saver')
 import _ from 'lodash'
+import { decode } from '@/util/base64'
 
 const req = function(url, data = {}, option = {}) {
   const requestData = {
@@ -464,9 +465,13 @@ export default {
       return list
     },
     tableHeight() {
+      const currentHeight = 0.85 * window.innerHeight
+      const tableHeight = this.currentTableHeight
+        ? this.currentTableHeight
+        : currentHeight
       return this.summaryFields && this.summaryFields.length > 0
-        ? this.defaultCurrentInnerHeight - this.summaryTableHeight
-        : this.defaultCurrentInnerHeight
+        ? tableHeight - this.summaryTableHeight
+        : tableHeight
     },
   },
   mounted() {
@@ -535,7 +540,7 @@ export default {
     //获取汇总全部数据
     getAllSummary(data) {
       const allSummaryConfig = data.reduce((pre, cur) => {
-        pre[cur.field] = utils.thousandBit(cur.val)
+        pre[cur.field] = cur.val
         return pre
       }, {})
       if (Object.keys(allSummaryConfig).length) {
@@ -731,14 +736,9 @@ export default {
         let manageField = JSON.parse(this.templateInfo.manageField)
         let this_ = this
         manageField.forEach((item) => {
-          if (item.buttonId) {
-            obj[item.buttonId] = true
-          }
           if (item.beforeScriptValue) {
             let promise = this_.beforeScript(item.beforeScriptValue, item)
             promise.then((res) => {
-              obj[item.buttonId] = res
-              //为兼容旧数据（没有buttonId的数据）
               obj[item.name] = res
             })
           }
@@ -1404,10 +1404,6 @@ export default {
     },
     //列表数据查询入口
     search(param, cb, isSearchBtn) {
-      // 如果是高级查询，页码重置为首页
-      if (isSearchBtn) {
-        this.pagination.page = 1
-      }
       let params = {}
       //判断为合并查询还是高级查询
       let showAdvancedSearch = this.$refs.multipleTemplateTable
@@ -1484,7 +1480,7 @@ export default {
         let betweenConditions = {}
         params.pagination.querys.forEach((q) => {
           if (
-            q.value != undefined &&
+            q.value &&
             (q.operation != 'BETWEEN' || q.value.constructor == Array)
           ) {
             tempQueryS.push(q)
@@ -1966,11 +1962,10 @@ export default {
         const filterField = utils.parseToJson(this.templateInfo.filteringField)
         temquerys.forEach((q) => {
           let prefix = this.getColPreFix(conditionField, q.property)
-          const queryPre = this.getQueryPre(conditionField, q.property)
           if (!prefix) {
             prefix = this.getColPreFix(filterField, q.property)
           }
-          q.property = queryPre + prefix + q.property
+          q.property = prefix + q.property
           querys.push(q)
         })
       }
@@ -2427,50 +2422,27 @@ export default {
       if (type === 'searchResult') {
         this.curSelectParams.queryFilter.querys = this.templateSearchQuery
       }
-      if (type === 'selected') {
-        const selectedId = this.tableData.selectRows.map((item) => item.id_)
-        const selectedQuery = {
-          property: 't.id_',
-          value: selectedId ? selectedId.join(',') : '',
-          group: 'main',
-          operation: 'IN',
-          relation: 'AND',
-        }
-        this.curSelectParams.queryFilter.querys = [
-          ...this.curSelectParams.queryFilter.querys,
-          selectedQuery,
-        ]
-      }
-      //导出全部数据按钮
-      if (type == 'all') {
-        this.curSelectParams.queryFilter.querys = []
+      // 增加导出字段限制
+      const checkField = this.getCheckField()
+      if (checkField && checkField.length) {
+        let fieldExport = {}
+        checkField.forEach((item) => {
+          fieldExport[item.key] = item.value
+        })
+        this.curSelectParams.fieldExport = fieldExport
       }
-      let loadingInstance = Loading.service({
-        fullscreen: true,
-      }) //开始
       this.$requestConfig
         .exportByBtnSetting({
           id: this.templateInfo.id,
           params: this.curSelectParams,
         })
-        .then(
-          ({ data, headers }) => {
-            const fileName = decodeURIComponent(
-              headers['content-disposition'].split(';')[1].split('filename=')[1]
-            )
-            const blob = new Blob([data])
-            saveAs(blob, fileName)
-            loadingInstance.close() // 结束
-          },
-          (e) => {
-            loadingInstance.close() // 结束
-            let enc = new TextDecoder('utf-8')
-            let uint8_msg = JSON.parse(
-              enc.decode(new Uint8Array(e.response.data))
-            )
-            this.$message.error(uint8_msg.message)
-          }
-        )
+        .then(({ data, headers }) => {
+          const fileName = decodeURIComponent(
+            headers['content-disposition'].split(';')[1].split('filename=')[1]
+          )
+          const blob = new Blob([data])
+          saveAs(blob, fileName)
+        })
     },
     importCommand(params) {
       switch (params.command) {
@@ -2759,13 +2731,6 @@ export default {
             operation: 'EQUAL',
             relation: 'AND',
           },
-          {
-            property: 'bo_alias_',
-            value: this.templateInfo.boDefAlias,
-            group: 'main',
-            operation: 'EQUAL',
-            relation: 'AND',
-          },
         ],
       }
       this.recordTableLoading = true
@@ -3152,10 +3117,6 @@ export default {
       this.getBpmTemplateByPagination(params)
     },
     filterChange(filters) {
-      // 筛选时需重置页面页码
-      if (filters) {
-        this.pagination.page = 1
-      }
       if (filters && Object.keys(filters).length > 0) {
         const key = Object.keys(filters)[0]
         const filter = filters[key]
@@ -3536,10 +3497,7 @@ export default {
         currentRows
           .filter((item) => item[fields] !== undefined && item[fields] !== '')
           .map((item) => Number(item[fields]))
-      if (!list || list.length == 0) {
-        let num = 0
-        return num.toFixed(decimal)
-      }
+      if (!list || list.length == 0) return
       const METHOD_MAP = {
         count: 'getCount',
         sum: 'getSum',
@@ -3707,7 +3665,7 @@ export default {
                 type: dialogConfig.custDialog,
               }
               obj.custdialog = {
-                name: dialogConfig.name || '请选择',
+                name: '请选择',
                 custDialog: custdialog,
                 resultField: dialogConfig.resultField,
               }
@@ -3783,10 +3741,6 @@ export default {
         type: 'warning',
       })
         .then(() => {
-          let loadingInstance = Loading.service({
-            fullscreen: true,
-            text: '数据更新中...',
-          })
           let selectRows = row
             ? [row]
             : this.tableData.selectRows
@@ -3802,37 +3756,20 @@ export default {
             boData: selectRows,
             boAlias: this.templateInfo.boDefAlias,
           }
-          this.$requestConfig
-            .batchUpdateTemplateData(data)
-            .then((data) => {
-              if (data.state) {
-                this.$message({
-                  type: 'success',
-                  message: data.message,
-                })
-                this.$nextTick(() => {
-                  // 以服务的方式调用的 Loading 需要异步关闭
-                  loadingInstance.close()
-                })
-                this.search({
-                  querys: this.buildDefaultQuerys() || [],
-                })
-                // 更新成功后需执行后置js
-                if (afterScriptValue) {
-                  let script = Base64.decode(afterScriptValue)
-                  this.tempScript(script, row)
-                }
-              } else {
-                this.$nextTick(() => {
-                  // 以服务的方式调用的 Loading 需要异步关闭
-                  loadingInstance.close()
-                })
-              }
-            })
-            .finally(() => {
-              loadingInstance.close()
-            })
-          this.$parent.init()
+          this.$requestConfig.batchUpdateTemplateData(data).then((data) => {
+            if (data.state) {
+              this.$message({
+                type: 'success',
+                message: data.message,
+              })
+              this.search({
+                querys: this.buildDefaultQuerys() || [],
+              })
+              // 更新成功后需执行后置js
+              let script = Base64.decode(afterScriptValue)
+              this.tempScript(script, row)
+            }
+          })
         })
         .catch(() => {
           this.$message({
@@ -4087,11 +4024,8 @@ export default {
         }
       } else if (btnOk.indexOf(btnAlias) != -1) {
         if (btnAlias == 'switch') {
-          const pkFieldValue =
-            parameter.pkField ||
-            this.getBindValue(row, this.templateInfo.pkField)
           this.switchChange(
-            pkFieldValue,
+            parameter.pkField,
             parameter.switchOn,
             parameter.switchOff,
             parameter.bind,
@@ -4598,6 +4532,20 @@ export default {
         return strData
       }
     },
+    getCheckField() {
+      let customColumns = this.$refs.multipleTemplateTable.customColumns || []
+      let customColumnSetting = JSON.parse(
+        localStorage.getItem('customColumnSetting') || '{}'
+      )
+      const keys = customColumns.reduce((m, n) => m.concat(n.key), [])
+      const customColumnsHashCode = utils.hashCode(keys.join(','))
+      const checkField = JSON.parse(
+        decode(customColumnSetting[customColumnsHashCode]) || '[]'
+      )
+      return checkField.filter(
+        (field) => field.checked && ['序号', '操作'].indexOf(field.value) == -1
+      )
+    },
   },
   // asyncComputed: {
   //   showDraftList() {