imatrix-ui 2.9.33-dw → 2.9.34-dw

package/package.json

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

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

@@ -40,7 +40,8 @@ import dynamicSourceSelectService from './dynamic-source-select-service'
 import events from './events'
 import {
   setEntityFieldValue,
-  getPropNameWhenJoinTable
+  getPropNameWhenJoinTable,
+  getEntityFieldValue
 } from '../../../src/utils/util'
 export default {
   name: 'DynamicSourceSelect',
@@ -104,6 +105,12 @@ export default {
     if (this.entity) {
       markValue = JSON.stringify(this.entity)
     }
+    let lastValues = []
+    if (this.baseProps.multiple !== undefined && this.baseProps.multiple === true) {
+      if (this.value !== undefined && this.value !== null && this.value && Array.isArray(this.value)) {
+        lastValues = JSON.parse(JSON.stringify(this.value))
+      }
+    }
     return {
       /**
        *  用于回显动态数据源选择的默认值，因为初始进入编辑状态时，没有获取映射关系，
@@ -121,7 +128,8 @@ export default {
       additionalParameterStr: this.options.additionalParameter, // 附加参数json字符串
       isLoaded: false,
       watchAttr: null, // 监控的entity属性名,多个属性名逗号分隔。即当该属性修改时，需要走后台重新获得当前下拉选的选项集合
-      backendUrl: null // 后台访问路径
+      backendUrl: null, // 后台访问路径
+      lastValues // 最后一次的value值，用于判断是否是增加元素
     }
   },
   watch: {
@@ -367,40 +375,162 @@ export default {
     },
     setValues(newValue) {
       if (this.valueSetOptions && this.valueSetOptions.length > 0) {
-        this.valueSetOptions.forEach(columnInfo => {
-          const sourceColumnName = columnInfo.columnName
+        if (this.baseProps.multiple !== undefined && this.baseProps.multiple === true) {
+          // 多选时
+          this.setColumnValueWhenMulti(newValue)
+        } else {
+          // 单选时
+          this.valueSetOptions.forEach(columnInfo => {
+            const sourceColumnName = columnInfo.columnName
+            let value
+            if (this.optionItems && sourceColumnName) {
+              value = this.getTargetColumnValue(newValue, sourceColumnName)
+            }
+            this.setColumnValue(sourceColumnName, value, columnInfo)
+          })
+        }
+      }
+    },
+    // 设置字段的值
+    setColumnValue(sourceColumnName, value, columnInfo) {
+      let targetColumnName = null
+      const targetColumnInfo = columnInfo.valueColumn
+      if (targetColumnInfo) {
+        targetColumnName = targetColumnInfo.name
+        if (this.isSql === true) {
+          targetColumnName = targetColumnInfo.dbColumnName
+          targetColumnName = getPropNameWhenJoinTable(
+            targetColumnName,
+            this.isJoinTable,
+            this.tableName
+          )
+        }
+      }
+      if (
+        this.entity &&
+            targetColumnName &&
+            targetColumnName !== null &&
+            targetColumnName !== ''
+      ) {
+        setEntityFieldValue(this.entity, targetColumnName, value)
+      }
+      this.$emit('set-value', {
+        value: value,
+        sourceColumnName: sourceColumnName,
+        targetColumnName: targetColumnName,
+        options: this.optionItems,
+        valueAttribute: this.valueAttribute
+      })
+    },
+    // 多选下拉框时处理增加tag、减少tag时，映射字段赋值问题
+    setColumnValueWhenMulti(newValue) {
+      // 是否添加tag
+      let isAddTag = false
+      let removeTag
+      this.valueSetOptions.forEach(columnInfo => {
+        const sourceColumnName = columnInfo.columnName
+        if (sourceColumnName === this.valueAttribute) {
+          // 是当前下拉选组件对应的字段时，才需要走该方法
+          // 字段的值
           let value
           if (this.optionItems && sourceColumnName) {
             value = this.getTargetColumnValue(newValue, sourceColumnName)
           }
-          let targetColumnName = null
-          const targetColumnInfo = columnInfo.valueColumn
-          if (targetColumnInfo) {
-            targetColumnName = targetColumnInfo.name
-            if (this.isSql === true) {
-              targetColumnName = targetColumnInfo.dbColumnName
-              targetColumnName = getPropNameWhenJoinTable(
-                targetColumnName,
-                this.isJoinTable,
-                this.tableName
-              )
+          this.setColumnValue(sourceColumnName, value, columnInfo)
+          if (this.lastValues.length < newValue.length) {
+            // 表示是增加tag
+            isAddTag = true
+          } else if (this.lastValues.length > newValue.length) {
+            // 表示减少tag
+            isAddTag = false
+            const totalArr = [...this.lastValues, ...newValue]
+            const totalSet = new Set(totalArr)
+            const arr = Array.from(totalSet)
+            const removeTagArr = [...arr.filter(item => !this.lastValues.includes(item)), ...arr.filter(item => !newValue.includes(item))]
+            if (removeTagArr && removeTagArr.length > 0) {
+              removeTag = removeTagArr[0]
             }
           }
-          if (
-            this.entity &&
+          this.lastValues = JSON.parse(JSON.stringify(newValue))
+          // 跳出forEach循环
+          return
+        }
+      })
+      if (isAddTag) {
+        // 表示是增加tag
+        const isRemove = false
+        const lastSelectTag = newValue[newValue.length - 1]
+        const items = this.optionItems.filter(
+          item => item[this.valueAttribute] === lastSelectTag
+        )
+        if (items && items.length > 0) {
+          this.setTagValue(null, isRemove, items[0])
+        }
+      } else {
+        // 表示是减少tag
+        const isRemove = true
+        this.setTagValue(removeTag, isRemove)
+      }
+    },
+    // 根据tag参数设置映射字段的值
+    setTagValue(tag, isRemove, selectItem) {
+      if (this.valueSetOptions && this.valueSetOptions.length > 0) {
+        this.valueSetOptions.forEach(columnInfo => {
+          const sourceColumnName = columnInfo.columnName
+          if (sourceColumnName !== this.valueAttribute) {
+            let targetColumnName = null
+            const targetColumnInfo = columnInfo.valueColumn
+            if (targetColumnInfo) {
+              targetColumnName = targetColumnInfo.name
+              if (this.isSql === true) {
+                targetColumnName = targetColumnInfo.dbColumnName
+                targetColumnName = getPropNameWhenJoinTable(
+                  targetColumnName,
+                  this.isJoinTable,
+                  this.tableName
+                )
+              }
+            }
+            let value
+            if (targetColumnName) {
+              const originalValue = getEntityFieldValue(this.entity, targetColumnName)
+              if (isRemove) {
+                // 移除tag
+                const index = this.value.indexOf(tag)
+                if (originalValue !== undefined && originalValue !== null && originalValue !== '') {
+                  const originalVals = originalValue.split(',')
+                  originalVals.splice(index, 1)
+                  value = originalVals.join(',')
+                }
+              } else {
+                // 添加tag
+                let addValue
+                if (selectItem) {
+                  addValue = selectItem[sourceColumnName]
+                }
+                if (originalValue !== undefined && originalValue !== null && originalValue !== '') {
+                  value = originalValue + ',' + addValue
+                } else {
+                  value = addValue
+                }
+              }
+            }
+            if (
+              this.entity &&
             targetColumnName &&
             targetColumnName !== null &&
             targetColumnName !== ''
-          ) {
-            setEntityFieldValue(this.entity, targetColumnName, value)
+            ) {
+              setEntityFieldValue(this.entity, targetColumnName, value)
+            }
+            this.$emit('set-value', {
+              value: value,
+              sourceColumnName: sourceColumnName,
+              targetColumnName: targetColumnName,
+              options: this.optionItems,
+              valueAttribute: this.valueAttribute
+            })
           }
-          this.$emit('set-value', {
-            value: value,
-            sourceColumnName: sourceColumnName,
-            targetColumnName: targetColumnName,
-            options: this.optionItems,
-            valueAttribute: this.valueAttribute
-          })
         })
       }
     },

package/packages/organization-input/src/organization-input.vue

@@ -502,7 +502,7 @@ export default {
           setEntityFieldValue(this.models, model, finallyOrgResult)
           // Vue.set(this.models, model, finallyOrgResult)
         }
-        console.log('this.value', this.models)
+        // console.log('this.value', this.models)
         // 调用setValue事件
         this.$emit('setValue', model, finallyOrgResult)
         if (finallyOrgResult === undefined || finallyOrgResult === null || finallyOrgResult === '') {

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

@@ -1,6 +1,6 @@
 import {
   Message
-} from 'element-ui'
+} from '@gcommon/gcommon-ui'
 import Vue from 'vue'
 import {
   getI18n
@@ -64,17 +64,17 @@ function exportResultData(dataParam, excelName, listCode, exportOptions, functio
         })
       } else {
         // const dataIds = []
-        if (dataParam && dataParam.hasOwnProperty('data')) {
-          // 导出选中行
-          console.log('data', dataParam.data)
-          // dataParam.data.forEach(item => {
-          //   if (item.id) {
-          //     dataIds.push(item.id)
-          //   } else if (item.ID) {
-          //     dataIds.push(item.ID)
-          //   }
-          // })
-        }
+        // if (dataParam && dataParam.hasOwnProperty('data')) {
+        // 导出选中行
+        // console.log('data', dataParam.data)
+        // dataParam.data.forEach(item => {
+        //   if (item.id) {
+        //     dataIds.push(item.id)
+        //   } else if (item.ID) {
+        //     dataIds.push(item.ID)
+        //   }
+        // })
+        // }
         // 导出台账数据，有查询条件则导出查询条件对应的数据，没有查询条件则导出所有记录
         exportListData(excelName, listCode, dataParam.data, functionCode, uuid, isAsync, pageCode, isPermission).then((result) => {
           resolve(result)

package/packages/rich-editor/index.vue

@@ -156,7 +156,7 @@ export default {
         paste_data_images: true, // 图片是否可粘贴'
         urlconverter_callback: (url, node, onSave, name) => {
           if (node === 'img' && url.startsWith('blob:')) {
-            console.log('urlconverter_callback ....')
+            // console.log('urlconverter_callback ....')
             tinymce.activeEditor && tinymce.activeEditor.uploadImages()
             return url
           }
@@ -165,10 +165,10 @@ export default {
         images_upload_handler: (blobInfo, success, failure, progress) => {
           let file
           if (blobInfo.blob() instanceof File) {
-            console.log('images_upload_handler .File')
+            // console.log('images_upload_handler .File')
             file = blobInfo.blob()
           } else {
-            console.log('images_upload_handler .base64')
+            // console.log('images_upload_handler .base64')
             file = _that.base64ToFile(blobInfo.base64(), 'a.png')
           }
           const params = new FormData()
@@ -179,7 +179,7 @@ export default {
             }
           }
           _that.$http.post('/common/fs-upload/rich-editor-image', params, config).then(res => {
-            console.log(res)
+            // console.log(res)
             success(res.url)
           }).catch(() => {
             failure('上传出错，服务器开小差了呢')
@@ -232,7 +232,7 @@ export default {
   },
   methods: {
     showImage($event) {
-      console.log(this.$refs.previewImg)
+      // console.log(this.$refs.previewImg)
       this.srcList = [$event.target.currentSrc]
       this.$refs.previewImg.showViewer = true
     },
@@ -251,7 +251,7 @@ export default {
       this.ImageComponent = Vue.extend({
         methods: {
           showImage($event) {
-            console.log($event)
+            // console.log($event)
             that.showImage($event)
           }
         },

package/packages/rich-editor/viewer.vue

@@ -86,7 +86,7 @@ export default {
       this.ImageComponent = Vue.extend({
         methods: {
           showImage($event) {
-            console.log($event)
+            // console.log($event)
             that.showImage($event)
           }
         },

package/packages/scan-code-input/src/scan-code-input-colse.vue

@@ -33,7 +33,7 @@ export default {
     this.openScan()
   },
   beforeDestroy() {
-    console.log('销毁定时器')
+    // console.log('销毁定时器')
     this.codeReader.reset()
   },
   methods: {
@@ -42,7 +42,7 @@ export default {
       that.codeReader.listVideoInputDevices().then((videoInputDevices) => {
         that.tipShow = true
         that.tipMsg = this.$t('messageVideo.callingRearCamera')
-        console.log('videoInputDevices', videoInputDevices)
+        // console.log('videoInputDevices', videoInputDevices)
         // 默认获取第一个摄像头设备id
         let firstDeviceId = videoInputDevices[0].deviceId
         // 获取第一个摄像头设备的名称
@@ -69,7 +69,7 @@ export default {
       that.codeReader.listVideoInputDevices().then((videoInputDevices) => {
         that.tipShow = true
         that.tipMsg = this.$t('messageVideo.callingRearCamera')
-        console.log('videoInputDevices', videoInputDevices)
+        // console.log('videoInputDevices', videoInputDevices)
         // 默认获取第一个摄像头设备id
         let firstDeviceId = videoInputDevices[0].deviceId
         // 获取第一个摄像头设备的名称
@@ -97,7 +97,7 @@ export default {
         // let nowContent = null
         that.textContent = null
         if (result) {
-          console.log(result)
+          // console.log(result)
           that.textContent = result.text
           if (that.textContent) {
             that.tipShow = false

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

@@ -291,9 +291,9 @@ export default {
                   }
                 }
               }
-              console.log('config拖动字段', vm.columns)
-              console.log('config拖动字段oldIndex', oldIndex)
-              console.log('config拖动字段newIndex', newIndex)
+              // console.log('config拖动字段', vm.columns)
+              // console.log('config拖动字段oldIndex', oldIndex)
+              // console.log('config拖动字段newIndex', newIndex)
               vm.hasLoaded = false
               setTimeout(function() {
                 vm.hasLoaded = true

package/packages/super-grid/src/custom-formatter.js

@@ -201,12 +201,12 @@ const customFormatter = {
       const result = initialization(JSON.parse(jumpPageJson), row, isSql, additionalParamerter, contextParameter, tableName, parentFormData)
       // console.log('getHyperLinkSetting--resut=', result)
       if (result && result.label && result.label !== '') {
-        console.log('label存在')
+        // console.log('label存在')
       } else {
         result.label = this.objectPropValueTwo(row, column)
       }
       if (result && result.title && result.title !== '') {
-        console.log('title存在')
+        // console.log('title存在')
       } else {
         result.title = result.label
       }
@@ -230,11 +230,11 @@ const customFormatter = {
       let canClick = true
       const gridParams = store.get(listCode)
       const jumpPageSetting = JSON.parse(jumpPageJson)
-      console.log('gupre-grid---clickHyperLink--jumpPageSetting=', jumpPageSetting)
+      // console.log('gupre-grid---clickHyperLink--jumpPageSetting=', jumpPageSetting)
       if (jumpPageSetting.beforeClick) {
         const funName = jumpPageSetting.beforeClick
-        console.log('gupre-grid---clickHyperLink--jumpPageSetting.beforeClick=', funName)
-        console.log('gupre-grid---clickHyperLink--gridParams.options[eventCallBack]=', gridParams.options['eventCallBack'])
+        // console.log('gupre-grid---clickHyperLink--jumpPageSetting.beforeClick=', funName)
+        // console.log('gupre-grid---clickHyperLink--gridParams.options[eventCallBack]=', gridParams.options['eventCallBack'])
         if (gridParams.options && gridParams.options['eventCallBack'] &&
           gridParams.options['eventCallBack'][funName] && typeof (gridParams.options['eventCallBack'][funName]) === 'function') {
           const param = {
@@ -261,9 +261,9 @@ const customFormatter = {
     if (gridParams.options.extraParam && gridParams.options.extraParam.entityMap) {
       parentFormData = gridParams.options.extraParam.entityMap
     }
-    console.log('ridParams.options.extraParam.entityMap', gridParams.options.extraParam)
+    // console.log('ridParams.options.extraParam.entityMap', gridParams.options.extraParam)
     jumpToPage(jumpPageSetting, gridParams.system, row.id ? row.id : row.ID, row, gridParams.additionalParamMap, null, null, parentFormData).then((openPageParams) => {
-      console.log('clickHyperLink--openPageParams===', openPageParams)
+      // console.log('clickHyperLink--openPageParams===', openPageParams)
       if (openPageParams) {
       // 点击列表组件中某元素弹出的页面
         openPageParams._position = 'list'

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

@@ -1233,7 +1233,7 @@ export default {
       this.$emit('refresMainTableFields', map)
     },
     deleteSuccess(deleteFile) {
-      console.log('deleteSuccess', deleteFile, this.fileInfo)
+      // console.log('deleteSuccess', deleteFile, this.fileInfo)
     },
     // 时间格式判断是否是字符串类型，如果是字符串类型使用格式化的数据，如果是时间格式的显示时间搓
     isValueFormat() {

package/packages/super-grid/src/header-context-menu.vue

@@ -36,7 +36,7 @@ export default {
 
   },
   created() {
-    console.log('12345', this.buttomArr)
+    // console.log('12345', this.buttomArr)
   },
   methods: {
     // 操作按钮的点击事件

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

@@ -557,8 +557,8 @@ export default {
     },
     refresPortData(port, value) {
       const gridParams = store.get(this.listCode)
-      console.log('gridParams', gridParams)
-      console.log('this.index', this.index)
+      // console.log('gridParams', gridParams)
+      // console.log('this.index', this.index)
       if (gridParams && gridParams.lineEdit && gridParams.lineEdit.editingCell) {
         this.$emit('refresPortData', port, value, gridParams.lineEdit.editingCell.row)
       } else {
@@ -567,8 +567,8 @@ export default {
     },
     refresPortsData(map) {
       const gridParams = store.get(this.listCode)
-      console.log('gridParams', gridParams)
-      console.log('this.index', this.index)
+      // console.log('gridParams', gridParams)
+      // console.log('this.index', this.index)
       if (gridParams && gridParams.lineEdit && gridParams.lineEdit.editingCell) {
         this.$emit('refresPortsData', map, gridParams.lineEdit.editingCell.row)
       } else {
@@ -702,7 +702,7 @@ export default {
       return iconName
     },
     createFormSubTableRow() {
-      console.log('触发了行新建')
+      // console.log('触发了行新建')
       this.createRow(this.listCode)
     },
     handleCommand(comman) {

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

@@ -153,7 +153,7 @@ export default {
     if (this.initSearchProps === undefined || this.initSearchProps === null) {
       this.initSearchProps = []
     }
-    console.log('searchForm=', searchColumns)
+    // console.log('searchForm=', searchColumns)
     searchColumns.forEach(column => {
       // propMap[column.prop] = column
       if (this.initSearchProps.indexOf(column.prop) < 0) {
@@ -225,7 +225,7 @@ export default {
     }
   },
   created() {
-    console.log('加载查询页面', this.searchType)
+    // console.log('加载查询页面', this.searchType)
     this.listSearchConditions()
     if (this.normalQuery) {
       this.searchType = 'normal'

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

@@ -10,7 +10,7 @@ import {
 } from './utils'
 const superGridService = {
   initialize() {
-    const a = new Date().getTime()
+    // const a = new Date().getTime()
     return new Promise((resolve, reject) => {
       const gridParams = store.get(this.code)
       if (this.options.isAdministerListView) {
@@ -41,7 +41,7 @@ const superGridService = {
         let additionalParams
         const additionalParamMap = sessionStorage.getItem('additionalParamMap')
         if (additionalParamMap) {
-          console.log('进入判断', additionalParamMap)
+          // console.log('进入判断', additionalParamMap)
           if (additionalParamMap && typeof (additionalParamMap) === 'object') {
             additionalParams = JSON.stringify(additionalParamMap)
           } else if (additionalParamMap && additionalParamMap !== '') {
@@ -72,7 +72,7 @@ const superGridService = {
         this.isLoading = true
         // 初始化组件时先获取元信息再获取数据，以后翻页、排序、查询不再去获取元数据了
         this.$http.post(url, param).then(data => {
-          const p1 = new Date().getTime()
+          // const p1 = new Date().getTime()
           // 判断是否查询组件渲染完之后查询
           this.isLoadCompleteQuery(data.columns)
           // 行编辑设置所有字段的默认值null时使用，优化行编辑性能
@@ -112,7 +112,7 @@ const superGridService = {
           packageEnumAndBeanColumnValueSets(data.columns, this.code).then(() => {
             return this.getDynamicColumnByBean(additionalParams, data.dynamicColumnInfo, data.columns, gridParams)
           }).then((dynamicColumns) => {
-            const b = new Date().getTime()
+            // const b = new Date().getTime()
             let showColumns = []
             if (typeof (this.options.showColumns) !== 'undefined') {
               showColumns = this.options.showColumns.split(',')
@@ -210,9 +210,9 @@ const superGridService = {
               }
             }
             this.createBackgroundColorMap()
-            const p2 = new Date().getTime()
-            console.log('拿到共享数据并存储p2-p1=', p2 - p1)
-            console.log('拿到共享数据并存储p2-b=', p2 - b)
+            // const p2 = new Date().getTime()
+            // console.log('拿到共享数据并存储p2-p1=', p2 - p1)
+            // console.log('拿到共享数据并存储p2-b=', p2 - b)
             resolve()
           }).catch(error => {
             reject(error)
@@ -221,8 +221,8 @@ const superGridService = {
           reject(error)
         })
       }
-      const a1 = new Date().getTime()
-      console.log('初始化所耗时间', a1 - a)
+      // const a1 = new Date().getTime()
+      // console.log('初始化所耗时间', a1 - a)
     })
   },
   isLoadCompleteQuery(columns) {
@@ -420,7 +420,7 @@ const superGridService = {
               columns: splitArr
             }
             vm.$http.post(Vue.prototype.baseAPI + '/component/super-grids/drag-columns', params).then(data => {
-              console.log('移动成功')
+              // console.log('移动成功')
             })
             // const oldIndex = evt.oldIndex
             // const newIndex = evt.newIndex