three-trees-ui 1.0.79 → 1.0.80

package/src/mixins/querySqlPreview.js

@@ -7,14 +7,9 @@ import { decode } from '@/util/base64'
 import Vue from 'vue'
 import $ from 'jquery'
 import _ from 'lodash'
-import moment from 'moment'
 export default {
   data() {
     return {
-      bindKey: {},
-      bindValue: {},
-      defaultQuerys: [],
-      isInit: true,
       bpmRunTime: this.$requestConfig.flowUrl,
       fileList: [],
       tableData: { selectRows: [], querys: '' },
@@ -82,8 +77,6 @@ export default {
         pageSize: 30,
         total: 0,
       },
-      lastPage: 1, //上一次输入的分页数、默认为1
-      total: 0,
       rows: [],
       queryParam: {},
       allSummaryConfig: {},
@@ -91,54 +84,15 @@ export default {
       summaryTableData: [],
       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: {
-    formKey: function(newVal) {
+    formKey: function (newVal) {
       if (newVal) {
         this.init()
       }
     },
-    'tableData.selectRows': function(newVal) {
+    'tableData.selectRows': function (newVal) {
       if (newVal.length > 0) {
         let me_ = this
         me_.uploadParams.id = []
@@ -206,29 +160,7 @@ export default {
       deep: true,
     },
   },
-  created() {
-    if (this.queryView.jsScript) {
-      // 执行js脚本
-      this.handleDiyScript(this.queryView.jsScript)
-    }
-  },
   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}`)
-      }
-    },
     handelBindFiledValua() {
       //数据视图控件
       let _me = this
@@ -277,7 +209,7 @@ export default {
               selectList[i].selectValue = value
 
               //添加监听
-              pInst.$watch(path, function(newVal, oldVal) {
+              pInst.$watch(path, function (newVal, oldVal) {
                 _.debounce(() => {
                   if (newVal !== oldVal) {
                     _me.queryViewOptions.selectList[i].selectValue = newVal
@@ -421,7 +353,7 @@ export default {
       this.$router.push(url)
     },
 
-    handleSizeChange: function(size) {
+    handleSizeChange: function (size) {
       //每页下拉显示数据
       this.pagination.pageSize = size
       if (this.$refs.queryViewList) {
@@ -430,9 +362,9 @@ export default {
         this.search()
       }
     },
-    handleCurrentChange: function(currentPage) {
+    handleCurrentChange: function (currentPage) {
       //点击第几页
-      this.pagination.page = currentPage ? currentPage : this.lastPage
+      this.pagination.page = currentPage
       if (this.$refs.queryViewList) {
         this.$refs.queryViewList.load()
       } else {
@@ -440,126 +372,14 @@ export default {
       }
     },
     //回车查询
-    searchEnterFun: function(e) {
+    searchEnterFun: function (e) {
       let keyCode = window.event ? e.keyCode : e.which
       if (keyCode == 13) {
         this.pagination.page = 1
         this.search()
       }
     },
-    getQueryDataViewOperation(key) {
-      switch (key) {
-        case 'EQ':
-          return 'EQUAL'
-        case 'NE':
-          return 'NOT_EQUAL'
-        case 'LK':
-          return 'LIKE'
-        case 'LFK':
-          return 'LEFT_LIKE'
-        case 'RHK':
-          return 'RIGHT_LIKE'
-        case 'BETWEEN':
-          return 'BETWEEN'
-        default:
-          return 'LIKE'
-      }
-    },
-    async buildDefaultQuerys() {
-      let querys = []
-      let conditions = JSON.parse(this.queryView.conditions)
-      //条件字段默认值判断
-      for (let i = 0; i < conditions.length; i++) {
-        let condition = conditions[i]
-        if (condition.defaultValue) {
-          let defaultValue = condition.isScriptDefault
-            ? await this.getScriptDefaultValue(condition.defaultValue)
-            : condition.defaultValue
-          if (condition.dataType == 'number') {
-            defaultValue = parseFloat(defaultValue)
-          }
-          this.$set(this.searchForm, condition.fieldName, defaultValue)
-
-          querys.push({
-            property: condition.fieldName,
-            value: defaultValue,
-            group: 'main',
-            operation: this.getQueryDataViewOperation(condition.operate),
-            relation: 'AND',
-          })
-        }
-      }
-      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}`)
-        }
-      })
-    },
-    validateSearchRequired(querys = []) {
-      let errorMsg = ''
-      let conditions = JSON.parse(this.queryView.conditions)
-      if (conditions && querys) {
-        conditions.forEach((item) => {
-          if (item.isRequired) {
-            let index = querys.findIndex((k) => {
-              return k.property == item.fieldName
-            })
-            if (index == -1) {
-              errorMsg = `字段【${item.fieldDesc}】为必填查询字段，不能为空！`
-            }
-          }
-        })
-      }
-      return errorMsg
-    },
-    checkHaveRequired() {
-      let haveRequired = false
-      try {
-        let conditions = JSON.parse(this.queryView.conditions)
-        if (conditions) {
-          haveRequired = conditions.some((item) => {
-            return item.isRequired
-          })
-        }
-      } catch (e) {
-        console.log(e)
-      }
-      return haveRequired
-    },
-    async search(param, cb, isSearchBtn, needRequestTotal = false) {
+    search(param, cb, isSearchBtn, needRequestTotal = false) {
       // 不需要请求后端接口统计列表数据
       this.needRequestTotal = needRequestTotal
       !param && (param = {})
@@ -567,38 +387,6 @@ export default {
       const dataTemplateQueryVo = {
         queryFilter: param,
       }
-      //初始化时，把查询字段的默认值加进去
-      if (this.isInit) {
-        let querys = await this.buildDefaultQuerys()
-        dataTemplateQueryVo.queryFilter.querys =
-          dataTemplateQueryVo.queryFilter.querys || []
-        dataTemplateQueryVo.queryFilter.querys = dataTemplateQueryVo.queryFilter.querys.concat(
-          querys
-        )
-      }
-      // 非高级查询时，将默认值带上
-      if (!isSearchBtn) {
-        dataTemplateQueryVo.queryFilter.querys =
-          dataTemplateQueryVo.queryFilter.querys || []
-        dataTemplateQueryVo.queryFilter.querys = dataTemplateQueryVo.queryFilter.querys.concat(
-          this.defaultQuerys
-        )
-      }
-      // 检查是否有必填字段
-      if (this.checkHaveRequired() && this.isInit) {
-        this.$refs.queryViewList.showAdvancedSearch = true
-      }
-      // 查询字段 校验是否必填，如果是必填没数据，需返回提示
-      let errorMsg = this.validateSearchRequired(
-        dataTemplateQueryVo.queryFilter.querys
-      )
-      if (errorMsg) {
-        !this.isInit && this.$message.warning(errorMsg)
-        cb && cb()
-        this.isInit = false
-        return
-      }
-      this.isInit = false
       //保存查询参数，用于作为导出的查询参数
       if (this.queryViewOptions) {
         //关联查询字段
@@ -615,34 +403,8 @@ 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
@@ -657,17 +419,13 @@ export default {
         })
       }
       this.$requestConfig
-        .getQueryViewDataListWithoutTotal(param)
+        .getQueryViewDataList(param)
         .then((response) => {
           this.rows = response.rows
-          // this.pagination.total = response.total
+          this.pagination.total = response.total
           this.pagination.page = response.page
           this.pagination.pageSize = response.pageSize
           this.filterOldSummaryValByType('currentPage')
-          //每次请求后不再统计总数，而是在统计按钮中去统计，当数量统计过一次后，再重新设置到当前页
-          if (this.total) {
-            this.$set(this.pagination, 'total', this.total)
-          }
           this.summaryTableData.push({
             project: '当前页汇总',
             key: 'currentPage',
@@ -687,31 +445,12 @@ export default {
           cb && cb()
         })
     },
-    getQuerySqlViewByPaginationTotal(param, cb) {
-      this.loadingTotal = true
-      this.$requestConfig
-        .getQueryViewDataListWithTotal(param)
-        .then((response) => {
-          this.total = response.value
-          //每次请求后不再统计总数，而是在统计按钮中去统计，当数量统计过一次后，再重新设置到当前页
-          if (this.total) {
-            this.$set(this.pagination, 'total', this.total)
-          }
-          this.loadingTotal = false
-          this.$nextTick(() => {
-            this.$refs.queryViewList && this.$refs.queryViewList.doLayout()
-          })
-        })
-        .finally(() => {
-          this.loadingTotal = false
-          cb && cb()
-        })
-    },
     getQueryFilter() {
       let operationMap = this.getSearchItems() //查询条件类型
       // let fieldQueryMap = this.getFieldQuery() //查询条件字段
       let specialMap = this.getSpecialMap() //获取特殊查询情况（自定义对话框）
       let querys = [] //查询条件
+      let queryFilter = {}
       let pageBean = { pageBean: this.pagination }
       let params = {
         sqlAlias: this.sqlAlias || this.queryView.sqlAlias,
@@ -719,18 +458,8 @@ export default {
       }
       params.pagination = pageBean
       if ($.isEmptyObject(this.searchForm)) {
-        if (this.$refs.queryViewList && this.$refs.queryViewList.querys) {
-          querys.push(...this.$refs.queryViewList.querys)
-        }
-        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' &&
@@ -761,12 +490,7 @@ export default {
                   })
                 }
               }
-            } else if (
-              this.searchForm[key] &&
-              typeof this.searchForm[key] === 'string' &&
-              this.searchForm[key].includes(',') &&
-              !specialMap[key]
-            ) {
+            } else if (this.searchForm[key].includes(',') && !specialMap[key]) {
               let arr = this.searchForm[key].split(',')
               for (let i = 0; i < arr.length; i++) {
                 if (
@@ -788,20 +512,9 @@ 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: value,
+                value: this.searchForm[key],
                 group: 'main',
                 operation: operationMap[key],
                 relation: 'AND',
@@ -809,10 +522,9 @@ export default {
             }
           }
         }
-        if (this.$refs.queryViewList && this.$refs.queryViewList.querys) {
-          querys.push(...this.$refs.queryViewList.querys)
-        }
-        return { pageBean: this.pagination, querys }
+        queryFilter = { pageBean: this.pagination, querys }
+        params.pagination = queryFilter
+        return params
       }
     },
     //获取查询条件类型
@@ -842,19 +554,11 @@ 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
@@ -876,16 +580,12 @@ export default {
               searchItems[i]
             ).attr('field-query')
           } 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')
-            ] = $(searchItems[i])
+            fieldQueryMap[$(searchItems[i]).children().attr('ht-query')] = $(
+              searchItems[i]
+            )
               .children()
               .attr('field-query')
           }
@@ -907,19 +607,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
           }
@@ -1073,14 +766,6 @@ export default {
           dataTemplateQueryVo.selectList = this.queryViewOptions.selectList
         }
       }
-      // 查询字段 校验是否必填，如果是必填没数据，需返回提示
-      let errorMsg = this.validateSearchRequired(
-        dataTemplateQueryVo.queryFilter.querys
-      )
-      if (errorMsg) {
-        this.$message.warning(errorMsg)
-        return
-      }
 
       let data = {
         sqlAlias: this.sqlAlias || this.queryView.sqlAlias,
@@ -1093,22 +778,15 @@ export default {
       let loadingInstance = Loading.service({ fullscreen: true }) //开始
       this.$requestConfig
         .querySqlViewExport(data)
-        // .then(({ data, headers }) => {
-        //   const fileName = decodeURIComponent(
-        //     headers['content-disposition'].split(';')[1].split('filename=')[1]
-        //   )
-        //   const blob = new Blob([data])
-        //   saveAs(blob, fileName)
-        // })
-        // .finally(() => {
-        //   loadingInstance.close() // 结束
-        //   this.dialogExportVisible = false
-        // })
-        .then(() => {
-          this.$message.success('正在导出，请稍后前往报表附件管理查看')
+        .then(({ data, headers }) => {
+          const fileName = decodeURIComponent(
+            headers['content-disposition'].split(';')[1].split('filename=')[1]
+          )
+          const blob = new Blob([data])
+          saveAs(blob, fileName)
         })
         .finally(() => {
-          loadingInstance.close()
+          loadingInstance.close() // 结束
           this.dialogExportVisible = false
         })
     },
@@ -1419,56 +1097,5 @@ export default {
         this.search()
       })
     },
-    countPageTotal() {
-      this.searchCountTotal(this.getQueryFilter())
-    },
-    searchCountTotal(param, cb, isSearchBtn, needRequestTotal = false) {
-      // 不需要请求后端接口统计列表数据
-      this.needRequestTotal = needRequestTotal
-      !param && (param = {})
-      param.pageBean = this.pagination
-      const dataTemplateQueryVo = {
-        queryFilter: param,
-      }
-      //保存查询参数，用于作为导出的查询参数
-      if (this.queryViewOptions) {
-        //关联查询字段
-        if (
-          this.queryViewOptions.selectList &&
-          this.queryViewOptions.selectList.length > 0
-        ) {
-          dataTemplateQueryVo.selectList = this.queryViewOptions.selectList
-        }
-      }
-      this.queryParam = { ...param }
-      let obj = {
-        sqlAlias: this.sqlAlias || this.queryView.sqlAlias,
-        alias: this.alias || this.queryView.alias,
-        param: dataTemplateQueryVo,
-      }
-
-      this.getQuerySqlViewByPaginationTotal(obj, cb)
-    },
-    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
-      }
-    },
   },
 }