imatrix-ui 2.9.9-dw → 2.9.11-dw

package/package.json

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

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

@@ -145,6 +145,8 @@ const apis = {
             if (editRows && editRows.length > 0) {
               editRows.forEach(editRow => {
                 setEntityFieldValue(editRow, '$editing', false)
+                // 取消上一行选中状态时，触发un-edit事件，处理下拉多选选项组问题
+                eventBus.$emit('un-edit', { row: editRow })
                 // Vue.set(editRow, '$editing', false)
               })
             }
@@ -758,6 +760,49 @@ const apis = {
     }
     const gridParams = store.get(listCode)
     return gridParams.pagination
+  },
+  // 获得该列表中，下拉选是选项组的字段信息，返回的key是属性名，value是选项集合
+  getOptionsValueSet(listCode) {
+    const result = {}
+    if (!listCode) {
+      listCode = store.get('_list_code')
+    }
+    const gridParams = store.get(listCode)
+    const columns = gridParams.columns
+    columns.forEach(col => {
+      if (col.valueSet && col.valueSet.length > 0) {
+        result[col.prop] = col.valueSet
+      }
+    })
+    return result
+  },
+  // 取消列表的编辑状态
+  restoreGridEdit(listCode) {
+    if (!listCode) {
+      listCode = store.get('_list_code')
+    }
+    const gridParams = store.get(listCode)
+    if (gridParams.options && gridParams.options.isFormSubTable) {
+      const isSubTableShowPage = gridParams.isSubTableShowPage
+      let gridData = []
+      if (isSubTableShowPage) {
+        gridData = gridParams.subTableData
+      } else {
+        gridData = gridParams.gridData
+      }
+      if (gridData && gridData.length > 0) {
+        for (let i = 0; i < gridData.length; i++) {
+          const row = gridData[i]
+          // 取消最后一个编辑行的状态
+          if (row.$editing !== undefined && row.$editing === true) {
+            setEntityFieldValue(row, '$editing', false)
+            // 取消上一行选中状态时，触发un-edit事件，处理下拉多选选项组问题
+            eventBus.$emit('un-edit', { row: row })
+            break
+          }
+        }
+      }
+    }
   }
 }
 export default apis

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

@@ -225,6 +225,7 @@ import searchFormDialog from './search-form-dialog'
 import {
   setEntityFieldValue
 } from '../../../src/utils/util'
+import eventBus from './eventBus'
 import {
   getSpanValuesForColumn,
   getFirstEditableColumn,
@@ -1356,11 +1357,11 @@ export default {
             // 子表无记录时不需要刷新子表记录。表示是新建或修改时子表无记录，且不需要刷新子表。
             if (
               this.isSubTableEmpty(gridParams)
-            ){
+            ) {
               // 表示是新建表单时，子表记录集合是空数组
               console.log('子表无记录----code=', this.code, gridParams)
               const subTableData = []
-              this.packageSubTableData(gridParams,subTableData)
+              this.packageSubTableData(gridParams, subTableData)
             }
             this.hasLoadData = true
             gridParams.loaded = true
@@ -1368,7 +1369,7 @@ export default {
         }
       }
     },
-    isSubTableEmpty (gridParams) {
+    isSubTableEmpty(gridParams) {
       return gridParams.options && gridParams.options.isFormSubTable &&
       ((gridParams.options.subTableData === undefined || gridParams.options.subTableData === null) ||
       gridParams.options.subTableData.length === 0)
@@ -1416,7 +1417,7 @@ export default {
         JSON.parse(JSON.stringify(this.gridData))
       )
     },
-    canRefreshTableData (gridParams) {
+    canRefreshTableData(gridParams) {
       let isCanRefreshTableData = false
       if (gridParams.options && !gridParams.options.isFormSubTable) {
         // 如果不是子表时
@@ -2505,6 +2506,12 @@ export default {
         const validateRules = formValidatorService.getValidator(this.code)
         for (let i = 0; i < gridData.length; i++) {
           const row = gridData[i]
+          // 取消最后一个编辑行的状态
+          if (row.$editing !== undefined && row.$editing === true) {
+            setEntityFieldValue(row, '$editing', false)
+            // 取消上一行选中状态时，触发un-edit事件，处理下拉多选选项组问题
+            eventBus.$emit('un-edit', { row: row })
+          }
           let needValidate = true
           if (isHasEditOption('isEnableValidate', this.code)) {
             // 表示配置了是否启用必填验证
@@ -2574,6 +2581,8 @@ export default {
           if (editRows && editRows.length > 0) {
             editRows.forEach(editRow => {
               setEntityFieldValue(editRow, '$editing', false)
+              // 取消上一行选中状态时，触发un-edit事件，处理下拉多选选项组问题
+              eventBus.$emit('un-edit', { row: editRow })
               // this.$set(editRow, '$editing', false)
             })
           }