imatrix-ui 2.9.18-dw → 2.9.19-dw

package/package.json

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

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

@@ -4,7 +4,8 @@ import {
   isEditOptionFunction,
   isLastEditRowSave,
   isHasEditOption,
-  scrollYToBottom
+  scrollYToBottom,
+  getAdditionalParamMap
 } from './utils'
 import formValidatorService from './formValidatorUtil'
 import Vue from 'vue'
@@ -354,7 +355,8 @@ const apis = {
           columns: gridParams.columns,
           isMobile: false,
           pageGridData: isSubTableShowPage ? gridParams.gridData : null,
-          pageSize
+          pageSize,
+          additionalParamMap: getAdditionalParamMap(gridParams)
         })
       }
       if (isPromise(canEdit)) {
@@ -463,12 +465,7 @@ gridParams.$rowIndex < gridParams.gridData.length) {
           if (canSave === undefined || canSave === true) {
             // 触发点击保存时的事件线，在 normal-column 监听处对字段控件是选项组的字段的值进行处理
             eventBus.$emit('un-edit', { row })
-            let additionalParamMap = null
-            if (gridParams.additionalParamMap && typeof (gridParams.additionalParamMap) === 'object') {
-              additionalParamMap = gridParams.additionalParamMap
-            } else if (gridParams.additionalParamMap && gridParams.additionalParamMap !== '') {
-              additionalParamMap = JSON.parse(gridParams.additionalParamMap)
-            }
+            const additionalParamMap = getAdditionalParamMap(gridParams)
             let saveRowRequest
             if (isEditOptionFunction('saveRow', listCode)) {
               // 表示保存方法，用户自己重写了

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

@@ -271,7 +271,8 @@
       :options="{
         dynamicDataSourceCode:dynamicDataSourceCode,
         valueSetOptions:valueSetOptions,
-        isSql:isSql
+        isSql:isSql,
+        additionalParameter: additionalParamMap?JSON.stringify(additionalParamMap):null
       }"
       :table-name="tableName"
       :list-code="listCode"
@@ -396,7 +397,7 @@
 <script>
 import store from './store'
 import Vue from 'vue'
-import { isDisableEdit, isEditOptionFunction, analysisFileSetObj, otherFilesToStandard, getFileList, isDynamicDataSourceSource } from './utils'
+import { isDisableEdit, isEditOptionFunction, analysisFileSetObj, otherFilesToStandard, getFileList, isDynamicDataSourceSource, getAdditionalParamMap } from './utils'
 import dynamicSourceSelect from '../../dynamic-source-select/src/dynamic-source-select'
 import { getEntityFieldValue, setEntityFieldValue } from '../../../src/utils/util'
 import { getToken } from '../../../src/utils/auth'
@@ -488,6 +489,7 @@ export default {
     const gridData = gridParams.gridData
     const subTableData = gridParams.subTableData
     const isSubTableShowPage = gridParams.isSubTableShowPage
+    const additionalParamMap = getAdditionalParamMap(gridParams)
     return {
       deptManTree: false, // 是否是部门人员树
       isMultiTree: false, // 是否是多选树
@@ -522,7 +524,8 @@ export default {
       inputNumberSet: {},
       fileInfo: { showName: null, serverPath: null },
       gridData: isSubTableShowPage ? subTableData : gridData,
-      pageGridData: isSubTableShowPage ? gridData : null
+      pageGridData: isSubTableShowPage ? gridData : null,
+      additionalParamMap
 
     }
   },

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

@@ -41,7 +41,7 @@
       type="yearRange"
       @change="setYearRangeValue(column.prop,$event)"
     />
-    <el-date-picker
+    <el-g-date-picker
       v-else-if="column.componentType==='dateTimePicker'"
       :value="getFormItemValue(column.prop)"
       :default-time="getDefaultTime(column)"
@@ -67,7 +67,7 @@
       value-format="yyyy-MM-dd"
       @input="setValueToModelProp(column.prop,$event)"
     />
-    <el-date-picker
+    <el-g-date-picker
       v-else-if="column.dataType === 'TIME' && column.componentType==='timepicker'"
       :value="getFormItemValue(column.prop)"
       type="datetimerange"

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

@@ -727,15 +727,9 @@ export default {
         const that = this
         const isShowUserTreeDialog =
           document.querySelector('.user-tree') !== null
-        // 列表页面中是否有弹框，例如：按钮区点击一个按钮dialog弹框时，如果有弹框，则列表的回车事件不生效，否则会导致页面刷新
-        let isPageHasDialog = window.sessionStorage.getItem(this.pageCode + '-isShowPageDialog')
-        if (isPageHasDialog === undefined) {
-          isPageHasDialog = false
-        }
-        console.log('super-grid-----this.pageCode=', this.pageCode, 'isPageHasDialog=', isPageHasDialog)
         // 当前页面监视键盘输入
         document.querySelector('.' + this.code).onkeydown = function(e) {
-          if (!that.isShowPageDialog && !isShowUserTreeDialog && !isPageHasDialog) {
+          if (!that.isShowPageDialog && !isShowUserTreeDialog) {
             // 当前列表页面没有弹框或选人弹框，才走键盘监视事件
             // 事件对象兼容
             // eslint-disable-next-line no-caller
@@ -804,11 +798,12 @@ export default {
     // 是否触发回车事件
     isCallEnterEvent(that) {
       let canCall = true
-      if (this.options.isEnableEnterEvent !== undefined && this.options.isEnableEnterEvent === false) {
+      if (that.options.isEnableEnterEvent !== undefined && that.options.isEnableEnterEvent === false) {
         canCall = false
       }
+      console.log('super-grid-----isEnableEnterEvent=', that.options.isEnableEnterEvent, 'canCall=', canCall)
       const gridParams = store.get(that.code)
-      if (gridParams.options && gridParams.options.isFormSubTable) {
+      if (canCall && gridParams.options && gridParams.options.isFormSubTable) {
         canCall = false
       }
       return canCall

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

@@ -770,3 +770,13 @@ export function scrollYToBottom(listCode) {
     scrollDivElement.scrollTop = scrollDivElement.scrollHeight
   }
 }
+
+export function getAdditionalParamMap(gridParams) {
+  let additionalParamMap = null
+  if (gridParams.additionalParamMap && typeof (gridParams.additionalParamMap) === 'object') {
+    additionalParamMap = gridParams.additionalParamMap
+  } else if (gridParams.additionalParamMap && gridParams.additionalParamMap !== '') {
+    additionalParamMap = JSON.parse(gridParams.additionalParamMap)
+  }
+  return additionalParamMap
+}