three-trees-ui 1.0.72 → 1.0.74

package/src/mixins/templatePreview.js

@@ -10,9 +10,8 @@ const axios = require('axios')
 const { saveAs } = require('file-saver')
 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,
@@ -42,7 +41,6 @@ export default {
   },
   data() {
     return {
-      defaultQuerys: [],
       treeQuerys: [],
       alias_new: 'statement',
       loading: false,
@@ -61,8 +59,6 @@ export default {
       displayFields: [],
       exportSellection: [],
       searchForm: {},
-      bindKey: {},
-      bindValue: {},
       queryForm: {
         queryData: '',
       },
@@ -116,9 +112,7 @@ export default {
         pageSize: 10,
         total: 1,
       },
-      lastPage: 1, //上一次输入的分页数、默认为1
       paginationLayout: 'total, sizes, prev, pager, next, jumper',
-      paginationLayoutWithoutTotal: 'sizes, prev, pager, next, jumper',
       total: 0,
       permission: {
         print: true,
@@ -228,45 +222,6 @@ export default {
         : 0.85 * window.innerHeight,
       needRequestTotal: false, // 需不需要后端统计列表全部数据
       tableDataTotal: {},
-      loadingTotal: false, // 统计按钮加载中
-      pageSizeArray: [
-        {
-          label: '10条/页',
-          value: 10,
-        },
-        {
-          label: '20条/页',
-          value: 20,
-        },
-        {
-          label: '30条/页',
-          value: 30,
-        },
-        {
-          label: '40条/页',
-          value: 40,
-        },
-        {
-          label: '50条/页',
-          value: 50,
-        },
-        {
-          label: '100条/页',
-          value: 100,
-        },
-        {
-          label: '200条/页',
-          value: 200,
-        },
-        {
-          label: '300条/页',
-          value: 300,
-        },
-        {
-          label: '500条/页',
-          value: 500,
-        },
-      ],
     }
   },
   watch: {
@@ -298,7 +253,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)
         }
@@ -307,7 +262,7 @@ export default {
       immediate: true,
     },
     templateInfo: {
-      handler: async function(newVal) {
+      handler: function (newVal) {
         if (newVal && newVal.id) {
           let _me = this
           _me.templateInfo = newVal
@@ -380,7 +335,7 @@ export default {
             )
             params.pagination.querys = querys
           }
-          let defaultQuery = await this.newBuildDefaultQuerys()
+          let defaultQuery = this.buildDefaultQuerys()
           if (defaultQuery.length > 0) {
             if (params.pagination.querys) {
               params.pagination.querys.concat(defaultQuery)
@@ -427,13 +382,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
@@ -475,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
           }
         })
       }
@@ -488,7 +442,7 @@ export default {
       //如果当前页面被嵌入iframe里面不显示草稿
       return !this.isJoinFlow
     },
-    navbarCollapseStyle: function() {
+    navbarCollapseStyle: function () {
       if (this.asideShow) {
         return { left: '200px' }
       }
@@ -527,35 +481,15 @@ export default {
     })
     this.handelBindFiledValua()
     let this_ = this
-    this.$on('data-reload-success', function() {
+    this.$on('data-reload-success', function () {
       this_.calcScriptBtnPermission()
     })
     this.$emit('afterMounted')
-    if (this.templateInfo.jsScript) {
-      // 执行js脚本
-      this.handleDiyScript(this.templateInfo.jsScript)
-    }
     // setTimeout(() => {
     //   this.$refs.multipleTemplateTable.handleFilterChange(this.filterMap)
     // }, 100)
   },
   methods: {
-    handleDiyScript(scriptValue) {
-      //执行前置脚本内容
-      const _this = this
-      // 用户信息
-      const account = this.$requestConfig.getAccount()
-      const userId = this.$requestConfig.getUserId()
-      const userName = this.$requestConfig.getUsername()
-      const preScript = `const scriptFunction = function(_this, account, userId, userName){
-            ${scriptValue}
-          };`
-      try {
-        eval(`${preScript}scriptFunction(_this, account, userId, userName);`)
-      } catch (err) {
-        this.$message.error(`脚本事件执行错误：${err}`)
-      }
-    },
     //因为row.id_ 或row.id可能会有重复，所以加随机值使其唯一
     getRowKey(row) {
       /** 检查row.id是否有重复的缓存对象 */
@@ -873,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 ||
@@ -978,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(() => {
@@ -1001,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(() => {
@@ -1259,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')
@@ -1299,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'
@@ -1352,7 +1286,7 @@ export default {
         context.scale(2, 2)
         return html2canvas(document.querySelector(classs), {
           canvas: canvas2,
-        }).then(function(canvas) {
+        }).then(function (canvas) {
           resolve(canvas)
         })
       })
@@ -1394,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
@@ -1407,10 +1341,8 @@ export default {
       }
       for (let x = 0; x < display.length; x++) {
         let item = JSON.parse(display[x])
-        if (this.rows[index][item.name] || this.rows[index][item.fieldsAlias]) {
-          const qrCode =
-            this.rows[index][item.name] || this.rows[index][item.fieldsAlias]
-          this.QRCodeDesc.push(`${item.desc}:${qrCode}`)
+        if (this.rows[index][item.name]) {
+          this.QRCodeDesc.push(item.desc + ':' + this.rows[index][item.name])
         }
       }
       this.mobileFormAlias = mobileFormAlias
@@ -1419,15 +1351,15 @@ 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) {
-      //点击第几页，如果当前页数没有值，则默认用上一次页数
-      this.pagination.page = currentPage ? currentPage : this.lastPage
+    handleCurrentChange: function (currentPage) {
+      //点击第几页
+      this.pagination.page = currentPage
       this.$refs.multipleTemplateTable.handleFilterChange()
     },
     getParam(str) {
@@ -1475,190 +1407,7 @@ export default {
       return params
     },
     //列表数据查询入口
-    async search(param, cb, isSearchBtn, needRequestTotal = false) {
-      // 不需要请求后端接口统计列表数据
-      this.needRequestTotal = needRequestTotal
-      // 如果是高级查询，页码重置为首页
-      if (isSearchBtn) {
-        this.pagination.page = 1
-      }
-      let params = {}
-      //判断为合并查询还是高级查询
-      let showAdvancedSearch = this.$refs.multipleTemplateTable
-        ? this.$refs.multipleTemplateTable.showAdvancedSearch
-        : false
-      //高级查询
-      if (showAdvancedSearch) {
-        params = this.getQueryFilter()
-      } else {
-        //合并查询
-        // 快速查询时，需处理添加快速查询字段前缀
-        param = this.handleQuickParams(param)
-        params = this.getConditionQuery(param)
-      }
-      this.templateSearchQuery =
-        (params.pagination && params.pagination.querys) || []
-      if (!params.pagination) {
-        params.pagination = {}
-      }
-      if (!params.pagination.querys) {
-        params.pagination.querys = []
-      }
-      //处理排序字段
-      if (param && param.sorter && param.sorter.length > 0) {
-        let sortField = JSON.parse(this.templateInfo.sortField)
-        params.pagination = params.pagination || {}
-        params.pagination.sorter = []
-        param.sorter.forEach((s) => {
-          let prefix = this.getColPreFix(sortField, s.property)
-          let queryPre = this.getQueryPre(sortField, s.property)
-          // 关联表时需特殊处理
-          let relevancyProperty = this.getRelevancyProperty(
-            sortField,
-            s.property
-          )
-          if (relevancyProperty) {
-            s.property = relevancyProperty
-          }
-          params.pagination.sorter.push({
-            property: queryPre + prefix + s.property,
-            direction: s.direction,
-          })
-        })
-      } else if (this.templateInfo.sortField) {
-        let sortField = JSON.parse(this.templateInfo.sortField)
-        let sorter = []
-        for (let x = 0; x < sortField.length; x++) {
-          const s = sortField[x]
-          // 默认排序字段的排序方向为空或者不为指定值时放弃
-          if (!s.sort || (s.sort != 'ASC' && s.sort != 'DESC')) {
-            continue
-          }
-          let prefix = this.getColPreFix(sortField, s.name)
-          let queryPre = this.getQueryPre(sortField, s.name)
-          if (!queryPre) {
-            if (s.joinTableField && s.tableName) {
-              prefix = `${s.tableName}.${prefix}`
-            } else {
-              prefix = `t.${prefix}`
-            }
-          }
-          sorter.push({
-            property: queryPre + prefix + s.name,
-            direction: s.sort,
-          })
-        }
-        params.pagination.sorter = sorter
-      } else if (param.querys && param.querys.length > 0) {
-        params.pagination.querys.concat(param.querys)
-      }
-
-      if (params.pagination && params.pagination.querys) {
-        let tempQueryS = []
-        let betweenConditions = {}
-        params.pagination.querys.forEach((q) => {
-          if (
-            q.value != undefined &&
-            (q.operation != 'BETWEEN' || q.value.constructor == Array)
-          ) {
-            tempQueryS.push(q)
-          } else if (q.value) {
-            let conditions = q
-            if (betweenConditions[q.property]) {
-              conditions = betweenConditions[q.property]
-              conditions.value = [conditions.value]
-              conditions.value.push(q.value)
-            }
-            betweenConditions[q.property] = conditions
-          }
-        })
-        for (const key in betweenConditions) {
-          tempQueryS.push(betweenConditions[key])
-        }
-        params.pagination.querys = tempQueryS
-        params.pagination.querys = params.pagination.querys
-          ? params.pagination.querys.concat(this.treeQuerys)
-          : this.treeQuerys
-      }
-      //把过滤树的条件也拼接进去
-      if (this.treeQuerys && this.treeQuerys.length > 0) {
-        params.pagination.querys = params.pagination.querys
-          ? params.pagination.querys.concat(this.treeQuerys)
-          : this.treeQuerys
-      }
-      //初始化时，把查询字段和筛选字段的默认值也加进去
-      if (this.isInit) {
-        await this.handleInitQuery(params)
-      }
-      //数据视图控件
-      if (this.dataView) {
-        this.handelBindFiledValua()
-        params.refIdValue = this.dataView.refIdValue
-        //关联查询字段
-        if (this.dataView.selectList && this.dataView.selectList.length > 0) {
-          params.selectList = this.dataView.selectList
-        }
-      }
-      const this_ = this
-      if (this_.isJoinFlow) {
-        params.isJoinFlow = true
-        params.taskType = this_.taskType
-        params.defKey = this_.defKey
-      }
-      // 检查是否有必填字段
-      if (this.checkHaveRequired() && this.isInit) {
-        this.$refs.multipleTemplateTable.showAdvancedSearch = true
-      }
-      // 查询字段 校验是否必填，如果是必填没数据，需返回提示
-      let errorMsg = this.validateSearchRequired(params.pagination.querys)
-      if (errorMsg) {
-        !this.isInit && this.$message.warning(errorMsg)
-        cb && cb()
-        this.isInit = false
-        this.$emit('data-reload-success')
-        return
-      }
-      this.isInit = false
-      if ($.isEmptyObject(this.searchForm)) {
-        this.getBpmTemplateByPagination(params, cb)
-      } else {
-        this.getBpmTemplateByPagination(params, cb)
-      }
-    },
-    // 校验查询字段必填
-    validateSearchRequired(querys = []) {
-      let errorMsg = ''
-      let conditions = JSON.parse(this.templateInfo.conditionField)
-      if (conditions) {
-        conditions.forEach((item) => {
-          if (item.isRequired) {
-            let queryPre = this.getQueryPre(conditions, item.name)
-            let index = querys.findIndex((k) => {
-              return k.property == queryPre + item.name
-            })
-            if (index == -1) {
-              errorMsg = `字段【${item.cm}】为必填查询字段，不能为空！`
-            }
-          }
-        })
-      }
-      return errorMsg
-    },
-    checkHaveRequired() {
-      let haveRequired = false
-      try {
-        let conditions = JSON.parse(this.templateInfo.conditionField)
-        if (conditions) {
-          haveRequired = conditions.some((item) => {
-            return item.isRequired
-          })
-        }
-      } catch (e) {
-        console.log(e)
-      }
-      return haveRequired
-    },
-    searchCountTotal(param, cb, isSearchBtn, needRequestTotal = false) {
+    search(param, cb, isSearchBtn, needRequestTotal = false) {
       // 不需要请求后端接口统计列表数据
       this.needRequestTotal = needRequestTotal
       // 如果是高级查询，页码重置为首页
@@ -1790,9 +1539,9 @@ export default {
         params.defKey = this_.defKey
       }
       if ($.isEmptyObject(this.searchForm)) {
-        this.getBpmTemplateByPaginationTotal(params, cb)
+        this.getBpmTemplateByPagination(params, cb)
       } else {
-        this.getBpmTemplateByPaginationTotal(params, cb)
+        this.getBpmTemplateByPagination(params, cb)
       }
     },
     // 处理快速查询参数
@@ -1813,24 +1562,20 @@ export default {
       }
       return param
     },
-    async handleInitQuery(params) {
+    handleInitQuery(params) {
       const conditionFields = JSON.parse(this.templateInfo.conditionField) || []
       const querys = []
-      for (let i = 0; i < conditionFields.length; i++) {
-        let item = conditionFields[i]
+      conditionFields.forEach((item) => {
         if (item.defaultValue) {
-          let defaultValue = item.isScriptDefault
-            ? await this.getScriptDefaultValue(item.defaultValue)
-            : item.defaultValue
           querys.push({
             property: `${item.queryPre || ''}${item.colPrefix}${item.name}`,
-            value: defaultValue,
+            value: item.defaultValue,
             operation: item.qt.toUpperCase(),
             relation: 'AND',
             group: 'defaultQuery',
           })
         }
-      }
+      })
       const filteringFields = JSON.parse(this.templateInfo.filteringField) || []
       filteringFields.forEach((item) => {
         if (item.defaultValue && item.defaultValue.length) {
@@ -1883,15 +1628,13 @@ export default {
           })
       }
       this.$requestConfig
-        .getDataTemplateDataListWithoutTotal(dataTemplateQueryVo)
+        .getDataTemplateDataList(dataTemplateQueryVo)
         .then((response) => {
           this.rows = response.rows
+          this.total = response.total
           this.$set(this.pagination, 'page', response.page)
           this.$set(this.pagination, 'pageSize', response.pageSize)
-          //每次请求后不再统计总数，而是在统计按钮中去统计，当数量统计过一次后，再重新设置到当前页
-          if (this.total) {
-            this.$set(this.pagination, 'total', this.total)
-          }
+          this.$set(this.pagination, 'total', response.total)
           this.$set(this, 'flowBtnPermission', {})
           this.$emit('data-reload-success')
           if (response.summary && response.summary.length) {
@@ -1915,46 +1658,6 @@ export default {
           cb2 && cb2()
         })
     },
-    getBpmTemplateByPaginationTotal(params, cb1, cb2) {
-      const dataTemplateQueryVo = {
-        templateId: params.templateId,
-        queryFilter: params.pagination,
-      }
-      if (params.isJoinFlow && params.taskType && params.defKey) {
-        dataTemplateQueryVo.isJoinFlow = params.isJoinFlow
-        dataTemplateQueryVo.taskType = params.taskType
-        dataTemplateQueryVo.defKey = params.defKey
-      }
-      if (params.selectField) {
-        dataTemplateQueryVo.selectField = params.selectField
-        dataTemplateQueryVo.selectValue = params.selectValue
-      }
-      if (params.selectList) {
-        dataTemplateQueryVo.selectList = params.selectList
-      }
-      dataTemplateQueryVo.refIdValue = params.refIdValue
-      this.curSelectParams = dataTemplateQueryVo
-      //加载按钮
-      this.loadingTotal = true
-      this.$requestConfig
-        .getDataTemplateDataListWithTotal(dataTemplateQueryVo)
-        .then((response) => {
-          //设置总数
-          this.total = response.value
-          this.$set(this.pagination, 'total', response.value)
-          this.loadingTotal = false
-          this.$emit('data-reload-success')
-          this.$nextTick(() => {
-            this.$refs.multipleTemplateTable &&
-              this.$refs.multipleTemplateTable.doLayout()
-          })
-        })
-        .finally(() => {
-          this.loadingTotal = false
-          cb1 && cb1()
-          cb2 && cb2()
-        })
-    },
     getQueryFilter() {
       let operationMap = this.getSearchItems()
       let fieldTypeMap = this.getFieldType()
@@ -1971,12 +1674,6 @@ export default {
       params.pagination = pageBean
       if (!$.isEmptyObject(this.searchForm)) {
         let conditionField = utils.parseToJson(this.templateInfo.conditionField)
-        //处理绑定字段
-        this.bindValue = this.searchForm.bindValue || this.bindValue
-        this.bindKey = this.searchForm.bindKey || this.bindKey
-        //记录后再删除
-        delete this.searchForm.bindValue
-        delete this.searchForm.bindKey
         for (let key in this.searchForm) {
           if (
             typeof this.searchForm[key] != 'undefined' &&
@@ -2014,16 +1711,6 @@ export default {
               if (fieldTypeMap[key] && fieldTypeMap[key] == 'number') {
                 value = parseFloat(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]]
-              }
               let queryPre = this.getQueryPre(conditionField, key)
               querys.push({
                 property: queryPre + key,
@@ -2036,14 +1723,7 @@ export default {
           }
         }
         this.clearQueryByGroupName(querys, 'filter')
-        // 将过滤条件添加查询参数数组中，不是高级查询时使用
-        if (
-          this.$refs.multipleTemplateTable &&
-          this.$refs.multipleTemplateTable.querys &&
-          !this.$refs.multipleTemplateTable.showAdvancedSearch
-        ) {
-          querys.push(...this.$refs.multipleTemplateTable.querys)
-        }
+        // 将过滤条件添加查询参数数组中
         this.buildFilterParams(querys)
       }
       // 判断table中是否含有filter查询
@@ -2196,18 +1876,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
@@ -2233,18 +1905,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
@@ -2267,19 +1931,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
           }
@@ -2347,7 +2004,7 @@ export default {
       }
     },
     //回车查询
-    searchEnterFun: function(e) {
+    searchEnterFun: function (e) {
       let keyCode = window.event ? e.keyCode : e.which
       if (keyCode == 13) {
         this.search()
@@ -2652,9 +2309,7 @@ export default {
     handledUrlParams(url, row, fieldName) {
       if (this.templateInfo.displayField) {
         let displayFields = JSON.parse(this.templateInfo.displayField)
-        let params =
-          this.getParentId(displayFields, fieldName, 'name') ||
-          this.getParentId(displayFields, fieldName, 'fieldsAlias')
+        let params = this.getParentId(displayFields, fieldName, 'name')
         if (params && params.urlParams && params.urlParams.length > 0) {
           let urlParams = params.urlParams
           let suffix = ''
@@ -2809,14 +2464,6 @@ export default {
           selectedQuery,
         ]
       }
-      // 校验
-      let errorMsg = this.validateSearchRequired(
-        this.curSelectParams.queryFilter.querys
-      )
-      if (errorMsg) {
-        this.$message.warning(errorMsg)
-        return
-      }
       //导出全部数据按钮
       if (type == 'all') {
         this.curSelectParams.queryFilter.querys = []
@@ -2829,30 +2476,24 @@ export default {
           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(() => {
-          this.$message.success('正在导出，请稍后前往报表附件管理查看')
-        })
-        .finally(() => {
-          loadingInstance.close()
-        })
+        .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)
+          }
+        )
     },
     importCommand(params) {
       switch (params.command) {
@@ -3459,7 +3100,7 @@ export default {
       }
       this.dialogSubVisible = true
     },
-    async nodeClick(node) {
+    nodeClick(node) {
       this.pagination.page = 1
       //每次点击过滤树,应该把右边的table 与分页全部重置为初始
 
@@ -3494,9 +3135,7 @@ export default {
             pageBean.querys.push({
               property: item.isMain
                 ? `t.${item.key_.oldTableField}`
-                : `${item.key_.alias ? item.key_.alias : item.key_.tableName}.${
-                    item.key_.oldTableField
-                  }`,
+                : `${item.key_.tableName}.${item.key_.oldTableField}`,
               value,
               group: 'main',
               operation,
@@ -3525,13 +3164,7 @@ export default {
         params.taskType = this_.taskType
         params.defKey = this_.defKey
       }
-      await this.handleInitQuery(params)
-      // 查询字段 校验是否必填，如果是必填没数据，需返回提示
-      let errorMsg = this.validateSearchRequired(params.pagination.querys)
-      if (errorMsg) {
-        this.$message.warning(errorMsg)
-        return
-      }
+      this.handleInitQuery(params)
       this.getBpmTemplateByPagination(params)
     },
     filterChange(filters) {
@@ -4187,7 +3820,7 @@ export default {
           }
           this.$requestConfig
             .batchUpdateTemplateData(data)
-            .then(async (data) => {
+            .then((data) => {
               if (data.state) {
                 this.$message({
                   type: 'success',
@@ -4197,9 +3830,8 @@ export default {
                   // 以服务的方式调用的 Loading 需要异步关闭
                   loadingInstance.close()
                 })
-                let defaultValue = await this.newBuildDefaultQuerys()
                 this.search({
-                  querys: defaultValue || [],
+                  querys: this.buildDefaultQuerys() || [],
                 })
                 // 更新成功后需执行后置js
                 if (afterScriptValue) {
@@ -4313,120 +3945,6 @@ export default {
       })
       return querys
     },
-    async newBuildDefaultQuerys(isSetSearchForm = true) {
-      let this_ = this
-      let querys = []
-      let conditions = JSON.parse(this_.templateInfo.conditionField)
-      //条件字段默认值判断
-      for (let i = 0; i < conditions.length; i++) {
-        let condition = conditions[i]
-        if (condition.defaultValue) {
-          let field = condition.colPrefix + condition.na
-          let defaultValue = condition.isScriptDefault
-            ? await this.getScriptDefaultValue(condition.defaultValue)
-            : condition.defaultValue
-          if (isSetSearchForm) {
-            this_.$set(this_.searchForm, field, defaultValue)
-          }
-          let value = defaultValue
-          if (condition.ty == 'number') {
-            value = parseFloat(value)
-          }
-          querys.push({
-            property: condition.queryPre ? condition.queryPre + field : field,
-            value: value,
-            group: 'main',
-            operation: condition.qt.toUpperCase(),
-            relation: 'AND',
-          })
-        }
-      }
-      //筛选字段默认值判断
-
-      if (this.parameterqQuerys) {
-        let parameterQuerys = JSON.parse(Base64.decode(this.parameterqQuerys))
-        if (parameterQuerys && parameterQuerys.length > 0) {
-          parameterQuerys.forEach((query) => {
-            let prefix = this.templateInfo.isExternal === 1 ? '' : 'F_'
-            query.property = prefix + query.property
-            if (isSetSearchForm) {
-              this_.$set(this_.searchForm, query.property, query.value)
-            }
-            querys.push(query)
-          })
-        }
-      }
-      let filters = JSON.parse(this_.templateInfo.filteringField)
-      filters.forEach((filter) => {
-        if (filter.defaultValue && filter.defaultValue.length > 0) {
-          this_.filterMap[filter.name] = filter.defaultValue
-          filter.defaultValue.forEach((val) => {
-            querys.push({
-              property: `${filter.queryPre || ''}${filter.colPrefix}${
-                filter.name
-              }`,
-              value: val,
-              group: 'defVal_' + filter.name,
-              operation: 'EQUAL',
-              relation: 'OR',
-            })
-          })
-        }
-      })
-      this_.$on('afterMounted', () => {
-        const tab = document.getElementById(this_.templateInfo.alias)
-        if (tab && tab.__vue__) {
-          let headerColumns = tab.__vue__.$refs.tableHeader
-            ? tab.__vue__.$refs.tableHeader.columns
-            : []
-          headerColumns.forEach((column) => {
-            if (this_.filterMap.hasOwnProperty(column.property)) {
-              this_.filterMap[column.property].forEach((val) => {
-                column.filteredValue.push(val)
-              })
-            }
-          })
-        }
-      })
-      this.defaultQuerys = querys
-      return querys
-    },
-    getScriptDefaultValue(scriptValue) {
-      return new Promise((resolve) => {
-        //执行前置脚本内容
-        const _this = this
-        // 用户信息
-        const account = this.$requestConfig.getAccount()
-        const userId = this.$requestConfig.getUserId()
-        const userName = this.$requestConfig.getUsername()
-        const _moment = moment
-        const preScript = `const scriptFunction = function(_this, account, userId, userName, _moment){
-            ${scriptValue}
-          };`
-        let result = ''
-        try {
-          result = eval(
-            `${preScript}scriptFunction(_this, account, userId, userName, _moment);`
-          )
-          if (result && result.then && typeof result.then === 'function') {
-            result.then(
-              (t) => {
-                resolve(t)
-              },
-              (fail) => {
-                //接口返回失败则终止按钮操作，并输出错误信息
-                resolve('')
-              }
-            )
-          } else {
-            resolve(result)
-          }
-        } catch (err) {
-          resolve('')
-          this.$message.error(`查询值默认脚本事件执行错误：${err}`)
-        }
-      })
-    },
     handleClose() {
       this.dataViewDialogVisible = false
     },
@@ -5114,30 +4632,6 @@ export default {
           )
         : customColumns
     },
-    countPageTotal() {
-      this.searchCountTotal(this.getParam())
-    },
-    switchPage(type) {
-      if (type == 'prev') this.pagination.page--
-      if (type == 'next') this.pagination.page++
-      this.handleCurrentChange(this.pagination.page)
-    },
-    handleInput(value) {
-      if (!value) {
-        return
-      }
-      // 使用正则表达式匹配正整数
-      const regex = /^[1-9]\d*$/
-
-      // 如果输入的值不符合正整数的模式，则将其重置为1
-      if (!regex.test(value)) {
-        //如果上一次输入的页数有值，则用上一次输入的页数，否则默认为1
-        this.pagination.page = this.lastPage ? this.lastPage : 1
-      } else {
-        //本次分页数，赋值给上一次分页数
-        this.lastPage = this.pagination.page
-      }
-    },
   },
   // asyncComputed: {
   //   showDraftList() {