imatrix-ui 2.9.12-dw-export1 → 2.9.14-dw

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "imatrix-ui",
-  "version": "2.9.12-dw-export1",
+  "version": "2.9.14-dw",
   "description": "前端组件库：表格、表单、组织结构树等",
   "main": "lib/super-ui.umd.min.js",
   "private": false,

package/packages/plugins/export-data-new.js

@@ -1,6 +1,6 @@
 import {
   Message
-} from '@gcommon/gcommon-ui'
+} from 'element-ui'
 import Vue from 'vue'
 import {
   getI18n
@@ -20,9 +20,9 @@ import {
  * @param {*} listCode  如果是九宫格组件导出时，如果页面中有多个九宫格时，该属性需要传“listCode~gridId”,例如：
  * @param {*} exportOptions
  */
-function exportData(isAsync, pageCode, dataParam, excelName, listCode, functionCode, uuid, exportOptions) {
+function exportData(dataParam, excelName, listCode, functionCode, uuid, exportOptions, isAsync, pageCode) {
   return new Promise((resolve, reject) => {
-    exportResultData(isAsync, pageCode, dataParam, excelName, listCode, exportOptions, functionCode, uuid).then(result => {
+    exportResultData(dataParam, excelName, listCode, exportOptions, functionCode, uuid, isAsync, pageCode).then(result => {
       // 表示导出成功，需要执行导出成功回调方法
       if (isHasTheOption('afterExport', exportOptions) && typeof (exportOptions.afterExport) === 'function') {
         exportOptions.afterExport.call(this)
@@ -39,7 +39,7 @@ function exportData(isAsync, pageCode, dataParam, excelName, listCode, functionC
 /**
  * 导出数据
  */
-function exportResultData(isAsync, pageCode, dataParam, excelName, listCode, exportOptions, functionCode, uuid) {
+function exportResultData(dataParam, excelName, listCode, exportOptions, functionCode, uuid, isAsync, pageCode) {
   return new Promise((resolve, reject) => {
     // 从store缓存中取出列表信息
     if (store.get(listCode + 'basicInfo')) {
@@ -426,7 +426,7 @@ function getExportData(data, excelName) {
 }
 
 function isHasTheOption(event, exportOptions) {
-  if (typeof (exportOptions) !== 'undefined' && typeof (exportOptions[event]) !== 'undefined') {
+  if (exportOptions !== null && typeof (exportOptions) !== 'undefined' && typeof (exportOptions[event]) !== 'undefined') {
     return true
   }
   return false
@@ -464,4 +464,3 @@ export default {
   exportData,
   download
 }
-

package/packages/super-grid/src/search-form-item.vue

@@ -41,7 +41,7 @@
       type="yearRange"
       @change="setYearRangeValue(column.prop,$event)"
     />
-    <el-g-date-picker
+    <el-date-picker
       v-else-if="column.componentType==='dateTimePicker'"
       :value="getFormItemValue(column.prop)"
       :default-time="getDefaultTime(column)"
@@ -219,6 +219,18 @@ export default {
     searchForm: {
       type: Object,
       default: null
+    },
+    index: {
+      type: Number,
+      default: 0
+    },
+    length: {
+      type: Number,
+      default: 0
+    },
+    loadCompleteQuery: {
+      type: Boolean,
+      default: false
     }
   },
   data() {
@@ -229,6 +241,12 @@ export default {
       dataTwo: null
     }
   },
+  mounted() {
+    // 查询页面加载完成
+    if ((this.index + 1) === this.length && this.loadCompleteQuery) {
+      this.$emit('submit-form')
+    }
+  },
   methods: {
     ...searchMethods,
     getDynamicDataSourceOptions(column) {

package/packages/super-grid/src/search-form-open.vue

@@ -13,6 +13,10 @@
               :is-sql="isSql"
               :table-name="tableName"
               :is-join-table="isJoinTable"
+              :index="fieldNum*(r-1)+(n-1)"
+              :length="searchableColumns.length"
+              :load-complete-query="loadCompleteQuery"
+              @submit-form="$emit('submit-form')"
             />
           </template>
           <!--初始进入台账页面时 或 展开时显示按钮--->
@@ -98,6 +102,10 @@ export default {
     isOpen: {
       type: Boolean,
       default: false
+    },
+    loadCompleteQuery: {
+      type: Boolean,
+      default: false
     }
   },
   data() {

package/packages/super-grid/src/search-form-ordinarySearch.vue

@@ -13,6 +13,7 @@
         :field-num="fieldNum"
         :row-num="rowNum"
         :is-open="isOpen"
+        :load-complete-query="loadCompleteQuery"
         @submit-form="$emit('submit-form')"
         @reset-form="$emit('reset-form')"
         @save-condition="$emit('save-condition')"
@@ -100,6 +101,10 @@ export default {
     spanNum: {
       type: Number,
       default: 8
+    },
+    loadCompleteQuery: {
+      type: Boolean,
+      default: false
     }
 
   },
@@ -166,11 +171,14 @@ export default {
           } else {
             this.searchForm[column.prop] = null
           }
+          this.setDefaultQueryValue(column, this.searchForm)
         }
       })
       // 取消当前选中的条件列表的信息
       // this.$refs.searchConditionList.editConditionId = null
       // this.$emit('reset')
+      // 重置条件后查询列表
+      this.$emit('submit-form')
     },
     openFold(isOpen) {
       this.isOpen = isOpen

package/packages/super-grid/src/search-form.vue

@@ -21,6 +21,7 @@
       :span-num="spanNum"
       :rules="rules"
       :is-sql="isSql"
+      :load-complete-query="loadCompleteQuery"
       @submit-form="submitForm('searchForm')"
       @reset-form="resetForm('searchForm')"
       @save-condition="saveCondition()"
@@ -133,6 +134,10 @@ export default {
       default: () => {
         return {}
       }
+    },
+    loadCompleteQuery: {
+      type: Boolean,
+      default: false
     }
 
   },
@@ -168,6 +173,7 @@ export default {
           } else {
             searchForm[column.prop] = null
           }
+          this.setDefaultQueryValue(column, searchForm)
         }
       }
     })
@@ -435,8 +441,10 @@ export default {
         this.$refs.searchFormOrdinarySearch.resetForm()
       } else if (this.searchType === 'advanced') {
         this.$refs.searchFormAdvancedQuery.resetForm()
+        this.$emit('reset')
       }
-      this.$emit('reset')
+      // 子组件重置完成后调用reset方法 同步执行
+      // this.$emit('reset')
     },
     setNumberValue(value, r, n) {
       let itemValue = this.getFormItemValue(this.searchableColumns[this.fieldNum * (r - 1) + (n - 1)].prop)
@@ -571,7 +579,7 @@ export default {
               }
             }
             if (isRangeQueryValue) {
-              searchForm[prop] = [item.startValue, item.endValue]
+              searchForm[prop] = [new Date(item.startValue), new Date(item.endValue)]
             } else {
               if (searchForm[prop]) {
                 if (searchForm[prop] instanceof Array) {

package/packages/super-grid/src/search-methods.js

@@ -11,7 +11,7 @@ const searchMethods = {
         // sql查询时，会把点“.”改为两个下划线"__"
         const replaceDot = '__'
         if (orgProp && orgProp.indexOf(replaceDot) > 0) {
-        // 表示包括点“.”，需要把两个下划线"__"重新改为点“.”,否则会导致查询报500错误
+          // 表示包括点“.”，需要把两个下划线"__"重新改为点“.”,否则会导致查询报500错误
           orgProp = orgProp.replace(replaceDot, '.')
         }
         param.propName = orgProp
@@ -22,7 +22,7 @@ const searchMethods = {
         param.formatter = column.formatter ? JSON.parse(JSON.stringify(column.formatter)) : column.formatter
         const values = this.getFormItemValue(column.prop)
         if (column.dataType === 'DATE' || column.dataType === 'TIME') {
-        // 日期 或 时间类型
+          // 日期 或 时间类型
           // console.log('values==', values, column.prop)
           if (values !== null && values.length === 2 && values[0] !== null && values[1] !== null) {
             const format = this.getDateTimeSearchFormatter(column, column.dataType, column.formatter)
@@ -40,8 +40,8 @@ const searchMethods = {
             searchParams.push(param)
           }
         } else if ((column.dataType === 'INTEGER' || column.dataType === 'LONG' || column.dataType === 'DOUBLE') &&
-        Array.isArray(values)) {
-        // 日期 或 时间类型
+          Array.isArray(values)) {
+          // 日期 或 时间类型
           // const values1 = this.getFormItemValue(column.prop)
           if (values) {
             if (column.componentType === 'yearRange') {
@@ -118,7 +118,7 @@ const searchMethods = {
           this.packageValueWithArray(propValue, searchParams, param)
         } else {
           if (column.componentType === 'multiselect') {
-          // 表示是多选下拉框选择器选择的值
+            // 表示是多选下拉框选择器选择的值
             const values = this.getFormItemValue(column.prop)
             // console.log('values==', values, column.prop)
             this.packageValueWithArray(values, searchParams, param)
@@ -141,14 +141,14 @@ const searchMethods = {
         // sql查询时，会把点“.”改为两个下划线"__"
         const replaceDot = '__'
         if (orgProp && orgProp.indexOf(replaceDot) > 0) {
-        // 表示包括点“.”，需要把两个下划线"__"重新改为点“.”,否则会导致查询报500错误
+          // 表示包括点“.”，需要把两个下划线"__"重新改为点“.”,否则会导致查询报500错误
           orgProp = orgProp.replace(replaceDot, '.')
         }
         newParam.propName = orgProp
         newParam.operator = this.getOperator(param)
         newParam.matchingType = param.queryMatching
         if (newParam.dataType === 'DATE' || newParam.dataType === 'TIME') {
-        // 日期 或 时间类型
+          // 日期 或 时间类型
           const values = newParam.value
           // console.log('values==', values, column.prop)
           if (values !== null && values.length === 2 && values[0] !== null && values[1] !== null) {
@@ -159,7 +159,7 @@ const searchMethods = {
           const values1 = newParam.value
           if (values1) {
             if (!Array.isArray(values1) || values1.length < 2 || values1[0] === null && values1[1] === null) {
-            // 填写了一个有效值
+              // 填写了一个有效值
               if (!Array.isArray(values1)) {
                 newParam.propValue = values1
               } else if (values1.length < 2) {
@@ -170,7 +170,7 @@ const searchMethods = {
                 newParam.propValue = values1[0]
               }
             } else {
-            // 填写了两个有效值
+              // 填写了两个有效值
               newParam.startValue = values1[0]
               newParam.endValue = values1[1]
             }
@@ -209,7 +209,7 @@ const searchMethods = {
           this.packageValueWithArray(propValue, newSearchFormList, param)
         } else {
           if (newParam.componentType === 'multiselect') {
-          // 表示是多选下拉框选择器选择的值
+            // 表示是多选下拉框选择器选择的值
             const values = newParam.value
             // console.log('values==', values, column.prop)
             this.packageValueWithArray(values, newSearchFormList, param)
@@ -258,6 +258,9 @@ const searchMethods = {
   // 根据日期字符串获得日期毫秒值
   getDateTimeMillsByDateStr(dateStr, format) {
     if (typeof (dateStr) === 'string' && format) {
+      if (dateStr.indexOf('T') !== -1) {
+        return new Date(dateStr).getTime()
+      }
       // 表示是格式化后的值，转成date毫秒值传给后台，解决时区问题
       format = format.toLowerCase()
       if (format.indexOf('h') > 0 && format.indexOf('m') > 0 && format.indexOf('s') > 0) {
@@ -288,8 +291,8 @@ const searchMethods = {
   },
   getOperator(column) {
     if ((column.dataType === 'TEXT' || column.dataType === 'CLOB') && column.fuzzy &&
-     (!column.componentType || (column.componentType && ((column.componentType !== 'select' && column.componentType !== 'multiselect') ||
-      (column.componentType === 'multiselect' && column.ifMultiData !== undefined && column.ifMultiData === true))))) {
+      (!column.componentType || (column.componentType && ((column.componentType !== 'select' && column.componentType !== 'multiselect') ||
+        (column.componentType === 'multiselect' && column.ifMultiData !== undefined && column.ifMultiData === true))))) {
       // 是否是文本类型的字段，且启用了模糊查询，则表示操作符为contains模糊查询
       return 'CONTAIN'
     } else if (Array.isArray(this.getFormItemValue(column.prop))) {
@@ -382,6 +385,64 @@ const searchMethods = {
   // 查询条件
   getSearchCondition(conditionId) {
     return this.$http.get(Vue.prototype.baseAPI + '/component/super-grids/search-conditions/' + conditionId)
+  },
+  // 设置默认查询值
+  setDefaultQueryValue(column, searchForm) {
+    if (column.componentType === 'date' || column.componentType === 'dateSection' ||
+      column.componentType === 'timePicker' || column.componentType === 'dateTimePicker') {
+      const formatList = { 'date': 'YYYYMMDD', 'dateSection': 'YYYYMMDDHHMMSS', 'timePicker': 'YYYYMMDD', 'dateTimePicker': 'YYYYMMDDHHMMSS' }
+      const valueTypeList = { 'date': 'String', 'dateSection': 'Date', 'timePicker': 'String', 'dateTimePicker': 'String' }
+      const rowControlConfig = column['controlConfig']
+      if (rowControlConfig !== null && rowControlConfig !== undefined && rowControlConfig !== '') {
+        const controlConfig = JSON.parse(rowControlConfig)
+        if (controlConfig.timeDefaultQueryRange) {
+          const format = formatList[column.componentType]
+          const valueType = valueTypeList[column.componentType]
+          if (format && valueType) {
+            const queryRange = this.getDateQueryRange(column.componentType, format, controlConfig.timeDefaultQueryRange, valueType)
+            searchForm[column.prop] = queryRange
+          }
+        }
+      }
+    }
+  },
+  // 获取近一周，近两周，近一个月的时间范围
+  // componentType组件类型 date time
+  // format 格式 年月日/年月日时分秒
+  // queryRangeType 查询范围类型 近一周nearlyWeek/近两周nearlyTwoWeeks/近一个月nearlyMonth
+  // valueType 返回对象类型 String Date
+  getDateQueryRange(componentType, format, timeDefaultQueryRange, valueType) {
+    const queryRange = []
+    const nowDate = new Date() // 当前时间
+    let startDate// 开始时间
+    const endDate = new Date()// 结束时间
+    if (timeDefaultQueryRange !== null && timeDefaultQueryRange > 0) {
+      startDate = new Date(nowDate.setDate(nowDate.getDate() - parseInt(timeDefaultQueryRange)))
+    }
+    if (format === 'YYYYMMDD') {
+      queryRange[0] = startDate.getFullYear() + '-' + (startDate.getMonth() + 1) + '-' + startDate.getDate()
+      queryRange[1] = endDate.getFullYear() + '-' + (endDate.getMonth() + 1) + '-' + endDate.getDate()
+    } else {
+      queryRange[0] = startDate.getFullYear() + '-' + (startDate.getMonth() + 1) + '-' + startDate.getDate() + ' 00:00:00'
+      queryRange[1] = endDate.getFullYear() + '-' + (endDate.getMonth() + 1) + '-' + endDate.getDate() + ' 23:59:59'
+    }
+    if (valueType === 'Date') {
+      const queryRangeFormat = []
+      queryRange.forEach(date => {
+        var tempStrs = date.split(' ')
+        var dateStrs = tempStrs[0].split('-')
+        var year = parseInt(dateStrs[0], 10)
+        var month = parseInt(dateStrs[1], 10) - 1
+        var day = parseInt(dateStrs[2], 10)
+        var timeStrs = tempStrs[1].split(':')
+        var hour = parseInt(timeStrs[0], 10)
+        var minute = parseInt(timeStrs[1], 10)
+        var second = parseInt(timeStrs[2], 10)
+        queryRangeFormat.push(new Date(year, month, day, hour, minute, second))
+      })
+      return queryRangeFormat
+    }
+    return queryRange
   }
 }
 export default searchMethods

package/packages/super-grid/src/super-grid-service.js

@@ -1,10 +1,10 @@
 /* eslint-disable no-undef */
-import Vue from 'vue'
 import Sortable from 'sortablejs'
-import store from './store'
+import Vue from 'vue'
 import {
   packageEnumAndBeanColumnValueSets
 } from '../../utils/value-set'
+import store from './store'
 import {
   isHasOptionFunction
 } from './utils'
@@ -72,6 +72,8 @@ const superGridService = {
         // 初始化组件时先获取元信息再获取数据，以后翻页、排序、查询不再去获取元数据了
         this.$http.post(url, param).then(data => {
           const p1 = new Date().getTime()
+          // 判断是否查询组件渲染完之后查询
+          this.isLoadCompleteQuery(data.columns)
           // 行编辑设置所有字段的默认值null时使用，优化行编辑性能
           let allColumns = []
           allColumns = allColumns.concat(JSON.parse(JSON.stringify(data.columns)))
@@ -189,10 +191,20 @@ const superGridService = {
                 // 表示是页面展示模式
               } else if (typeof (this.options.initSearch) === 'undefined') {
                 if (typeof (gridParams.basicInfo.initializationQuery) === 'undefined' || gridParams.basicInfo.initializationQuery) {
-                  this.fetchData()
+                  // 判断是否初始化完查询条件后再查询数据
+                  if (this.loadCompleteQuery) {
+                    this.isLoading = false
+                  } else {
+                    this.fetchData()
+                  }
                 }
               } else if (this.options.initSearch !== false) {
-                this.fetchData()
+                // 判断是否初始化完查询条件后再查询数据
+                if (this.loadCompleteQuery) {
+                  this.isLoading = false
+                } else {
+                  this.fetchData()
+                }
               }
             }
             this.createBackgroundColorMap()
@@ -211,6 +223,26 @@ const superGridService = {
       console.log('初始化所耗时间', a1 - a)
     })
   },
+  isLoadCompleteQuery(columns) {
+    if (columns !== null) {
+      let queryParameterSize = 0
+      columns.forEach(column => {
+        if (column.hasOwnProperty('queryType') && column.hasOwnProperty('prop')) {
+          if (column.prop !== '$index' && column.prop !== '$selection') {
+            if (column.queryType && column.queryType !== 'no') {
+              // 配置了默认值
+              if (column.controlConfig) {
+                queryParameterSize++
+              }
+            }
+          }
+        }
+      })
+      if (queryParameterSize > 0) {
+        this.loadCompleteQuery = true
+      }
+    }
+  },
   packageColumnOptionMap(gridParams) {
     const columnOptionMap = {}
     if (gridParams.columns && gridParams.columns.length > 0) {
@@ -268,13 +300,13 @@ const superGridService = {
             const watchParentAttrs = dynamicColumnInfo.watchParentAttr.split(',')
             watchParentAttrs.forEach(watchParentAttr => {
               if (watchParentAttr) {
-              // 存储属性对应的值
+                // 存储属性对应的值
                 if (!param.watchParentAttrValues) {
                   param.watchParentAttrValues = {}
                 }
                 param.watchParentAttrValues[watchParentAttr] = this.parentFormData[watchParentAttr]
-                const unWatch = this.$watch('parentFormData.' + watchParentAttr, function(newValue, oldValue) {
-                // 重新加载表格及表格数据
+                const unWatch = this.$watch('parentFormData.' + watchParentAttr, function (newValue, oldValue) {
+                  // 重新加载表格及表格数据
                   if (!gridParams.dynamicTemp) {
                     gridParams.dynamicTemp = {}
                   }
@@ -284,7 +316,7 @@ const superGridService = {
                   }
                   gridParams.dynamicTemp.watchParentAttrValues[watchParentAttr] = newValue
                   if (this.$refs && this.$refs.superGrid) {
-                  // 手动注销watch，否则会调用多次watch
+                    // 手动注销watch，否则会调用多次watch
                     unWatch()
                     // 重新加载表格及表格数据
                     this.$emit('reload-grid')

package/packages/super-grid/src/super-grid.vue

@@ -11,6 +11,7 @@
       :search-form-info="searchFormInfo"
       :search-param="searchFormContent"
       :init-search-props="initSearchProps"
+      :load-complete-query="loadCompleteQuery"
       @search="doSearch"
       @reset="resetSearch"
       @open-fold="openFold"
@@ -352,6 +353,7 @@ export default {
         summary: 'no'
       },
       columns: [],
+      loadCompleteQuery: false,
       pagination: null,
       query: null,
       lineEdit: null,
@@ -2654,6 +2656,7 @@ export default {
     // api方法，super-pages中有调用该方法
     closePageDialog(popParams) {
       // popParams格式为：{ entity, pageCode }
+      console.log('列表组件--closePageDialog---this.jumpPageSetting=', this.jumpPageSetting )
       if (this.jumpPageSetting) {
         // 调用关闭弹框事件
         const gridParams = store.get(this.code)
@@ -2684,6 +2687,12 @@ export default {
           }
           closeEvent.call(this, params)
         }
+        const isRefreshWhenClosePopup = this.jumpPageSetting.isRefreshWhenClosePopup
+        if (isRefreshWhenClosePopup !== undefined && isRefreshWhenClosePopup === true) {
+          // 关闭弹框时，刷新父页面列表
+          const gridParams = store.get(this.code)
+          this.search(gridParams.searchForm)
+        }
       }
       this.isShowPageDialog = false
       this.jumpPageSetting = null

package/packages/super-grid/src/utils.js

@@ -1,16 +1,15 @@
-import store from './store'
 import Vue from 'vue'
-import {
-  isShowMenuRoute,
-  isPlateSys
-} from '../../../src/utils/common-util'
 import {
   getToken
-}
-  from '../../../src/utils/auth'
+} from '../../../src/utils/auth'
+import {
+  isPlateSys,
+  isShowMenuRoute
+} from '../../../src/utils/common-util'
 import {
   getEntityFieldValue
 } from '../../../src/utils/util'
+import store from './store'
 export function getColumnValues(data, prop) {
   const values = []
   for (const obj of data) {
@@ -390,7 +389,7 @@ export function getGridParams() {
       'isRestoreByEsc': true, // 点击ESC时，是否撤销编辑,
       'aftersaveIsCancelEditState': true, // 保存后，是否取消编辑状态
       'afterRestoreIsCancelEditState': true, // 撤销编辑后，是否取消编辑状态
-      'input': function() {} // 数据改变时触发
+      'input': function () { } // 数据改变时触发
       // 'beforeSave': function() { return true }, // 保存行数据前的回调
       // 'saveSuccess': function() {}, // 保存行数据成功的回调
       // 'saveError': function() {}, // 保存行数据发生异常的回调

package/src/i18n/langs/cn.js

@@ -73,7 +73,8 @@ const cn = {
     selectYear: '选择年',
     search: '查询',
     forbiddenException: '您没有权限访问该资源',
-    theButtonIsNotBoundToAResource: '该按钮未绑定资源,请先绑定资源'
+    theButtonIsNotBoundToAResource: '该按钮未绑定资源,请先绑定资源',
+    asyncExport: '正在异步导出，请等待消息通知!'
   },
   // 列表组件
   superGrid: {

package/src/i18n/langs/en.js

@@ -73,7 +73,8 @@ const en = {
     selectYear: 'Select Year',
     search: 'Search',
     forbiddenException: 'You do not have permission to access this resource',
-    theButtonIsNotBoundToAResource: 'The button is not bound to a resource, Bind the resource first'
+    theButtonIsNotBoundToAResource: 'The button is not bound to a resource, Bind the resource first',
+    asyncExport: 'Asynchronous export, please wait for message notification!'
   },
   superGrid: {
     columnConfig: 'Column Config',

package/src/utils/jump-page-utils.js

@@ -427,6 +427,7 @@ function openDialogWhenPopup(jumpPageSetting, system, pageCode, dataId, jumpMode
     popPageSetting.valueMappings = jumpPageSetting.valueMappings
     popPageSetting.updateValueEvent = jumpPageSetting.updateValueEvent
     popPageSetting.closeEvent = jumpPageSetting.closeEvent
+    popPageSetting.isRefreshWhenClosePopup = jumpPageSetting.isRefreshWhenClosePopup
   }
   // 是否是自定义系统
   let isDsc = false