doway-coms 2.2.30 → 2.2.32

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "doway-coms",
-  "version": "2.2.30",
+  "version": "2.2.32",
   "description": "doway组件库",
   "author": "dowaysoft",
   "main": "packages/index.js",

package/packages/BaseForm/src/index.vue

@@ -275,6 +275,7 @@
             pullDownChange(col, rowInfo)
           }
         "
+        :dataSource="col.dataSource"
       />
       <BaseTreeSelect
         v-if="

package/packages/BaseGrid/src/index.vue

@@ -1777,7 +1777,7 @@ export default {
         colParams['editStatuss'] = originCol.editStatuss
       }
       // 单元格输入限制
-      if (originCol.editStatuss) {
+      if (originCol.cellEdit) {
         colParams['cellEdit'] = originCol.cellEdit
       }
       if (originCol.width) {

package/packages/BasePulldown/src/index.vue

@@ -244,6 +244,12 @@ export default {
     }
   },
   props: {
+    dataSource: {
+      type: Array,
+      default: function() {
+        return []
+      }
+    },
     labelWidth: {
       type: Number,
       default: function () {
@@ -422,7 +428,14 @@ export default {
     currentValue: {
       // 动态计算currentValue的值
       get: function () {
-        return this.value // 将props中的value赋值给currentValue
+        // return this.value // 将props中的value赋值给currentValue
+          for (let i = 0; i < this.dataSource.length; i++) {
+            const element = this.dataSource[i];
+            if (this.value === element.value) {
+              return element.caption
+            }
+          }
+          return this.value
       },
       set: function (val) {
         this.$emit('input', val) // 通过$emit触发父组件