imatrix-ui 2.9.29-dw → 2.9.30-dw-tmp1

package/package.json

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

package/packages/dynamic-source-select/src/dynamic-source-select.vue

@@ -5,12 +5,12 @@
       ref="dynamicDataSourceRef"
       :value="value"
       v-bind="myProps"
-      filterable
       :remote="remote"
       :remote-method="remoteMethod"
       :value-key="valueAttribute"
       :loading="loading"
       :reserve-keyword="true"
+      filterable
       clearable
       style="width:100%;height:100%"
       @input="inputValue"
@@ -18,7 +18,7 @@
       @visible-change="visibleChange"
       @remove-tag="removeTag(remote,$event)"
       @clear="clear"
-      @blur="blur"
+      @blur="blurEvent($event)"
       @focus="focus"
     >
       <el-option
@@ -187,6 +187,12 @@ export default {
             this.watchAttrValueChange(initWatchValue)
           }
           this.isLoaded = true
+          // 解决当监控值变化时，数据源重新加载后select输入框中显示的值和下拉中的值不一致问题
+          if (this.baseProps.multiple !== undefined && this.baseProps.multiple === true) {
+            this.$nextTick(() => {
+              this.$refs['dynamicDataSourceRef'].setSelected()
+            })
+          }
         })
         .catch(error => {
           console.log(error)
@@ -199,6 +205,15 @@ export default {
   methods: {
     ...dynamicSourceSelectService,
     ...events,
+    blurEvent(event) {
+      // 解决当监控值变化时，数据源重新加载后select输入框中显示的值和下拉中的值不一致问题
+      if (this.baseProps.multiple !== undefined && this.baseProps.multiple === false) {
+        this.$nextTick(() => {
+          this.$refs['dynamicDataSourceRef'].setSelected()
+        })
+      }
+      this.$emit('blur', event)
+    },
     // 必须有该方法，否则无法给字段赋值
     inputValue(newValue) {
       this.$emit('input', newValue)
@@ -220,14 +235,6 @@ export default {
             if (dynamicDataSourceDto) {
               if (dynamicDataSourceDto.options) {
                 this.optionItems = dynamicDataSourceDto.options
-                if (this.watchAttr) {
-                  // 解决当监控值变化时，数据源重新加载后select输入框中显示的值和下拉中的值不一致问题
-                  if (this.baseProps.multiple !== undefined && this.baseProps.multiple === true) {
-                    this.$nextTick(() => {
-                      this.$refs['dynamicDataSourceRef'].setSelected()
-                    })
-                  }
-                }
                 //
                 if (this.column) { // 只有行编辑时处理
                   // 设置选项组数据、 选项组值字段、 映射关系
@@ -317,6 +324,12 @@ export default {
         this.loading = true
         this.packageDynamicDataSourceInfo(this.dynamicDataSourceCode, param)
           .then(dynamicDataSourceDto => {
+          // 解决当监控值变化时，数据源重新加载后select输入框中显示的值和下拉中的值不一致问题
+            if (this.baseProps.multiple !== undefined && this.baseProps.multiple === true) {
+              this.$nextTick(() => {
+                this.$refs['dynamicDataSourceRef'].setSelected()
+              })
+            }
             this.loading = false
           })
           .catch(error => {

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

@@ -20,9 +20,9 @@ import {
  * @param {*} listCode  如果是九宫格组件导出时，如果页面中有多个九宫格时，该属性需要传“listCode~gridId”,例如：
  * @param {*} exportOptions
  */
-function exportData(dataParam, excelName, listCode, functionCode, uuid, exportOptions, isAsync, pageCode) {
+function exportData(dataParam, excelName, listCode, functionCode, uuid, exportOptions, isAsync, pageCode, isPermission) {
   return new Promise((resolve, reject) => {
-    exportResultData(dataParam, excelName, listCode, exportOptions, functionCode, uuid, isAsync, pageCode).then(result => {
+    exportResultData(dataParam, excelName, listCode, exportOptions, functionCode, uuid, isAsync, pageCode, isPermission).then(result => {
       // 表示导出成功，需要执行导出成功回调方法
       if (isHasTheOption('afterExport', exportOptions) && typeof (exportOptions.afterExport) === 'function') {
         exportOptions.afterExport.call(this)
@@ -39,7 +39,7 @@ function exportData(dataParam, excelName, listCode, functionCode, uuid, exportOp
 /**
  * 导出数据
  */
-function exportResultData(dataParam, excelName, listCode, exportOptions, functionCode, uuid, isAsync, pageCode) {
+function exportResultData(dataParam, excelName, listCode, exportOptions, functionCode, uuid, isAsync, pageCode, isPermission) {
   return new Promise((resolve, reject) => {
     // 从store缓存中取出列表信息
     if (store.get(listCode + 'basicInfo')) {
@@ -76,7 +76,7 @@ function exportResultData(dataParam, excelName, listCode, exportOptions, functio
           // })
         }
         // 导出台账数据，有查询条件则导出查询条件对应的数据，没有查询条件则导出所有记录
-        exportListData(excelName, listCode, dataParam.data, functionCode, uuid, isAsync, pageCode).then((result) => {
+        exportListData(excelName, listCode, dataParam.data, functionCode, uuid, isAsync, pageCode, isPermission).then((result) => {
           resolve(result)
         }).catch(error => {
           reject(error)
@@ -190,7 +190,7 @@ function getExportParamByGridParam(listCode) {
   return param
 }
 // 导出当前台账数据
-function exportListData(excelName, listCode, data, functionCode, uuid, isAsync, pageCode) {
+function exportListData(excelName, listCode, data, functionCode, uuid, isAsync, pageCode, isPermission) {
   return new Promise((resolve, reject) => {
     const gridParams = getGridParams(listCode)
     if (gridParams === undefined || gridParams === null) {
@@ -229,6 +229,8 @@ function exportListData(excelName, listCode, data, functionCode, uuid, isAsync,
       param['async'] = isAsync
       // 页面编码
       param['pageCode'] = pageCode
+      // 导出按钮是否需要验证权限
+      param['isPermission'] = isPermission
       Vue.prototype.$http.post(Vue.prototype.baseURL + '/dsc/commons/export-list-data', param).then(data => {
         if (isAsync) {
           Message({

package/packages/workflow-history-list/src/workflow-history-list.vue

@@ -1,6 +1,8 @@
 <template>
   <el-table
     v-if="loaded"
+    ref="historyList"
+    style="width: 100%"
     :data="histories"
     element-loading-text="Loading"
     border
@@ -97,7 +99,8 @@ export default {
       loaded: false,
       histories,
       processI18n: null,
-      processNameI18n: null
+      processNameI18n: null,
+      tableHeight: null
     }
   },
   computed: {
@@ -118,7 +121,9 @@ export default {
     })
   },
   mounted() {
-
+    this.$nextTick(() => {
+      this.tableHeight = window.innerHeight - this.$refs.historyList.$el.offsetTop
+    })
   },
   methods: {
     ...ApiJs,

package/src/utils/util.js

@@ -27,9 +27,9 @@ export function getLanguageWithLocale() {
  * @param {*} entity 实体信息
  * @returns
  */
-export function findOptionsByDynamicDataSource(dynamicSourceCode, searchText, entity, additionalParameterStr) {
+export function findOptionsByDynamicDataSource(dynamicSourceCode, searchText, entity, additionalParameterStr, searchParam) {
   return new Promise((resolve, reject) => {
-    findDynamicDataSourceByCode(dynamicSourceCode, searchText, entity, additionalParameterStr).then(dynamicDataSourceDto => {
+    findDynamicDataSourceByCode(dynamicSourceCode, searchText, entity, additionalParameterStr, searchParam).then(dynamicDataSourceDto => {
       let options = []
       if (dynamicDataSourceDto && dynamicDataSourceDto.options) {
         const setOptions = dynamicDataSourceDto.options
@@ -68,26 +68,70 @@ export function findOptionsByDynamicDataSource(dynamicSourceCode, searchText, en
  * @param {*} entity 实体信息
  * @returns
  */
-export function findDynamicDataSourceByCode(dynamicSourceCode, searchText, entity, additionalParameterStr) {
-  return new Promise((resolve, reject) => {
-    if (searchText === undefined || searchText === null) {
-      searchText = ''
-    }
-    const params = {
-      searchText
-    }
-    // const additionalParameterStr = sessionStorage.getItem('additionalParamMap')
-    if (additionalParameterStr) {
-      params.additionalParamMap = JSON.parse(additionalParameterStr)
+export function findDynamicDataSourceByCode(dynamicSourceCode, searchText, entity, additionalParameterStr, searchParam) {
+  let watchAttrValue
+  let parentEntity
+  let listCode
+  let formCode
+  let tableName
+  if (searchParam) {
+    watchAttrValue = searchParam.watchAttrValue
+    if (watchAttrValue === undefined || watchAttrValue === null) {
+      watchAttrValue = ''
     }
-    if (entity && entity !== null) {
-      params.entity = entity
+    parentEntity = searchParam.parent
+    listCode = searchParam._listCode
+    formCode = searchParam._formCode
+    tableName = searchParam._tableName
+  }
+  const params = {
+    searchText,
+    watchAttrValue,
+    parent: parentEntity
+
+  }
+  if (additionalParameterStr && typeof (additionalParameterStr) === 'object') {
+    params.additionalParamMap = additionalParameterStr
+  } else if (additionalParameterStr && typeof (additionalParameterStr) === 'string') {
+    params.additionalParamMap = JSON.parse(additionalParameterStr)
+  }
+  if (params.additionalParamMap === undefined) {
+    params.additionalParamMap = {}
+  }
+  if (listCode) {
+    params.additionalParamMap._listCode = listCode
+  }
+  if (formCode) {
+    params.additionalParamMap._formCode = formCode
+  }
+  if (tableName) {
+    params.additionalParamMap._tableName = tableName
+  }
+  if (entity && entity !== null) {
+    params.entity = entity
+  }
+  const backendUrl = Vue.prototype.baseURL
+
+  return new Promise((resolve, reject) => {
+    // 页面设计不请求动态数据源
+    if (Vue.prototype.systemCode !== undefined && Vue.prototype.systemCode === 'iMatrix') {
+      resolve()
+    } else {
+      Vue.prototype.$http.post(backendUrl + '/common/dynamic-data-source/' + dynamicSourceCode, params).then(result => {
+        if (result.backendUrl) {
+          // result.backendUrl表示需要使用动态数据源所属的系统路径重新获得一次数据
+          Vue.prototype.$http.post(result.backendUrl + '/common/dynamic-data-source/' + dynamicSourceCode, params).then(finallyResult => {
+            resolve(finallyResult)
+          }).catch(error => {
+            reject(error)
+          })
+        } else {
+          resolve(result)
+        }
+      }).catch(error => {
+        reject(error)
+      })
     }
-    Vue.prototype.$http.post(Vue.prototype.baseURL + '/common/dynamic-data-source/' + dynamicSourceCode, params).then(dynamicDataSourceDto => {
-      resolve(dynamicDataSourceDto)
-    }).catch(error => {
-      reject(error)
-    })
   })
 }