agilebuilder-ui 1.0.87-temp3 → 1.0.87-temp4

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

@@ -155,15 +155,9 @@
       @focus="cellEvent('focus', $event)"
       @input="cellEvent('input', $event, true)"
     >
-    <template
-        v-if="isShowScanIcon"
-        #append
-      >
-        <SuperIcon
-          iconValue="fa-barcode"
-          @click="scanClick()"
-        ></SuperIcon>
-    </template>
+      <template v-if="isShowScanIcon" #append>
+        <SuperIcon iconValue="fa-barcode" @click="scanClick()"></SuperIcon>
+      </template>
     </el-input>
 
     <el-input
@@ -436,7 +430,7 @@ import {
   isDynamicDataSourceSource,
   isEditOptionFunction,
   otherFilesToStandard,
-  getControlConfig 
+  getControlConfig
 } from './utils'
 import dynamicSourceSelect from '../../dynamic-source-select/src/dynamic-source-select.vue'
 import { getEntityFieldValue, setEntityFieldValue } from '../../../src/utils/util'
@@ -554,10 +548,10 @@ export default {
     const additionalParamMap = getAdditionalParamMap(gridParams)
     const pageContext = gridParams.options.pageContext
     const isMobile = isMobileBrowser()
-    
-    const componentId = this.listCode+'_'+this.column.prop
+
+    const componentId = this.listCode + '_' + this.column.prop
     let scanEnable = false
-    if(controlConfig.scanEnable){
+    if (controlConfig.scanEnable) {
       scanEnable = true
     }
     let userAgent
@@ -570,9 +564,9 @@ export default {
       userAgent = 'browser'
     }
     console.log('superGrid----window.location.protocol---', window.location.protocol)
-    const isShowScanIcon = isMobile && window.location.protocol === 'https:' ? true: false
-    const isApk = isMobile && userAgent && userAgent === 'app' ? true: false
-    
+    const isShowScanIcon = isMobile && window.location.protocol === 'https:' ? true : false
+    const isApk = isMobile && userAgent && userAgent === 'app' ? true : false
+
     let baseURL = gridParams.options.backendUrl
     if (!baseURL) {
       baseURL = window.$vueApp.config.globalProperties.baseURL
@@ -753,7 +747,14 @@ export default {
     const that = this
     // 选择文件结束
     eventBus.$on(this.componentId + '-pickFileDone', (data) => {
-      console.log('superPage666611---pickFileDone--data.componentId=', data.componentId, 'data.listCode=', data.listCode, 'data=', data)
+      console.log(
+        'superPage666611---pickFileDone--data.componentId=',
+        data.componentId,
+        'data.listCode=',
+        data.listCode,
+        'data=',
+        data
+      )
       if (that.$refs.fileUploadRef) {
         that.$refs.fileUploadRef.pickFileDone(data)
       }
@@ -766,12 +767,19 @@ export default {
     })
     // 扫描结束
     eventBus.$on(this.componentId + '-scanDone', (data) => {
-      console.log('superPage666611---scanDone--data.componentId=', data.componentId, 'data.listCode=', data.listCode, 'data=', data)
-        that.innerValue = data.result
-        that.blurEvent()
+      console.log(
+        'superPage666611---scanDone--data.componentId=',
+        data.componentId,
+        'data.listCode=',
+        data.listCode,
+        'data=',
+        data
+      )
+      that.innerValue = data.result
+      that.blurEvent()
     })
   },
-  destroyed(){
+  destroyed() {
     eventBus.$off(this.componentId + '-pickFileDone')
     // 上传文件结束
     eventBus.$off(this.componentId + '-uploadFileDone')
@@ -1080,7 +1088,7 @@ export default {
           param.parent = this.parentFormData
           param.rowIndex = this.rowIndex
           param.additionalParamMap = gridParams.additionalParamMap
-          if(gridParams.options.pageContext){
+          if (gridParams.options.pageContext) {
             param.pageContext = gridParams.options.pageContext
             param.configure = gridParams.options.configureObj
             const eventFunc = gridParams.options['eventCallBack'][funName]
@@ -1125,7 +1133,7 @@ export default {
     uploadOnSuccess(response) {
       console.log('superGrid---uploadOnSuccess----response=', response)
       if (response) {
-        if(this.isMobile){
+        if (this.isMobile) {
           // 移动端时事件
           if (this.column.fileSet && this.column.fileSet !== '') {
             const fileSetObj = JSON.parse(this.column.fileSet)
@@ -1293,7 +1301,7 @@ export default {
         if (!fileArr) {
           fileArr = []
         }
-        responseFiles.forEach(responseFile=>{
+        responseFiles.forEach((responseFile) => {
           const fileObj = this.responseFileToFileObj(fileSetObj, responseFile)
           fileArr.push(fileObj)
         })
@@ -1308,11 +1316,11 @@ export default {
             if (fileSetObj.showNameData.dbName) {
               if (this.row) {
                 let showName = ''
-                responseFiles.forEach(responseFile=>{
+                responseFiles.forEach((responseFile) => {
                   showName = showName + responseFile.name + ','
                 })
-                if(showName.indexOf(',')>=0){
-                  showName = showName.substring(0,showName.lastIndexOf(','))
+                if (showName.indexOf(',') >= 0) {
+                  showName = showName.substring(0, showName.lastIndexOf(','))
                 }
                 this.setCellValue(fileSetObj.showNameData.dbName, showName, 'input')
                 showNameStr = this.row[fileSetObj.showNameData.dbName]
@@ -1322,11 +1330,11 @@ export default {
             if (fileSetObj.showNameData.name) {
               if (this.row) {
                 let showName = ''
-                responseFiles.forEach(responseFile=>{
+                responseFiles.forEach((responseFile) => {
                   showName = showName + responseFile.name + ','
                 })
-                if(showName.indexOf(',')>=0){
-                  showName = showName.substring(0,showName.lastIndexOf(','))
+                if (showName.indexOf(',') >= 0) {
+                  showName = showName.substring(0, showName.lastIndexOf(','))
                 }
                 this.setCellValue(fileSetObj.showNameData.name, showName, 'input')
                 showNameStr = this.row[fileSetObj.showNameData.name]
@@ -1339,11 +1347,11 @@ export default {
             if (fileSetObj.serverNameData.dbName) {
               if (this.row) {
                 let serverName = ''
-                responseFiles.forEach(responseFile=>{
+                responseFiles.forEach((responseFile) => {
                   serverName = serverName + responseFile.serverPath + ','
                 })
-                if(serverName.indexOf(',')>=0){
-                  serverName = serverName.substring(0,serverName.lastIndexOf(','))
+                if (serverName.indexOf(',') >= 0) {
+                  serverName = serverName.substring(0, serverName.lastIndexOf(','))
                 }
                 this.setCellValue(fileSetObj.serverNameData.dbName, serverName, 'input')
                 pathNameStr = this.row[fileSetObj.serverNameData.dbName]
@@ -1353,11 +1361,11 @@ export default {
             if (fileSetObj.serverNameData.name) {
               if (this.row) {
                 let serverName = ''
-                responseFiles.forEach(responseFile=>{
+                responseFiles.forEach((responseFile) => {
                   serverName = serverName + responseFile.serverPath + ','
                 })
-                if(serverName.indexOf(',')>=0){
-                  serverName = serverName.substring(0,serverName.lastIndexOf(','))
+                if (serverName.indexOf(',') >= 0) {
+                  serverName = serverName.substring(0, serverName.lastIndexOf(','))
                 }
                 this.setCellValue(fileSetObj.serverNameData.name, serverName, 'input')
                 pathNameStr = this.row[fileSetObj.serverNameData.name]
@@ -1573,7 +1581,6 @@ export default {
       }
     },
     multiselectChange(arr, selectedItem) {
-			debugger
       // console.log('multiselectChange1---arr=', arr)
       this.extendParams = selectedItem
       let isSaveAll = false
@@ -1610,6 +1617,8 @@ export default {
         }
         this.cellEvent('change', val)
         this.setCellValue(this.column.prop, val, 'change')
+      } else {
+        this.cellEvent('change', arr)
       }
     },
     getDefaultValue(val) {
@@ -1750,17 +1759,17 @@ export default {
         }
       }
     },
-    scanClick(){
+    scanClick() {
       console.log('scanClick----userAgent=', this.userAgent)
-      if(this.isApk) {
+      if (this.isApk) {
         // 表示是APK中
         const message = {
-            type: 'scan',
-            componentId: this.componentId,
-            systemCode: this.pageContext.systemCode,
-            listCode: this.listCode
-          }
-          window.parent.postMessage(JSON.stringify(message), '*')
+          type: 'scan',
+          componentId: this.componentId,
+          systemCode: this.pageContext.systemCode,
+          listCode: this.listCode
+        }
+        window.parent.postMessage(JSON.stringify(message), '*')
       } else {
         // 表示是移动端浏览器中
         this.isShowBrowserScan = true
@@ -1770,7 +1779,7 @@ export default {
      * 扫描组件时，监听扫描值变化
      */
     watchScanValueChange(newValue) {
-      if(this.scanEnable && this.type === 'input'){
+      if (this.scanEnable && this.type === 'input') {
         const valueSet = analysisScanValue(newValue, this.column._scanRuleSets)
         if (valueSet) {
           setScanAnalysisValue(this.row, valueSet.scanSet, valueSet.params)