imatrix-ui 2.9.46-dw → 2.9.48-dw

package/package.json

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

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

@@ -21,6 +21,7 @@
       @blur="blurEvent($event)"
       @focus="focus"
     >
+      <el-option v-if="baseProps.multiple !== undefined && baseProps.multiple === true && optionItems && optionItems.length > 0 " :label="$t('superGrid.selectAll')" value="saveAll" />
       <el-option
         v-for="item in optionItems"
         :key="item.value"
@@ -224,11 +225,28 @@ export default {
     },
     // 必须有该方法，否则无法给字段赋值
     inputValue(newValue) {
+      let isClickSaveAll = false
+      if (this.baseProps.multiple !== undefined && this.baseProps.multiple === true && newValue && newValue.indexOf('saveAll') >= 0) {
+        // 表示点击了全选选项
+        isClickSaveAll = true
+        if (newValue.length - 1 >= this.optionItems.length) {
+          // 表示需要取消全选
+          newValue = []
+        } else {
+          // 表示需要全选
+          const allValues = []
+          for (let i = 0; i < this.optionItems.length; i++) {
+            const item = this.optionItems[i]
+            allValues.push(item[this.valueAttribute])
+          }
+          newValue = allValues
+        }
+      }
       this.$emit('input', newValue)
       if (newValue === null || newValue === undefined || newValue === '') {
         this.remoteQueryMethod(newValue)
       }
-      this.setValues(newValue)
+      this.setValues(newValue, isClickSaveAll)
     },
     packageDynamicDataSourceInfo(dynamicDataSourceCode, param) {
       return new Promise((resolve, reject) => {
@@ -373,11 +391,11 @@ export default {
         ? '_label_'
         : this.valueAttribute
     },
-    setValues(newValue) {
+    setValues(newValue, isClickSaveAll) {
       if (this.valueSetOptions && this.valueSetOptions.length > 0) {
         if (this.baseProps.multiple !== undefined && this.baseProps.multiple === true) {
           // 多选时
-          this.setColumnValueWhenMulti(newValue)
+          this.setColumnValueWhenMulti(newValue, isClickSaveAll)
         } else {
           // 单选时
           this.valueSetOptions.forEach(columnInfo => {
@@ -423,7 +441,7 @@ export default {
       })
     },
     // 多选下拉框时处理增加tag、减少tag时，映射字段赋值问题
-    setColumnValueWhenMulti(newValue) {
+    setColumnValueWhenMulti(newValue, isClickSaveAll) {
       // 是否添加tag
       let isAddTag = false
       let removeTag
@@ -459,18 +477,88 @@ export default {
       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])
+        if (isClickSaveAll) {
+          // 全选
+          this.setAllTagValue(isRemove)
+        } else {
+          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)
+        if (isClickSaveAll) {
+          this.setAllTagValue(isRemove)
+        } else {
+          this.setTagValue(removeTag, isRemove)
+        }
+      }
+    },
+    setAllTagValue(isRemove) {
+      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) {
+              if (isRemove) {
+                // 移除tag
+                value = null
+              } else {
+                // 添加tag
+                let originalValue = ''
+                if (this.optionItems && this.optionItems.length > 0) {
+                  this.optionItems.forEach(selectItem => {
+                    const addValue = selectItem[sourceColumnName]
+                    if (originalValue !== undefined && originalValue !== null && originalValue !== '') {
+                      originalValue = originalValue + ',' + addValue
+                    } else {
+                      originalValue = addValue
+                    }
+                  })
+                  value = originalValue
+                }
+              }
+            }
+            this.setTargetColumnValue(sourceColumnName, targetColumnName, value)
+          }
+        })
+      }
+    },
+    setTargetColumnValue(sourceColumnName, targetColumnName, value) {
+      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参数设置映射字段的值
     setTagValue(tag, isRemove, selectItem) {
@@ -515,21 +603,7 @@ export default {
                 }
               }
             }
-            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
-            })
+            this.setTargetColumnValue(sourceColumnName, targetColumnName, value)
           }
         })
       }

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

@@ -463,8 +463,7 @@ export default {
         if (!isDynamic) {
           // 选项组保存时将数组处理为字符串
           const beforeColumnValue = param.row[this.column.prop]
-          console.log('un-edit---beforeColumnValue=', beforeColumnValue, 'this.column.prop=', this.column.prop)
-          if (beforeColumnValue && Array.isArray(beforeColumnValue)) {
+          if (beforeColumnValue && Object.prototype.toString.apply(beforeColumnValue) === '[object Array]') {
             // 如果是数组才需要转换
             this.$set(param.row, this.column.prop, beforeColumnValue.join(','))
           }
@@ -510,7 +509,7 @@ export default {
             }
           } else {
             const beforeColumnValue = param.row[this.column.prop]
-            if (beforeColumnValue && Array.isArray(beforeColumnValue)) {
+            if (beforeColumnValue && Object.prototype.toString.apply(beforeColumnValue) === '[object Array]') {
               // 如果是数组才需要转换
               this.$set(param.row, this.column.prop, beforeColumnValue.join(','))
             }